From c9d196622b1093236c9d4c7f9b82ef415ee9a89e Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 2 Nov 2015 13:02:29 -0500 Subject: [PATCH] v0.3.2: fixed some bugs with tengu boss fight --- .../shatteredpixeldungeon/actors/mobs/Tengu.java | 3 ++- .../shatteredpixeldungeon/levels/PrisonBossLevel.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java index 418980ad5..9420bd7c5 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java @@ -86,7 +86,8 @@ public class Tengu extends Mob { @Override public void damage(int dmg, Object src) { - if (dmg > HP) { + //phase 2 of the fight is over + if (dmg >= HP) { ((PrisonBossLevel)Dungeon.level).progress(); return; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java index ff4fb6d4a..f78423002 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java @@ -303,11 +303,11 @@ public class PrisonBossLevel extends Level { Dungeon.hero.sprite.interruptMotion(); Dungeon.hero.sprite.place(Dungeon.hero.pos); + tengu.pos = 5+28*32; + tengu.sprite.place(5 + 28 * 32); + changeMap(MAP_END); - tengu.pos = 5+28*32; - tengu.sprite.interruptMotion(); - tengu.sprite.place(5 + 28 * 32); tengu.die(Dungeon.hero); state = State.WON;