From d3899871ac292e88b98fe0cadc285c1660ebca0d Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 19 Mar 2015 03:29:33 -0400 Subject: [PATCH] v0.2.4d: added safety checks to some mod ai state modifiers, fixing some bugs --- .../shatteredpixeldungeon/items/armor/RogueArmor.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/plants/Blindweed.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java index eecb856b8..90951f813 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java @@ -93,7 +93,7 @@ public class RogueArmor extends ClassArmor { for (Mob mob : Dungeon.level.mobs) { if (Level.fieldOfView[mob.pos]) { Buff.prolong( mob, Blindness.class, 2 ); - mob.state = mob.WANDERING; + if (mob.state == mob.HUNTING) mob.state = mob.WANDERING; mob.sprite.emitter().burst( Speck.factory( Speck.LIGHT ), 4 ); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Blindweed.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Blindweed.java index 694a2e37a..af681633e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Blindweed.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Blindweed.java @@ -49,7 +49,7 @@ public class Blindweed extends Plant { Buff.prolong( ch, Blindness.class, len ); Buff.prolong( ch, Cripple.class, len ); if (ch instanceof Mob) { - ((Mob)ch).state = ((Mob)ch).WANDERING; + if (((Mob)ch).state == ((Mob)ch).HUNTING) ((Mob)ch).state = ((Mob)ch).WANDERING; ((Mob)ch).beckon( Dungeon.level.randomDestination() ); } }