From ba29858ddcdd2a0601cd16b4764636c83f14712f Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 16 Dec 2024 12:32:05 -0500 Subject: [PATCH] v3.0.0: removed floor 20 limit for the Cleric! --- .../shatteredpixeldungeon/levels/Level.java | 15 --------------- .../levels/features/Chasm.java | 7 ------- .../shatteredpixeldungeon/scenes/GameScene.java | 6 ------ 3 files changed, 28 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java index 31f16d8d3..ce3d84b4b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -46,7 +46,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Regeneration; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.RevealedArea; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Shadows; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; -import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.huntress.SpiritHawk; @@ -96,14 +95,12 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.tiles.CustomTilemap; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; -import com.shatteredpixel.shatteredpixeldungeon.windows.WndMessage; import com.watabou.noosa.Game; import com.watabou.noosa.Group; import com.watabou.noosa.audio.Sample; import com.watabou.utils.BArray; import com.watabou.utils.Bundlable; import com.watabou.utils.Bundle; -import com.watabou.utils.Callback; import com.watabou.utils.GameMath; import com.watabou.utils.PathFinder; import com.watabou.utils.Point; @@ -565,18 +562,6 @@ public abstract class Level implements Bundlable { return false; } - if (transition.type == LevelTransition.Type.REGULAR_EXIT - && Dungeon.depth >= 20 - && Dungeon.hero.heroClass == HeroClass.CLERIC){ - Game.runOnRenderThread(new Callback() { - @Override - public void call() { - GameScene.show(new WndMessage("Thanks for playing the Alpha!\n\nRuns with the Cleric cap out at floor 20 for the moment, but you'll be able to finish your run closer to the beta releases.")); - } - }); - return false; - } - beforeTransition(); InterlevelScene.curTransition = transition; if (transition.type == LevelTransition.Type.REGULAR_EXIT diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/Chasm.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/Chasm.java index 069d1fe63..1d5b7e6a2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/Chasm.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/Chasm.java @@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; -import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfFeatherFall; @@ -42,7 +41,6 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.MobSprite; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; -import com.shatteredpixel.shatteredpixeldungeon.windows.WndMessage; import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions; import com.watabou.noosa.Game; import com.watabou.noosa.Image; @@ -60,11 +58,6 @@ public class Chasm implements Hero.Doom { Game.runOnRenderThread(new Callback() { @Override public void call() { - if (Dungeon.depth >= 20 && Dungeon.hero.heroClass == HeroClass.CLERIC){ - GameScene.show(new WndMessage("Thanks for playing the Alpha!\n\nRuns with the Cleric cap out at floor 20 for the moment, but you'll be able to finish your run closer to the beta releases.")); - return; - } - GameScene.show( new WndOptions( new Image(Dungeon.level.tilesTex(), 176, 16, 16, 16), Messages.get(Chasm.class, "chasm"), 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 08d0786fb..90e1afb33 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -38,7 +38,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.AscensionChallenge; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ChampionEnemy; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; -import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DemonSpawner; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Ghoul; @@ -216,11 +215,6 @@ public class GameScene extends PixelScene { return; } - if (Dungeon.depth > 20 && Dungeon.hero.heroClass == HeroClass.CLERIC){ - ShatteredPixelDungeon.switchNoFade(TitleScene.class); - return; - } - Dungeon.level.playLevelMusic(); SPDSettings.lastClass(Dungeon.hero.heroClass.ordinal());