From 61d145e23375f7652cc5cbf622f48972629444dc Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 2 May 2022 19:26:21 -0400 Subject: [PATCH] Advanced reconstructor in tech tree --- .../units/advanced-reconstructor-top.png | Bin 0 -> 5397 bytes .../blocks/units/advanced-reconstructor.png | Bin 0 -> 5140 bytes core/assets/logicids.dat | Bin 4376 -> 4400 bytes core/src/mindustry/content/Blocks.java | 19 ++++++++++++++++++ .../src/mindustry/content/ErekirTechTree.java | 8 ++++++++ 5 files changed, 27 insertions(+) create mode 100644 core/assets-raw/sprites/blocks/units/advanced-reconstructor-top.png create mode 100644 core/assets-raw/sprites/blocks/units/advanced-reconstructor.png diff --git a/core/assets-raw/sprites/blocks/units/advanced-reconstructor-top.png b/core/assets-raw/sprites/blocks/units/advanced-reconstructor-top.png new file mode 100644 index 0000000000000000000000000000000000000000..24cc4cd5a583694efb880ebb363069dd372cf265 GIT binary patch literal 5397 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 F0RR|))Tsaf literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/units/advanced-reconstructor.png b/core/assets-raw/sprites/blocks/units/advanced-reconstructor.png new file mode 100644 index 0000000000000000000000000000000000000000..5304816b218a003628d0cf8aacad8b8fa002af87 GIT binary patch literal 5140 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 literal 0 HcmV?d00001 diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index ba100007a4ee12198c3bfee23a6f0862a786e8aa..908dcdc6b42524f63ff74ed35364742e86c94a23 100644 GIT binary patch delta 40 vcmbQCv_Xl9;q^u)Za#6b#FVncyyVmr-J;aw{Ji3lqSEA&{G!b~d_2qm5P%I& delta 16 Xcmdm>G((Ar;nhYaZobW`eB8_cE0hE| diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 141288e202..f7f1828d7d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -142,6 +142,7 @@ public class Blocks{ tankFabricator, shipFabricator, mechFabricator, basicReconstructor, + advancedReconstructor, //tankReconstructor, shipReconstructor, mechReconstructor, tankAssembler, shipAssembler, mechAssembler, @@ -4252,6 +4253,24 @@ public class Blocks{ ); }}; + advancedReconstructor = new Reconstructor("advanced-reconstructor"){{ + requirements(Category.units, with(Items.beryllium, 250, Items.oxide, 200, Items.tungsten, 200, Items.silicon, 400)); + regionSuffix = "-dark"; + + size = 5; + consumePower(5f); + consumeLiquid(Liquids.nitrogen, 10f / 60f); + consumeItems(with(Items.oxide, 110, Items.tungsten, 100)); + + constructTime = 60f * 60f; + + upgrades.addAll( + new UnitType[]{UnitTypes.locus, UnitTypes.precept}, + new UnitType[]{UnitTypes.latum, UnitTypes.anthicus}, + new UnitType[]{UnitTypes.avert, UnitTypes.obviate} + ); + }}; + /* mechReconstructor = new Reconstructor("mech-reconstructor"){{ requirements(Category.units, with(Items.beryllium, 250, Items.tungsten, 120, Items.silicon, 150)); diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index cd32971c71..2d149c9d8b 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -298,7 +298,15 @@ public class ErekirTechTree{ node(UnitTypes.avert); node(UnitTypes.locus); + //TODO + node(advancedReconstructor, () -> { + node(UnitTypes.precept); + node(UnitTypes.anthicus); + node(UnitTypes.obviate); + }); + node(tankAssembler, Seq.with(new OnSector(three), new Research(constructor), new Research(atmosphericConcentrator)), () -> { + node(UnitTypes.vanquish, () -> { node(UnitTypes.conquer, Seq.with(tmpNever), () -> {