diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java index 79e824c0a..37f59e997 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java @@ -102,8 +102,8 @@ public class GamesInProgress { info.slot = slot; Dungeon.preview(info, bundle); - //saves from before v0.9.0b are not supported - if (info.version < ShatteredPixelDungeon.v0_9_0b) { + //saves from before v0.9.2b are not supported + if (info.version < ShatteredPixelDungeon.v0_9_2b) { info = null; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index e50b7fad0..d98cb0032 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -35,9 +35,7 @@ import com.watabou.utils.PlatformSupport; public class ShatteredPixelDungeon extends Game { //variable constants for specific older versions of shattered, used for data conversion - //versions older than v0.9.0b are no longer supported, and data from them is ignored - public static final int v0_9_0b = 489; - public static final int v0_9_1d = 511; + //versions older than v0.9.2b are no longer supported, and data from them is ignored public static final int v0_9_2b = 531; public static final int v0_9_3c = 557; //557 on iOS, 554 on other platforms diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java index b1d6ce792..d35843d4e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java @@ -160,9 +160,7 @@ public class Combo extends Buff implements ActionIndicator.Action { count = bundle.getInt( COUNT ); comboTime = bundle.getFloat( TIME ); - //pre-0.9.2 - if (bundle.contains(INITIAL_TIME)) initialComboTime = bundle.getFloat( INITIAL_TIME ); - else initialComboTime = 5; + initialComboTime = bundle.getFloat( INITIAL_TIME ); clobberUsed = bundle.getBoolean(CLOBBER_USED); parryUsed = bundle.getBoolean(PARRY_USED); 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 505f96009..fbb657436 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 @@ -661,10 +661,6 @@ public enum Talent { for (int i = 0; i < MAX_TALENT_TIERS; i++){ LinkedHashMap tier = hero.talents.get(i); Bundle tierBundle = bundle.contains(TALENT_TIER+(i+1)) ? bundle.getBundle(TALENT_TIER+(i+1)) : null; - //pre-0.9.1 saves - if (tierBundle == null && i == 0 && bundle.contains("talents")){ - tierBundle = bundle.getBundle("talents"); - } if (tierBundle != null){ for (Talent talent : tier.keySet()){ 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 702e20be4..dd4e30b29 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -311,8 +311,8 @@ public abstract class Level implements Bundlable { version = bundle.getInt( VERSION ); - //saves from before v0.9.0b are not supported - if (version < ShatteredPixelDungeon.v0_9_0b){ + //saves from before v0.9.2b are not supported + if (version < ShatteredPixelDungeon.v0_9_2b){ throw new RuntimeException("old save"); }