From da1e844e03eaf499205ec43b415e0b3fc1639dad Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 2 Jan 2024 19:41:00 -0500 Subject: [PATCH] v2.3.0: fixed various cases where tutorial could become stuck --- .../levels/rooms/standard/EntranceRoom.java | 1 + .../shatteredpixeldungeon/scenes/GameScene.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/EntranceRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/EntranceRoom.java index d3926fbe8..ad0560cbf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/EntranceRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/EntranceRoom.java @@ -94,6 +94,7 @@ public class EntranceRoom extends StandardRoom { Random.IntRange( top + 1, bottom - 2 ))); } while (pos == level.entrance() || level.findMob(level.entrance()) != null); level.drop( new Guidebook(), pos ); + Document.ADVENTURERS_GUIDE.deletePage(Document.GUIDE_INTRO); } //places the third guidebook page on floor 2 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 f42b93bc9..e575f3b58 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -568,7 +568,9 @@ public class GameScene extends PixelScene { //Tutorial if (SPDSettings.intro()){ - if (ControllerHandler.isControllerConnected()) { + if (Document.ADVENTURERS_GUIDE.isPageFound(Document.GUIDE_INTRO)){ + GameScene.flashForDocument(Document.ADVENTURERS_GUIDE, Document.GUIDE_INTRO); + } else if (ControllerHandler.isControllerConnected()) { GLog.p(Messages.get(GameScene.class, "tutorial_move_controller")); } else if (SPDSettings.interfaceSize() == 0) { GLog.p(Messages.get(GameScene.class, "tutorial_move_mobile"));