From 4170108350e551ac375f29b069fb9ea0770772a9 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 8 Jan 2015 14:44:45 -0500 Subject: [PATCH 1/4] v0.2.3c: reverted exception handling change for info preview, no meaningful reports can be gained here, also not letting the user start a new game and crashing instead is a realllly bad idea. --- .../shatteredpixel/shatteredpixeldungeon/GamesInProgress.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java b/src/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java index f5eff1433..a212b5907 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java @@ -42,7 +42,7 @@ public class GamesInProgress { info = new Info(); Dungeon.preview( info, bundle ); - } catch (IOException e) { + } catch (Exception e) { info = null; } From c74cabeee69c86aee20feb4eb4f2c3e9756767ec Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 8 Jan 2015 14:52:02 -0500 Subject: [PATCH 2/4] v0.2.3c: modified welcome scene to force load rankings when a user with potentially old ranking info starts the game up. Should eliminate all cases where loading old rankings were conflicting with a running game. --- .../shatteredpixeldungeon/scenes/WelcomeScene.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java index cc377869a..99d85f57f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java @@ -1,6 +1,7 @@ //TODO: update this class with relevant info as new versions come out. package com.shatteredpixel.shatteredpixeldungeon.scenes; +import com.shatteredpixel.shatteredpixeldungeon.Rankings; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; @@ -88,6 +89,11 @@ public class WelcomeScene extends PixelScene { RedButton okay = new RedButton("Okay!") { @Override protected void onClick() { + //imports new ranking data for pre-0.2.3 saves. + if (gameversion < 29){ + Rankings.INSTANCE.load(); + Rankings.INSTANCE.save(); + } ShatteredPixelDungeon.version(Game.versionCode); Game.switchScene(TitleScene.class); } From 969b90256611197216641885e62a094a143daa16 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 8 Jan 2015 14:53:41 -0500 Subject: [PATCH 3/4] v0.2.3c: removed now unecessary interruption from hitting hero. Hero now interrupts from taking damage, so this is pointless. --- src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index ed8cb0d79..a702b2621 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -137,10 +137,6 @@ public abstract class Char extends Actor { Sample.INSTANCE.play( Assets.SND_HIT, 1, 1, Random.Float( 0.8f, 1.25f ) ); } - if (enemy == Dungeon.hero) { - Dungeon.hero.interrupt(); - } - if (buff(FireImbue.class) != null) buff(FireImbue.class).proc(enemy); if (buff(EarthImbue.class) != null) From ed4e92e49516e5c5e653674f9757333bbf028cbb Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 8 Jan 2015 14:55:44 -0500 Subject: [PATCH 4/4] v0.2.3c: Corrected swarm potion drop logic to respect order of operations, I do infact know 3rd grade math, I swear. --- .../shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java index f5047d4f8..bc5e9b4e0 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java @@ -136,7 +136,7 @@ public class Swarm extends Mob { @Override public void die( Object cause ){ //sets drop chance - lootChance = 1f/((5 + Dungeon.limitedDrops.swarmHP.count ) * generation+1 ); + lootChance = 1f/((5 + Dungeon.limitedDrops.swarmHP.count ) * (generation+1) ); super.die( cause ); }