From c28db45c4b413d5d0b95df8ba233821d5fcbb4aa Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
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!ia0y~yU|0ac9Bd2>4Bh9`br~2K7>k44ofy`glX=O&z+~^~
z;uumf=k49oxx#@GZ4b|Lbh0s7YjI?@q~7viexvg~qaiFqWo46En{SR}^6_~yji0ms
zuG}UUFSg#zYF@D?15Pk))2e@rG3y^z+RoYS)}Zrf(hniVO%2|Uy;(exlOK7rcsM6N
z_GURDs6Tu8Ma8@J_k4e?E1!Jt=+#+5_hpz;mY3IbGE{~N#w$4liN`A)m>n(&BEw|w
zze?OJq@WtcKRfghpGRYEO((<49Q%DP4J9QK@k$O>mSXXf_Pqb={G+}$^1p>`d4la*
zV_&x&h136ueom_~=9sWqP){^o$sulTSHVe;lb#zKTKc$o|DK$AZLi!*7#P4#mUtSF
zw7Vs^p=A61x`>97(j67C4JE}n&si8R-B~~Xew)hAA3qP@%s$J$WMyv6bRmVaJ-zyZ
z3cWs^`hp6)J|MR7SrGdui-#s-kXOT*PcL78kK{LIIgwMWB%<K!(;LuWVyx=Kc<IUw
zj<anGr7v&PNO#hD>T`1Wohijn7ibDHG5nFP%0Hhba>nl{+f*i%PTeZal*vV>ES5DI
zC9_L=yJ#GczE-rQ`hUguXRnv{y)u%Ypyy{>CaiE*raPdaq*P)d!^=E-C&r*dYEM-%
z&4ujDx$KV0emE8?@1fz~r7WW0`ASJd!CF+1Yl8ikz6%;N(w40$5?1i-1-Z;z&53bS
mhqtnbLifhcj5wn>;I(=5@&ktzVxn6>YCK*2T-G@yGywoX;PMgx

literal 347
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z$ohJ
z;uumf=j|QCz9t8Tw!oXmPF;Gtr*Yc6EPh9eBlCRTH;b}e44ro3kK6s#SGqp1s`VJ_
zh%tb{nN?o$2X<%km)`y#_jXoy@xRb-1rlt63Jc^N8z$&A878D1jy^X*TfwKnfbkFu
zhcSnENw$O7f(@(HA75##*;L2E=p<(=AJD+Tz`#%=SL`S(JA1zUa>0GySI^$R-u(3E
z=Xtdg>{HZslz%$DNh@iQp?dup(F=vFEt~>s4l@`MnUEMC{BQsIp1GO*>bjLIGag6^
zw$1(ua$?#wxmVX}Tsle}9k;DyySYO4Nhm90+>I}fSU7~i&T3lI#j(j%bH#oY*M>uD
f*qK0@7&P9n<cNEIHOhE&48-?z^>bP0l+XkK;mm?l

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 ad9693f2d1bab4e16ae7783a175e7a4276e955f5..0137cd141deb414806e2ac86a0169cdaa7d86154 100644
GIT binary patch
literal 701
zcmeAS@N?(olHy`uVBq!ia0y~yU|0ac9Bd2>4Bh9`br~2K7>k44ofy`glX=O&z*O$(
z;uumf=k49ozS4mbZ4di3beC{tsO-JqV8*f0lljWQX-b=p`l`GMI*`)nCXv$ryhyL>
zS>?53^Ny~*FI97HCJO^DuwdHid*TlEhYdn%{~td5_9*|4ps!pv)>?j4Wm?j-6GU!M
z1(6GuepEeqT}u2={kx}ig&yt8uZPN~GJU$(^<$fW!h5OX(>W#tw*L@foK(`SFQ_2<
z*qdcX{@lmA_f_u^QizSYZyTqorXbq`GHK)EA3}_mE<6X3CszIt+RwWA$l1R)S<hTI
ze|_%~%bm@g3(WSGF*3fpJ7<H|(dir$Qmi&~eN<&iDbd<;>Z2;tlN*HvypOzdPT$#j
z>$cHz1ICwL4JE1$yDV+)@G&jvF63U$kom6S{|1K4SD&AiGG02fa<cH6wuL+F&)c`D
z{QUd+{n6{Q8bnNwnNMfXOv|k4WYA3U1(6B4HJuDMGrVg$8D9E;O%zg?UGw{2@#RHn
zjGJyw<6!j=%vKgrIJ%}Yph0A-iPP>!Woy2!+Yx+vqmRR^LL2G3mJ24mley?!p4^h>
zRCeZ~%$s=(FTEOSz7*MSscD+TP+2Y$x0r+V#O&aMrX2wdKJ8(aP9R?%&~no_U>hwI
zwv=No@8KF@LAiNx>i@soS-i`~VV1>K5p6*Q-bj9ra=sNytlhs{x+}5pX@s>IkMqX*
z^)b7+?T)kD+3j||#oE20q&J{p&r6Yo43*avoftm_KIXW~`aa^Nujli+yxB=iL1%Wd
wvInzx1bTyfq1zeI5VG;vYYAK_gJHp%`b6W6Lf0nS{sgJ<boFyt=akR{0DsXWOaK4?

literal 345
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z$onL
z;uumf=j|QCyh8>IZGnd>U!1gXnc`fqs_!XVj)74rSMaJUiv*M&$xr>RmeBP_GeW|8
zwI~A^bZ1=>|8W29?p*u2{h8(akJZF}FVbk{5HRRda5y1wP-er1Puk0$@Noz$_%s+W
z9`ZRP8asOe>xwl!3JwP>niv$n*U1MoaxgG3?2*rQH2xa@cK&IO<%hptJ>Nh7`TXmL
z|0&d;I8%`QVfiNQq-C1T_D}gFb}%1eff<KjR0Mp!Xq)>r;qp5v#<U8zmQNex7#J81
z9Qt;5+jcp@r1*dd$*Uasve+v_92?lp_F6DP4N=&w)FczgC6(_fxWMRlBiK(2TDuwQ
W?ff+@*1Vhz67Y2Ob6Mw<&;$T-gny<0

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 1a2301dfc14a444b94c359883f6e305463e5014f..c8335d400885b91b499b475fdf72cabe6c0a446e 100644
GIT binary patch
delta 101
zcmey)-pDvXIgWv`ILO_JVcj{ImkbOH)}AhoAr*7p9yDZRU|=}3;H!TwNBjZ?!l2<g
X!-NC|MtNV2t02Xmu6{1-oD!M<-&+-M

delta 994
zcmZo<{LVf>xt@8Sr;B4q#hkZu9P>mB1zd~mB8qraj!cp*;65_TxL{%dm!9AiM^V$c
z+hX^>x~(_6DoB6%@;`BIlMDUNA8zlDpSQ2}f1s_Lkg)Fh^Lh98)PA2L_#@-VewGs)
zF<U<U=bRvDq3|i5^#q4qz|ZZBMoqlkf07z{8WN|*^G*;fsd!Rv&YaR>757vBoe>kC
z@4g9wUoJf5mR#s-{?o}#<8ti234(FPKKmZ@e)#g^rtCrK$zP8btVvx_b5QD`L<HaK
zMSHmu_9~svmeh)OP@coS&FzC;i|V61UFWCVw>Zj~7Yj;sC(c>CZQ8<5tzj+q?d?OE
zGn6)nJ+bxAmYv0MD^k(xQ+<7H?f;qzC4>KqY@S~_k?-oT*J;X=YNZYFm#%$Q{NydT
zr!I8LlW3(c70#RITvqxo)%bR&m#3YO<LAb8<qgSf{WY)at3+%B`&v&MY9FX<d-{ZX
z8prciWx*}R3qRQkR_zLHcG(fVLygHwSnIyf!gg=tSsYtiuPa5QJ3Unvobj$c;|f!T
zSe^JmYhkT;;l_unq~m@*=U6i{;OAD3H8XcTnp!XOX6Bk=9rgGQmG}=XFHD2Y7oF_4
z6QBCotn`R$)V=<;eA9@XyTb%L_cfe~S8{sW<g4<NNz1;3<!tC?k58;2btgD<e=g<N
z{9G*H=R&27r}4^X=Kbc<vUgz#*(Vd+Ucav4)O@K#^Ph)|1k0xA>j*wbaR2F4@$*pM
zr`8XjCaZW(f}kh=mA5OYO`2WU{ibD|SYqef7kd;ozgVqM)Uxym_liGzH10Eo)NSGL
zuGe*Sc<SD{;i&j#mXLpMIHGG!109||pI&U;a7td5ac;KePo`Zb0tFYHb5+j|oaIq}
zZ;83!wcJ%_{Lf7LzIgQ?RizDiSJLvLBmOCCpX8Ta_%)dI7RQ;r%BRyOJx=)Z=T?Bp
zCsV;0(iPMEpB_K><LB0e3ZJqCXY5`vt#;++KdDL)Pwu-W<R?d)vD@zdbM<neVE>=u
z7P;$!7v2^=`QGQ`GU1`^C*4gKeoiQ^QsTM0YKLC^0cCm7w7G%RcHS)uXO}K*t$3n*
zX-{$1xmFj6U9oqgCb;kWW*M=0o80<NgD*|J-&EgDTwl3v;`0@2UGME_cX7CP!AmgW
zyydHpPM-T@?kX?%^j>Mhyy`EHTPOW_C%ER*dBHW^`_37>{^;acx1A&IXOFA<;;nH}
zEmPu`RkuvJzbrbsWy<<?ImM@sFDNakv7W-AdB5GfN&CQ?qwWWV6L-(nNlWbA@O5w8
z;*Bm1%xB_KN-l6j-_Nq*R$=;El<-MBw`J}7lKH)AhvYA)b-v7c_G=RZ0|SGntDnm{
Hr-UW|xVqsQ

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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

literal 1379
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z$)wM
z;uumf=k45$c_M}aZF5ES9T*oyl$?z%4)U7tVgaj_9Fyk60IjSnEvX3=Tr7*)`8vNX
z$<CYY5w1|dxWcLNn?YJ`|J(Xwk5lY5gNh=n)1L4DSato|uNOCOc6WcR%8YvOa<A;m
z9oyr>&dhu8qV4XnobArJ_KO0V=U3(AS|#^f)N}H4h!$KZU4K#UQ0mgn|7W;Pcs}d*
z!40=1l6zKGCYJ4IvHul6p~|GpY}ZQu>@=q3vAs8KH5&{|T_$W;?%VQzmcs0a;w^Xi
z+LHxz!jEs*<y2GgpD*lsQEAMTEtSRzN2YVWc+kIX$HNahRaP%z@{xSVu`joq+i!lc
zD~Flmx``|ATNb?jU-vgG&9=xqdFNjDAht6XPMl;ZV%s4u-T7^oYmjl{6vn&{*IzG<
z=wIp@WTdFouzt2_w?Lbg(-uyyrI&u#Z@0Yl{`}&$*k5%MW0tXS%D3NDyCotT-*VUI
zgyqIbMU%E!)U<qQauf8D{W7)w-`D7(*nLJZcF&kzx7GdoA{fN)#Io+e;@5_13#FwV
zoqZkNk;V7s`}4_fbN$qAlq!AvIm4@vZ9%hr6OY98udIRkD$GF}_M2`LcBnb6;pp{|
zv-ibf4)YmP9!z6VG5rxTe?kZ618YM)!J?-5kA%4d8I#mo#1^Xj(6m!b5O1hb(hw9l
z=x@7@C5$o1e?bUK%7@~9|JJqQQ(jlx*Z0`F_|C54(}iFAo-ximb%rUV&6mN~U&j0O
zvoD>d%t5l#cW_^QCR{D-V$0b3m{G`1l)Ip)O3b!xb$Bq-A@y&|7oNUqm>IL#rA6vs
z|4ld6`9k*V8NL}PPv<age*c+K^3TM8KYem`RYihYInFa*A2PLD(0b*;ZJ(q3b%N9C
z=4f*s-?`DI>%pGV?YTERZaW{m#{2Y4%gS9#-!8OBIdFP+eY(Q^J)es|J&@l1cXRJ@
zG56vWCk=^7-`-U040vRIY;||2+tKZM;y>RmyrP=OFS(vCaAx#MZY2%P(t=yg$5;QF
zVGtgfS-mr4uIRzgWz+V`g!Hp}n8%t1=pG175L;lhnPF<6F2kc`UWbLR3oK$P@HM=W
zq|a{17{#?@2}kV7MeO4DPk&l6Tgb2aMMdcfFU#inLDO4oQ}#SiPWrYwVMox-@?zE8
z^X^v#HwwPw43knX2~3a_yliohE3yCaMm8JfE#G&03q-H5{i-H%rKe+GyiDDe36F$b
zTc-SAjlU(Xo#V_~_u{=&fv(JwWBNB(0^`gQed0bO&-XsCw;<q2s;uh4<^Se0zie%`
zn-#UB-D$G_S=~$8uCx7LsikGkNjUm)@~e*xs}JZnq~5s3`TX9l>1WPAuljvzkH>i>
zGxIHN{;DQhJ@`${zXa)CTCA{FflsmNiu2J|$%kTA3wpZ<$O?;XPWd5rWa^Z)dkX^o
z%q`SZ@0caMYU$3IPALn^_%3l<XI<q!*)aLC@rzF(^H(gb_Ef5M>EznYw!mni$&ZD}
zfp+)mKS%`i8$ReRc*&{MB(L54LGb6Rx(a=b?<_mlsd_}0Sx(`&n0=tkS|#5{S@KMb
zfZeZe{t^p0rtIy%aYnvoro-I_y4ms@XVw?GdfbfFuar0JwVsr9;O>(SuS>2K=U8k`
znkNa(yzr>*(7SJa7iy2hSQsxn`nToo1LyC8pARZJb^qr4ZD!W`R#`0RM((;lb%zu+
z&Td^5DX9BS-DjitDV9(siObLG4vFlx6FkD6qOoPi`~sf%;w5^_dd9&s4Y(D0w4H>R
t6uwWo(xB@k%p}o#(>q9bF~@$!mVGvNb;MVEU|?Wi@O1TaS?83{1OQ{tbK(F1

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.