diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java index 678aac819..7cc3ccd09 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java @@ -112,7 +112,7 @@ public class GamesInProgress { Bundle bundle = FileUtils.bundleFromFile(gameFile(slot)); - if (bundle.getInt( "version" ) < ShatteredPixelDungeon.v2_3_2) { + if (bundle.getInt( "version" ) < ShatteredPixelDungeon.v2_4_2) { info = null; } else { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index 33232a2ca..6bb204f87 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -36,8 +36,7 @@ public class ShatteredPixelDungeon extends Game { //rankings from v1.2.3 and older use a different score formula, so this reference is kept public static final int v1_2_3 = 628; - //savegames from versions older than v2.3.2 are no longer supported, and data from them is ignored - public static final int v2_3_2 = 768; + //savegames from versions older than v2.4.2 are no longer supported, and data from them is ignored public static final int v2_4_2 = 782; public static final int v2_5_4 = 802; @@ -67,30 +66,6 @@ public class ShatteredPixelDungeon extends Game { com.watabou.utils.Bundle.addAlias( com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invulnerability.class, "com.shatteredpixel.shatteredpixeldungeon.actors.buffs.AnkhInvulnerability" ); - - //pre-v2.4.0 - com.watabou.utils.Bundle.addAlias( - com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.UnstableBrew.class, - "com.shatteredpixel.shatteredpixeldungeon.items.potions.AlchemicalCatalyst" ); - com.watabou.utils.Bundle.addAlias( - com.shatteredpixel.shatteredpixeldungeon.items.spells.UnstableSpell.class, - "com.shatteredpixel.shatteredpixeldungeon.items.spells.ArcaneCatalyst" ); - com.watabou.utils.Bundle.addAlias( - com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfFeatherFall.class, - "com.shatteredpixel.shatteredpixeldungeon.items.spells.FeatherFall" ); - com.watabou.utils.Bundle.addAlias( - com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfFeatherFall.FeatherBuff.class, - "com.shatteredpixel.shatteredpixeldungeon.items.spells.FeatherFall$FeatherBuff" ); - com.watabou.utils.Bundle.addAlias( - com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.AquaBrew.class, - "com.shatteredpixel.shatteredpixeldungeon.items.spells.AquaBlast" ); - - com.watabou.utils.Bundle.addAlias( - com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.entrance.EntranceRoom.class, - "com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.EntranceRoom" ); - com.watabou.utils.Bundle.addAlias( - com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.exit.ExitRoom.class, - "com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.ExitRoom" ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java index 85ce567d5..1b097fcfe 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java @@ -1149,15 +1149,12 @@ public enum Talent { private static final HashSet removedTalents = new HashSet<>(); static{ - //v2.4.0 - removedTalents.add("TEST_SUBJECT"); - removedTalents.add("TESTED_HYPOTHESIS"); + //nothing atm } private static final HashMap renamedTalents = new HashMap<>(); static{ - //v2.4.0 - renamedTalents.put("SECONDARY_CHARGE", "VARIED_CHARGE"); + //nothing atm } public static void restoreTalentsFromBundle( Bundle bundle, Hero hero ){ 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 6e35395e6..e250ac72e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -364,7 +364,7 @@ public abstract class Level implements Bundlable { version = bundle.getInt( VERSION ); //saves from before v2.3.2 are not supported - if (version < ShatteredPixelDungeon.v2_3_2){ + if (version < ShatteredPixelDungeon.v2_4_2){ throw new RuntimeException("old save"); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java index b5c56e871..da74f4feb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java @@ -525,7 +525,7 @@ public abstract class RegularLevel extends Level { Random.popGenerator(); //cached rations try to drop in a special room on floors 2/4/7, to a max of 2/3 - //we incremented dropped by 2 for compatibility with pre-v2.4 saves (when the talent dropped 4/6 items) + //we increment dropped by 2 for compatibility with old saves, when the talent dropped 4/6 items Random.pushGenerator( Random.Long() ); if (Dungeon.hero.hasTalent(Talent.CACHED_RATIONS)){ Talent.CachedRationsDropped dropped = Buff.affect(Dungeon.hero, Talent.CachedRationsDropped.class); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java index 4d19f7110..a3a16b98c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java @@ -301,7 +301,7 @@ public class WelcomeScene extends PixelScene { } Dungeon.daily = Dungeon.dailyReplay = false; - if (previousVersion <= ShatteredPixelDungeon.v2_3_2){ + if (previousVersion <= ShatteredPixelDungeon.v2_4_2){ Document.ADVENTURERS_GUIDE.findPage(Document.GUIDE_ALCHEMY); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java index fce0ed7dc..10cf24446 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java @@ -204,8 +204,7 @@ public class WndBlacksmith extends Window { } - //public so that it can be directly called for pre-v2.2.0 quest completions - public static class WndReforge extends Window { + protected static class WndReforge extends Window { private static final int WIDTH = 120;