From 59550f58ee2f4384481782579506e12eac26eca4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 19 Dec 2021 13:06:23 -0500 Subject: [PATCH] Assembler sprites mostly done --- .../blocks/units/tank-assembler-in.png | Bin 0 -> 1182 bytes .../blocks/units/tank-assembler-side1.png | Bin 0 -> 765 bytes .../blocks/units/tank-assembler-side2.png | Bin 0 -> 765 bytes .../blocks/units/tank-assembler-top.png | Bin 2564 -> 3169 bytes .../sprites/blocks/units/tank-assembler.png | Bin 1023 -> 2898 bytes .../world/blocks/units/UnitAssembler.java | 8 +++++++- gradle.properties | 2 +- 7 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/units/tank-assembler-in.png create mode 100644 core/assets-raw/sprites/blocks/units/tank-assembler-side1.png create mode 100644 core/assets-raw/sprites/blocks/units/tank-assembler-side2.png diff --git a/core/assets-raw/sprites/blocks/units/tank-assembler-in.png b/core/assets-raw/sprites/blocks/units/tank-assembler-in.png new file mode 100644 index 0000000000000000000000000000000000000000..080596e1d6a100d0868e96a82fbdc484819055b5 GIT binary patch literal 1182 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%fjKx9jP7LeL$-HD>V2SW_aSW-L z^Y-rPTxmlQw}Qk@L;{-hA(${tTPO8_ZT> zvshAa2@B9P28IT?dGT@g&;OG)SnsOjG$;M%cUHkiJg46>E4k#K{(oP=>B|>Qhfa=* z=d&7w1Q+$6Wl&Xesou@#<t*U+f z$;G9^v|B|`@!Y3EE;Xk)58v4;2rk<0FRo~-v?uQVm#44Im5%%hEjZ1Qe_YKe=U!W; z;KN%pTr9S?FJ{o2u0C1ai}Tm{_woE{{%q!a`7Y5ioWaK*WLV5!;_sBDbmniY(j4zk z?uDv?)7rdSKA-rdW1+s{R^-n1|Gq$C&e6*ouQ_Fx zGSB9CylNJIg>=m8{tq1n%MMFlT>LPtR3|pgCHm7h{^r_uOj9}xgr);SOQQ8Q&@(*; zN`W4$dTs~wq%F4~(8F=9py23t0tVtj^M^p?7bZ^tDu3a61E~CqLJ3fLpI!}!%;^G( z$XqpHO!8sr2)4avcO$B8amud0E0Pm+sjYq@tmrj! z?Iiyejg8f!HbA`+?$bj*xyy4uPc-B4E0uV#!o16J?XeBg3Gcf1lt;;w>deVDJ`mWf zxGy4%S;kc2QTOxUhQ(~oHHLRtEwT)bh=*UA^2hWDJNGkdRaZ&wT9cdF=YB`LSbj5a zX54Y7c;D~b-^|2*dC!_O|F;szImO$J4y|xkbL#HCX<#AB_$cHu%L%jf$+MIk9!ZD) zVCc-xS;(xi?_(?Pgda5=k_sPx3hFsL`m7q#aOAoF42I70%LN#P=EuKdR038|W?oqSR z6zEDVr$^oEfzI42D0E+D);sYSDaDUxl{F8{S{(WAz0m!bU27)Iw_^Kv_Ics^_G`Db za&$L3R(v*!R<%ERYsL|C^U0x~itqIK)~twA-GAiiCzqNDAv?Y5R?fHICoHcLx@J;* z*N=kii5>jUBRlxhUl}RS`mteYWy6tnTVJ5tWirJSJ}SCSX6WQ!c?QUTVgU5Ugwr|> zkDNI{f=gEc1+T2&n(!lFwS~i@=GH|(!LUt0!H82p!314Pph|8}Mj`nqOP&coE?mk3 zntaU+DF0=Hl)}e_)BS-`RlB%>Qn%fKQo%O+_w1Yh*Bo3RFfe4i(pNP9b8_jIlk-3# Mp00i_>zopr0G%T6eEVA}5K;uumf z=j~nVJmElzwuk*4O{@!a8reF#R4-g|iR?K&C5~s&!n0;KT#hiU;NacX^LXc+(`P1p zu-TfryQ0+1`1td3CZL%ZV8hh#=z7MuW%2jl$vxlW*HB_^zR#thBupq?$-zpiS6@(J z?v*3cRl@h~=lDOr{qH(0psYz&r+y*lvV)a1`S5tj-`ZnJJ|(Il7oBMbsJSm#Z;d0SzJAe}iW| z$!z)7H1iJc%v;=fH@h}7U9yQBtU+tu(at&yELgjLf64buubjDtG@BRYx^yh6Rul} znZ1=o6#TdFt<~uaX!x_#bYJsMpd%K?eUv=|6i|67fB#@ei`?N0s{1w?A5KnhWj&#@ zmHpaszE#{4ZtA(-0L3xaT(=uiKw9h0{d+dwI`j+0eOfo##vksCIQvss?D5TryNXW# zr=3(=SN?mM>lrQ&@vXu9EFR{jKzr7C0d2o4dGYi!pF>#F*1y{QjBNkEslCWvmH_gR Mr>mdKI;Vst04_U05&!@I literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/units/tank-assembler-side2.png b/core/assets-raw/sprites/blocks/units/tank-assembler-side2.png new file mode 100644 index 0000000000000000000000000000000000000000..c549831fd501851fc813c40dc8e8e932a1a9d3cb GIT binary patch literal 765 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%fjKx9jP7LeL$-HD>VA}5K;uumf z=j~nlJYh$P_J{Hv#!on=gvc~bV=I)Hu30PLGI^SEfa1l1mJa3sRg)WB=l;!}c~@3w z-tuiZ;_K74TF*Pr2{aP}IOywF)icgpt}kzYN566|L*(5{KZF=JZJGok7lGN6X8oA- zkgHDE)6^xy#<*yoeYwJ(utlmox2m# zrreRe?xO9GrrTMtdUpoMZx3F6{xIP#kFURg!fpxayNV8G=BDOu4LMnP850?9o|)7c z$&@1O_T^Hq;NFncwheVbR&zWW=Dd{!dg|W`!T3i3LYecs0;J<7?aBI?FmIpS$GyM5 z{H%Gpl__YgDbNXTUKoMM6b%rWpaUdJ)PPoOHC1;gGZb6MaPw?H3)7OQm-8>F^eb-> zKl3K<#GSZ;(_wQ&Cp^2DWvczKQ*?r{{qaTC_8w19ex6*jt5~D+oy_Sa*6f#Gp3C6d zWjv?jo!7fQMxaj`o*!<`NXz}%ew8UD=;W6*vpD8*CWgFxvF-Nbg%zuP8+caDm5u<0 zX62I7j8xASrYHJqKhD+Z4QQCNR`mYKNuY53`q+AA_l0DMu+IEfXFgnsOk~{T@wV~n z&gNH4DH|7ZL_hLo@mSa{xa}A)kh#juuYb=5Ml1KSLs#alf9Ue&*(bs7k2!DNi7c!? zy`+2f;fPx>8%ab#RCt{2ow1KzH4?yQR}|2mXpmBF zQUKX1?NwX_x)eZ};;L1uXvJT!e*uc9PN}Y-Dkr$?;n8&k53*QxPK%Rbn)+JUtf8pb$EI4 z5?;N!bVHH4zXXB!Ao`EX&eNK!A{N7qBivQvm@&!jLkR(c zp_mI8Lv!omQFfaGO2&f`>J6N{cL{%fcQ(b~_&)IGcV|~8@6ozgdL*QLmsA5<1|_5! z5fa*y=CP%O)bEfV!5j&xpd<*kK;oMTySK!1vac+8fBts4&s^=aj)ri9$u zlKm3Wk}&_QCL!g9Lqa_$d8r|x;c=v<1S>Hc>asBVFp2p*t!jsc$`JR5%cOJ{fF|HGIqd+YrOyxs3 z5~6%aNZ1DDLuQmPU8L$(VQNZPk`JLsn9GNRgk^I1keMXRS4g|{5~9^6Y{>@zaQ@RT z;x=I|qxTuhJke?smX_zM%GOg8ZpoLjRTI`~L4Sa#36Yk3y|rITPfb``8?sq|5(zo- zAt9k0FZmFOgsp{1)eG;(&p#E_oFO3}Z}|Z92L?D}NL>-iNNGi6{{v0MZQ-285UU2LW~-VIBKNdl8+LDS9^-2f6tHc3WIZ-mWdLU z#LEB1k*`$%8c{T(1#aB~B@d8Xu#%McH-FCFpU9qYMW3~z7!OPk_Qq-^ra5#yp>3J zdGYc_cz=mjjpreum3#>09wZWu>c}5Ddcct|o$yqXkn*^-l+ao}L|ejvJrb@Y zAHbw5q_#4u74qMj=)~#aw+P4LoKrd)(Rz`YQ9gi41q3K(SSxY{DM`5E`ZCgME{y`s zDj&e4kKh!198=^=!N;+rAV)ufQ>2gMRaTRj`r;62P-`prp~mQ!kP=b}SAVGar@ug) z8p@sSIiq}thlKc6Y(2-Nm#HrqT_QGnD;T)2tgkJI?xm?uaN@z$(jqsUG z!fE>fxA^k+zw*&rzWg)laeqD6l9RsSdavuO$+7|hTuUgC@8eHCyV??iBF?K};qFG~_yZc}e1;mRy6AZPu;+OesG zmhvIm60R=n(gFg|B-}cNy0@JcS`w}2+$UcBIwcG`_0cUFMnRX`DY92vAq)R zf_wlI_5%XQ*Qd^3O0?voeur}`BIzd_z1Wf_(_IkKE1{KqweNC{&EZJ6OY#9sEFggG z?oB=N<>%lWTcc-Z@-1eS4`6Zu0c<4Hkk2Ar3kheI4`2ZS0dyrCB_B0?O$le04`2}i z0dyoBEg$tdG$dR>K7W9Px?#MwmE8qakq=-Y0Rcin3M9<_5t6UN%o0v}VKFJ`CNU|=k(icwlbDw2h?abu z^Km59Jho@;z+I7Ws*3@T3Ah!csv)5^8VgtM!fIN}^aIwQL`YMP@tTl?X>BddK@nv( znItSNASXP37Jmsbjh2KQu~wIGX#u&6mM}keNy62I;ns7=1TN##a)5?J(p+!58bI#heZb{hc2b@*H>8j>dMx`CQ+_z$6 z>v25#C4}-rDLsx;`C6e~vptTdx)`c_h_-~IyJ0xBbShz~=37O=X)c5-AEG7U=#FSf zJN5X%J^1!-A67qKLBc88fKvGY8JYl8-Xf zR)5Rj^zZqIiKl$rV{7EsoZb^94{AL9sQ%fA7ZX@WDmuG&d z=EGlgOEzin0l>}njP`mnTr|?}c|5jiJbw&cC>`SwPiUS%ZzPID!ct?JD}i=gpho%< z2_L>bXN7X*SW9Sna;-2Zj)bi@IjRI!L8%()b0kckF0)E#c4F-qJc@*rZiFoftoJ0= zNS`8MscAE#geE7o3IJ_MIC@CQ8)<+TjW!_s?e!n_s?`PxY5QrBuiE%{Q?ny`Dgih`DeAs-EtkUNn-m(W5!1SLEG z@R^X)E1^bU!9F4F4nqkor!0f0VOXcA)g#c z-hKJ|0cjr-EkrdSXRovpmJ3Y=x1rXAc?H3pZ6~QU*)?D*_>npvfl?EOe0oswvQ#Fe zny^(fN@`7(fE2+rBnZy{ zRi^3!hJ3q=McKYJBGF)7BvwAO#)GHmhKWD~f4uU1E0k-vfFa*FW{_~GfFa*_MoTzM zz>seqMoKtDz>se~MoH){V8}NwBP4VcFyxybZwdboj?p01wN4g%00000NkvXXu0mjf DL<-V$ delta 2555 zcmVi5Cu^6_1sI}!{McuUiJ|bz4qyR2|21w zN)QDCIsD87i~mO;yyz+niC3Je6n^>R&%fVZfBuu%z8%{OQ16=!2sOMGrra)627hMX0O2#p!lRI@jc`!52R_@e|O1OSna}tejhS1WN37`cm5ymD9 zAG)OgB*NHS6<;bqB8T#CBiK;e9q^w zDfm7CToK{Po!0FUO7Sg>@MF)83s?o=>$<-{vk_;-%D|^V2>YZeg4(nhzF>r=njGJw zs;Bj6phbwlCqcM1QNhJUQU-OjnbiS|&~tt)==c!`5%@et!aJ5Cya2vagcu9Bb+?RfBLp6zNLdgDEVde z9UAc&;zg+WdH=Bu=9B^^VtnE=#EQ`JH-9Fx&2Q#Zf)6o1@fo5;X!#ox>E<_cD#3>s zpZE-sBJ}*BlVMIJ_z>e0pCL1ZovxG6mx zXnYX}2@sepfM*-i;)ueBMo56bWB{CPPBc6;LIMN^0dTZwlFgBV(cp?gXv9Z=qaXmD zZ5j&S43_4#5`>nuNCC#~<^^*s4u29M65kmt&1i>5`W z0T_u;dl#(57g_VCj^&f9L8t{7fza|CFcKdDHnCnbOA%TCA`x02ct_$Rz$RA(C`Cws zi|2}`U?f7Gf{PQ0FXAQyjgU7X7s>v~)!@?twBYk11Oa^Gku5M*d>Vird>({AfJBJS z>(4d5ibEm{2KbJU5S>BbtA7AELzn=N2)#k!+xij#%s{BQ1{}?u2!pa03x#j%OAIg) zq4q9#Hh&GmwzkYkj>SUY+xk)g)I5Zieq&;J4k%fJ6ydSH%pu3q1q$ERw+V;lebzBh z>zK7(jhQB|z-zuv-)111*CX*+*CII`6W}3jVLSi_{ku++n$sx?pMQ5fGk`?c1OZSm zhWlC#*)rBcfWl+|+{P(K*p3su76KF|3*a_Z8N%K;k?SBpVKM=3}DxQ$tk@6i(HPJE+y0A3Yg@|=lp77xIyAuO0H@kw$AgavaX zK51T^r{dKS7R-&OUVmv`0e8e6guPUckHANSf*gyr0z%K&i1A0y5ViP-aFDZNJ=)`c zKVN~siw`xv1>vJ+qncXh^pu(5+gm0A6h74W8iZ}lh;R}qzD$H@e5mmy2zxan!jow6 zWgv{ghZ=u`a8xrQJj9AG5@9qx)c8GwlA00W7B4;o!mGCyp?{`kw?~M=M}+?)wAAcU z2$7RQgA9a7d=Usk@o6We#kV@b+4`fe2_x_!5r*H)Xa=z2 zTNR;p-B-egK!2EuZ#IY*-)ac0M}jNi^CCpw#F#rDEnqKb20|19@2LnieiFXn&$vnu zqVZ)QoQ)lcuU8Ai_!flDzgw_@t_sQrgg!_vvZ?>fnr{-m>FHSeVR9DHDhQ zJ6fxzW^J8~2w`|n7gmK&gV2NTs_`Q1)wvwuYWO4w?}%@Y72&APl?b6v?K2SG8Q&f) zLP?#g5PydMf&+<=_&y>zs-(?N1Rsjrh(ps*U5rp4OHJ zNPP2L8R60ZiBF!ZA~XTi-s%%yPO=apzgFK(kzS2@2rU3T4oU!O7k30GIpPuFM`qW1z1mv#=n?=e z3v_D%YEHLAIIqE3U9J0+4lt|rj(#~?`26V|1+(^bhHzPcwOjUlsRB4dxCB5R_40x^ z4I>ej1LR|tydbXyQ3y)`5?_8+Ls$lo`0BC}!V-YQSD#f7rUN9tb+Q7&{{Sr3s}57( Rkz4=(002ovPDHLkV1g(mobUhu diff --git a/core/assets-raw/sprites/blocks/units/tank-assembler.png b/core/assets-raw/sprites/blocks/units/tank-assembler.png index 9db25c43e722e232abfcc84fcadadcb6275bc946..bf54cf6950078560e7b40538b78fc9026d9dbea5 100644 GIT binary patch literal 2898 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 diff --git a/core/src/mindustry/world/blocks/units/UnitAssembler.java b/core/src/mindustry/world/blocks/units/UnitAssembler.java index 07d6362ae6..41ea60d383 100644 --- a/core/src/mindustry/world/blocks/units/UnitAssembler.java +++ b/core/src/mindustry/world/blocks/units/UnitAssembler.java @@ -10,6 +10,7 @@ import arc.struct.*; import arc.util.*; import arc.util.io.*; import mindustry.ai.types.*; +import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.entities.units.*; @@ -33,6 +34,9 @@ import static mindustry.Vars.*; * 3. * */ public class UnitAssembler extends PayloadBlock{ + public @Load("@-side1") TextureRegion sideRegion1; + public @Load("@-side2") TextureRegion sideRegion2; + public int areaSize = 11; public UnitType droneType = UnitTypes.assemblyDrone; public int dronesCreated = 4; @@ -87,7 +91,7 @@ public class UnitAssembler extends PayloadBlock{ @Override public void drawRequestRegion(BuildPlan plan, Eachable list){ Draw.rect(region, plan.drawx(), plan.drawy()); - //Draw.rect(outRegion, plan.drawx(), plan.drawy(), plan.rotation * 90); + Draw.rect(plan.rotation >= 2 ? sideRegion2 : sideRegion1, plan.drawx(), plan.drawy(), plan.rotation * 90); Draw.rect(topRegion, plan.drawx(), plan.drawy()); } @@ -359,6 +363,8 @@ public class UnitAssembler extends PayloadBlock{ } } + Draw.rect(rotation >= 2 ? sideRegion2 : sideRegion1, x, y, rotdeg()); + Draw.z(Layer.blockOver); payRotation = rotdeg(); diff --git a/gradle.properties b/gradle.properties index f6658de073..58a8d51b9f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=224e6c07e0 +archash=15f2f63a9f