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

v1.2.1: cleaned up how the global badges list is accessed

Browse Source
This commit is contained in:
Evan Debenham 2022-03-28 18:01:54 -04:00
parent a10c3b399f
commit ec014d7d8a
1 changed files with 50 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
View File

@ -539,16 +539,18 @@ public class Badges {
} }
} }
if (!global.contains( Badge.ALL_ITEMS_IDENTIFIED ) && if (isUnlocked( Badge.ALL_WEAPONS_IDENTIFIED ) &&
global.contains( Badge.ALL_WEAPONS_IDENTIFIED ) && isUnlocked( Badge.ALL_ARMOR_IDENTIFIED ) &&
global.contains( Badge.ALL_ARMOR_IDENTIFIED ) && isUnlocked( Badge.ALL_WANDS_IDENTIFIED ) &&
global.contains( Badge.ALL_WANDS_IDENTIFIED ) && isUnlocked( Badge.ALL_RINGS_IDENTIFIED ) &&
global.contains( Badge.ALL_RINGS_IDENTIFIED ) && isUnlocked( Badge.ALL_ARTIFACTS_IDENTIFIED ) &&
global.contains( Badge.ALL_ARTIFACTS_IDENTIFIED ) && isUnlocked( Badge.ALL_POTIONS_IDENTIFIED ) &&
global.contains( Badge.ALL_POTIONS_IDENTIFIED ) && isUnlocked( Badge.ALL_SCROLLS_IDENTIFIED )) {
global.contains( Badge.ALL_SCROLLS_IDENTIFIED )) {
displayBadge( Badge.ALL_ITEMS_IDENTIFIED ); Badge badge = Badge.ALL_ITEMS_IDENTIFIED;
if (!isUnlocked( badge )) {
displayBadge( badge );
}
} }
} }
@ -601,17 +603,19 @@ public class Badges {
} }
private static void validateYASD() { private static void validateYASD() {
if (global.contains( Badge.DEATH_FROM_FIRE ) && if (isUnlocked( Badge.DEATH_FROM_FIRE ) &&
global.contains( Badge.DEATH_FROM_POISON ) && isUnlocked( Badge.DEATH_FROM_POISON ) &&
global.contains( Badge.DEATH_FROM_GAS ) && isUnlocked( Badge.DEATH_FROM_GAS ) &&
global.contains( Badge.DEATH_FROM_HUNGER) && isUnlocked( Badge.DEATH_FROM_HUNGER) &&
global.contains( Badge.DEATH_FROM_GLYPH) && isUnlocked( Badge.DEATH_FROM_GLYPH) &&
global.contains( Badge.DEATH_FROM_FALLING)) { isUnlocked( Badge.DEATH_FROM_FALLING)) {
Badge badge = Badge.YASD; Badge badge = Badge.YASD;
if (!isUnlocked( badge )) {
displayBadge( badge ); displayBadge( badge );
} }
} }
}
public static void validateBossSlain() { public static void validateBossSlain() {
Badge badge = null; Badge badge = null;
@ -650,21 +654,16 @@ public class Badges {
break; break;
} }
local.add( badge ); local.add( badge );
if (!global.contains( badge )) { addGlobal(badge);
global.add( badge );
saveNeeded = true;
}
if (global.contains( Badge.BOSS_SLAIN_1_WARRIOR ) && if (isUnlocked( Badge.BOSS_SLAIN_1_WARRIOR ) &&
global.contains( Badge.BOSS_SLAIN_1_MAGE ) && isUnlocked( Badge.BOSS_SLAIN_1_MAGE ) &&
global.contains( Badge.BOSS_SLAIN_1_ROGUE ) && isUnlocked( Badge.BOSS_SLAIN_1_ROGUE ) &&
global.contains( Badge.BOSS_SLAIN_1_HUNTRESS)) { isUnlocked( Badge.BOSS_SLAIN_1_HUNTRESS)) {
badge = Badge.BOSS_SLAIN_1_ALL_CLASSES; badge = Badge.BOSS_SLAIN_1_ALL_CLASSES;
if (!global.contains( badge )) { if (!isUnlocked( badge )) {
displayBadge( badge ); displayBadge( badge );
global.add( badge );
saveNeeded = true;
} }
} }
} else } else
@ -698,25 +697,20 @@ public class Badges {
return; return;
} }
local.add( badge ); local.add( badge );
if (!global.contains( badge )) { addGlobal(badge);
global.add( badge );
saveNeeded = true;
}
if (global.contains( Badge.BOSS_SLAIN_3_GLADIATOR ) && if (isUnlocked( Badge.BOSS_SLAIN_3_GLADIATOR ) &&
global.contains( Badge.BOSS_SLAIN_3_BERSERKER ) && isUnlocked( Badge.BOSS_SLAIN_3_BERSERKER ) &&
global.contains( Badge.BOSS_SLAIN_3_WARLOCK ) && isUnlocked( Badge.BOSS_SLAIN_3_WARLOCK ) &&
global.contains( Badge.BOSS_SLAIN_3_BATTLEMAGE ) && isUnlocked( Badge.BOSS_SLAIN_3_BATTLEMAGE ) &&
global.contains( Badge.BOSS_SLAIN_3_FREERUNNER ) && isUnlocked( Badge.BOSS_SLAIN_3_FREERUNNER ) &&
global.contains( Badge.BOSS_SLAIN_3_ASSASSIN ) && isUnlocked( Badge.BOSS_SLAIN_3_ASSASSIN ) &&
global.contains( Badge.BOSS_SLAIN_3_SNIPER ) && isUnlocked( Badge.BOSS_SLAIN_3_SNIPER ) &&
global.contains( Badge.BOSS_SLAIN_3_WARDEN )) { isUnlocked( Badge.BOSS_SLAIN_3_WARDEN )) {
badge = Badge.BOSS_SLAIN_3_ALL_SUBCLASSES; badge = Badge.BOSS_SLAIN_3_ALL_SUBCLASSES;
if (!global.contains( badge )) { if (!isUnlocked( badge )) {
displayBadge( badge ); displayBadge( badge );
global.add( badge );
saveNeeded = true;
} }
} }
} }
@ -741,33 +735,27 @@ public class Badges {
break; break;
} }
if (!global.contains( badge )) { addGlobal(badge);
global.add( badge );
saveNeeded = true;
}
} }
public static void validateRatmogrify(){ public static void validateRatmogrify(){
if (!global.contains( Badge.FOUND_RATMOGRIFY )) { addGlobal(Badge.FOUND_RATMOGRIFY);
global.add( Badge.FOUND_RATMOGRIFY );
saveNeeded = true;
}
} }
public static void validateMageUnlock(){ public static void validateMageUnlock(){
if (Statistics.upgradesUsed >= 1 && !global.contains(Badge.UNLOCK_MAGE)){ if (Statistics.upgradesUsed >= 1 && !isUnlocked(Badge.UNLOCK_MAGE)){
displayBadge( Badge.UNLOCK_MAGE ); displayBadge( Badge.UNLOCK_MAGE );
} }
} }
public static void validateRogueUnlock(){ public static void validateRogueUnlock(){
if (Statistics.sneakAttacks >= 10 && !global.contains(Badge.UNLOCK_ROGUE)){ if (Statistics.sneakAttacks >= 10 && !isUnlocked(Badge.UNLOCK_ROGUE)){
displayBadge( Badge.UNLOCK_ROGUE ); displayBadge( Badge.UNLOCK_ROGUE );
} }
} }
public static void validateHuntressUnlock(){ public static void validateHuntressUnlock(){
if (Statistics.thrownAssists >= 10 && !global.contains(Badge.UNLOCK_HUNTRESS)){ if (Statistics.thrownAssists >= 10 && !isUnlocked(Badge.UNLOCK_HUNTRESS)){
displayBadge( Badge.UNLOCK_HUNTRESS ); displayBadge( Badge.UNLOCK_HUNTRESS );
} }
} }
@ -800,15 +788,12 @@ public class Badges {
break; break;
} }
local.add( badge ); local.add( badge );
if (!global.contains( badge )) { addGlobal(badge);
global.add( badge );
saveNeeded = true;
}
if (global.contains( Badge.VICTORY_WARRIOR ) && if (isUnlocked( Badge.VICTORY_WARRIOR ) &&
global.contains( Badge.VICTORY_MAGE ) && isUnlocked( Badge.VICTORY_MAGE ) &&
global.contains( Badge.VICTORY_ROGUE ) && isUnlocked( Badge.VICTORY_ROGUE ) &&
global.contains( Badge.VICTORY_HUNTRESS )) { isUnlocked( Badge.VICTORY_HUNTRESS )) {
badge = Badge.VICTORY_ALL_CLASSES; badge = Badge.VICTORY_ALL_CLASSES;
displayBadge( badge ); displayBadge( badge );
@ -870,17 +855,11 @@ public class Badges {
badge = Badge.CHAMPION_1; badge = Badge.CHAMPION_1;
} }
if (challenges >= 3){ if (challenges >= 3){
if (!global.contains(badge)){ addGlobal(badge);
global.add(badge);
saveNeeded = true;
}
badge = Badge.CHAMPION_2; badge = Badge.CHAMPION_2;
} }
if (challenges >= 6){ if (challenges >= 6){
if (!global.contains(badge)){ addGlobal(badge);
global.add(badge);
saveNeeded = true;
}
badge = Badge.CHAMPION_3; badge = Badge.CHAMPION_3;
} }
local.add(badge); local.add(badge);