diff --git a/assets/buffs.png b/assets/buffs.png index 32b19ca66..850fd049b 100644 Binary files a/assets/buffs.png and b/assets/buffs.png differ diff --git a/assets/large_buffs.png b/assets/large_buffs.png index 0e4e2476e..ab4a8a7f5 100644 Binary files a/assets/large_buffs.png and b/assets/large_buffs.png differ 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;