diff --git a/core/assets-raw/sprites/units/reaper.png b/core/assets-raw/sprites/units/reaper.png index 8c34437e2e..22d5f468c7 100644 Binary files a/core/assets-raw/sprites/units/reaper.png and b/core/assets-raw/sprites/units/reaper.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 437729f54a..e0abc0d87d 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index 9d7b299942..47163ca7fc 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 0d4bd24ec3..fde4ab86f8 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -77,8 +77,6 @@ public class Blocks implements ContentList{ //units groundFactory, repairPoint - //upgrades - //dartPad, alphaPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad; ; @Override @@ -1665,104 +1663,6 @@ public class Blocks implements ContentList{ consumes.items(new ItemStack(Items.silicon, 10)); }}; - /* - draugFactory = new UnitFactory("draug-factory"){{ - requirements(Category.units, ItemStack.with(Items.copper, 30, Items.lead, 70)); - unitType = UnitTypes.draug; - produceTime = 2500; - size = 2; - consumes.power(1.2f); - consumes.items(); - }}; - - spiritFactory = new UnitFactory("spirit-factory"){{ - requirements(Category.units, ItemStack.with(Items.metaglass, 45, Items.lead, 55, Items.silicon, 45)); - unitType = UnitTypes.spirit; - produceTime = 4000; - size = 2; - consumes.power(1.2f); - consumes.items(new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)); - }}; - - phantomFactory = new UnitFactory("phantom-factory"){{ - requirements(Category.units, ItemStack.with(Items.titanium, 50, Items.thorium, 60, Items.lead, 65, Items.silicon, 105)); - unitType = UnitTypes.phantom; - produceTime = 4400; - size = 2; - consumes.power(2.5f); - consumes.items(new ItemStack(Items.silicon, 50), new ItemStack(Items.lead, 30), new ItemStack(Items.titanium, 20)); - }}; - - commandCenter = new CommandCenter("command-center"){{ - requirements(Category.units, ItemStack.with(Items.copper, 200, Items.lead, 250, Items.silicon, 250, Items.graphite, 100)); - flags = EnumSet.of(BlockFlag.rally, BlockFlag.comandCenter); - size = 2; - health = size * size * 55; - }}; - - wraithFactory = new UnitFactory("wraith-factory"){{ - requirements(Category.units, ItemStack.with(Items.titanium, 30, Items.lead, 40, Items.silicon, 45)); - unitType = UnitTypes.wraith; - produceTime = 700; - size = 2; - consumes.power(0.5f); - consumes.items(new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 5)); - }}; - - ghoulFactory = new UnitFactory("ghoul-factory"){{ - requirements(Category.units, ItemStack.with(Items.titanium, 75, Items.lead, 65, Items.silicon, 110)); - unitType = UnitTypes.ghoul; - produceTime = 1150; - size = 3; - consumes.power(1.2f); - consumes.items(new ItemStack(Items.silicon, 15), new ItemStack(Items.titanium, 10)); - }}; - - revenantFactory = new UnitFactory("revenant-factory"){{ - requirements(Category.units, ItemStack.with(Items.plastanium, 50, Items.titanium, 150, Items.lead, 150, Items.silicon, 200)); - unitType = UnitTypes.revenant; - produceTime = 2000; - size = 4; - consumes.power(3f); - consumes.items(new ItemStack(Items.silicon, 40), new ItemStack(Items.titanium, 30)); - }}; - - daggerFactory = new UnitFactory("dagger-factory"){{ - requirements(Category.units, ItemStack.with(Items.lead, 55, Items.silicon, 35)); - unitType = UnitTypes.dagger; - produceTime = 850; - size = 2; - consumes.power(0.5f); - consumes.items(new ItemStack(Items.silicon, 6)); - }}; - - crawlerFactory = new UnitFactory("crawler-factory"){{ - requirements(Category.units, ItemStack.with(Items.lead, 45, Items.silicon, 30)); - unitType = UnitTypes.crawler; - produceTime = 300; - size = 2; - consumes.power(0.5f); - consumes.items(new ItemStack(Items.coal, 10)); - }}; - - titanFactory = new UnitFactory("titan-factory"){{ - requirements(Category.units, ItemStack.with(Items.graphite, 50, Items.lead, 50, Items.silicon, 45)); - unitType = UnitTypes.titan; - produceTime = 1050; - size = 3; - consumes.power(0.60f); - consumes.items(new ItemStack(Items.silicon, 12)); - }}; - - fortressFactory = new UnitFactory("fortress-factory"){{ - requirements(Category.units, ItemStack.with(Items.thorium, 40, Items.lead, 110, Items.silicon, 75)); - unitType = UnitTypes.fortress; - produceTime = 2000; - size = 3; - consumes.power(1.4f); - consumes.items(new ItemStack(Items.silicon, 20), new ItemStack(Items.graphite, 10)); - }};*/ - repairPoint = new RepairPoint("repair-point"){{ requirements(Category.units, ItemStack.with(Items.lead, 15, Items.copper, 15, Items.silicon, 15)); repairSpeed = 0.5f; @@ -1770,67 +1670,6 @@ public class Blocks implements ContentList{ powerUse = 1f; }}; - //endregion - //region upgrades - - //mechs are dead for now - /* - dartPad = new MechPad("dart-ship-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 100, Items.graphite, 50, Items.copper, 75)); - mech = UnitTypes.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 = UnitTypes.alpha; - size = 2; - consumes.power(0.5f); - }}; - - deltaPad = new MechPad("delta-mech-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 175, Items.titanium, 175, Items.copper, 200, Items.silicon, 225, Items.thorium, 150)); - mech = UnitTypes.delta; - size = 2; - consumes.power(0.7f); - }}; - - tauPad = new MechPad("tau-mech-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 125, Items.titanium, 125, Items.copper, 125, Items.silicon, 125)); - mech = UnitTypes.tau; - size = 2; - consumes.power(1f); - }}; - - omegaPad = new MechPad("omega-mech-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 225, Items.graphite, 275, Items.silicon, 325, Items.thorium, 300, Items.surgealloy, 120)); - mech = UnitTypes.omega; - size = 3; - consumes.power(1.2f); - }}; - - javelinPad = new MechPad("javelin-ship-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 175, Items.silicon, 225, Items.titanium, 250, Items.plastanium, 200, Items.phasefabric, 100)); - mech = UnitTypes.javelin; - size = 2; - consumes.power(0.8f); - }}; - - tridentPad = new MechPad("trident-ship-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 125, Items.copper, 125, Items.silicon, 125, Items.titanium, 150, Items.plastanium, 100)); - mech = UnitTypes.trident; - size = 2; - consumes.power(1f); - }}; - - glaivePad = new MechPad("glaive-ship-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 225, Items.silicon, 325, Items.titanium, 350, Items.plastanium, 300, Items.surgealloy, 100)); - mech = UnitTypes.glaive; - size = 3; - consumes.power(1.2f); - }};*/ - //endregion //region sandbox @@ -1881,6 +1720,7 @@ public class Blocks implements ContentList{ //looked up by name, no ref needed new LegacyMechPad("legacy-mech-pad"); new LegacyUnitFactory("legacy-unit-factory"); + new LegacyCommandCenter("legacy-command-center"); //endregion } diff --git a/core/src/mindustry/io/SaveFileReader.java b/core/src/mindustry/io/SaveFileReader.java index fc85ddd988..9478d54bd9 100644 --- a/core/src/mindustry/io/SaveFileReader.java +++ b/core/src/mindustry/io/SaveFileReader.java @@ -32,7 +32,9 @@ public abstract class SaveFileReader{ "dagger-factory", "legacy-unit-factory", "crawler-factory", "legacy-unit-factory", "titan-factory", "legacy-unit-factory", - "fortress-factory", "legacy-unit-factory" + "fortress-factory", "legacy-unit-factory", + + "command-center", "legacy-command-center" ); protected void region(String name, DataInput stream, CounterInputStream counter, IORunner cons) throws IOException{ diff --git a/core/src/mindustry/world/blocks/legacy/LegacyCommandCenter.java b/core/src/mindustry/world/blocks/legacy/LegacyCommandCenter.java new file mode 100644 index 0000000000..91ac7acce0 --- /dev/null +++ b/core/src/mindustry/world/blocks/legacy/LegacyCommandCenter.java @@ -0,0 +1,21 @@ +package mindustry.world.blocks.legacy; + +import arc.util.io.*; +import mindustry.gen.*; +import mindustry.world.*; + +public class LegacyCommandCenter extends Block{ + + public LegacyCommandCenter(String name){ + super(name); + update = true; + } + + public class LegacyCommandCenterEntity extends TileEntity{ + @Override + public void read(Reads read, byte revision){ + super.read(read, revision); + read.b(); + } + } +} diff --git a/gradle.properties b/gradle.properties index b5f2f64a0a..85a032e854 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=206fe4eda06f42e80277ee8d6bd85606fc32b1c9 +archash=3d5a2312ef867b76d996aacb9a00870899775b5e