konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.3.2: fixed slight errors in all class vistory badge

Browse Source
This commit is contained in:
Evan Debenham
2022-07-24 17:33:34 -04:00
parent 19936a214b
commit 8cee59b2ad
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
+11 -20
View File
@@ -702,7 +702,7 @@ public class Badges {
private static LinkedHashMap<HeroClass, Badge> victoryClassBadges = new LinkedHashMap<>(); private static LinkedHashMap<HeroClass, Badge> victoryClassBadges = new LinkedHashMap<>();
static { static {
victoryClassBadges.put(HeroClass.WARRIOR, Badge.VICTORY_WARRIOR); victoryClassBadges.put(HeroClass.WARRIOR, Badge.VICTORY_WARRIOR);
victoryClassBadges.put(HeroClass.MAGE, Badge.MASTERY_MAGE); victoryClassBadges.put(HeroClass.MAGE, Badge.VICTORY_MAGE);
victoryClassBadges.put(HeroClass.ROGUE, Badge.VICTORY_ROGUE); victoryClassBadges.put(HeroClass.ROGUE, Badge.VICTORY_ROGUE);
victoryClassBadges.put(HeroClass.HUNTRESS, Badge.VICTORY_HUNTRESS); victoryClassBadges.put(HeroClass.HUNTRESS, Badge.VICTORY_HUNTRESS);
} }
@@ -867,28 +867,19 @@ public class Badges {
local.add( badge ); local.add( badge );
displayBadge( badge ); displayBadge( badge );
switch (Dungeon.hero.heroClass) { badge = victoryClassBadges.get(Dungeon.hero.heroClass);
case WARRIOR: if (badge == null) return;
badge = Badge.VICTORY_WARRIOR;
break;
case MAGE:
badge = Badge.VICTORY_MAGE;
break;
case ROGUE:
badge = Badge.VICTORY_ROGUE;
break;
case HUNTRESS:
badge = Badge.VICTORY_HUNTRESS;
break;
}
local.add( badge ); local.add( badge );
unlock(badge); unlock(badge);
if (isUnlocked( Badge.VICTORY_WARRIOR ) && boolean allUnlocked = true;
isUnlocked( Badge.VICTORY_MAGE ) && for (Badge b : victoryClassBadges.values()){
isUnlocked( Badge.VICTORY_ROGUE ) && if (!isUnlocked(b)){
isUnlocked( Badge.VICTORY_HUNTRESS )) { allUnlocked = false;
break;
}
}
if (allUnlocked){
badge = Badge.VICTORY_ALL_CLASSES; badge = Badge.VICTORY_ALL_CLASSES;
displayBadge( badge ); displayBadge( badge );
} }