diff --git a/core/assets-raw/sprites/blocks/units/basic-assembler-module-side1.png b/core/assets-raw/sprites/blocks/units/basic-assembler-module-side1.png index 04e681b69b..202794fcf3 100644 Binary files a/core/assets-raw/sprites/blocks/units/basic-assembler-module-side1.png and b/core/assets-raw/sprites/blocks/units/basic-assembler-module-side1.png differ diff --git a/core/assets-raw/sprites/blocks/units/basic-assembler-module-side2.png b/core/assets-raw/sprites/blocks/units/basic-assembler-module-side2.png index ad9693f2d1..0137cd141d 100644 Binary files a/core/assets-raw/sprites/blocks/units/basic-assembler-module-side2.png and b/core/assets-raw/sprites/blocks/units/basic-assembler-module-side2.png differ diff --git a/core/assets-raw/sprites/blocks/units/basic-assembler-module-top.png b/core/assets-raw/sprites/blocks/units/basic-assembler-module-top.png index 1a2301dfc1..c8335d4008 100644 Binary files a/core/assets-raw/sprites/blocks/units/basic-assembler-module-top.png and b/core/assets-raw/sprites/blocks/units/basic-assembler-module-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/basic-assembler-module.png b/core/assets-raw/sprites/blocks/units/basic-assembler-module.png index 4e1478888a..b124b41455 100644 Binary files a/core/assets-raw/sprites/blocks/units/basic-assembler-module.png and b/core/assets-raw/sprites/blocks/units/basic-assembler-module.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 487b30191d..45dbe999a0 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -559,3 +559,4 @@ 63133=osc|unit-osc-ui 63132=precept|unit-precept-ui 63131=diffuse|block-diffuse-ui +63130=basic-assembler-module|block-basic-assembler-module-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 908dcdc6b4..6cd7f11d8f 100644 Binary files a/core/assets/logicids.dat and b/core/assets/logicids.dat differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index ba367b0aeb..b9329b8612 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2621,8 +2621,8 @@ public class Blocks{ //TODO bad name eruptionDrill = new BurstDrill("eruption-drill"){{ - requirements(Category.production, with(Items.silicon, 200, Items.beryllium, 250, Items.oxide, 80, Items.tungsten, 200, Items.carbide, 120)); - drillTime = 60f * 9f; + requirements(Category.production, with(Items.silicon, 200, Items.oxide, 80, Items.tungsten, 200, Items.carbide, 120)); + drillTime = 60f * 6f; size = 5; hasPower = true; tier = 7; @@ -4317,10 +4317,13 @@ public class Blocks{ }};*/ tankAssembler = new UnitAssembler("tank-assembler"){{ - requirements(Category.units, with(Items.graphite, 600, Items.beryllium, 600, Items.oxide, 250, Items.tungsten, 400, Items.silicon, 500)); + requirements(Category.units, with(Items.thorium, 500, Items.oxide, 250, Items.tungsten, 500, Items.silicon, 500)); regionSuffix = "-dark"; size = 5; - plans.add(new AssemblerUnitPlan(UnitTypes.vanquish, 60f * 50f, PayloadStack.list(UnitTypes.stell, 4, Blocks.tungstenWallLarge, 10))); + plans.add( + new AssemblerUnitPlan(UnitTypes.vanquish, 60f * 50f, PayloadStack.list(UnitTypes.stell, 4, Blocks.tungstenWallLarge, 10)), + new AssemblerUnitPlan(UnitTypes.conquer, 60f * 60f * 3f, PayloadStack.list(UnitTypes.locus, 6, Blocks.carbideWallLarge, 20)) + ); areaSize = 13; researchCostMultiplier = 0.4f; @@ -4356,13 +4359,12 @@ public class Blocks{ }}; //TODO 5x5 - if(false) basicAssemblerModule = new UnitAssemblerModule("basic-assembler-module"){{ - requirements(Category.units, with(Items.graphite, 10)); - consumePower(0.5f); + requirements(Category.units, with(Items.carbide, 400, Items.thorium, 500, Items.oxide, 300, Items.graphite, 500)); + consumePower(4f); regionSuffix = "-dark"; - size = 3; + size = 5; }}; //TODO setup, sprite, balance... or just scrap it completely.