From 478d86677d6332de53b8950e5125ba48ffb8ce7f Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 20 Jun 2019 00:16:22 -0400 Subject: [PATCH] Fixed boulder sprites --- .../sprites/blocks/environment/pebbles1.png | Bin 199 -> 1966 bytes .../sprites/blocks/environment/pebbles2.png | Bin 224 -> 2112 bytes .../sprites/blocks/environment/pebbles3.png | Bin 203 -> 2119 bytes .../sprites/blocks/environment/rock1.png | Bin 358 -> 4564 bytes .../sprites/blocks/environment/rock2.png | Bin 389 -> 4603 bytes .../blocks/environment/shale-boulder1.png | Bin 253 -> 2195 bytes .../blocks/environment/shale-boulder2.png | Bin 268 -> 2185 bytes .../sprites/blocks/environment/snowrock1.png | Bin 347 -> 5453 bytes .../sprites/blocks/environment/snowrock2.png | Bin 347 -> 5636 bytes core/assets/sprites/block_colors.png | Bin 709 -> 711 bytes core/assets/sprites/sprites.png | Bin 1228883 -> 1229611 bytes core/assets/sprites/sprites2.png | Bin 259762 -> 260109 bytes core/assets/sprites/sprites3.png | Bin 282907 -> 282980 bytes core/assets/sprites/sprites_fallback.png | Bin 136610 -> 136815 bytes core/assets/sprites/sprites_fallback4.png | Bin 410781 -> 411270 bytes core/assets/sprites/sprites_fallback5.png | Bin 301706 -> 302062 bytes core/assets/sprites/sprites_fallback6.png | Bin 284648 -> 284797 bytes .../io/anuke/mindustry/content/Blocks.java | 2 +- .../src/io/anuke/mindustry/content/Zones.java | 2 +- .../maps/generators/MapGenerator.java | 8 ++++++- .../world/blocks/DoubleOverlayFloor.java | 20 ++++++++++++++++++ 21 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 core/src/io/anuke/mindustry/world/blocks/DoubleOverlayFloor.java diff --git a/core/assets-raw/sprites/blocks/environment/pebbles1.png b/core/assets-raw/sprites/blocks/environment/pebbles1.png index 81baa64bd58a8d4a32f5387f8fe259d468482bef..825833c5b6c546602e7d86b31b085f0c8797f26d 100644 GIT binary patch delta 1953 zcmX@kxQ>58f};Gi%$!t(lFEWqh1817GzNx>TW7m)G$h->rSTWtN@J^B)(>X6)5{{YlQa=_2d588W~=+^XCzX+2N#S zb8%banGEg}SMT|cpP#$1m*c_BT}RH}pYYLEX7|F|n=YyPwcDL=J-=MK%0cAC7aw`S zvvs>Fy6(@3eJ=C+RhAFmL$CVdi}Ji9b$N0))YoTnmLK!KaPGCg+%I z=itmk#rzVUjK>aqeEfD@*Zq6^ZO^ut@E?3Fsr^9dwEh8uXKy+K6;#eBFWdA;y8e#d zpRYzql02ulHYYV+-G0|)a>04sIGfGl?F%oy|E>C@PQsz%K{SJ!fy4*R4J{%yYNr$x z`nc+}CJ4J{B`95@ST%1X-be^*z&ArGMk@FDZW-8Qxtk_#UjtmtHjo}axL!Z)L!{y(b6eV z54RlSiWYsWEz&Es{l=1|(`IkG^s4R4%|~j{w>~Y4zL~ZBoUH1BuUCq%$5qKDDok~g zF}ifZ*AKo^i_~Q^m!C6wee%}9SIXJp&+O85W!79&I(6)+b#}n>8e_pVb2-u~j>6!WU1 zbBtg8V=F$l;`f0&#`*dYuS=&!$FbbhbMXmOl)TN)+!l5z>-nYiOMbsS@_*;TYt4rP z-}*X-p5J#exAc+gr02PBK6YEoXRZG?wdB3kK2_saJzG_)zSozn>6w$7(dl%b@##ON z8B2@i_v-FtXWn|?;`42H;~6&Zx+7l9Gv(~U^=Ed=KUiVAkn6w}Q`Y-!6|sBe*!y;y z#+_<-pko~&fZNu=bbsBNN`WdoQV$0MQ6qqUg8W;bG5jV&m1Wm z{CJh)`{2f`R;}09)^E_gS${|N4*#@oPP+`U4)1CxZWVZ1dB4i_ezf?_wZGrqnJZ}e zdsFiIqPGdsLiV~0d8Sg2u5Rnnn%nhG;`*eoYfD${E}av$-R4xUYO(Mew!?dS>(1WV z%U#IzV_Eg|+;`1MZ%g~nyBp{Hdh0Mju6JGB6c&a>Y3gi!(%j!Bi+5YCd9>zmy^^Zf zRrTuAx=C@j*6Qqyo~*0W}AJR9*`tFM2o-@4_;8rycC1LjK(Mn}58U-n_1%&&kK z^PY&CO3R0y(EKhx)nm0tA>XAX3=E7dna<7up3cs&qKbi`VovQuTaUvIGDqWsw<=BL zD-#er6EIh&qst;ov@1aI3fEez88N>UO)@=#Vq{paH#N(5hq8;O$I8aAI(}e2a`bAw z=S5eqKk-2sf{zat+TXideP=IoOV!NGu;UU7UT&M|r*90TV)%!`%iLH!oeU%{#9LxSbsQ<7# zdbNS!JJnWUhv(goYj~I!#x4jfp7TEWc;+02gXs^v@_%ZVCj6TGCCa;7mT_Y4gGalT zYE~b3%6H*^eaeYtZ@e65IW1(^GykIb(}sP~3(~K?Uc0mZGP{Cv?9#l3X6J+@9yhb? z-oMLx|MtG|*?)BmzZHtgw;1f5&cMLHmgMd3!tj$}F~jksNZU#V1_sUokH}&M20djE zW~^9hU&g?|z+U3%>&pI^O@!G*Ej`X|I|BnFr>Bc!NJRbNw_(-=aJ z#a$bou3@;gi9z&G!$K*I(?M5uNw)9fwR*aQH+aj8G@+cBth);yhrDJxdpn}Jh;#YX zN&SjPSiS@s&)uT&&M)l7o&(`WbmAN~vB%gsZ0(yH*TC5Mj&)!0-fBiE%?1gb8is2n X*`k|Y?J8hkU|{fc^>bP0l+XkK7M!Cz delta 172 zcmZ3-f1GiGay>(zr;B4q#jUqj4fz@rcv=(rPCh&LH-AB5fnrDNx9tbFcs{S2^&!s7 z(6Cu^>73HLeA{31{b2c2CgYyNd_W+YQNZO~`_1?Wx3CtGrY9$OCpc_S$QJY$&^c1o zaBq>O6ayy{>l&NGkp@D?S3Q2ma9VH1zoOTA0iu(Zai3vW9owL)uq3vDDa60q>5p`R e*xKfu46*@*JGcbvL>L$t7(8A5T-G@yGywpXZAS+H diff --git a/core/assets-raw/sprites/blocks/environment/pebbles2.png b/core/assets-raw/sprites/blocks/environment/pebbles2.png index 7b11d5fc170cafa830fab83ae03969db6d0c081d..075f05dfcde6e3bbbbab2b08d3050ad346873b5d 100644 GIT binary patch delta 2100 zcmaFBctBu+ay`q8f};Gi%$!t(lFEWqh1817GzNx>TWiCjr@hwT`I9cX znWaUb|LF&V=XYe!d|KYJQCR(D$*$+Oj(`))Q@lT%pd8m-IWlw!u?o06#Pt6p5sjjaN-`Saa)AO{z&C^%b z7-#R-pKw}WcdXy*+fPgvwCsMm=J?jsZxPoHZ|^T~6Tgw1e&^VcvVC{$gqc~>^)i_6 zy;!Ye{Htl(hV;sB^DSe)A8Jg0f3W_W!!h&nH*I~Xt?c%?mM5F%oX@<&D!8*at=#cS z?w0S@=l(zTBC{tqKK5hB;y3k&qpob6a5Ni&ocV{39Q|*pxk4WW71BIPZ^_a}KyM7xQei-gse- z`Rke)I*HHxE|jn&Klo8K+x=kv`|gE?CTBWxtZG?f{2p@~OtGwW=5DzVVK?<)V&J?Y!KI-%i6$7_d|HpL8gx4D&b_8rW4xVznA~5|Di)o!bLu;*@+l0Lo%?OS-Z||i?Uea> zc1~h<^sP@}Y)QEvJ~+Ec6fT+QZW$T9CN8o%<(+NzmWblX8dtl`uPO9>G;oaabFpMj zJ|`?u-+zjM>6T`?*~IUDGlS3Nl;zAg%D7a+a_$sEgBRvSMlYVcJ9cOK9?6RD%lGUI zKO?#HUA{s3lwH=(=2cc7jMCqH=aY)ZW&u0b)|4gkBHKb@w07ygeao@%j9uA`>$=+o z&N)7_`t^P7PX@Q6vtr+!WGc~$<`G@z@?y!glilwoRLopl|GEBlx8kiRclTS@O7+85 z+Vn2cb(>=oAd&R$?s8T0^~(coWh53zYJ0mda6G=fdtcGoDJVSl{&6-u`IQM%RzNd-q(cH~ykkVf9vI`fL5- z^~_;g*|X07m~mylb5VW!3y#aV{cr!U@$6Yux#VGrF4HT%SvO6e@8_O!HE!#Dm7b0E zO)9%@dZ{nG5woS+A}jvs`Syf@I}VyRddf=X^hZ9^Y1(}MzUz~HC2txZu`qf+JEXZi z=vjly%UShteQ$2xUS4BzJtkm*ViKcl^~o*sE`Q(2Uuya!J0kAlg|xaE@%5X(DSmB8 zTlA@1;jD31ZYkf%*aiXjz7qL6@fx#N_9~xz_~rPi@2&IGQg^OrKUVjI>Bn1XaXX1i z2}KLn3Y>VqWA=;y?J4#j^6Zwi&HH)v!b0su%qIm7PK#K!xytHp*&>al>s!0tn`JtL z>0NElDOg~=v)=V}dhVHJ@00I7Pj1NKtLJ<-t()US)0BgWhq6r$)Jt(k)bUOcx4VDu z-Dc6N?#wrr=&TM{K0p78=+gz~{_v=&-}1V9ckPOs=Ko`B>+F1|B*{(sdwut|nFik$ zwe7I-4qw=>oFzQxN7}djD|7E}VQ$x(Qt?^-RK$tJhvv!5W?*1!$#ixO@N{;Dm3H+E z3>9-~C)#=(c91z5AG}p*Dqop^;F*BAIvrgWS)yG5idVSSTFr?0rD&4r5fmfCdcCPx zzB`m%JUv!6hSl){^O2)hJukX?{fQ6C5PW>F(Ei@t>N|UxTdHPeh8>q!@N(NsKeZz{ zd9FNr7jX+RICGplW0a<<$$I}|X+J~!`$snQr~luXzc~DCG!I9|5#uukxsOU8t@OS9 zV2{5{s%oUFow}Uq%cdj!G2u3Kk7G(AAIuCio;**vPpJE-S=g-^Q+;|XCRr@YvU