From 5a733d72e8a4535b2db1569c8a0a97eb7725759c Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 16 Jun 2021 21:11:39 -0400 Subject: [PATCH] v0.9.3b: fixed no killing badge not appearing if hero fell --- .../scenes/GameScene.java | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index eadca9221..7a0d11e1a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -360,36 +360,36 @@ public class GameScene extends PixelScene { counter.show(this, busy.center(), 0f); switch (InterlevelScene.mode) { - case RESURRECT: - ScrollOfTeleportation.appear( Dungeon.hero, Dungeon.level.entrance ); - new Flare( 8, 32 ).color( 0xFFFF66, true ).show( hero, 2f ) ; - break; - case RETURN: - ScrollOfTeleportation.appear( Dungeon.hero, Dungeon.hero.pos ); - break; - case DESCEND: - switch (Dungeon.depth) { - case 1: - WndStory.showChapter( WndStory.ID_SEWERS ); + case RESURRECT: + ScrollOfTeleportation.appear( Dungeon.hero, Dungeon.level.entrance ); + new Flare( 8, 32 ).color( 0xFFFF66, true ).show( hero, 2f ) ; break; - case 6: - WndStory.showChapter( WndStory.ID_PRISON ); + case RETURN: + ScrollOfTeleportation.appear( Dungeon.hero, Dungeon.hero.pos ); break; - case 11: - WndStory.showChapter( WndStory.ID_CAVES ); + case DESCEND: + case FALL: + switch (Dungeon.depth) { + case 1: + WndStory.showChapter( WndStory.ID_SEWERS ); + break; + case 6: + WndStory.showChapter( WndStory.ID_PRISON ); + break; + case 11: + WndStory.showChapter( WndStory.ID_CAVES ); + break; + case 16: + WndStory.showChapter( WndStory.ID_CITY ); + break; + case 21: + WndStory.showChapter( WndStory.ID_HALLS ); + break; + } + if (Dungeon.hero.isAlive()) { + Badges.validateNoKilling(); + } break; - case 16: - WndStory.showChapter( WndStory.ID_CITY ); - break; - case 21: - WndStory.showChapter( WndStory.ID_HALLS ); - break; - } - if (Dungeon.hero.isAlive()) { - Badges.validateNoKilling(); - } - break; - default: } ArrayList dropped = Dungeon.droppedItems.get( Dungeon.depth );