From f6e55ba1cda1386edb4f5901a3eafd6fd1305ecd Mon Sep 17 00:00:00 2001 From: SolestialDev Date: Sat, 21 Dec 2024 23:45:21 +0100 Subject: [PATCH] Fixes for #669 --- src/api/achievements.js | 2 +- static/data/achievements.json | 8 +++ static/data/battlepets.json | 16 +++++ static/data/mounts.json | 57 ++++++++-------- static/data/pets.json | 119 +++++++++++++--------------------- static/data/toys.json | 102 +++++++++++++++-------------- 6 files changed, 154 insertions(+), 150 deletions(-) diff --git a/src/api/achievements.js b/src/api/achievements.js index 2dfa10c..a720073 100644 --- a/src/api/achievements.js +++ b/src/api/achievements.js @@ -121,7 +121,7 @@ function parseAchievementObject(db, earned, character, faction) { // Always add it if we've completed it, it should show up regardless if its available if (myAchievement.completed) { - if(showOnlyUnobtained == "false") { + if(showOnlyUnobtained != "true") { added = true; mySubCat.achievements.push(myAchievement); } diff --git a/static/data/achievements.json b/static/data/achievements.json index 27f9af6..e794407 100644 --- a/static/data/achievements.json +++ b/static/data/achievements.json @@ -565,10 +565,18 @@ "points": 10, "title": "The War Within" }, + { + "icon": "inv_seed_crystallineworldsoul", + "id": 41052, + "points": 0, + "title": "Lingering Shadows" + }, { "icon": "achievement_reputation_kirintor", "id": 40791, "points": 0, + "notObtainable": true, + "notReleased": true, "title": "Fate of the Kirin Tor" } ], diff --git a/static/data/battlepets.json b/static/data/battlepets.json index d386201..3ad817c 100644 --- a/static/data/battlepets.json +++ b/static/data/battlepets.json @@ -599,6 +599,14 @@ "icon": "inv_babymolepet_dark", "name": "Snuffling", "spellid": 449473 + }, + { + "ID": 3547, + "creatureId": 204354, + "icon": "inv_viperrock2_green", + "itemId": 205153, + "name": "Jade Cragviper", + "spellid": 408265 } ], "name": "The Ringing Deeps" @@ -665,6 +673,14 @@ "icon": "inv_bloodticklarvaepurple", "name": "Vile Bloodtick", "spellid": 446115 + }, + { + "ID": 3550, + "creatureId": 204361, + "icon": "inv_mothunderlight_red", + "itemId": 205157, + "name": "Undermoth", + "spellid": 408314 } ], "name": "Azj-Kahet" diff --git a/static/data/mounts.json b/static/data/mounts.json index 676743a..6d67526 100644 --- a/static/data/mounts.json +++ b/static/data/mounts.json @@ -169,25 +169,6 @@ ], "name": "Trading Post: December" }, - { - "items": [ - { - "ID": 2199, - "icon": "inv_nightsaberhordemount_black", - "itemId": 223459, - "name": "Blackrock Warsaber", - "spellid": 449132 - }, - { - "ID": 2203, - "icon": "inv_alliancewolfmount2_purple", - "itemId": 223471, - "name": "Kaldorei War Wolf", - "spellid": 449142 - } - ], - "name": "Twitch Drops" - }, { "items": [ { @@ -211,6 +192,13 @@ "name": "Hateforged Blazecycle", "spellid": 428067 }, + { + "ID": 571, + "icon": "ability_mount_ironchimera", + "itemId": 107951, + "name": "Iron Skyreaver", + "spellid": 153489 + }, { "ID": 1579, "icon": "inv_sharkraymount_4", @@ -490,7 +478,7 @@ { "ID": 1943, "icon": "inv_motorcyclefelreavermount_fel", - "itemId": "229348", + "itemId": 229348, "name": "Incognitro, the Indecipherable Felcycle", "spellid": 428013 } @@ -9576,14 +9564,6 @@ "name": "Dread Raven", "spellid": 155741 }, - { - "ID": 571, - "icon": "ability_mount_ironchimera", - "itemId": 107951, - "name": "Iron Skyreaver", - "notObtainable": true, - "spellid": 153489 - }, { "ID": 593, "icon": "ability_mount_clockworkhorse", @@ -10174,6 +10154,27 @@ } ], "name": "Annual Subscription" + }, + { + "items": [ + { + "ID": 2199, + "icon": "inv_nightsaberhordemount_black", + "itemId": 223459, + "name": "Blackrock Warsaber", + "notObtainable": true, + "spellid": 449132 + }, + { + "ID": 2203, + "icon": "inv_alliancewolfmount2_purple", + "itemId": 223471, + "name": "Kaldorei War Wolf", + "notObtainable": true, + "spellid": 449142 + } + ], + "name": "Twitch Drops" } ] }, diff --git a/static/data/pets.json b/static/data/pets.json index a54e596..c6842a6 100644 --- a/static/data/pets.json +++ b/static/data/pets.json @@ -267,7 +267,7 @@ { "ID": 4682, "creatureId": 232502, - "icon": "inv_foxpetdetective", + "icon": "6075526", "itemId": 231294, "name": "Reven", "spellid": 468186 @@ -275,20 +275,6 @@ ], "name": "Charity Bundle" }, - { - "id": "a969d4a1", - "items": [ - { - "ID": 4629, - "creatureId": 198987, - "icon": "inv_babymurlo3frost", - "itemId": 229366, - "name": "Brrrgl", - "spellid": 464798 - } - ], - "name": "Blizzard Gear Store" - }, { "items": [ { @@ -425,6 +411,14 @@ "itemId": 225934, "name": "Lil' Bonechewer", "spellid": 446493 + }, + { + "ID": 4490, + "creatureId": 222574, + "icon": "inv_spiderpet_brown", + "itemId": 222970, + "name": "Fuzzy", + "spellid": 446435 } ], "name": "Achievement" @@ -580,14 +574,6 @@ "itemId": 221819, "name": "Shadowbog Hopper", "spellid": 446031 - }, - { - "ID": 4726, - "creatureId": 235124, - "icon": "ability_mount_bluewindrider", - "itemId": 234379, - "name": "Crackleroar", - "spellid": 1213821 } ], "name": "Treasure" @@ -802,6 +788,19 @@ ], "name": "Dungeon Drop" }, + { + "items": [ + { + "ID": 4726, + "creatureId": 235124, + "icon": "ability_mount_bluewindrider", + "itemId": 234379, + "name": "Crackleroar", + "spellid": 1213821 + } + ], + "name": "Siren Isle" + }, { "items": [ { @@ -915,16 +914,6 @@ "notReleased": true, "spellid": 446119 }, - { - "ID": 4490, - "creatureId": 222574, - "icon": "inv_spiderpet_brown", - "itemId": 222970, - "name": "Fuzzy", - "notObtainable": true, - "notReleased": true, - "spellid": 446435 - }, { "ID": 4493, "creatureId": 222080, @@ -2326,26 +2315,6 @@ "notReleased": true, "spellid": 408254 }, - { - "ID": 3547, - "creatureId": 204354, - "icon": "inv_viperrock2_green", - "itemId": 205153, - "name": "Jade Cragviper", - "notObtainable": true, - "notReleased": true, - "spellid": 408265 - }, - { - "ID": 3550, - "creatureId": 204361, - "icon": "inv_mothunderlight_red", - "itemId": 205157, - "name": "Undermoth", - "notObtainable": true, - "notReleased": true, - "spellid": 408314 - }, { "ID": 3554, "creatureId": 204368, @@ -8912,8 +8881,6 @@ "icon": "6027035", "itemId": 232531, "name": "Grunch", - "notObtainable": true, - "notReleased": true, "spellid": 471121 } ], @@ -11208,24 +11175,6 @@ }, { "items": [ - { - "ID": 245, - "creatureId": 36908, - "icon": "inv_misc_pet_02", - "itemId": 49662, - "name": "Gryphon Hatchling", - "notObtainable": true, - "spellid": 69535 - }, - { - "ID": 246, - "creatureId": 36909, - "icon": "inv_misc_pet_04", - "itemId": 49663, - "name": "Wind Rider Cub", - "notObtainable": true, - "spellid": 69536 - }, { "ID": 256, "creatureId": 40703, @@ -12146,6 +12095,22 @@ }, { "items": [ + { + "ID": 245, + "creatureId": 36908, + "icon": "inv_misc_pet_02", + "itemId": 49662, + "name": "Gryphon Hatchling", + "spellid": 69535 + }, + { + "ID": 246, + "creatureId": 36909, + "icon": "inv_misc_pet_04", + "itemId": 49663, + "name": "Wind Rider Cub", + "spellid": 69536 + }, { "ID": 4630, "creatureId": 230834, @@ -12153,6 +12118,14 @@ "itemId": 229368, "name": "Gill'el", "spellid": 464808 + }, + { + "ID": 4629, + "creatureId": 198987, + "icon": "inv_babymurlo3frost", + "itemId": 229366, + "name": "Brrrgl", + "spellid": 464798 } ], "name": "Blizzard Gear Store" diff --git a/static/data/toys.json b/static/data/toys.json index e6cea29..f13eae1 100644 --- a/static/data/toys.json +++ b/static/data/toys.json @@ -258,6 +258,23 @@ ], "name": "Delves" }, + { + "items": [ + { + "ID": 1538, + "icon": "inv_10_all_memorycrystal_color2", + "itemId": 235017, + "name": "Glittering Vault Shard" + }, + { + "ID": 1543, + "icon": "inv_leatherworking_70_loveseat", + "itemId": 234473, + "name": "Soweezi's Comfy Lawn Chair" + } + ], + "name": "Rare" + }, { "items": [ { @@ -329,6 +346,18 @@ "icon": "inv_spiderpet_yellow", "itemId": 228914, "name": "Arachnophile Spectacles" + }, + { + "ID": 1539, + "icon": "inv_bfa_paragoncache_orderofembers", + "itemId": 233486, + "name": "Hallowfall Supply Cache" + }, + { + "ID": 1541, + "icon": "inv_legion_cache_hightmountaintribes", + "itemId": 235015, + "name": "Awakened Supply Crate" } ], "name": "Vendor" @@ -365,34 +394,12 @@ "itemId": 235041, "name": "Cyrce's Circlet" }, - { - "ID": 1538, - "icon": "inv_10_all_memorycrystal_color2", - "itemId": 235017, - "name": "Glittering Vault Shard" - }, - { - "ID": 1539, - "icon": "inv_bfa_paragoncache_orderofembers", - "itemId": 233486, - "name": "Hallowfall Supply Cache" - }, - { - "ID": 1541, - "icon": "inv_legion_cache_hightmountaintribes", - "itemId": 235015, - "name": "Awakened Supply Crate" - }, - { - "ID": 1543, - "icon": "inv_leatherworking_70_loveseat", - "itemId": 234473, - "name": "Soweezi's Comfy Lawn Chair" - }, { "ID": 1545, "icon": "inv_10_blacksmithing_craftedoptional_engineering_uprez", "itemId": 235016, + "notObtainable": true, + "notReleased": true, "name": "Redeployment Module" } ], @@ -1152,6 +1159,29 @@ } ], "name": "Raid" + }, + { + "items": [ + { + "ID": 1341, + "icon": "inv_helm_armor_gnomish_c_01_blue", + "itemId": 206696, + "name": "Tricked-Out Thinking Cap" + }, + { + "ID": 1342, + "icon": "inv_misc_1h_torchbearersflame_b_01_blue", + "itemId": 208092, + "name": "Torch of Pyrreth" + }, + { + "ID": 1343, + "icon": "trade_archaeology_apexisstatue", + "itemId": 207730, + "name": "Idol of Ohn'ahra" + } + ], + "name": "Riddle" } ] }, @@ -6602,30 +6632,6 @@ ], "name": "Dragonriding Cup" }, - { - "id": "69fd463c", - "items": [ - { - "ID": 1341, - "icon": "inv_helm_armor_gnomish_c_01_blue", - "itemId": 206696, - "name": "Tricked-Out Thinking Cap" - }, - { - "ID": 1342, - "icon": "inv_misc_1h_torchbearersflame_b_01_blue", - "itemId": 208092, - "name": "Torch of Pyrreth" - }, - { - "ID": 1343, - "icon": "trade_archaeology_apexisstatue", - "itemId": 207730, - "name": "Idol of Ohn'ahra" - } - ], - "name": "Secrets of Azeroth" - }, { "id": "abab0c56", "items": [