From 35da3512df8f3f0a3e618affc8c2f1e2e06bf9b7 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sat, 6 Jun 2015 17:56:36 -0400
Subject: [PATCH] v0.3.0c: corrected some behaviour on wand of corruption
---
.../items/wands/WandOfCorruption.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java
index b5caeb378..d2ebd363b 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java
@@ -11,6 +11,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Goo;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.King;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Tengu;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Yog;
+import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost;
import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
@@ -36,7 +37,9 @@ public class WandOfCorruption extends Wand {
//FIXME: sloppy
private static HashSet<Class> bosses = new HashSet<Class>(Arrays.asList(
- Goo.class, Tengu.class, DM300.class, King.class, Yog.class, Yog.BurningFist.class, Yog.RottingFist.class
+ Ghost.FetidRat.class, Ghost.GnollTrickster.class, Ghost.GreatCrab.class,
+ Goo.class, Tengu.class, DM300.class, King.class,
+ Yog.class, Yog.BurningFist.class, Yog.RottingFist.class
));
@Override
@@ -45,6 +48,11 @@ public class WandOfCorruption extends Wand {
if (ch != null){
+ if(ch.buff(Corruption.class) != null){
+ GLog.w("that character is already corrupted");
+ return;
+ }
+
if (bosses.contains(ch.getClass())){
GLog.w("Bosses are immune to corruption");
return;