From a3871cca9085d10689d7e413c37ceca1ac684ba8 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 15 Oct 2019 18:32:47 -0400 Subject: [PATCH] Added correctly named mech pads for alpha/dart --- .../sprites/blocks/mechs/alpha-mech-pad.png | Bin 0 -> 5083 bytes .../{dart-mech-pad.png => dart-ship-pad.png} | Bin core/assets/bundles/bundle.properties | 3 ++- core/assets/sprites/block_colors.png | Bin 727 -> 732 bytes core/src/io/anuke/mindustry/content/Blocks.java | 11 +++++++++-- core/src/io/anuke/mindustry/content/Mechs.java | 5 ++--- .../io/anuke/mindustry/io/SaveFileReader.java | 4 +++- 7 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/mechs/alpha-mech-pad.png rename core/assets-raw/sprites/blocks/mechs/{dart-mech-pad.png => dart-ship-pad.png} (100%) diff --git a/core/assets-raw/sprites/blocks/mechs/alpha-mech-pad.png b/core/assets-raw/sprites/blocks/mechs/alpha-mech-pad.png new file mode 100644 index 0000000000000000000000000000000000000000..e5a90abb4bf1d775336e05994fcf0ba9a33f3876 GIT binary patch literal 5083 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 JPDHLkV1m@_U?%_o diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 130d56d369..8bfcbbec0f 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -79,7 +79,7 @@ public class Blocks implements ContentList{ fortressFactory, repairPoint, //upgrades - dartPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad; + dartPad, alphaPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad; @Override public void load(){ @@ -1742,7 +1742,14 @@ public class Blocks implements ContentList{ //endregion //region upgrades - dartPad = new MechPad("dart-mech-pad"){{ + dartPad = new MechPad("dart-ship-pad"){{ + requirements(Category.upgrade, ItemStack.with(Items.lead, 100, Items.graphite, 50, Items.copper, 75)); + mech = Mechs.dart; + size = 2; + consumes.power(0.5f); + }}; + + alphaPad = new MechPad("alpha-mech-pad"){{ requirements(Category.upgrade, ItemStack.with(Items.lead, 100, Items.graphite, 50, Items.copper, 75)); mech = Mechs.alpha; size = 2; diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index dca4b16c2e..b13f10a91b 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -43,10 +43,9 @@ public class Mechs implements ContentList{ homingPower = 20f; damage = 3f; speed = 3f; - bulletWidth = 4f; - bulletHeight = 4f; + bulletWidth = 6f; + bulletHeight = 6f; lifetime = 60f; - }}; }}; } diff --git a/core/src/io/anuke/mindustry/io/SaveFileReader.java b/core/src/io/anuke/mindustry/io/SaveFileReader.java index 8384aca50e..b5e0fe8a8c 100644 --- a/core/src/io/anuke/mindustry/io/SaveFileReader.java +++ b/core/src/io/anuke/mindustry/io/SaveFileReader.java @@ -14,7 +14,9 @@ public abstract class SaveFileReader{ protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput); protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream(); protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall); - protected final ObjectMap fallback = ObjectMap.of(); + protected final ObjectMap fallback = ObjectMap.of( + "dart-mech-pad", "dart-ship-pad" + ); protected void region(String name, DataInput stream, CounterInputStream counter, IORunner cons) throws IOException{ counter.resetCount();