diff --git a/core/src/main/assets/badges.png b/core/src/main/assets/badges.png index d7c479d2b..849f9f64c 100644 Binary files a/core/src/main/assets/badges.png and b/core/src/main/assets/badges.png differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java index b495cc13f..09e7ab665 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java @@ -33,9 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.bags.PotionBandolier; import com.shatteredpixel.shatteredpixeldungeon.items.bags.ScrollHolder; import com.shatteredpixel.shatteredpixeldungeon.items.bags.SeedPouch; import com.shatteredpixel.shatteredpixeldungeon.items.bags.WandHolster; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; -import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring; -import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; +import com.shatteredpixel.shatteredpixeldungeon.journal.Catalogs; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; @@ -67,16 +65,19 @@ public class Badges { LEVEL_REACHED_2( 9 ), LEVEL_REACHED_3( 10 ), LEVEL_REACHED_4( 11 ), - ALL_POTIONS_IDENTIFIED( 16 ), - ALL_SCROLLS_IDENTIFIED( 17 ), - ALL_RINGS_IDENTIFIED( 18 ), - ALL_WANDS_IDENTIFIED( 19 ), - ALL_ITEMS_IDENTIFIED( 35, true ), + ALL_WEAPONS_IDENTIFIED( 16 ), + ALL_ARMOR_IDENTIFIED( 17 ), + ALL_WANDS_IDENTIFIED( 18 ), + ALL_RINGS_IDENTIFIED( 19 ), + ALL_ARTIFACTS_IDENTIFIED( 20 ), + ALL_POTIONS_IDENTIFIED( 21 ), + ALL_SCROLLS_IDENTIFIED( 22 ), + ALL_ITEMS_IDENTIFIED( 23, true ), BAG_BOUGHT_SEED_POUCH, BAG_BOUGHT_SCROLL_HOLDER, BAG_BOUGHT_POTION_BANDOLIER, BAG_BOUGHT_WAND_HOLSTER, - ALL_BAGS_BOUGHT( 23 ), + ALL_BAGS_BOUGHT( 58 ), DEATH_FROM_FIRE( 24 ), DEATH_FROM_POISON( 25 ), DEATH_FROM_GAS( 26 ), @@ -102,8 +103,6 @@ public class Badges { BOSS_SLAIN_3_SNIPER, BOSS_SLAIN_3_WARDEN, BOSS_SLAIN_3_ALL_SUBCLASSES( 33, true ), - RING_OF_HAGGLER( 20 ), - RING_OF_THORNS( 21 ), STRENGTH_ATTAINED_1( 40 ), STRENGTH_ATTAINED_2( 41 ), STRENGTH_ATTAINED_3( 42 ), @@ -132,7 +131,7 @@ public class Badges { VICTORY_MAGE, VICTORY_ROGUE, VICTORY_HUNTRESS, - VICTORY( 22 ), + VICTORY( 31 ), VICTORY_ALL_CLASSES( 36, true ), MASTERY_COMBO( 56 ), POTIONS_COOKED_1( 52 ), @@ -142,14 +141,12 @@ public class Badges { NO_MONSTERS_SLAIN( 28 ), GRIM_WEAPON( 29 ), PIRANHAS( 30 ), - NIGHT_HUNTER( 58 ), GAMES_PLAYED_1( 60, true ), GAMES_PLAYED_2( 61, true ), GAMES_PLAYED_3( 62, true ), GAMES_PLAYED_4( 63, true ), HAPPY_END( 38 ), - CHAMPION( 39, true ), - SUPPORTER( 31, true ); + CHAMPION( 39, true ); public boolean meta; @@ -436,55 +433,6 @@ public class Badges { displayBadge( badge ); } - public static void validateAllPotionsIdentified() { - if (Dungeon.hero != null && Dungeon.hero.isAlive() && - !local.contains( Badge.ALL_POTIONS_IDENTIFIED ) && Potion.allKnown()) { - - Badge badge = Badge.ALL_POTIONS_IDENTIFIED; - local.add( badge ); - displayBadge( badge ); - - validateAllItemsIdentified(); - } - } - - public static void validateAllScrollsIdentified() { - if (Dungeon.hero != null && Dungeon.hero.isAlive() && - !local.contains( Badge.ALL_SCROLLS_IDENTIFIED ) && Scroll.allKnown()) { - - Badge badge = Badge.ALL_SCROLLS_IDENTIFIED; - local.add( badge ); - displayBadge( badge ); - - validateAllItemsIdentified(); - } - } - - public static void validateAllRingsIdentified() { - if (Dungeon.hero != null && Dungeon.hero.isAlive() && - !local.contains( Badge.ALL_RINGS_IDENTIFIED ) && Ring.allKnown()) { - - Badge badge = Badge.ALL_RINGS_IDENTIFIED; - local.add( badge ); - displayBadge( badge ); - - validateAllItemsIdentified(); - } - } - - //TODO: no longer in use, deal with new wand related badges in the badge rework. - /**public static void validateAllWandsIdentified() { - if (Dungeon.hero != null && Dungeon.hero.isAlive() && - !local.contains( Badge.ALL_WANDS_IDENTIFIED ) && Wand.allKnown()) { - - Badge badge = Badge.ALL_WANDS_IDENTIFIED; - local.add( badge ); - displayBadge( badge ); - - validateAllItemsIdentified(); - } - }*/ - public static void validateAllBagsBought( Item bag ) { Badge badge = null; @@ -515,15 +463,45 @@ public class Badges { } } - public static void validateAllItemsIdentified() { + public static void validateItemsIdentified() { + if (!global.contains( Badge.ALL_WEAPONS_IDENTIFIED ) && Catalogs.allWeaponsSeen()){ + displayBadge( Badge.ALL_WEAPONS_IDENTIFIED ); + } + + if (!global.contains( Badge.ALL_ARMOR_IDENTIFIED ) && Catalogs.allArmorSeen()){ + displayBadge( Badge.ALL_ARMOR_IDENTIFIED ); + } + + if (!global.contains( Badge.ALL_WANDS_IDENTIFIED ) && Catalogs.allWandsSeen()){ + displayBadge( Badge.ALL_WANDS_IDENTIFIED ); + } + + if (!global.contains( Badge.ALL_RINGS_IDENTIFIED ) && Catalogs.allRingsSeen()){ + displayBadge( Badge.ALL_RINGS_IDENTIFIED ); + } + + if (!global.contains( Badge.ALL_ARTIFACTS_IDENTIFIED ) && Catalogs.allArtifactsSeen()){ + displayBadge( Badge.ALL_ARTIFACTS_IDENTIFIED ); + } + + if (!global.contains( Badge.ALL_POTIONS_IDENTIFIED ) && Catalogs.allPotionsSeen()){ + displayBadge( Badge.ALL_POTIONS_IDENTIFIED ); + } + + if (!global.contains( Badge.ALL_SCROLLS_IDENTIFIED ) && Catalogs.allScrollsSeen()){ + displayBadge( Badge.ALL_SCROLLS_IDENTIFIED ); + } + if (!global.contains( Badge.ALL_ITEMS_IDENTIFIED ) && + global.contains( Badge.ALL_WEAPONS_IDENTIFIED ) && + global.contains( Badge.ALL_ARMOR_IDENTIFIED ) && + global.contains( Badge.ALL_WANDS_IDENTIFIED ) && + global.contains( Badge.ALL_RINGS_IDENTIFIED ) && + global.contains( Badge.ALL_ARTIFACTS_IDENTIFIED ) && global.contains( Badge.ALL_POTIONS_IDENTIFIED ) && - global.contains( Badge.ALL_SCROLLS_IDENTIFIED ) && - global.contains( Badge.ALL_RINGS_IDENTIFIED )) { - //global.contains( Badge.ALL_WANDS_IDENTIFIED )) { + global.contains( Badge.ALL_SCROLLS_IDENTIFIED )) { - Badge badge = Badge.ALL_ITEMS_IDENTIFIED; - displayBadge( badge ); + displayBadge( Badge.ALL_ITEMS_IDENTIFIED ); } } @@ -724,24 +702,6 @@ public class Badges { displayBadge( badge ); } } - - //TODO: Replace this badge, delayed until an eventual badge rework - public static void validateRingOfHaggler() { - if (!local.contains( Badge.RING_OF_HAGGLER )/* && new RingOfThorns().isKnown()*/) { - Badge badge = Badge.RING_OF_HAGGLER; - local.add( badge ); - displayBadge( badge ); - } - } - - //TODO: Replace this badge, delayed until an eventual badge rework - public static void validateRingOfThorns() { - if (!local.contains( Badge.RING_OF_THORNS )/* && new RingOfThorns().isKnown()*/) { - Badge badge = Badge.RING_OF_THORNS; - local.add( badge ); - displayBadge( badge ); - } - } public static void validateRare( Mob mob ) { @@ -846,22 +806,6 @@ public class Badges { } } - public static void validateNightHunter() { - if (!local.contains( Badge.NIGHT_HUNTER ) && Statistics.nightHunt >= 15) { - Badge badge = Badge.NIGHT_HUNTER; - local.add( badge ); - displayBadge( badge ); - } - } - - public static void validateSupporter() { - - global.add( Badge.SUPPORTER ); - saveNeeded = true; - - PixelScene.showBadge( Badge.SUPPORTER ); - } - public static void validateGamesPlayed() { Badge badge = null; if (Rankings.INSTANCE.totalNumber >= 10) { @@ -949,10 +893,13 @@ public class Badges { leaveBest( filtered, Badge.DEATH_FROM_GAS, Badge.YASD ); leaveBest( filtered, Badge.DEATH_FROM_HUNGER, Badge.YASD ); leaveBest( filtered, Badge.DEATH_FROM_POISON, Badge.YASD ); + leaveBest( filtered, Badge.ALL_WEAPONS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED ); + leaveBest( filtered, Badge.ALL_ARMOR_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED ); + leaveBest( filtered, Badge.ALL_WANDS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED ); + leaveBest( filtered, Badge.ALL_RINGS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED ); + leaveBest( filtered, Badge.ALL_ARTIFACTS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED ); leaveBest( filtered, Badge.ALL_POTIONS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED ); leaveBest( filtered, Badge.ALL_SCROLLS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED ); - leaveBest( filtered, Badge.ALL_RINGS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED ); - leaveBest( filtered, Badge.ALL_WANDS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED ); leaveBest( filtered, Badge.VICTORY, Badge.VICTORY_ALL_CLASSES ); leaveBest( filtered, Badge.VICTORY, Badge.HAPPY_END ); leaveBest( filtered, Badge.VICTORY, Badge.CHAMPION ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Statistics.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Statistics.java index 6c76f73ac..de714016e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Statistics.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Statistics.java @@ -31,7 +31,6 @@ public class Statistics { public static int foodEaten; public static int potionsCooked; public static int piranhasKilled; - public static int nightHunt; public static int ankhsUsed; public static float duration; @@ -49,7 +48,6 @@ public class Statistics { foodEaten = 0; potionsCooked = 0; piranhasKilled = 0; - nightHunt = 0; ankhsUsed = 0; duration = 0; @@ -66,7 +64,6 @@ public class Statistics { private static final String FOOD = "foodEaten"; private static final String ALCHEMY = "potionsCooked"; private static final String PIRANHAS = "priranhas"; - private static final String NIGHT = "nightHunt"; private static final String ANKHS = "ankhsUsed"; private static final String DURATION = "duration"; private static final String AMULET = "amuletObtained"; @@ -78,7 +75,6 @@ public class Statistics { bundle.put( FOOD, foodEaten ); bundle.put( ALCHEMY, potionsCooked ); bundle.put( PIRANHAS, piranhasKilled ); - bundle.put( NIGHT, nightHunt ); bundle.put( ANKHS, ankhsUsed ); bundle.put( DURATION, duration ); bundle.put( AMULET, amuletObtained ); @@ -91,7 +87,6 @@ public class Statistics { foodEaten = bundle.getInt( FOOD ); potionsCooked = bundle.getInt( ALCHEMY ); piranhasKilled = bundle.getInt( PIRANHAS ); - nightHunt = bundle.getInt( NIGHT ); ankhsUsed = bundle.getInt( ANKHS ); duration = bundle.getFloat( DURATION ); amuletObtained = bundle.getBoolean( AMULET ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java index d832c11e6..f94a6cddd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java @@ -47,7 +47,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TimekeepersHourg import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfAccuracy; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfWealth; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; -import com.shatteredpixel.shatteredpixeldungeon.levels.Level.Feeling; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; @@ -532,13 +531,6 @@ public abstract class Mob extends Char { Statistics.enemiesSlain++; Badges.validateMonstersSlain(); Statistics.qualifiedForNoKilling = false; - - if (Dungeon.level.feeling == Feeling.DARK) { - Statistics.nightHunt++; - } else { - Statistics.nightHunt = 0; - } - Badges.validateNightHunter(); } int exp = exp(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java index a7bb521bc..326e6264e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java @@ -22,7 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.potions; import com.shatteredpixel.shatteredpixeldungeon.Assets; -import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; @@ -255,7 +254,6 @@ public class Potion extends Item { } Catalogs.setSeen(getClass()); - Badges.validateAllPotionsIdentified(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java index f2f162e51..a5b4460ff 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java @@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.ItemStatusHandler; import com.shatteredpixel.shatteredpixeldungeon.items.KindofMisc; +import com.shatteredpixel.shatteredpixeldungeon.journal.Catalogs; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; @@ -142,9 +143,7 @@ public class Ring extends KindofMisc { handler.know( this ); } - //Player has to fully identify a ring first - //Catalogs.setSeen(getClass()); - Badges.validateAllRingsIdentified(); + Catalogs.setSeen(getClass()); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java index 7b1f6fa8c..49fe0c02b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java @@ -21,7 +21,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; -import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.items.Item; @@ -171,7 +170,6 @@ public abstract class Scroll extends Item { } Catalogs.setSeen(getClass()); - Badges.validateAllScrollsIdentified(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Catalogs.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Catalogs.java index dbbb7309d..98f68c356 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Catalogs.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Catalogs.java @@ -21,6 +21,7 @@ package com.shatteredpixel.shatteredpixeldungeon.journal; +import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClothArmor; import com.shatteredpixel.shatteredpixeldungeon.items.armor.HuntressArmor; @@ -31,6 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.armor.PlateArmor; import com.shatteredpixel.shatteredpixeldungeon.items.armor.RogueArmor; import com.shatteredpixel.shatteredpixeldungeon.items.armor.ScaleArmor; import com.shatteredpixel.shatteredpixeldungeon.items.armor.WarriorArmor; +import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.AlchemistsToolkit; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CapeOfThorns; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.ChaliceOfBlood; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CloakOfShadows; @@ -155,21 +157,35 @@ public class Catalogs { return weapons.keySet(); } - private static final LinkedHashMap, Boolean> armors = new LinkedHashMap<>(); - static { - armors.put( ClothArmor.class, false); - armors.put( LeatherArmor.class, false); - armors.put( MailArmor.class, false); - armors.put( ScaleArmor.class, false); - armors.put( PlateArmor.class, false); - armors.put( WarriorArmor.class, false); - armors.put( MageArmor.class, false); - armors.put( RogueArmor.class, false); - armors.put( HuntressArmor.class, false); + public static boolean allWeaponsSeen(){ + for (Boolean val : weapons.values()){ + if (!val) return false; + } + return true; } - public static Collection> armors(){ - return armors.keySet(); + private static final LinkedHashMap, Boolean> armor = new LinkedHashMap<>(); + static { + armor.put( ClothArmor.class, false); + armor.put( LeatherArmor.class, false); + armor.put( MailArmor.class, false); + armor.put( ScaleArmor.class, false); + armor.put( PlateArmor.class, false); + armor.put( WarriorArmor.class, false); + armor.put( MageArmor.class, false); + armor.put( RogueArmor.class, false); + armor.put( HuntressArmor.class, false); + } + + public static Collection> armor(){ + return armor.keySet(); + } + + public static boolean allArmorSeen(){ + for (Boolean val : armor.values()){ + if (!val) return false; + } + return true; } private static final LinkedHashMap, Boolean> wands = new LinkedHashMap<>(); @@ -193,6 +209,13 @@ public class Catalogs { return wands.keySet(); } + public static boolean allWandsSeen(){ + for (Boolean val : wands.values()){ + if (!val) return false; + } + return true; + } + private static final LinkedHashMap, Boolean> rings = new LinkedHashMap<>(); static { rings.put( RingOfAccuracy.class, false); @@ -212,9 +235,16 @@ public class Catalogs { return rings.keySet(); } + public static boolean allRingsSeen(){ + for (Boolean val : rings.values()){ + if (!val) return false; + } + return true; + } + private static final LinkedHashMap, Boolean> artifacts = new LinkedHashMap<>(); static{ - //artifacts.put( AlchemistsToolkit.class, false); + artifacts.put( AlchemistsToolkit.class, false); artifacts.put( CapeOfThorns.class, false); artifacts.put( ChaliceOfBlood.class, false); artifacts.put( CloakOfShadows.class, false); @@ -233,6 +263,13 @@ public class Catalogs { return artifacts.keySet(); } + public static boolean allArtifactsSeen(){ + for (Boolean val : artifacts.values()){ + if (!val) return false; + } + return true; + } + private static final LinkedHashMap, Boolean> potions = new LinkedHashMap<>(); static { potions.put( PotionOfHealing.class, false); @@ -252,6 +289,13 @@ public class Catalogs { public static Collection> potions(){ return potions.keySet(); } + + public static boolean allPotionsSeen(){ + for (Boolean val : potions.values()){ + if (!val) return false; + } + return true; + } private static final LinkedHashMap, Boolean> scrolls = new LinkedHashMap<>(); static { @@ -273,10 +317,17 @@ public class Catalogs { return scrolls.keySet(); } - public static final ArrayList, Boolean>> allCatalogs = new ArrayList<>(); + public static boolean allScrollsSeen(){ + for (Boolean val : scrolls.values()){ + if (!val) return false; + } + return true; + } + + private static final ArrayList, Boolean>> allCatalogs = new ArrayList<>(); static{ allCatalogs.add(weapons); - allCatalogs.add(armors); + allCatalogs.add(armor); allCatalogs.add(wands); allCatalogs.add(rings); allCatalogs.add(artifacts); @@ -299,7 +350,7 @@ public class Catalogs { catalog.put(itemClass, true); } } + Badges.validateItemsIdentified(); } - } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java index 9921b605a..ddaf5b812 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java @@ -343,7 +343,7 @@ public class WndJournal extends WndTabbed { itemClasses = new ArrayList<>(Catalogs.weapons()); for (Class cls : itemClasses) known.put(cls, true); } else if (currentItemIdx == ARMOR_IDX){ - itemClasses = new ArrayList<>(Catalogs.armors()); + itemClasses = new ArrayList<>(Catalogs.armor()); for (Class cls : itemClasses) known.put(cls, true); } else if (currentItemIdx == WAND_IDX){ itemClasses = new ArrayList<>(Catalogs.wands()); diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc.properties index dd69333d0..c9c628af0 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/misc/misc.properties @@ -13,11 +13,14 @@ badges$badge.level_reached_1=Level 6 reached badges$badge.level_reached_2=Level 12 reached badges$badge.level_reached_3=Level 18 reached badges$badge.level_reached_4=Level 24 reached +badges$badge.all_weapons_identified=All weapons identified +badges$badge.all_armor_identified=All armor identified +badges$badge.all_wands_identified=All wands identified +badges$badge.all_rings_identified=All rings identified +badges$badge.all_artifacts_identified=All artifacts identified badges$badge.all_potions_identified=All potions identified badges$badge.all_scrolls_identified=All scrolls identified -badges$badge.all_rings_identified=All rings identified -badges$badge.all_wands_identified=All wands identified -badges$badge.all_items_identified=All potions, scrolls, rings & wands identified +badges$badge.all_items_identified=All items identified badges$badge.all_bags_bought=All bags bought badges$badge.death_from_fire=Death from fire badges$badge.death_from_poison=Death from poison @@ -32,8 +35,6 @@ badges$badge.boss_slain_3=3rd boss slain badges$badge.boss_slain_4=4th boss slain badges$badge.boss_slain_1_all_classes=1st boss slain by Warrior, Mage, Rogue & Huntress badges$badge.boss_slain_3_all_subclasses=3rd boss slain by Gladiator, Berserker, Warlock, Battlemage, Freerunner, Assassin, Sniper & Warden -badges$badge.ring_of_haggler=Ring of Haggler obtained -badges$badge.ring_of_thorns=Ring of Thorns obtained badges$badge.strength_attained_1=13 points of Strength attained badges$badge.strength_attained_2=15 points of Strength attained badges$badge.strength_attained_3=17 points of Strength attained @@ -57,14 +58,12 @@ badges$badge.potions_cooked_4=12 potions cooked badges$badge.no_monsters_slain=Level completed without killing any monsters badges$badge.grim_weapon=Monster killed by a Grim weapon badges$badge.piranhas=6 piranhas killed -badges$badge.night_hunter=15 monsters killed at nighttime badges$badge.games_played_1=10 games played badges$badge.games_played_2=100 games played badges$badge.games_played_3=500 games played badges$badge.games_played_4=2000 games played badges$badge.happy_end=Happy end badges$badge.champion=Challenge won -badges$badge.supporter=Thanks for your support! challenges.no_food=On diet challenges.no_armor=Faith is my armor diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties index d3b3c6a0f..08b71c18d 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties @@ -2,10 +2,6 @@ windows.wndblacksmith.prompt=Ok, a deal is a deal, here's what I can do for you: windows.wndblacksmith.select=Reforge an item windows.wndblacksmith.reforge=Reforge them -windows.wndcatalogs.potions=Potions -windows.wndcatalogs.scrolls=Scrolls -windows.wndcatalogs.title=Catalogs - windows.wndchallenges.title=Challenges windows.wndchooseway.message=Which way will you follow? @@ -26,8 +22,6 @@ windows.wndgame.return=Return to Game windows.wndhero.stats=Stats windows.wndhero.buffs=Buffs windows.wndhero$statstab.title=Level %1$d %2$s -windows.wndhero$statstab.catalogs=Catalogs -windows.wndhero$statstab.journal=Journal windows.wndhero$statstab.exp=Experience windows.wndhero$statstab.str=Strength windows.wndhero$statstab.health=Health