From ed70f7617e406f0dc493c2896ccb3e5e6b82d4d4 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 1 May 2023 14:58:46 -0400 Subject: [PATCH] v2.1.0: enemy misses now interrupt the hero just like hits --- .../com/shatteredpixel/shatteredpixeldungeon/actors/Char.java | 4 ++++ .../shatteredpixeldungeon/actors/hero/Hero.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index 2e4603355..057ca03e8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -322,6 +322,10 @@ public abstract class Char extends Actor { boolean visibleFight = Dungeon.level.heroFOV[pos] || Dungeon.level.heroFOV[enemy.pos]; + if (enemy == Dungeon.hero && Dungeon.hero.damageInterrupt){ + Dungeon.hero.interrupt(); + } + if (enemy.isInvulnerable(getClass())) { if (visibleFight) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 72ca93aff..389148276 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -197,7 +197,7 @@ public class Hero extends Char { private int defenseSkill = 5; public boolean ready = false; - private boolean damageInterrupt = true; + public boolean damageInterrupt = true; public HeroAction curAction = null; public HeroAction lastAction = null;