From b91d5d718533387fccf9a0e04851836038393729 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 6 Jun 2015 17:45:58 -0400 Subject: [PATCH] v0.3.0c: rebalanced wand of corruption, added a buff icon to corruption --- assets/buffs.png | Bin 3662 -> 4506 bytes assets/large_buffs.png | Bin 4635 -> 6553 bytes .../actors/buffs/Corruption.java | 4 +--- .../items/wands/WandOfCorruption.java | 16 +++++++++++----- .../ui/BuffIndicator.java | 3 ++- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/assets/buffs.png b/assets/buffs.png index 32b19ca662308c402a0d4881a9623780d363c935..850fd049b4a55b168ed8849cc41f5038d4f67feb 100644 GIT binary patch delta 1851 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 YUxQaO!=N-EH~;_u07*qoM6N<$g3o`pvH$=8 diff --git a/assets/large_buffs.png b/assets/large_buffs.png index 0e4e2476ef3b283b08f5d4640056d6675e9dd150..ab4a8a7f5364b4398043a6efe322e200753f8266 100644 GIT binary patch delta 3912 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 delta 1981 zcmWkvYdBPk8vfRrF*C-<%ut5NXr_xvL)g?Q3=t;EWfY-C9hV#$B{kcQwNSguuFZ~$ z3W-uwF4KvMtjd$lP8u3*xnxeqC1p#c3)`M`^#1wY_j#Y^{hsf~`+S9t=Y+Xt3<>}| z$PPbVYwgR-`-y3RQK<|BJU4|p%^KZ-{xa{``5o4qL3SC!76ZNsQ~+%NLqLPoTy~;R zwOwTHC^i&3`h)W_zN>eD&p(USoB9VhTLrj^H|@P0?!b?+ijCEfd)y;2LqqIpCvIqn z?{dU({K#5bPEO7lyTZbp$il+3!a}UDkaQ~Td{%k8uj)?UwcR_aD2G zS+!~gOW9^@n;z5?dMEU)=Am28&^cp zf)Gihf()w)r3F_11^1Rnk(GYBnU;d$b{SRMx(6m+BD|c|lGYt`DAC9F&ZE}27y5sB zuKP{GChli0lH7ZOK$kxZ_$`1P?vEG+Ph;yt=tQ~$O60KQ$A4~R;Ux%;-5MxQMeUK> z&CicT=u?ye_{!HOZVWaz26aFsRU3j8AsTmUsQXpXnbBrrf9_SgElf=z5|bvE7XuXJ zqtVZ;48m0arX&}i8cAd-scjvfHo8F!<-%)8ad=d{V!GN8nY2=2o2eBO zcm8}K#JBu0y#yV!GR!fAsYIl^>q&YL#cN(cp387VILtA@9ndSjfDJZVmF-q`S?dwx z57pZalE(V-b=K-bDb;50Ykq(R&;fiQX&bEc!yrsgo@a^NpyiuM^Z-{}!!>$ug;x-z zPKI#NcFgv!YyIOd;FKNp+suaPTKGQs$CZE^Sz^yqg&RU3C;IjFeZ1vF^MTo=;y4)(W&9d1! zh|4Z^oB6@PvLdQrw@$-YXdn-<-NTJcNlNZV?8hy$)co>w(Uln=F|oaI6mbx?QW8?u zMK7TKXfo_!Z_lg%rK`OGaT$^&N$R@>$sDhDsANLSw_Ceg>)elGJI3 zlNRHtXDN}BBYG1()epOMLR_7y6ueJWMvTh*FudecnpAM9B;QGrjx`5Q2OM>K)Nh$| zE8kq&y!7u%Y%&2Rhbg>9A?}=}FaU+|Q$$VG2P^Ih+_KabOpn^)2I_EUxc6>^E%K_;F zceXE5pk$)ji8wGaGP((P%h-;ELOBK&(L7&prOQ)3ed}&;Sw`WpXehx(So#naho-<- zG;=nh=#{jy**ce|F6ZN4*T8~nJfiGsea<|5MaF4E?YFn04|D#-Ce+7}#34i*OxR_~ zXZpWlrP-{#10{*-=9?I^yl4Q z1Gko%itV1|5r-ctoZ6S;t{t>cPGmkBAVO=LvteI%^RlclcNQ__15K&Q&kvH4?b+12 zU>tG6F=AD9rin6vlOHlA)X)my-U*A$j-_GLyZwTZ=3n$6hHmYjS#TRh~>eSB`m>uxf8SAgMkYa+`YP;+`&&qDC3q#M%lLt?vW_DqC>b6 zV}F!N*pi$Iz6(=D68yn+*2WB$+y_IG&DhkMcs5rz|94Wg?!T9L)Q6Dv0xJ&cZUb|o z-2%394oojSFU`~lzj4o4_cDu9%{n3Yj5WrcseKYy$+(x*tMvp@n;J&aY5T6N{cz%- zT}$Vvq{Lq~-Moy2pN~V{6hy^^BL&ahy{Lzy!Lo1PX+7foCK^8NiR~JKZlWF*6rJV( zkEBo|rbWSMO+|A8_#3Wtx-~i>P>G{B!mmMItj6DsdI1`3?3Tk+Z+I0D8<8Vvx)aA& zZgGW+x^TF|5cl#2pCPq>(8~hnN9sZCUt80r=%tfO+rF00H9Pb<##gufg%p)MKb!)& sr%_3%=b=T+xgyz>z*+X4#1BonNOwjUjHW*s`2K|byf=8=@RVo$9}&bt9RL6T diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java index bb65cc0d9..ccb0697a3 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java @@ -12,7 +12,6 @@ public class Corruption extends Buff { type = buffType.NEGATIVE; } - //TODO: need to bundle this private float buildToDamage = 0f; @Override @@ -37,9 +36,8 @@ public class Corruption extends Buff { } @Override - //TODO: new icon public int icon() { - return BuffIndicator.POISON; + return BuffIndicator.CORRUPT; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java index eed3c43ec..b5caeb378 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java @@ -50,14 +50,20 @@ public class WandOfCorruption extends Wand { return; } - int basePower = 5 + 5*level; - int mobPower = Random.NormalIntRange(0, ch.HT+ch.HP); + int basePower = 10 + 2*level; + int mobPower = Random.IntRange(0, ch.HT) + ch.HP*2; + for ( Buff buff : ch.buffs()){ + if (buff.type == Buff.buffType.NEGATIVE){ + mobPower *= 0.67; + break; + } + } int extraCharges = 0; //try to use extra charges to overpower the mob while (basePower <= mobPower){ extraCharges++; - basePower += 10 + 2.5*level; + basePower += 5 + level; } //if we fail, lose all charges, remember we have 1 left to lose from using the wand. @@ -106,9 +112,9 @@ public class WandOfCorruption extends Wand { return "This wand radiates dark energy, if that weren't already obvious from the small decorative skull shaped onto its tip.\n" + "\n" + "This wand will release a blast of corrupting energy, attempting to bend enemies to your will. " + - "The weaker an enemy is, the easier they are to corrupt. " + + "Full health enemies are dramatically harder to corrupt than weakened and debuffed ones. " + "Successfully corrupting an enemy restores them to full health.\n" + "\n" + - "This wand uses at least one charge per cast, but will often use more in an attempt to overpower tougher enemies."; + "This wand uses at least one charge per cast, but will often use more in an attempt to overpower more healthy enemies."; } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java index 26b198ced..f8d67aca8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java @@ -72,7 +72,8 @@ public class BuffIndicator extends Component { public static final int VERTIGO = 33; public static final int RECHARGING = 34; public static final int LOCKED_FLOOR= 35; - + public static final int CORRUPT = 36; + public static final int SIZE = 7; private static BuffIndicator heroInstance;