From e0187cd233576078fbd4a2c369b5f18f935d11d3 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 7 Jun 2015 14:17:11 -0400 Subject: [PATCH] v0.3.0c: added a buff icon for bless --- assets/buffs.png | Bin 4506 -> 3722 bytes assets/large_buffs.png | Bin 6553 -> 4838 bytes .../actors/buffs/Bless.java | 3 +-- .../ui/BuffIndicator.java | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/buffs.png b/assets/buffs.png index 850fd049b4a55b168ed8849cc41f5038d4f67feb..f31e073eb4efbccc83eb977c53847fa033db8328 100644 GIT binary patch delta 1060 zcmV+<1l#+XBZ?i683+Ra008a$fETeLND7mC3LSq35)L;6w>I1W007}oOjJbx0000X zR{&I|09YmfSv&xMRsgLJ0ObG%06QeJVka_yDjG8`4K6cG05&TiJw;7NWSvVFOiUO} zO*S7*JuXsGQdV@iSu!AHA7*CM|8hTEcs(|MDj9#N(tr&OfNnE@fPjTw3W!4nmoJ%_ zk6eG5nR=Q3G@;VZtZ`$qJ0!B{|Ffu}v$M0a>i@TqN4R3Rz;>m~007Jk49v{T%+nFg zow(j&TjkGO<`+5dlg{#U81kTI^5oj{a*O{O8viN)|1&fHRWtv28ULy?|HS40%-#Rh zP5;|v|Nj90|7QRH{|G;y!vFvP0b)x>L`r`i47J7p00QbsL_t(o!|jz@SK3ezg%8Dw z6)oPls0ERr)=L3NREQYv67v6lQ1_lm0>#!Y`_R0wCx@&B3+6lf>TQyXDR+&ga5E!$o`lL#$E>wYPPj#olmzv$lWYQ(TO%MQJ-WP!V{e1wO;g^5U zX6|$Ew)gC|A8~tZ53lj&wE%2v0KoGq>|aFzU^E&Lpj<8sKqdmn5}-hU?X9h??InQj zq}gpwy2r=(P#l=U0!ub!%?$Q$W^NCidv059?V%Zd!_w{3fr>`}sa1eXCZhmZ02HLq zpVtCl(rof#e*%o>a}ZcY%a|FKdrN=0ZMhM^Tnm6PaKJ-*FFt~E0G#s($~=M$mFD)d zJc2?27GVE-Sa(Kh$pQSpO$hKx2M*qGU?>ittGsxc0YiWh6*~|DVEfF#9~_7>@Ph`# z4xqg`cs~Qu77kPlGhnJH0Gy);Knv2F=)al1$VMUjZ3b4SU_539tOL}CrhtF_0U))Q zg3RBiAk-ICUDZ*gRN+vDQ}v`eRN<=wtemQ(+EIN~h5YPp?5N=apyE*#G`}Rk5moQJ zOgqyT062~VfQI8V0B|JrB%@A%djZG~@&Gu+{G7%BClmo{1SnFjZP-5WMF0>A0!WHh z0j5+Z<@kZ`q%6ncm99%Y?Mi>4|2+sy-nQ+$$@Oy}$h97*7Po)069E*9S65fXBIbli z^&1Uie18cbbl{SD0|46qV0{+{A^>&Zo;n;1Y}6nGcqo;4X@3CJY9K&=1A+h+z=Igz z&V(88WRfBWNWcuRf9wGFPXLM;*kuM3VBtV6M+Zu+5*;|%SprZ8WdDDGc?&=bDhq)6 zk%n+8A=C^o1P(&T{s5o>@e%x*0iHoC&OnWdGJy7sL7agY-~&?-0{r6?*hU6nbqYd- zy@LNPK0&H@hNPU7kCg;~-f-NATQUGrDIbCN6LO%MtOIBtRFlkr{*fj(1wq1E1FQko e0Be9Xz)u*H(=cbDv%D&t_yq7n> zol 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 delta 3911 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 diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bless.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bless.java index e3d6c338f..a99c314c2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bless.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bless.java @@ -14,8 +14,7 @@ public class Bless extends FlavourBuff { @Override public int icon() { - //TODO: add icon - return BuffIndicator.FIRE; + return BuffIndicator.BLESS; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java index f8d67aca8..00c7587ed 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java @@ -73,6 +73,7 @@ public class BuffIndicator extends Component { public static final int RECHARGING = 34; public static final int LOCKED_FLOOR= 35; public static final int CORRUPT = 36; + public static final int BLESS = 37; public static final int SIZE = 7;