diff --git a/core/assets-raw/sprites/blocks/production/silicon-arc-furnace-bottom.png b/core/assets-raw/sprites/blocks/production/silicon-arc-furnace-bottom.png index cc9cacb3f8..4f4b6a2b8f 100644 Binary files a/core/assets-raw/sprites/blocks/production/silicon-arc-furnace-bottom.png and b/core/assets-raw/sprites/blocks/production/silicon-arc-furnace-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/storage/core-citadel-team.png b/core/assets-raw/sprites/blocks/storage/core-citadel-team.png new file mode 100644 index 0000000000..c4412053d9 Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-citadel-team.png differ diff --git a/core/assets-raw/sprites/blocks/storage/core-citadel-thruster1.png b/core/assets-raw/sprites/blocks/storage/core-citadel-thruster1.png new file mode 100644 index 0000000000..a637342ac9 Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-citadel-thruster1.png differ diff --git a/core/assets-raw/sprites/blocks/storage/core-citadel-thruster2.png b/core/assets-raw/sprites/blocks/storage/core-citadel-thruster2.png new file mode 100644 index 0000000000..e09884a489 Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-citadel-thruster2.png differ diff --git a/core/assets-raw/sprites/blocks/storage/core-citadel.png b/core/assets-raw/sprites/blocks/storage/core-citadel.png new file mode 100644 index 0000000000..795eb990b2 Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/core-citadel.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 3e9805ee66..a5bfbe9482 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -433,3 +433,4 @@ 63275=reinforced-liquid-tank|block-reinforced-liquid-tank-ui 63274=reinforced-bridge-conduit|block-reinforced-bridge-conduit-ui 63273=core-aegis|block-core-aegis-ui +63272=core-citadel|block-core-citadel-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index e86a9ebbf6..9aa5dac48f 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 4b545dd5a5..854b556cd8 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -95,7 +95,7 @@ public class Blocks implements ContentList{ //storage coreShard, coreFoundation, coreNucleus, vault, container, unloader, //storage - erekir - coreBastion, coreAegis, + coreBastion, coreAegis, coreCitadel, //turrets duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, foreshadow, spectre, meltdown, segment, parallax, tsunami, @@ -733,7 +733,6 @@ public class Blocks implements ContentList{ itemCapacity = 30; drawer = new DrawArcSmelter(); - //TODO don't use sand? consumes.items(with(Items.graphite, 1, Items.sand, 4)); consumes.power(6f); }}; @@ -1825,6 +1824,7 @@ public class Blocks implements ContentList{ }}; coreAegis = new CoreBlock("core-aegis"){{ + //TODO cost requirements(Category.effect, BuildVisibility.editorOnly, with(Items.beryllium, 2000, Items.graphite, 2000, Items.tungsten, 1000)); unitType = UnitTypes.evoke; @@ -1837,6 +1837,20 @@ public class Blocks implements ContentList{ researchCostMultiplier = 0.07f; }}; + coreCitadel = new CoreBlock("core-citadel"){{ + //TODO cost + requirements(Category.effect, with(Items.beryllium, 7000, Items.graphite, 7000, Items.tungsten, 5000, Items.carbide, 5000)); + + unitType = UnitTypes.gamma; + health = 14000; + itemCapacity = 11000; + size = 5; + thrusterLength = 40/4f; + + unitCapModifier = 30; + researchCostMultiplier = 0.11f; + }}; + vault = new StorageBlock("vault"){{ requirements(Category.effect, with(Items.titanium, 250, Items.thorium, 125)); size = 3;