diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java index 5adb732c2..3817eda95 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java @@ -39,13 +39,6 @@ public class Corruption extends Buff { public boolean attachTo(Char target) { if (super.attachTo(target)){ target.alignment = Char.Alignment.ALLY; - if (target instanceof Mob){ - ((Mob) target).rollToDropLoot(); - } - PinCushion p = target.buff(PinCushion.class); - if (p != null){ - p.detach(); - } return true; } else { return false; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java index e30163d19..65cd1c52f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java @@ -43,6 +43,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicalSleep; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Ooze; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.PinCushion; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Slow; @@ -225,6 +226,8 @@ public class WandOfCorruption extends Wand { if (buff.type == Buff.buffType.NEGATIVE && !(buff instanceof SoulMark)) { buff.detach(); + } else if (buff instanceof PinCushion){ + buff.detach(); } } Buff.affect(enemy, Corruption.class); @@ -236,7 +239,7 @@ public class WandOfCorruption extends Wand { curUser.sprite.showStatus(CharSprite.POSITIVE, Messages.get(enemy, "exp", enemy.EXP)); curUser.earnExp(enemy.EXP); } - //TODO perhaps enemies should also drop loot here + enemy.rollToDropLoot(); } else { Buff.affect(enemy, Doom.class); }