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 0000000000..e5a90abb4b Binary files /dev/null and b/core/assets-raw/sprites/blocks/mechs/alpha-mech-pad.png differ diff --git a/core/assets-raw/sprites/blocks/mechs/dart-mech-pad.png b/core/assets-raw/sprites/blocks/mechs/dart-ship-pad.png similarity index 100% rename from core/assets-raw/sprites/blocks/mechs/dart-mech-pad.png rename to core/assets-raw/sprites/blocks/mechs/dart-ship-pad.png diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 91a5ecfc89..258828f879 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -873,7 +873,8 @@ block.pneumatic-drill.name = Pneumatic Drill block.laser-drill.name = Laser Drill block.water-extractor.name = Water Extractor block.cultivator.name = Cultivator -block.dart-mech-pad.name = Alpha Mech Pad +block.dart-ship-pad.name = Dart Ship Pad +block.alpha-mech-pad.name = Alpha Mech Pad block.delta-mech-pad.name = Delta Mech Pad block.javelin-ship-pad.name = Javelin Ship Pad block.trident-ship-pad.name = Trident Ship Pad diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index c8615955a6..a518537775 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ 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();