diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor-top.png b/core/assets-raw/sprites/blocks/power/impact-reactor-top.png index baa449e990..b564994c56 100644 Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor-top.png and b/core/assets-raw/sprites/blocks/power/impact-reactor-top.png differ diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 52eb86fdbd..72bd8db72f 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -820,7 +820,6 @@ public class Blocks implements ContentList{ batteryLarge = new Battery("battery-large"){{ requirements(Category.power, ItemStack.with(Items.titanium, 40, Items.lead, 80, Items.silicon, 30)); - requirements(Category.power, ItemStack.with(Items.copper, 8, Items.lead, 30, Items.silicon, 4)); size = 3; consumes.powerBuffered(20000f, 1f); }}; diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index 91f7e54d1d..014e10a98a 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -398,7 +398,7 @@ public class Zones implements ContentList{ }}; desolateRift = new Zone("desolateRift", new MapGenerator("desolateRift") - .core(Blocks.coreNucleus).dist(2f)){{ + .core(Blocks.coreNucleus).dist(2f)){{ deployCost = ItemStack.with(Items.copper, 2000); startingItems = ItemStack.with(Items.copper, 1500); itemRequirements = ItemStack.with(Items.copper, 8000, Items.metaglass, 2000, Items.graphite, 3000); diff --git a/core/src/io/anuke/mindustry/io/versions/Save16.java b/core/src/io/anuke/mindustry/io/versions/Save16.java index 35bf6ba75a..40c2c2f371 100644 --- a/core/src/io/anuke/mindustry/io/versions/Save16.java +++ b/core/src/io/anuke/mindustry/io/versions/Save16.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.io.versions; +import io.anuke.arc.util.Strings; import io.anuke.arc.util.Time; import io.anuke.mindustry.game.Version; import io.anuke.mindustry.gen.Serialization; @@ -34,7 +35,7 @@ public class Save16 extends SaveFileVersion{ } String mapname = stream.readUTF(); Map map = world.maps.getByName(mapname); - if(map == null) map = new Map("unknown", 1, 1); + if(map == null) map = new Map(Strings.capitalize(mapname), 1, 1); world.setMap(map); int wave = stream.readInt();