v2.3.1: hero interrupts now also cancel resting

This commit is contained in:
Evan Debenham
2024-01-24 13:55:24 -05:00
parent a94186e011
commit 910eb58be7
2 changed files with 2 additions and 6 deletions

View File

@@ -91,7 +91,6 @@ public class Hunger extends Buff implements Hero.Doom {
if (newLevel >= STARVING) {
GLog.n( Messages.get(this, "onstarving") );
hero.resting = false;
hero.damage( 1, this );
hero.interrupt();

View File

@@ -860,6 +860,7 @@ public class Hero extends Char {
}
curAction = null;
GameScene.resetKeyHold();
resting = false;
}
public void resume() {
@@ -1424,7 +1425,6 @@ public class Hero extends Char {
// unless the player recently hit 'continue moving', in which case this is ignored
if (!(src instanceof Hunger || src instanceof Viscosity.DeferedDamage) && damageInterrupt) {
interrupt();
resting = false;
}
if (this.buff(Drowsy.class) != null){
@@ -1497,7 +1497,6 @@ public class Hero extends Char {
}
//hero gets interrupted on taking serious damage, regardless of any other factor
interrupt();
resting = false;
damageInterrupt = true;
}
}
@@ -1542,11 +1541,10 @@ public class Hero extends Char {
}
if (newMob) {
interrupt();
if (resting){
Dungeon.observe();
resting = false;
}
interrupt();
}
visibleEnemies = visible;
@@ -1921,7 +1919,6 @@ public class Hero extends Char {
if (ankh != null) {
interrupt();
resting = false;
if (ankh.isBlessed()) {
this.HP = HT / 4;