From c28db45c4b413d5d0b95df8ba233821d5fcbb4aa Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 4 May 2022 16:55:27 -0400 Subject: [PATCH] Assembler module block stuff --- .../units/basic-assembler-module-side1.png | Bin 347 -> 645 bytes .../units/basic-assembler-module-side2.png | Bin 345 -> 701 bytes .../units/basic-assembler-module-top.png | Bin 1015 -> 129 bytes .../blocks/units/basic-assembler-module.png | Bin 1379 -> 3111 bytes core/assets/icons/icons.properties | 1 + core/assets/logicids.dat | Bin 4400 -> 4424 bytes core/src/mindustry/content/Blocks.java | 18 ++++++++++-------- 7 files changed, 11 insertions(+), 8 deletions(-) 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 04e681b69bd18f6925e42b7b9323c76349255af8..202794fcf3a3947360172b44ea76b612eec0b953 100644 GIT binary patch literal 645 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%fjKx9jP7LeL$-HD>V6yjgaSW-L z^Y-rPT;V{8wuk3AI@y@4wKy_cQg3-MztMT0(GZrQva(67%{NCf`S`q<#?RS*S8kJw z7hCUUHLutcXdVtQZPTiMj4|sUR@%Eq`8dvfNry>c&MU;sN=;%PwA?v~(&lI{EJ zA{t6ccT~hSloaPYXJNc_XZ`&9Z7M&1{5*U!`z-sCmAN(3g%r;A^y&*L^!juHNnRfi z+xRSqeU!yRlQGDv;moI(ufIp~8?&6qDOM6u@b&2pXfQEWbz;19-=xGU2g0Ccg$LWY-l_D+mJht!^`WSR@vnRD44mHlum zRNh0w!An_0!SfZ+A=aXTTodfS^j*-Hk+y72k+6bqFUV!)YEF!sI=q3Zx;K7i#1X*^ b3<0mrqn95ztPm630#f7Y>gTe~DWM4fLE!Qd literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zMLk^{Ln`LH zy<^zdP!0;J)vxXYXHce){wCyxIx& zDQY{)KONtsm9)rEz5a~og+kUAP60KC84QU`NQ@8uw|{-l+{}J;-Aa}j4U@G@?aSW-L z^Y-p(U+F-Jwuk*1x=Xk+RQ6tQFyq+h$$aJDG^I^PeO2BB9Y|?(lSt`*UZmIctn%8i zc}G{@m#R58lLcrXcCcXD>U-i2_J<8ZYX2WT{PrmSkD#wyH`ZEyRApMyv=c;bPz8|- zmVQ({d0k5UQ2o27b%h@7%ddyZr!sxI*!5$ZfWmvJ72W+B{!t9#g|B5d!N@Lt~a~cP$hhVm{ zh{Dk|odFFZTTPsHKPp@Eb={8O(;IypW)<2<-?dyY>7C3)@ABl9Jg2fV7iHeeV*t9X z=1Y-vPs|QJXxb6b;L{#v=>+oS0WCL;1GdpZVM{sY@*b`c7L=P8 zr~d!ToyEI==2~nO(H2zTjpX+z=UcJF+WpI=yAlhZMp&EiIB%?9AG3?w?l{Yx-EQYw ztlb+*dIK8vycAi;P?jdoYVfpf|`DxM=-Oo4pCC1!u6{1-oD!ME=UUg-WfYKxRso&KSy8dWJNLa5H1)2f` z-C38!Kiq%2JJ-H$e`fjqV>Pkgi!_=!1PuBV98L%vl-aQ1llJl_d>q0GJ`DzphkOo+ z#?GF=x?)X_g2MreCI-dtb@Bm?96*Ei$Y(nme~o`T|1`()!{4u-@1OsC{`JHE6zWf$ zDaih?e3N$4GRMMkv!=zK{`KGfckVjqvpN*&V?fll8}NtYxTt!5ZNhSPtu=y$fKy zBF}3XDqlb&oCmf>@GgWU;%+TNi+?qqdfz@`YA}-#Jhf6b>2(^XRB3Nfa4g=KXe4mRkKL)1yp{>2rc=g2(#xFQ2C)EXysoc%%1xSDnCR7 zRK6Tjhkves%AXoxH~GRc5q6X>ED_*fNBKf{`NEF!h4Au|BuSDaNs=THxbrts?1N!miMEp{3Rl=Zq#OO zTUh=hE6EQXq4iS*+6c_OBg4Be`@ zE`Puy9~EYuQF}g1grS>trGhVHJz8u{npz`k`u%3JLSyIq1yWs QvH$=807*qoM6N<$g1EZj8UO$Q 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 4e1478888aa09071aeff90a5241618ab6d736046..b124b414557cca616943d70f27fff071fc6a9060 100644 GIT binary patch literal 3111 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 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 908dcdc6b42524f63ff74ed35364742e86c94a23..6cd7f11d8fee05df9e566d1a09277f92a10b29b6 100644 GIT binary patch delta 40 vcmdm>bV7-V;mt-SWj=ASq{QOPWZlH#;?&%voYW%S-29Z%oYc)Kd_2qm7NQMM delta 16 XcmX@1v_Xl9;q^u)Wxma}eB8_cFLnf) 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.