From cef3d383b7dccc766742cc99c03ea9498dcab711 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 19 Jan 2022 10:50:28 -0500 Subject: [PATCH] Display liquid tooltips --- .../environment/ore-crystal-thorium1.png | Bin 232 -> 226 bytes .../blocks/props/vibrant-crystal-cluster1.png | Bin 1677 -> 1682 bytes core/src/mindustry/content/UnitTypes.java | 4 ++-- .../maps/planet/ErekirPlanetGenerator.java | 1 - .../ui/fragments/PlacementFragment.java | 2 +- .../world/blocks/environment/Floor.java | 10 ++++++++++ 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium1.png b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium1.png index da724496a5ba586b425b6e15f18f1d8420b98779..3f0625749b8f87e11f91435d0a7704a54489de55 100644 GIT binary patch delta 185 zcmaFC_=s_WVf`FW7srr@*5m{U*2M`+nBB4@zZ8G`_}{>+dX4JEXF*39PfVNqibE|b z!jEf#1`9`|pO3}_S*9t!<|wfToG#iV>)`9KiJ5PE&hlCBB_%w3T24%xeUke@sQ2fb zidPTWi?%Le5c4uwY|SL5wPZ?*i*>_{9qQ^KE9PXLEbJ$~BZra%L(4ps)o6%MYxi5g}M3=9mOu6{1-oD!Moy0rAu-?bh#WAE}&fB@ZL2oU1-0XK%+2&t6Ja7L!hS?8AnYqjkvn8CHASwNb zSEGD+^W+_6KP4Z9T-G-L_DM=G{-)^4} z$mF5f_Veds{nu(f%1b2_il#6GbuDr7x_I*L+r#Nk>aQ>^5s7v2mu{V+^wZ62VvX|B zj3rC@UVP?MSn8p*M1(gcwJFj=lW)f?0SB*%As(7#5$>JZK1PjGlvYj%Qn~-*@-9Z@ zoKTy;e_zj+UYQ+J*c4fydGz)1YSaDeQzuS&qV<{cz)BJS^WV)6eB^r^B;@J1=odU@`COMU zY@6P~V_lP;X<3;XQ7V$Lq@Lm1(GObf%Q*rKrY=S8M65` z4b%D`$SKYUVs}tD%JF99k>pbmPMWT#&&j>EdF;XQY)jyR2}!S4>~0k_OzTZ~FSy7- z@u-;b(HqGrCfhk4E;F!>l3?*Uow8KZ>a`IBBY6b4h$Rv~f^BD!BJE z_cdR=YgZU2comB1x~a{}@7Gt;k4j&;`%Pm|mzZ0ASyv%XE(i0odCFgGV(by$e)%Nq zYx98qU#EOYqN(yBxf)23v& zI*XKQ+MEiIh+KIlWtxIkP=(mS18Oe3nx4zN1OwZc7K?bF<51FaW#MetChJkA$)#Lh z)ZroM*miGihJFyk-y|Mg&zmY1yR|-)nO(ef@8abfdYUFF7PlSuD$j7`I9WEwc9wbN z>@z)m5}eOJ8yDxu5k~pev*0Wz=@uwxz3t1=C|!yBp?+U?JT}wTCz!vH|N5@ z>l@uRxA=cCJ+ygd;N+Dz+my3%x2$+x^4WSGPrcKeTzBsE^6#Iu?tLUaUyb7fb zQ%hryUg`GcP||H_pL^m$kdCCFOArUYk%*qMtK;Lje40lr&qx`(KDu~bD}%+71=WeW z)fFY``+b-`UpLTynh;rL6z4D8mF_uz-uwI@4mph_7R_ZlW8PK;O)@y6&LE`e*8hBQ ze}wj#r61~5j)bb1OkX6vTJrxzQ)SNNUpEr`r@YwtvS(`GJcDkL%`G3ePOAtjR350{ zW|Ne-wV=0CL^p8Ja^q>z3D-gs1p}r(^5_VZoL2w)r}HwVzg>Y$3f}UY<%?b>x^!Ic z|Gv;u?{W=Oz_cWNuPr4_VKZ-qD!VxPcIhh4Nb%Tb;4SY{ulm+|ot!Fzs^+!8q}Ruy z-C4L5Z#)xja9om5xh>Jxt>ga;y`x56I{7xu9L5r{jRuCHT}my>c$Al~3kz&AEM?%D z*z~Y-`I7#XK^yv7oX#n~+Oc}M$1`ECu9?R_UecUk+0`~_(bRj++m()lK69HsWzp2N z!8bO~KP{u$!0n}2C{%C#SlwtQhjMGmLqBhmjyYZ{UTLnm_#)%m6-JgW5%)6|Q+uU! zojeM+9eMBb{M(=P?HY_M6O;IRclBlnDu0=i~xp%DKa1($0TMds`1k z$%fCfj=UaHG1H%cQOQ;Nmh#QdY+)Xn*JKxIy0n-G;>MdR2%4wz;am%pDTl3lm&W%TI*Dw|A@(-+@))L6Ee#h>Kudh5T zRN3^{s&gTe~DWM4f9!KFd delta 1647 zcmbQl+siw_u-@I%#WAE}&fB@RL2oSt-0YX#tBNyw_~d@VI#5?%Tu5pVzNs=Fpt=!7f+Dsq2BXqU(p= z35zC~lvbQqZt-aV`FMT&^)YVF{q37Pyo#pQFd1kaz5MwvZ^6F9GrW~FJIa0Tudq3?z3+*# zr&sXt`g_l-r<^@1KFMOb$K2i1y{FjSUM$cctl6+}#l+9QKF0m|J#|UJW|hCEjQ8Dm zeIst&loY1EB@Fwz6?KnmZIL%BQf2*6Z`fdFxkYu??%E$$#FzpmJbL>v^_TelF2)b; zeKzWs@}3uIUJ}11pd1_jds+U?brs)k?dy6PWMg~({t~~L^?Rq*loW3-%IMq_Yih`` zIw>VHKJnS7JePforykFk?d|@V=XA_f7h`!*m{o@4#w?S zyietBU*FB7jMIfCQ!}^gF4SWU5No#0`f}#4E_?2*6`p~Y4R0lRl+9SWNVdy^@r^#G zWZ4h5m6nyM5v3{_OBm|=j&9IuU&=8tVCtgMym-yFBUcJlSd#T72K0+8WnQDa$E}EvE!sdGluDGs$!(1Al2wF3oR!yRu&hCSUW|CZ{MQ6757Hl)7mATUuZK(cxUN!`tsAQ|D(CRb)U(l zDIe7k3uj$z@Uu$!8K3S}-DUjsiA&<#HXYw~*lk(=tpBNTr7AC^InLbA_m~@_eYZn| zGtDwX`q+-`6Er+8N*|SYx*%I%Gf%@Bf#?X9g&rn1T_cX3nSOZNg0y9>f@yA@#$jBW zVz|1ERI0+XF0Gl6+$l26)x&^eqH%EF%AkrViVJm*ig|jvEd8Ls7_goBq?+rw74-^A zK@}4gmTJ$6?3yFzxNF*y9HE|dToLEgmfXHrEp=PvD3_#LzRzopZz?TUChj?PJ0-2e z#or=b^NQq7dE+eOBjqOH{d=Yw85nL3cpk#_Z27`6x7}I;Z`PyXlg!7e4Ne@m z&~|l&N1(83l$G**hRf@?J|8I3JlFDKs^b6K>*pJZz6kFTVz~Jw@HVHm*5s;|ioX@_ zy^3aj;!M~m;vTqYnQ++Dm9eHyD$_hSs6Cd?RF5eWlxRqPe z&HIm=)%K_Lx-OgtIz`;qthoI_%rNG;h`Uq8YY)#e?p^bOFG@O9Ogi&LJX4n??qcD~ zos)BYTc_4A6$of%McPi%%}>}lCF!=JcIyX&-W}d1lHUJxd}SLRdK6Ae$jIV4sFbXq zwp3%{qL#0I7mqCwS*meRjm6u#%0Tm|n3-bHny11I7i+sNZC2@Via2_w_l}>en7fko wvgQ2(NqlKbITV}zC;aw&3#$d17EHI_@}b{H?(g(21_lNOPgg&ebxsLQ0M>Q)DF6Tf diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index e4e9cfdd29..3d70796424 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2705,7 +2705,7 @@ public class UnitTypes{ mineTier = 1; buildSpeed = 0.8f; drag = 0.06f; - speed = 2.5f; + speed = 2.9f; rotateSpeed = 9f; accel = 0.1f; itemCapacity = 40; @@ -2763,7 +2763,7 @@ public class UnitTypes{ mineTier = 2; buildSpeed = 1.4f; drag = 0.06f; - speed = 2.6f; + speed = 2.8f; rotateSpeed = 5f; accel = 0.11f; itemCapacity = 70; diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index f4a2b6a4f2..0e1b60514b 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -192,7 +192,6 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ pass((x, y) -> { if(block != Blocks.air){ - //TODO use d4 instead of d8 for no out-of-reach ores? if(nearAir(x, y)){ if(block == Blocks.carbonWall && noise(x + 78, y, 4, 0.7f, 33f, 1f) > 0.52f){ block = Blocks.graphiticWall; diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java index 6579accef4..68b56afb4b 100644 --- a/core/src/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/mindustry/ui/fragments/PlacementFragment.java @@ -476,7 +476,7 @@ public class PlacementFragment extends Fragment{ } //if the tile has a drop, display the drop - if(hoverTile.drop() != null || hoverTile.wallDrop() != null){ + if(hoverTile.drop() != null || hoverTile.wallDrop() != null || hoverTile.floor().liquidDrop != null){ return hoverTile; } } diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java index ec07d11326..2127c65e3e 100644 --- a/core/src/mindustry/world/blocks/environment/Floor.java +++ b/core/src/mindustry/world/blocks/environment/Floor.java @@ -129,6 +129,16 @@ public class Floor extends Block{ } } + @Override + public TextureRegion getDisplayIcon(Tile tile){ + return liquidDrop == null ? super.getDisplayIcon(tile) : liquidDrop.uiIcon; + } + + @Override + public String getDisplayName(Tile tile){ + return liquidDrop == null ? super.getDisplayName(tile) : liquidDrop.localizedName; + } + @Override public void createIcons(MultiPacker packer){ super.createIcons(packer);