From f347ab47145414e58d490d9b6ffea2c8d9ba977f Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 24 Oct 2021 18:08:07 -0400 Subject: [PATCH] WIP core bastion --- .../blocks/storage/core-bastion-team.png | Bin 0 -> 1260 bytes .../sprites/blocks/storage/core-bastion.png | Bin 0 -> 1358 bytes core/assets/icons/icons.properties | 1 + core/assets/logicids.dat | Bin 2912 -> 2926 bytes core/src/mindustry/content/Blocks.java | 13 +++++++++++++ 5 files changed, 14 insertions(+) create mode 100644 core/assets-raw/sprites/blocks/storage/core-bastion-team.png create mode 100644 core/assets-raw/sprites/blocks/storage/core-bastion.png diff --git a/core/assets-raw/sprites/blocks/storage/core-bastion-team.png b/core/assets-raw/sprites/blocks/storage/core-bastion-team.png new file mode 100644 index 0000000000000000000000000000000000000000..50e4e1012d4a17a624e2bf9ce5781ac9d5162bd4 GIT binary patch literal 1260 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z_QHK z#WAE}&fB?X3m+Tsw94DQOS$Y)b2FLCQ&CF%kyFi=qnS$4+}}4a^M^0F(cAH?PATP6*q4BrQEE!)FBh$XVm;tt) ze}l#wu8vZ}oAZuEig zfA{UyzpB=G!}SIQB!;}X znE4_#QtsfNe?M;2KHPr!WTZ@i_m<;-E;Pr#f8T#TdB66&G{=QMR|;=u$p~HgY`tjo zy&wDzr~cTAE1cz6c(vw|)FI{ra-Y5ROoUnVK6@&*FbAa7on=iA?-gfx7?50dx-~tx zoBdw({XHTdPYGBQrAKmCxpKrZ(#%I%(d@ZxudB=IKFT?!j zpC2EP=XlCx>+RUV#BsKN?gZyqyL8?~B*o=ARxk+|+m}8P%WP0cwA0)zHpQs^JZqMT zP}7p1OH5nX8*HCVk6GcOtk7dHU&P6RDfQX)7=a5H?@n3q{m5a<=X<`#m6UB}U1$~= z<-c<6{fB+a-5y;&U3zKlv&lOYJp6aIpLwsDsrT7)t$^E~dx1ZhwXbe{(v=o`JVR%4 zhXW=UBN(vrIg-WA84V?)d9TlNwc@K3bXVbxv8)wEXZcA>}n{FBElk9YeVl z?ykE&eZ?L&k*y35e%>rurz)`I(zQiT-?2|&WccPBv3eI1=7#2WN9^ zyq3t=v?{^tez-En%5|RBET)ZH_UO!*oW`+=?P1)dKRuDW4Oe(pEUT!f_2F=bR4Z+t+p> zt1jDStI^*kx9sbS9IL>Y(q>aLjyy2`TO?`)5l=xI|ko|thcE9B%wx@Fznvff4N+ky!#6Yg&57il(F z{8NRKBf50uY;QrumYeK%zRDWju_3wY*6^q`?u}(WW>!Z$xs%OVG zNv&FGKV2yN+*yXWi#0;-@7kxOc7&VFzw)TD_?#@m%(q!-VZGvC5?0)9^WDsIfZ>1K z&4XK`|ztc?SU*S^xW>a;eYr!_dl#n+$>YH-xPQID{<4l6x z$vgKW&ZgL%JR`sJY=)humifd}7TM33iww)z6E4`eJpQFbz{bt};`&ThZ8Y!nxM7J(3DNCmOGEoEC69dM>ZYl|woC aAGdypmX74sA9f533=E#GelF{r5}E+@_(6C8 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/storage/core-bastion.png b/core/assets-raw/sprites/blocks/storage/core-bastion.png new file mode 100644 index 0000000000000000000000000000000000000000..67086867653b21272e917344b718a182d9064d9e GIT binary patch literal 1358 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z{=t2 z;uumf=j~j>JQ+oa*85SGr*?Hd=~hXNx~?4_*!Mu$W#ytPnZat}8@Kd+*Yi6%OP2pI z|9@t=ZSl!(&tx@x*ERUSd{1%V{QY(IOW$oQE#GnXtC#jPC&_UAZ)YL`@;S6pYYG!x zjx|*|253DF{qykk_TPz;%)cazFa6p2<-Cbq?Y~bf48LDX*ZkS>e(rkit*bZ}pY0bt zwS#%yS^l7g4`LDi%-nZ8`23zdp0zi2RaVt7G<458(6lIQ zx7$?hNam(Tvkt5g^xB%8vU3wdL)qDhOf46m8Zq98zaNsWwtS*M)Uw>#GBF45&&_TQ zFD5Qi?LF(aV|mcbuVvS`&fb~k<9orQk|)Gmeg*?WK>8D&XUvBfruq7JE$x2H4qRFx#IZAepAw5EgJ!diz?!ptQY?}TmdRc{$#$!^rZ7CYRqn6; zrZO!1Bm={xV-d5&v*Q=0*eS3vRAdI6)K2AVn)S0mf#Jc;6|=to6k&1w%oxbfkZw~`MO^DR?(B#9~c&~aa>}MU|Z!pf$c!X?y0xy4@gXrUpezJbu>TKujSCl>YKlHx7Dl_%T?{@{ecQZBA*Z-dpuKYZUY4Nfx zKdydT;k)!1bD(etlj72Zee6!B)tWEPH~1v3zkmM=W*dQN%dR`T*r+hWaMd@58+R0$ zuQ+XX_;}W8&7Wz3T58B^LWfthVJ6sB*b>hoLCn_4My+%T6&ptgzYXP$|X` z@h&=qH6b&K%jr~2cKTjc#eL@*0(ObCZT+@l7uyqsEB`)SzqHY1Th%p|XNUB|g{L%4 zFy5~w>z&elGe1H(`(9ncJZvT*Xg;zM@;PVPR%&K^lHN$j~k1nW~@CE|ND&~YeT8tiN!)3x@XVF>WkKzU9k!b zSAKoP?DU*FC(3W+WCY}GGyZDZzfHlQ+3MQax_c$77^j>oGy2_O$}w+&-^(0zVJA_B z*DcX`+orG{l)e)ATl&dOi;TeU6I6DqZD_K}o*$p;vFV$&Tx7GAH!r8>v^A5sllHWI zYdLVEFf#eyt&KCq8M4msCz;qy1fu#?OTChk{tPBML9DUDj|pR4G}Fz>`HQ?KPpmJCZL zZe3fgdwumL71jkNo3@p%J>Heumcn3Q-thf~&$&rF3~niFk8Y0gW@8B0cQgNWRR7T= z9#2MwQ|7;O?`H3enWSpT(2&1*e(B={T`G(W`woVjo?4l6lBpxK`onRaN$dv2HV2eu z{$F(E)S4^Bp|eywgN5Dy1XVAwJi4+|d3NWtO#i~HMNZOpSH)~u@aNM(9nBf?R~E&D zakz4Cz8AXgPQBXndfvIQJ7)##G5Zo*8nv3Uy#4mwpCb0E96iQ9*G+cy7`7BNJ#uw) zPZ!8Yue!TV`iSjHXRDqqza-$; Z|DM`RNzav``3wvU44$rjF6*2UngD0baWen_ literal 0 HcmV?d00001 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index c4ad3a214f..bec00ed84d 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -407,3 +407,4 @@ 63301=neoplasm|liquid-neoplasm-ui 63300=scuttler|unit-scuttler-ui 63299=breach|block-breach-ui +63298=core-bastion|block-core-bastion-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 720717c1702d580dbdb4537296b2a33e5bbdd5d9..0a7a8904db7860cdf4d65ca69352fdeebf39491b 100644 GIT binary patch delta 30 lcmaDL_D+n6Vd+LD7fxQD