From df0d1ddeb6c8029830fe11c0ce087a01f6053464 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 3 Sep 2024 14:20:36 -0400 Subject: [PATCH] v2.5.0: added a new buff indicator for wand-based buffs --- core/src/main/assets/interfaces/buffs.png | Bin 1700 -> 1725 bytes .../main/assets/interfaces/large_buffs.png | Bin 3741 -> 3788 bytes .../actors/buffs/ScrollEmpower.java | 2 +- .../actors/buffs/WandEmpower.java | 2 +- .../ui/BuffIndicator.java | 1 + 5 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/assets/interfaces/buffs.png b/core/src/main/assets/interfaces/buffs.png index 980748a79359e758af48f268f16874646d6ad6fb..64f8054cb8e9eaac5847c5c093c597c167fab30d 100644 GIT binary patch delta 1413 zcmV;01$z3V4ZRJJBmpV0B`N`bzrVjMj>N41000qmQchF<|NsC0|NsC0|NsC0|Ns90 zC9Roa000FtNklLCvWm$s2x~?j)eF^MA;0OZebzSF=0P>?EDvLNa#^?`JDFpZ^E7oFM zhvd$AJ>DP;!{?)Ap0Et+QDECP6}Wc@99qZ^{UcCD+OeTPT2(MG!V<9<*9V-}69gpt z;H)f^+(?2T8gZ(Fa!7}NW-V!AnP+*tEHVhp%>Vxrm)SYfBWumC)%J2eWmiiOU_KhC zBfcJwU=9LvJc21~`6U(Pks00sWa1?Jhn<*zhg*vxnQqj;Au z3IJ-L6quQrMGIeOAkF|Mplsl>L*eT)-~N`bTU z^YgRccAW7hAOH)034|#c7dRlxD_PT;*~)6R%13pH3j$#w{}2X#w6n8w*1-e~c83SiwXTfPsb(`Edp~1Q~{q`4C_MI)V!`z%yvY88{`y3?MsJ2ugoPdKm`yp2r}ES_^H`KcuOb+m=6IOpn-e6du)K8)R_O^Ap~Tvd&vAO zS*bmG{OD0G5Y|c)1K(V!)a!gCjXQT>P&D8)2pbN63)jhl9TL-Zjsm^jlU~pB&knb@ zk-yD+jy`J)4K&%n)2Gj#N`MLD4L|@SPI1*=Ou=OzZ@@JJ$gIT%^agx*_&_rNfp`SS zZ-xdQJ$fvG%Y2gKGoS|aJyrLm8BhZ{^*964K|>Ni0m@ecS(t&rU?>5-k&fSjMx#;Q z0;d0e#4R|Kf#(<>7jHpRJQoupud6Ctq@NJK_+=)<6_Euy%iF8*>8>uARQa| z)#|&d8`h4eh72nO;M5HQU2H|uF?@EJpH0AjU;_<=vo8c@Pyhv9ynT-?fxeCa`Gr6} zcFKoo93cc=}Jmj;9d1b%|R4Fr!61{`<-1PBlyK!5-N0t5&UAV9zeM+UJb TKLjZM00000NkvXXu0mjf!Z>J@ delta 1361 zcmV-X1+MzN4Wtc_BmpL|B`N^~7n$+xlU4yBe;i3fK~#7FWRQh{Wg!p*alXrQ_xxkL zX8P6(_ZrlHG%?0l6h}M>BoaqX+oemA$pbqWnN^A;6&g*?W{w|BU^M zb2T+UfnWX?=w$=xTN*HI<~#nQc$Y5<07V0ZKxb!nlDw&bI0Kx3*np)Dg}2Xu6Ex83 ztqxKw2=ri4fEASbklzP^1iWbmUbzJ=Et~<))Q8;yQAPo4Fxp*niS|+UspQgYJ85o?M8=RYkK%VCic#-EXATSfw z$TLEL`5>?`wg7=e+@HlLutX@ZOo5fv)zy_BrkwF6AOH&qgeiI|Fh>T5@~Tzyq2YX( zpV9yq1j0i8JPdqcYHDi1$G;ngf5CXIPHGciX`&EVS#2~Lt1HNMEL&T1H-i9Ha|6@l z6#>XXV0ax3L;*E`d>V|6O<|2mV7#7X{4gII`O7dszQe#!floyNCluiGV;2q3fHT1S z*Z`lO0)#X03|j(C4UCVofvlFX0p?2}HlXMCD1ZhezzSNU01PyQ$d5C?e<8>*gv^Hk z3(yg~G6Ot=TAYDpQp^Cd!x#jZ4nFi2NZ?~{!IT?#+#0K;QJU@S+8Gt}M0_0ai14l>45=adSPiH_4==W6Jn`S@_=+xs3 zNCyo`00k&t4dh`4c6awA;3?KCx1g&FGvFemf5a`A2SGp>Kd;_`syG*|!c|vExX4H( z{^FZy70*Q`5`cOxe*^`<&Lsq{uC5@kLm+T%*AURVM`MhvH8cDZMkruwE&m|i zOSrhWzrWWEpa2PAaR`wgXJFt?L%7C!6wW$^X|BBpHY}lh5F2>T6KE3P7+l`8-0s;a80((F}KtMo1KtMns1lY3n TRyG(M00000NkvXXu0mjf;7Ce+ diff --git a/core/src/main/assets/interfaces/large_buffs.png b/core/src/main/assets/interfaces/large_buffs.png index 2ac695a7d2192e26791e26b8a04efa80519f77ac..4253c026e6847e1bfdf1fa1459fef4ca9fe06a88 100644 GIT binary patch delta 3483 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 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ScrollEmpower.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ScrollEmpower.java index 922cc7910..91ea91197 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ScrollEmpower.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ScrollEmpower.java @@ -55,7 +55,7 @@ public class ScrollEmpower extends Buff { @Override public int icon() { - return BuffIndicator.UPGRADE; + return BuffIndicator.WAND; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/WandEmpower.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/WandEmpower.java index 14ee316b1..34578579a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/WandEmpower.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/WandEmpower.java @@ -34,7 +34,7 @@ public class WandEmpower extends Buff { @Override public int icon() { - return BuffIndicator.UPGRADE; + return BuffIndicator.WAND; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java index 946409887..ef7bdebc5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java @@ -121,6 +121,7 @@ public class BuffIndicator extends Component { public static final int DUEL_COMBO = 69; public static final int DAZE = 70; public static final int DISGUISE = 71; + public static final int WAND = 72; public static final int SIZE_SMALL = 7; public static final int SIZE_LARGE = 16;