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

v0.2.4: added the potion bandolier to badge logic.

Browse Source
This commit is contained in:
Evan Debenham 2015-02-13 15:05:08 -05:00
parent 36ea98c4bd
commit 61246dcc46
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/shatteredpixel/shatteredpixeldungeon/Badges.java
View File

@ -27,6 +27,7 @@ import java.util.Iterator;
import java.util.List;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.Artifact;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.PotionBandolier;
import com.watabou.noosa.Game;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Acidic;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Albino;
@ -69,6 +70,7 @@ public class Badges {
ALL_ITEMS_IDENTIFIED( "All potions, scrolls, rings & wands identified", 35, true ),
BAG_BOUGHT_SEED_POUCH,
BAG_BOUGHT_SCROLL_HOLDER,
BAG_BOUGHT_POTION_BANDOLIER,
BAG_BOUGHT_WAND_HOLSTER,
ALL_BAGS_BOUGHT( "All bags bought", 23 ),
DEATH_FROM_FIRE( "Death from fire", 24 ),
@ -481,6 +483,8 @@ public class Badges {
badge = Badge.BAG_BOUGHT_SEED_POUCH;
} else if (bag instanceof ScrollHolder) {
badge = Badge.BAG_BOUGHT_SCROLL_HOLDER;
} else if (bag instanceof PotionBandolier) {
badge = Badge.BAG_BOUGHT_POTION_BANDOLIER;
} else if (bag instanceof WandHolster) {
badge = Badge.BAG_BOUGHT_WAND_HOLSTER;
}
@ -490,8 +494,9 @@ public class Badges {
local.add( badge );
if (!local.contains( Badge.ALL_BAGS_BOUGHT ) &&
local.contains( Badge.BAG_BOUGHT_SCROLL_HOLDER ) &&
local.contains( Badge.BAG_BOUGHT_SEED_POUCH ) &&
local.contains( Badge.BAG_BOUGHT_SCROLL_HOLDER ) &&
local.contains( Badge.BAG_BOUGHT_POTION_BANDOLIER ) &&
local.contains( Badge.BAG_BOUGHT_WAND_HOLSTER )) {
badge = Badge.ALL_BAGS_BOUGHT;

20
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.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Rankings;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.ui.Archs;
@ -99,11 +100,20 @@ 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 < 30){
Rankings.INSTANCE.load();
Rankings.INSTANCE.save();
}
if (gameversion <= 32){
//removes all bags bought badge from pre-0.2.4 saves.
Badges.disown(Badges.Badge.ALL_BAGS_BOUGHT);
Badges.saveGlobal();
//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);
}