From 70469168e06f650fa763a1c9ed492957592b5b1e Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 6 Mar 2023 13:33:01 -0500 Subject: [PATCH] v2.0.0: fixed feint not redirecting aggro in some cases --- .../actors/hero/abilities/duelist/Feint.java | 4 ++-- .../shatteredpixeldungeon/actors/mobs/Mob.java | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Feint.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Feint.java index 073ab1574..830fdf221 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Feint.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Feint.java @@ -53,7 +53,7 @@ import com.watabou.utils.Callback; public class Feint extends ArmorAbility { { - baseChargeUse = 50; + baseChargeUse = 0; } @Override @@ -126,7 +126,7 @@ public class Feint extends ArmorAbility { }); for (Mob m : Dungeon.level.mobs.toArray( new Mob[0] )){ - if (m.focusingHero() || + if ((m.isTargeting(hero) && m.state == m.HUNTING) || (m.alignment == Char.Alignment.ENEMY && m.state != m.PASSIVE && Dungeon.level.distance(m.pos, image.pos) <= 2)){ m.aggro(image); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java index d28bbacc7..44b047dd7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java @@ -928,11 +928,6 @@ public abstract class Mob extends Char { GLog.n( "%s: \"%s\" ", Messages.titleCase(name()), str ); } - //returns true when a mob sees the hero, and is currently targeting them. - public boolean focusingHero() { - return enemySeen && (target == Dungeon.hero.pos); - } - public interface AiState { boolean act( boolean enemyInFOV, boolean justAlerted ); }