From e4bf20bc982b2cfd40bfdae8b134855a790f5d48 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 4 Oct 2019 15:02:43 -0400 Subject: [PATCH] v0.7.5a: adjusted how teleportation effects handle boss floors --- .../items/scrolls/ScrollOfTeleportation.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java index 77d6b542c..d115ac25e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java @@ -109,6 +109,11 @@ public class ScrollOfTeleportation extends Scroll { public static void teleportHero( Hero hero ) { + if (Dungeon.bossLevel()){ + GLog.w( Messages.get(ScrollOfTeleportation.class, "no_tele") ); + return; + } + int count = 10; int pos; do { @@ -118,7 +123,7 @@ public class ScrollOfTeleportation extends Scroll { } } while (pos == -1); - if (pos == -1 || Dungeon.bossLevel()) { + if (pos == -1) { GLog.w( Messages.get(ScrollOfTeleportation.class, "no_tele") );