LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Evan Debenham 2015-01-08 19:04:10 -05:00
commit b52a97567a
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java
View File

@ -42,7 +42,7 @@ public class GamesInProgress {
info = new Info();
Dungeon.preview( info, bundle );
} catch (IOException e) {
} catch (Exception e) {
info = null;
}

4
src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
View File

@ -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)

2
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java
View File

@ -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 );
}

6
src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java
View File

@ -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;
@ -93,6 +94,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);
}