From 0371126ccf1fb72481d496648b6c00bb65c0f571 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 4 Jul 2019 00:51:42 -0400 Subject: [PATCH] Various menu fixes --- .../sprites/blocks/environment/icerocks1.png | Bin 236 -> 2447 bytes .../blocks/environment/shalerocks1.png | Bin 2191 -> 2205 bytes .../blocks/environment/shalerocks2.png | Bin 2164 -> 2181 bytes .../mindustry/graphics/MenuRenderer.java | 14 +++++++++----- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/assets-raw/sprites/blocks/environment/icerocks1.png b/core/assets-raw/sprites/blocks/environment/icerocks1.png index 8e11fd1ddfab75cdb6c2300a66cb5b1458258392..c690d8d2f83049e6fcd56a4ce6b58b7a310d8c9b 100644 GIT binary patch delta 2437 zcmaFE*e^Umxt`6gDkP#LD6w3jpeR2rGbdG{q_QAYA+;hije()!*4psMNjmC0f1Zoj zIVmbmd)%RW$o#{{xlONL{r%bdcHNA&Wf3Z=%Z}{$czyomzm5Eboq8UpHXf;XAnc{F zFV{hX44z7tg|KIxkzkdzw0Dee#QwO8(bR ze#r>r5Es1n$UOagao^jyY#&zCw^Ue_7N>qS*qEdpcUoy)i@l@$+T{;Uw#)IZDBTft zH}K=)3a2B>`S(?Sz1)A*?0!Ph0!L2WK;^jPnZlx3+*1(`K z_P%>>pH=*o*ucY*+G=^&(e~B7MP2)gyT#AdbR51?khAy4mGis;N^^7#ju{JBEK2`) zQNB~7vfm=@!Qu^bECN`W;^qXjPZgP=eBfkCdb01QY(37miA%&86lD}==P)rvD0*~U zh-PcO!s#tAQNweS$i)+eE}e$UGAg}HWArTWariBu*|Z(Rv^~S?kP9IlslXv+9}Wb$KXwn^#OIJ(6ME zRvvXo=ZdNG8^=9UHZy1aT~WG!{{j93>3^?CTGo{oihHmsCv5woxYCD_xuH1ZNw0|2 zy~dSuKXQH4n=J6{ZJl~<;0ig}qvqEZv@uP6P*QM0+b*hRpX|LI)h~J7eI;2{m-hP! z|H)d|cDz|>{&S0u_I&5+-Q^eldn)tJR^Vij!GVK|MWk6HqnmS`8-lYgKQIbAXwN*2 zt)|7~4NHW|j`}?tnNO|^E4Fu9A-ZJ#!f#@~if+kBa3zO{1oEgV-6)u7?X>ep^g{Dw z3m3HuT{pM+9>4pc?Q-_)PcLpSl8ic$|B+$crGQ-%1zcD+vR!Y`aPt>9BUOL7?%m?f zT@u}{yOK7UEW9((>f1W`m}hemOk>Q>TkEeEZ3{W+@lX9n$AQ@&`3)=h8eR3DC$DdL zR(n5cHS^0Cv*jdTCUnc6oqXWMrRnamw|hQlbj3HlWc65@BKZE`CF#d8DmxeT&)XH1 z{I0OcfkWNv^UHXdlE{*!i$AJ*-k4!5UZ1}%ZmsI}!k()NE0;B7|6b<0@qx=@H>0k( zZ*pQ~k9pRdl{IYrEwM?wYvJPgD;~D}IQzCkC3jKwqcz&gPDQwzxk`C>Puu8!a&lf& zOY(V122UwsM@EzZAI6v^rd_O2O3Sc zi&f35e{CoItJwN(^pAI4Cr?NUx_-$%adyvJc_HafX-XH1i}?0)ygDThv%y{NsUCce^WlHHVpAE#9AG`_nx z=&$hQK$-6EE z=D4w;s5<(CrEmPyy87^f?^V7(x3B#jWq-cTPP+y|htYbu$0j-xrzc z8x?uOPNm#8&kA$>pjRKZTQNzfd*PoSVZY_q9p9fYGxG3>H#=U7e>YdS-sZTg0eh= zb~7?gtZ0*5=DWwwW@n~!{haTe%4<|sA9;R6SuJ+LkBP6lj_1$m*5kG@PD;B}d_*v5 zGVH z@IL*EujPXGVlU#pKD%af{3Y{*g^^418k(IGc6i*(wtN3BYyR#1wr79-WmvMhXt)20 zS~CU)2DT(`cNd1A42v0#Cq>#;GB7Z3))#n07BevDDT6R$#Zvn+1_lQ95>H=O_Q&ij z%*G7Uvx65gFfclJx;TbJ9KJivm+O#$fZP6Q^A?D#f3PfEpzC|l-1H2uB1-erm zzMRTDX|kn)BUWH_86)dL-8I+RLOh=stg~m&>CkCD(Ne)E(Z9)edqu-81_lNOPgg&e IbxsLQ01BIh00000 delta 209 zcmeAde#1CHxt?LOr;B4q#jUqjeYqMG1XvUF?=9#C_OR;o14>b4w=h?wNa{ z{Y+2VeLwMIa_h3s@JsMTh`&BGg>Si6R~FspCLo}i0_GIY<02$&Sw}k6rV9Z5h!L1>fnC#_l(R+6_-B@ P3=9mOu6{1-oD!MJul zQ4#2PYA~bt9$(c@S)Oh0r$o;DdTZUDLp)Ah6IfFF{{Optw*G^Gb^aa~UQL$n5Md*$V+oWvx?IeB{A70Ulu-dfym3D4aoy2f-zRFCct zk0TCyCNFoJX(byRw#wk*=YxWic5a$o`$|cD-DDB_xK}c~KQjFeda)Ms-L1LlRD9p$ z+u^jXxzdSh!c!U_Kfk`G?9bcZOICareC86Sza~Mv|3{N#^UjamkqRxpj)kc0OR1l> zVf}f9YmJUG4YXy>Y|{~SebJ|DURf5#v#e_Or`Dv~TnvKW#3Y(EzNIi*E_5(6a#wn= z;(_|%qAUD*2@OX$%p*?T+sRNg<@mh_;mmWX53lxqVp2N7x}>*{g(>o0H~$H9SB_L= zzdao+or@-^u#4AB5OCsI?DzD=qJAOgp1|b#uE@DnqP$X}rkQ?oWKPYPArj;>E9jKu z?6mm{wUg`I+#f#b(hqX#boJKSsZ_ISeUNi+X!fd|g~hz82ew>Dx;!n)?uCPf?7s=h zG9ND}%kEUZw(IpiZ+_ddw=17_Z$10UID7q>+VfJm*D8cepB95nisz0mkOcVnZ>Q&;h#bnlJvxt^*NU}ef z^la#oiV}gd9?NhQ-u$EWXqN*?dW|Vz1PC4aNd=* z-xH6no^zTt)cv6S!OR_fqHPh;wMwh%+^;BBZp*U$G_U3J`jUv2{t2^wxpmAjyyDh2 zFW9ehEt{&x#vTz)@7eYI=Fig1+Ya9Lx$%6*oPD8fb2o@RJ5hdY_U&Ki!DhMy_(FvLg#4BbEXoNOT}zgjiM(7eHJ$}ny9;@=h-Xoh`)Vr zuCLjDwciJ1;V5U*?gExXjTfsb6$%$Ieaii*B6Q`SR$#>(P~Q`=-=eypuPM zW6L<<@!DoleR{^n!&ww#fj!MZ1O?R?mg@2c~tmROxd`4B#?H!jJe!a~;(Z4n6 z3|nf=G?lgf3v=v_ed2#&ARPDfUemI$$@M!o{@cNFK-ppPo5=pmUpi;qBkJ{!?wRT| z^I_Aepue%Z_p|*xa-$~jbbZ?M4$mF_Cs+>qP8W>0x8%_@hI`_FcPwN*Wz9eHOX1&W zSM&SRzg)kv=M!IfQ{?Oq^~;Vn|17w7*CX{#NkmzO%GJ5iJB&SA)+(DHuy0|Ty!x{> zQ{m13ne~n_TeC%WJ-A+EoTU6m>QVW!v+S$t3y&#nn|wG{kNM5MeyKlfPfmGGDvoFV z{ZcOR+%cx!;I@C)7agrXp=>eBM{}E@zAo3BzQdJ!56(9&%n91NpRXn4we+fI@u@eO zP3&iMoU(Yq7Gk~SS#7e~oiqBr7AwyD_WW9Y=}*UP10%1ei(^Q{;j_~W`3@`axW+zN>wIigw0`(khrJ2g zRwy$UTPq4SZ7gJ%uG#hI$;ZEc4?q1{Q_sjS?KrQ_v~Kabzc-j79Cti0-_YW~(7;g` z`_8o^to}%q=iPOzJEdN7FFm#7yyvT!y5^<~*1(woOb351QK{y=Q{VVei^;`!USMO; zqyM54-o(w4Je%yX_JR4e8L_qwzAl_gmNliMv{yRJ67RdcQAPce<#M~YPb^tYD^jn| z5xlB9!J%w+)5OackG6<(yvp}*E%tUO4ORGSz#e4n?{l6}v*q%Rxj{~s)oeDemfJVu zlkuvnk5259PpY+T6V8e|;dx(gk=VCsQ`VjinNg?0U3a^8$;p`ptqulJ8)fZ(-rFNL Un>8Ycfq{X+)78&qol`;+0J)G+!~g&Q delta 1728 zcmbO$*e^Iir9Q7JB%&lJv0R~`C_gPTCsm=OvLICt%5T*0lPN#Z-L&weCDqj}RUmx&{hnxFBOa{vx!T(K_bIOm+U2}`;nv|37F|j=AiJT3vX;=a$vd5lzyU-QThZY>!yj8LX5{*>O|&k z{v30Fp;IvL!=$~%j89bLwte(nvU6JNbcwgDE3)om$Hti9Y56I`#T;evTLXcBP z)l-aD?}vh7i-g^mfuD?R!m$pe|uiBaQ_?c8xL*~Mx)1vZjtyG@6>-{C?e%r5i zzB;UvefObV=3$4s)u)B(*|V=&XRkj~dsZs{hnRo+Lt-o^Mp)R3CvjJY&9i5G@rdk(YxhsZiJ8R8n z+3WszSE0p}Ud-0hnxyZ@-JsX5vFXr4E+>B9XIWmEzH93Dx_#FA@wOt|W$T%lPwxDA zx#!5b!|l(y&Yp6g?JZIp*X5xVapc6}r$+Y_zh)-w`Fg3k<@xg`*}>-1oSQjMq+jV! zif1-jermya_LL&$XPW=q=ANBd+r#&wH?q)AzPsnH@M)`BK27ga3-t;gcysa`;Ng0^ zr7QlAvf-Jh??2?S+t$ZC`}APhrw0?5&Tz^c?JsC!YMD9Vx*kt5+y5KP+rv+suynS1 zr8}?a2iw`5I+-7@o69@xzWMR?xwB{fNe26dzSeEpxV~1BspN?^=^MR7PHXF0de{!TJ_-cn2*iD}NeX{oNsHn6n*Jj>0T<^Xn+b;H0 z>CvD^7ELz-Yne@)rdjK=OGOCr9Q|?6a*6x3JClO$si}tX9B^KKIsJ3`a{C`^nByF7 z@75Ro^l&lf-a~hqyXC`P1uvXcy|hVGCfng}pXrO@y?vY5Qva-Y6|z3W?0wNs>Bj}a zfeYON7c9G4llb?gI)fZ%SJ1QSnfG?rcUQ8%_IJ;@d7`P2W!v>G7l+EOGbNJMo%z*? zU-KR65_0ZsKm7iuWs%TB;jG>rOP{jX`f&B)#cFTXUOWPM&@0Q?s`9dpu^+DqWVR9;#->EZXT8_`^SD!U zwtxAm_?~Cx@_MtbcM99)%31KfdU?Robap+Xg1K~8(@v&(i_L3Tk22OXSePngeGq0~ zU=;9laSVw#d^X%#h{=${we4Jz_wjS5E#*#3u55m5G)*%od#mw8RnDKfL2vt?e0<>e z?aK~(`_pfk!rBg6e|UYHkAa~Y(Elrj_d$^K5um)@$ta-159ZSwi}n+xk?+qeuQ5FX)Ur>@=N6)zxFw zj8#mYeL@ptxTQ||t!B*Ke<0|H?p&j-J41w*ylq+=IGt;wC9Bkg!yyL2vd&!wtV^<` zK0OP$yr9iUAU}p_l9zj5>)|xV&lb}bc^O`ur1q*a%OzIEsHbS3iShg0+xESiExgrG zCt}gQHeD&-%!~aS3w})O`QJEm4rj6ei`%xPkGZ=;_6x=-zo}bP0l+XkK D(0)Wq diff --git a/core/assets-raw/sprites/blocks/environment/shalerocks2.png b/core/assets-raw/sprites/blocks/environment/shalerocks2.png index 7f844dba8164ae46246c58083664aecfa0b8b6bb..50d0f74c0caf06b25920990bbdfc8b70045343ca 100644 GIT binary patch delta 1719 zcmew&&?-1Vr9P`FB%&lJv0R~`C_gPTCsm=OvLICsri;Ge>WW1{O!p6y^5d9t)?x!z3q{(|L(gVgLm6cU&yWG{`}OJ4vsyl zzkk?#Fn617*td1J&?3gz!u9$A8 z)=ZBNvtExaJS@98XB}hGf@UGFMQ(N5I{l}t^bKsGP^B?=Xg29XjZ4 zb4k(N?o`8iUi(821l^^KK4~n^ioUu!>-?$OwX<%ox+vmxeCh7248NCYhcc}aukv&S z76jO=tY<372s*oFhk(b_;Ilbu`Fqltyuu211s`3IU?KCdV0l^jQ@g8Y8}62uF7BUV ztabPQ!a0F2<)&0$ean2cYUayp{*5MF2Q`hBxc@LsnCP^XeUt3hS4q99);repmwn?j znk?qpzwY{_nrk2PEO}*PP96Bk(l%#3Uv$}x8GNtIesgT9mwLQfX|d;iAe0K-&w^AFUqn9{ZLg+dBe({cRKAnThI@c zC&?A>m>;npcyZ0sj;p2ohICnnVBeDMac7#H-Y)0LjZ0s6JdRYdjCmvfS)Zckf>IPg9@Iis#}F7(1KxPKqqbS#5ji`-ixMS@SRc)U|Pa z!o0~n$8~SSY^#Hv+gl>{-46|wNJ(4uAjMp1jo#WVPmk)EJQ3w-IiJL*UoRi0Z86c? zXJ&N3+Kvszr!GxQy#3SS>D6f*e9rfSZ>N6IJ6n8M=W6O!t+#g?gLZ9r8Z+_or=kp?J~vG_MJ77ppwXD0{l)WR2sy2{Cp{|4y3h z`(yTm{jL@dr1X9+X$w!kTK(K~k%su3E%kOEE>t9mn93ALS;pR|5%hY&IngfQMbM*$ zc`L<2RP8Rm(S6QtIg$H)4Y!}3E4aC+5YE1 z|GIn;cE7i5_OnlxzDNjP^;X(i?~Q%py_gmCvwxm7`C(kXZ0#+*sz(P56XW()J`I|1 z!)g2cdbe45Now0-R+ab{Sxelv5I>)Mv8Grr?)+VGjqhL2_>0X^Et9M|E_?1?qrHTQ z{cT2t^D*h%)^~1Ils(v=|2-tjg#TbDKYJSSV)am-c?@ zv+cr;8Xe8fO)sRbY<})|jqTm4n}667+AI?iEuPG0VA$NwdYG}E*@#)Z(m0ZVfsxD8 z#W5t}@YS&0e9Zd1=nIY_7uQK<3RT+tQ zbIt_aag(+B;`n3DoRwQR>K!2Zo;zpgYaDdJR)bUQM0qKM0+##*8K4N1G5c3t{^oV{p!nkM&OV*%lL zPyR3bpDMCS<0*H#$wF_fuHKAL-X~|Q*;j-J*ZMnlalVuM9^28nC|1F6jkETQw|P7E svi7}c>r|8a;P@i!QE>_*^B;!Od|PTi)jyoaz`(%Z>FVdQ&MBb@0QcoJ=>Px# delta 1720 zcmZn_{30+xr9Pr6B%&lJv0R~`C_gPTCsm=OvLIC9bw%~UuP;rWrj)Ml{@J4P z%x$A0&7@mT^K57DG0WIdoc=dBHY-2R*5)^d!7K;)$qUc*z5TQFuS%QfoJhlCKTmJ* zp4!S>*ZJAF?peb-)`sJ6811V!_xM|sxtec3#O&w&?up~MMKB2OYPjh6f&*yYcAc^leESuH3ebkIC_7R5)~#DOskOQCg;(`<&aN7cvDt z58M+iH!f#lnqMbV7@|^@8o?q`g%*qSOjlNGaXD+EfExkAC z9M7wN{LjuTc-OZx{a)OLYbDd7=dtwauq<0Kq36r$RlZxhUtL?&b|>rYqXN4*b9l0CyW@{{Jn#j7aU9EU)y?5sPi0Zy)fgiR%4xP9< z^_?}v5h7_->#$>1+mE0>y*aat zf9Itnn5DHw=Ffg(IE$U}g09ks0*ePbQjXkyT460aGva`a$d4s47}cMDQooGjTHof0x2HO3-4>AMRA#i#wJo?7z2~u@(=5TZ_uG0J zw)oH5$JP8haM8<1RV%*TKeRu`&B~0sRcZKnaivgV@62Z%S2<_4=$zcXbWz8VLR*ms6J4{`R;bM zD&Zf`EQJr%u}STm&CYx&_4bL~4-YG_^=?#7*rNu6eW!Sp zc+Ccevg;qGDM=lbTq;~C`ShCkZ@zEd-+X@6d(40R<5bL)OPtQ14`etxXR>y4tM5F0 z>)6q>rE7WX1J1c9H>E|M%v)ueAH=!7{=(sZi(F=Ic6%GC!QxF?@ZVCy}ygv&wJ@RJ6iv?Ix{=0D>sAx(zXi`)Oe`d1pF;Z zwFYa}uNOK0GC_L2SV}+Vk5lRGZZi*Cwa&{vlH57t@mHJA9}gHF^5)vR$-lfUUUb%Z zxt?PwSFB8y|B&EwKi0ij^``g6pGTKJI)1Tc=Z8}6qU((_?$;*Y?|+tWw(r#o9y>n4 z+AOpGj5c9{KWFB&+c7XOwq-gy2Y5O=!%AC*&8t~AGS)L#$co;Nc*(%P$nELk7!q;# z>~urE!wNjEvE91N$y3)(UtP6e-Wu}+XGzH!w>dkvG;9>knj!SC0LN0p8LZgN|8 z{0rN$2aGar0an1t?n`jMHF~`acEIMVZnWwT;&UCbDPA(IUc%v1! zCxlhivAD`%Q!(enJpLu0CU<3-sx0A|e!Y%o-Wyiub4{7Q9P~N)T7PnG>A9|S(K}It z@nT}gEy1heeHBfm@)=WKtdx7P^7|}>b?VR7F?G4*uKO0-$@E%hf{w|W`47LPAHE;_ oq4sF_M+dz_88h|&rq?hCs_dNqY=f3J0|Nttr>mdKI;Vst04!fSPXGV_ diff --git a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java index c64564b988..ac901d9265 100644 --- a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java @@ -22,8 +22,8 @@ import io.anuke.mindustry.world.blocks.OreBlock; import static io.anuke.mindustry.Vars.*; public class MenuRenderer implements Disposable{ - private static final int width = 100, height = 50; private static final float darkness = 0.3f; + private final int width = !mobile ? 90 : 60, height = !mobile ? 40 : 50; private int cacheFloor, cacheWall; private Camera camera = new Camera(); @@ -52,16 +52,20 @@ public class MenuRenderer implements Disposable{ Simplex s3 = new Simplex(offset + 2); RidgedPerlin rid = new RidgedPerlin(1 + offset, 1); Block[] selected = Structs.select( - new Block[]{Blocks.moss, Blocks.sporePine}, new Block[]{Blocks.sand, Blocks.sandRocks}, new Block[]{Blocks.shale, Blocks.shaleRocks}, - new Block[]{Blocks.ice, Blocks.icerocks} + new Block[]{Blocks.ice, Blocks.icerocks}, + new Block[]{Blocks.sand, Blocks.sandRocks}, + new Block[]{Blocks.shale, Blocks.shaleRocks}, + new Block[]{Blocks.ice, Blocks.icerocks}, + new Block[]{Blocks.moss, Blocks.sporePine} ); Block[] selected2 = Structs.select( - new Block[]{Blocks.moss, Blocks.sporerocks}, + new Block[]{Blocks.ignarock, Blocks.duneRocks}, new Block[]{Blocks.ignarock, Blocks.duneRocks}, new Block[]{Blocks.stone, Blocks.rocks}, new Block[]{Blocks.stone, Blocks.rocks}, + new Block[]{Blocks.moss, Blocks.sporerocks}, new Block[]{Blocks.salt, Blocks.saltRocks} ); @@ -280,7 +284,7 @@ public class MenuRenderer implements Disposable{ float tw = width * tilesize * 2; float th = height * tilesize * 2; float range = 500f; - float offset = -00f; + float offset = -600f; for(int i = 0; i < flyers; i++){ Tmp.v1.trns(flyerRot, time * (2.5f + flyerType.speed));