From 59e909ae3a800d619fd6fae7fb71f1805d52d19e Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 14 Feb 2019 12:11:20 -0500 Subject: [PATCH] Better 'unknown' map names / Recipe fixes --- .../blocks/power/impact-reactor-top.png | Bin 481 -> 4467 bytes .../src/io/anuke/mindustry/content/Blocks.java | 1 - core/src/io/anuke/mindustry/content/Zones.java | 2 +- .../io/anuke/mindustry/io/versions/Save16.java | 3 ++- 4 files changed, 3 insertions(+), 3 deletions(-) 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 baa449e9909029481dc56e17c557652df33c9a5b..b564994c5626c294cd74b30d6ac638b45626acb9 100644 GIT binary patch literal 4467 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 delta 456 zcmeyY^pJUiay{b;PZ!6Kid#pg+xi_f5NN4&J7OuI`c&JJY0)zVkCKk2%K-reEKPrw zI3C_Jvsczt<&v1^pU;(Ld*imZA7B3T=hwgewfpCsTXuhYlxf`VowmAMAKx=@eXOi6 z-}X;e^46Ixx{M45WlI!dCrbTOXL$aOn_>GZuWMd$%cu2Szqf9E{j@y4AoGIgN|_bK zk_U7dtUkP|nDq2@a^uI{O&grJK5{Sk_x{;}OD?}2?Du2gC|%9^;{7?@+z*9C*#&M4 zd|t8~0(aWZ`mVd3FL7Wk+d5B%lch3qR2$Z{{k@r*!qHn+lg=UM9IC-MCtlD)bFpGG z(}G)z1Q|Xp>yvG`Z1!uFkX1d~>V~@oi~$!HZ}h$$(5EQW5L_tSaQZvX#F$En1Mj#j zI7$zi9Pkmy`cRlqG;apip_#cegeC@0Jm2@wW`RJ}iWNe4B?^j_qP&l0Z&h;6@jAM= zJ&@_fQv<6%7SEbm6y4OXH?_p3GX{Ac6Ua;t>6bgdQDt>kQ2DohpEagVkyH8{r#ub) z7$~agoVxS%6g{=fqSh69YO5Lc{Qb6X*3RsN)lYmi%df?JV>yz@(C~wi$+G*h(KU`a Q3=9kmp00i_>zopr078b-M*si- 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();