From 779905baf4bc258474177091aab23a2e1f285692 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 2 Nov 2022 21:40:25 -0400 Subject: [PATCH] v2.0.0: improved logic for correcting Tengu's time when re-added --- .../shatteredpixeldungeon/actors/mobs/Tengu.java | 10 ---------- .../shatteredpixeldungeon/levels/PrisonBossLevel.java | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java index 4aca48abe..cdb8023cf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java @@ -98,16 +98,6 @@ public class Tengu extends Mob { viewDistance = 12; } - @Override - protected void onAdd() { - //when he's removed and re-added to the fight, his time is always set to now. - if (cooldown() > TICK) { - timeToNow(); - spendToWhole(); - } - super.onAdd(); - } - @Override public int damageRoll() { return Random.NormalIntRange( 6, 12 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java index bfe5e680e..c959bfb02 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java @@ -476,6 +476,7 @@ public class PrisonBossLevel extends Level { tengu.state = tengu.HUNTING; tengu.pos = (arena.left + arena.width()/2) + width()*(arena.top+2); GameScene.add(tengu); + tengu.timeToNow(); tengu.notice(); GameScene.flash(0x80FFFFFF);