From 3cee5fa5a3e7b980d58745f77be91763c926e16e Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 31 May 2020 22:59:58 +0200 Subject: [PATCH] Fixed ability icons on the hud --- .../unicopia/client/gui/UHud.java | 7 +++---- .../unicopia/textures/gui/ability/cast.png | Bin 613 -> 728 bytes .../unicopia/textures/gui/ability/grow.png | Bin 0 -> 701 bytes .../unicopia/textures/gui/ability/stomp.png | Bin 0 -> 690 bytes .../unicopia/textures/gui/ability/teleport.png | Bin 279 -> 793 bytes 5 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/unicopia/textures/gui/ability/grow.png create mode 100644 src/main/resources/assets/unicopia/textures/gui/ability/stomp.png diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java b/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java index 4a3e5ca2..6a5d14d1 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java @@ -49,8 +49,6 @@ public class UHud extends DrawableHelper { AbilityDispatcher.Stat stat = abilities.getStat(AbilitySlot.PRIMARY); - //renderAbilityIcon(stat, x, y, 0, 0, frameWidth, frameHeight); - float progressPercent = stat.getFillProgress(); if (progressPercent > 0 && progressPercent < 1) { @@ -61,6 +59,7 @@ public class UHud extends DrawableHelper { frameWidth, progressHeight, 128, 128); // progress } + renderAbilityIcon(stat, x + 9, y + 15, 32, 32, 32, 32); blit(x, y, 0, 54, frameWidth, frameHeight, 128, 128); // frame secondarySlot.render(abilities, x, y, tickDelta); @@ -103,7 +102,6 @@ public class UHud extends DrawableHelper { float cooldown = stat.getFillProgress(); blit(x, y, 80, 105, 25, 25, 128, 128); - renderAbilityIcon(stat, x + 1, y + 1, 20, 20, 20, 20); if (cooldown > 0 && cooldown < 1) { float lerpCooldown = MathHelper.lerp(tickDelta, cooldown, lastCooldown); @@ -116,11 +114,12 @@ public class UHud extends DrawableHelper { int progressBottom = y + slotPadding + slotSize; int progressTop = progressBottom - (int)(15F * cooldown); - fill(x + slotPadding, progressTop, x + slotPadding + slotSize, progressBottom, 0x88FFFFFF); + fill(x + slotPadding, progressTop, x + slotPadding + slotSize, progressBottom, 0xFFFFFFFF); RenderSystem.enableAlphaTest(); RenderSystem.enableBlend(); } + renderAbilityIcon(stat, x + 2, y + 2, 20, 20, 20, 20); blit(x, y, 105, 105, 25, 25, 128, 128); } diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/cast.png b/src/main/resources/assets/unicopia/textures/gui/ability/cast.png index 307dcfcf5ab85fa65cea0816bd47984c83ee651b..07e809b37b6fc9373fde3f605fd5f4f6f2c28c87 100644 GIT binary patch literal 728 zcmV;}0w?{6P)c(7BG(jQ}6(GOK2=@d%buXeA#?7Y?z(7_ndq0IV12tKk9OYx?Hng3!KlF>eVDh&jbgMNk0cGU9N)FI%OyUzyXj_@X2gSTXo<#2(djL z06>^Yx8n6Ro8!46pD%AH-yRR0&BwoQj|W1JKJ?Zea6A{b+HDpqLZ{Jhj|XfPEAwB) zTgEUw?Et{p9uGG)r{MIaaxnDSJ@mZ^bg@9eH;WaDeF*?4_N7M88d4bLe5?ohdZB}A z{S^CB*B*e7euVV2gSuP^(9PM>kNQhsu%O}~)F?Rvgua=U^j`P#ghr1@FV&mV&db3@ z^6g%r(etL`Z)#Akj7eQ(`Fu&*a&ur)QhNe6-!Jy1o_7i!2cc$Rh(8ehaS#q-K#{UF z^RGvekn`^(NSuYf!^Z>Ar_F4W7i7|pbUBEHq^6nK4s|?N*!+R(zA=9K@AJA4B;Q=pzdyg)4AAUT zFp|?ge<0;MuM1*G0LaekLQwEH2*K|V#GciRhUmD7ijYY^!g*bYKOY<1Gqa~IrDRb2 z(jomw^qG~-%pOX>QU+l&tG`K!v0SyximT__eix*t9k@Q2rbX17>rW?;)D_rx3Yu-x ztfU`dELU1V&Gm;9FsB57pc(HntL9>BU4M!Jb4oaR)2!&Rt^WYalLDj42`z*G0000< KMNUMnLSTaK^<3@% literal 613 zcmV-r0-F7aP)HwC%3A9zy$=1g-7uFig=D0U~JE2h#yw%#)izTIHQKbMI zyk0E7J^wImFg_hrS{7e&o{i@trvpddhiS2~16&ob@$1Esk~||Kq9o6%=<|JF#$?sT zOWa!EN?nrVnHRa=Y6`FlxDaxbr2;tmtJ$2mQ}{3%kJ?rM=ev}>Ob5R23*)w4B%|*Z zJy{f41$C3*AQez&K$2%wzh~oDvw5Y0hf@GYpL>6NIw&Ht>&3ECL6T?H^`G_!gHnL} z@U$!_J{=VI_qr4yqR-j?xHs&q!7IQ7+VUo7LsabuO`v0$0&?4Xb=qea2qQ0Q!QFd! zd%nEOb|%kFpzUvMtO>N0>u#M7j$0qj*QEpM)(?IT_!r6klHin_?_J_4od5s;0000000000fIs{N-7BlTj+@wo00000NkvXXu0mjfSf(M6 diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/grow.png b/src/main/resources/assets/unicopia/textures/gui/ability/grow.png new file mode 100644 index 0000000000000000000000000000000000000000..7376a678d7b1360be4eccf316892eeb05cc5a433 GIT binary patch literal 701 zcmV;u0z&FE%fW%UDVeImx0@7QM zlJX|Hy|GfKC<9T3bU?O@V;d)7s3i-?htIj^T;FQ|e%e^B)t}AwDP;S!5?)P20#6z6 zv^gNZ%LaFG>Vf4NpxZeH2LJ+IRneO2B1NnzVrQ*t&hTs~LYO6xor-9+(Fmw-^(rSl zPl1e@+;KBsl(8zKb4k^LlO%kr2h-*NRvQh<1f!Az!UgJ=zhsJJDi&N+@$awil?LW2 z(Cq*!qePW~1j&?@cu)F{D7Yg9!mX~{2F?MVBVe@>2)83WkfG%o+O#>yZ^Lk_!*YF4!)hhux@qc&p0c1EJ4KG2qQG;JsGDL!IRaKI0n!6-Teu-a%a-lYJ|0U$#I)`rQIE3bs@Mtrm=Jy}A$ zAyR@S;#)m=DQ1C8Q&$3~l^gF~ik}DQ-cAF`q-TNgc>k!A_3-E9$|bE_+6&(9???pi zA9W!K`WjCmY=vW|xn_oB(UUYcGzhmkv>P!XL&H5kqicz(HGy|XzEOV&@#hyHnFVa| zptmJen2-uMO@Ka0adQ9}S`HlVjCLc2xBI)?!YcW3{WyV}`2uF)A7VkNL+Qi+g%CtW zl0n-emD=MshReE=x00G*upJO0GcJ-t4Y2*umR$0~_HQ8;Qk%Sf}tG?E;_ zKD?a-WZZ2!@TX${fIl5e?`i#J07i?M^q7p&ShCAfnlqUt=Z2NmbAl)x1HS^+FmhaFIk>h4XN46wY_9qwN>(le@;qFb4f-^o) zT9W;t>~jIoh5`Z-to`c_Zq`9st=I7S^ehIUus1@0GS3iDY$n?Xwvzp!?6nB!)^IV0 ziTyF$p+tZjt-kycBmlfju2Np|LCE$4yA5VlltHA)76ZF&b{X}rJ2|$CXQS-B$%RJ8 zQ<5R3N}t*R!M>4vW@lf=w8_*CSg+Z_%{ma+ZvEp^$`>OA zP10MAwZ}lTUpiE1$FO6s*%Ht@7XDtdB?dreDW54hP_bRLUdwbOd(BqHm_*0ARW9oB z$Z-K142#`HE9)W0c4W&rVv!RlTahGB`v<$gTaLvn^lTT>WVHWJ$d7F*QmWQ#?+AQf zPXxGmr@12HobPQ_xTr`=Ws)+;n3M7ju6fe7Nbx zzTDpQOh>2f0v(U5*ikOz$Z@gh#{S2jeWjj!RO>Y{06GSe2GemEIj&Ezs&3ZdVh)ww zh>9<8nPW$O9;D5Q9shVEl%r18*0TPj4-=jpW%MXZ6_*h7vYwd+kS5#R0J;k#tN6%q zg^`XfsdzSmw;V&KH%5Rf&X8FZAAnEqC_Da!BAL(MNZ^#O{f10 X~)z2V5!D~zk}{p_`S*#94&op@~3+o0)8>*qAB|5cDTi4$l5G2lR4 zcx+X}w|^3U%XZ7yUkkq;eEF^Bm+cakPCr)el2QBA o`-Aly$)&FU#OD7_nb-W4Wm%HxOvO_N`$4YsboFyt=akR{0CB=)kpKVy