From 5fe279cb48746de56cd6cfe20f0746af54e5aaff Mon Sep 17 00:00:00 2001 From: RDW Date: Tue, 8 Aug 2023 04:51:19 +0200 Subject: [PATCH 1/2] DB: Added support for Island Expedition salvage crates --- DB/Mounts/BattleForAzeroth.lua | 39 ++++- DB/Pets/BattleForAzeroth.lua | 299 ++++++++++++++++++++++++++++----- DB/Toys/BattleForAzeroth.lua | 15 +- 3 files changed, 298 insertions(+), 55 deletions(-) diff --git a/DB/Mounts/BattleForAzeroth.lua b/DB/Mounts/BattleForAzeroth.lua index 6ec99b64..5c766c82 100644 --- a/DB/Mounts/BattleForAzeroth.lua +++ b/DB/Mounts/BattleForAzeroth.lua @@ -591,7 +591,8 @@ local bfaMounts = { ["Twilight Avenger"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.MOUNT, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173950, 173989 }, name = L["Twilight Avenger"], spellId = 279466, itemId = 163584, @@ -602,7 +603,8 @@ local bfaMounts = { ["Craghorn Chasm-Leaper"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.MOUNT, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173992, 173950, 173949, 173993 }, name = L["Craghorn Chasm-Leaper"], spellId = 279467, itemId = 163583, @@ -613,7 +615,8 @@ local bfaMounts = { ["Qinsho's Eternal Hound"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.MOUNT, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173949, 173993 }, name = L["Qinsho's Eternal Hound"], spellId = 279469, itemId = 163582, @@ -624,7 +627,8 @@ local bfaMounts = { ["Squawks"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.MOUNT, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173991, 173950 }, name = L["Squawks"], spellId = 254811, itemId = 163586, @@ -635,7 +639,8 @@ local bfaMounts = { ["Surf Jelly"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.MOUNT, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173996, 173997, 173990, 173992 }, name = L["Surf Jelly"], spellId = 278979, itemId = 163585, @@ -732,7 +737,8 @@ local bfaMounts = { ["Risen Mare"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.MOUNT, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173988, 173996 }, name = L["Risen Mare"], spellId = 288722, itemId = 166466, @@ -743,7 +749,8 @@ local bfaMounts = { ["Island Thunderscale"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.MOUNT, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173989 }, name = L["Island Thunderscale"], spellId = 288721, itemId = 166467, @@ -754,7 +761,8 @@ local bfaMounts = { ["Bloodgorged Hunter"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.MOUNT, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173997, 173990, 173988, 173992, 173989, 173993, 173950 }, name = L["Bloodgorged Hunter"], spellId = 288720, itemId = 166468, @@ -765,7 +773,20 @@ local bfaMounts = { ["Stonehide Elderhorn"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.MOUNT, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173996, + 173997, + 173994, + 173992, + 173990, + 173988, + 173949, + 173991, + 173989, + 173950, + 173993, + }, name = L["Stonehide Elderhorn"], spellId = 288712, itemId = 166470, diff --git a/DB/Pets/BattleForAzeroth.lua b/DB/Pets/BattleForAzeroth.lua index 386a3b0c..498d09c0 100644 --- a/DB/Pets/BattleForAzeroth.lua +++ b/DB/Pets/BattleForAzeroth.lua @@ -8,7 +8,8 @@ local bfaPets = { ["Scuttle"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173989 }, name = L["Scuttle"], spellId = 177244, itemId = 163797, @@ -19,7 +20,8 @@ local bfaPets = { ["Captain Nibs"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173950, 173989, 173991 }, name = L["Captain Nibs"], spellId = 177243, itemId = 163798, @@ -30,7 +32,8 @@ local bfaPets = { ["Barnaby"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173991 }, name = L["Barnaby"], spellId = 177242, itemId = 163799, @@ -41,7 +44,8 @@ local bfaPets = { ["Poro"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173949, 173950 }, name = L["Poro"], spellId = 177241, itemId = 163800, @@ -52,7 +56,8 @@ local bfaPets = { ["Octopode Fry"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173993 }, name = L["Octopode Fry"], spellId = 177240, itemId = 163801, @@ -63,7 +68,8 @@ local bfaPets = { ["Inky"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173993 }, name = L["Inky"], spellId = 177239, itemId = 163802, @@ -74,7 +80,16 @@ local bfaPets = { ["Sparkleshell Sandcrawler"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173949, + 173997, + 173991, + 173994, + 173988, + 173989, + 173950, + }, name = L["Sparkleshell Sandcrawler"], spellId = 177237, itemId = 163803, @@ -85,7 +100,15 @@ local bfaPets = { ["Kindleweb Spiderling"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173990, + 173988, + 173996, + 173950, + 173989, + 173993, + }, name = L["Kindleweb Spiderling"], spellId = 177236, itemId = 163804, @@ -96,7 +119,8 @@ local bfaPets = { ["Mischievous Zephyr"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173987 }, name = L["Mischievous Zephyr"], spellId = 177221, itemId = 163814, @@ -107,7 +131,19 @@ local bfaPets = { ["Littlehoof"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173996, + 173949, + 173993, + 173950, + 173991, + 173992, + 173990, + 173997, + 173989, + 173988, + }, name = L["Littlehoof"], spellId = 177219, itemId = 163815, @@ -118,7 +154,17 @@ local bfaPets = { ["Snapper"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173994, + 173949, + 173991, + 173997, + 173989, + 173988, + 173993, + 173950, + }, name = L["Snapper"], spellId = 177217, itemId = 163816, @@ -129,7 +175,17 @@ local bfaPets = { ["Sunscale Hatchling"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173949, + 173994, + 173991, + 173988, + 173989, + 173997, + 173993, + 173950, + }, name = L["Sunscale Hatchling"], spellId = 280331, itemId = 163817, @@ -140,7 +196,17 @@ local bfaPets = { ["Bloodstone Tunneler"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173994, + 173996, + 173991, + 173949, + 173990, + 173988, + 173989, + 173950, + }, name = L["Bloodstone Tunneler"], spellId = 280332, itemId = 163818, @@ -151,7 +217,17 @@ local bfaPets = { ["Snort"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173996, + 173993, + 173949, + 173950, + 173989, + 173992, + 173994, + 173991, + }, name = L["Snort"], spellId = 280333, itemId = 163819, @@ -162,7 +238,20 @@ local bfaPets = { ["Muskflank Calfling"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173996, + 173990, + 173993, + 173997, + 173950, + 173989, + 173991, + 173949, + 173994, + 173992, + 173988, + }, name = L["Muskflank Calfling"], spellId = 280334, itemId = 163820, @@ -173,7 +262,8 @@ local bfaPets = { ["Juvenile Brineshell"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173997 }, name = L["Juvenile Brineshell"], spellId = 280335, itemId = 163821, @@ -184,7 +274,8 @@ local bfaPets = { ["Kunchong Hatchling"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173993 }, name = L["Kunchong Hatchling"], spellId = 280336, itemId = 163822, @@ -195,7 +286,8 @@ local bfaPets = { ["Coldlight Surfrunner"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173997 }, name = L["Coldlight Surfrunner"], spellId = 280337, itemId = 163823, @@ -206,7 +298,8 @@ local bfaPets = { ["Voru'kar Leecher"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173992 }, name = L["Voru'kar Leecher"], spellId = 280338, itemId = 163824, @@ -217,7 +310,12 @@ local bfaPets = { ["Tinder Pup"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173990, + 173950, + 173989, + }, name = L["Tinder Pup"], spellId = 177230, itemId = 163807, @@ -228,7 +326,15 @@ local bfaPets = { ["Sandshell Chitterer"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173989, + 173992, + 173988, + 173950, + 173949, + 173993, + }, name = L["Sandshell Chitterer"], spellId = 177229, itemId = 163808, @@ -239,7 +345,16 @@ local bfaPets = { ["Deathsting Scorpid"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173990, + 173988, + 173989, + 173997, + 173992, + 173993, + 173950, + }, name = L["Deathsting Scorpid"], spellId = 177228, itemId = 163809, @@ -250,7 +365,19 @@ local bfaPets = { ["Thistlebrush Bud"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173949, + 173990, + 173993, + 173992, + 173996, + 173989, + 173950, + 173988, + 173991, + 173994, + }, name = L["Thistlebrush Bud"], spellId = 177226, itemId = 163810, @@ -261,7 +388,8 @@ local bfaPets = { ["Giggling Flame"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173987 }, name = L["Giggling Flame"], spellId = 177225, itemId = 163811, @@ -272,7 +400,8 @@ local bfaPets = { ["Laughing Stonekin"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173987 }, name = L["Laughing Stonekin"], spellId = 177224, itemId = 163812, @@ -283,7 +412,8 @@ local bfaPets = { ["Playful Frostkin"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173987 }, name = L["Playful Frostkin"], spellId = 177222, itemId = 163813, @@ -294,7 +424,20 @@ local bfaPets = { ["False Knucklebump"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173994, + 173996, + 173997, + 173949, + 173989, + 173992, + 173950, + 173990, + 173991, + 173988, + 173993, + }, name = L["False Knucklebump"], spellId = 177231, itemId = 163806, @@ -305,7 +448,20 @@ local bfaPets = { ["Craghoof Kid"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173949, + 173993, + 173994, + 173996, + 173950, + 173989, + 173992, + 173990, + 173988, + 173997, + 173991, + }, name = L["Craghoof Kid"], spellId = 177235, itemId = 163805, @@ -723,7 +879,21 @@ local bfaPets = { ["Baby Stonehide"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173997, + 173988, + 173996, + 173990, + 173949, + 173950, + 173992, + 173987, + 173991, + 173993, + 173989, + 173994, + }, name = L["Baby Stonehide"], spellId = 288867, itemId = 166486, @@ -734,7 +904,17 @@ local bfaPets = { ["Leatherwing Screecher"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173994, + 173950, + 173989, + 173996, + 173949, + 173988, + 173993, + 173991, + }, name = L["Leatherwing Screecher"], spellId = 288868, itemId = 166487, @@ -745,7 +925,8 @@ local bfaPets = { ["Rotting Ghoul"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173988 }, name = L["Rotting Ghoul"], spellId = 288870, itemId = 166488, @@ -756,7 +937,8 @@ local bfaPets = { ["Thunderscale Whelpling"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173989, 173991 }, name = L["Thunderscale Whelpling"], spellId = 288916, itemId = 166499, @@ -767,7 +949,18 @@ local bfaPets = { ["Scritches"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173949, + 173990, + 173992, + 173993, + 173950, + 173989, + 173994, + 173991, + 173988, + }, name = L["Scritches"], spellId = 288914, itemId = 166498, @@ -778,7 +971,15 @@ local bfaPets = { ["Tonguelasher"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173990, + 173994, + 173996, + 173991, + 173950, + 173989, + }, name = L["Tonguelasher"], spellId = 288910, itemId = 166495, @@ -789,7 +990,8 @@ local bfaPets = { ["Lord Woofington"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173988 }, name = L["Lord Woofington"], spellId = 288901, itemId = 166494, @@ -800,7 +1002,19 @@ local bfaPets = { ["Firesting Buzzer"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { + 173949, + 173993, + 173996, + 173997, + 173950, + 173989, + 173994, + 173992, + 173991, + 173988, + }, name = L["Firesting Buzzer"], spellId = 288895, itemId = 166493, @@ -811,7 +1025,8 @@ local bfaPets = { ["Needleback Pup"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173996, 173950, 173988, 173994, 173997, 173989, 173990, 173992, 173991, 173993, 173949 }, name = L["Needleback Pup"], spellId = 288875, itemId = 166489, @@ -822,7 +1037,8 @@ local bfaPets = { ["Shadefeather Hatchling"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173997, 173989, 173996, 173950, 173993, 173991, 173949, 173994, 173988 }, name = L["Shadefeather Hatchling"], spellId = 288889, itemId = 166492, @@ -1144,11 +1360,11 @@ local bfaPets = { coords = { { m = 456, i = true } }, }, -- 8.2 Pets - ["Adventurous Hopling Pack"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173993 }, name = L["Adventurous Hopling Pack"], spellId = 300934, itemId = 169322, @@ -1159,7 +1375,8 @@ local bfaPets = { ["Ghostly Whelpling"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.PET, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173950 }, name = L["Ghostly Whelpling"], spellId = 300367, itemId = 169205, diff --git a/DB/Toys/BattleForAzeroth.lua b/DB/Toys/BattleForAzeroth.lua index 0a268097..4e42e76c 100644 --- a/DB/Toys/BattleForAzeroth.lua +++ b/DB/Toys/BattleForAzeroth.lua @@ -9,7 +9,8 @@ local bfaToys = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.ITEM, isToy = true, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173994 }, name = L["Oomgut Ritual Drum"], itemId = 163795, chance = 250, @@ -19,7 +20,8 @@ local bfaToys = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.ITEM, isToy = true, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173992 }, name = L["Whiskerwax Candle"], itemId = 163924, chance = 250, @@ -51,7 +53,8 @@ local bfaToys = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.ITEM, isToy = true, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173992 }, name = L["Enchanted Soup Stone"], itemId = 164373, chance = 250, @@ -61,7 +64,8 @@ local bfaToys = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.ITEM, isToy = true, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173994 }, name = L["Magic Monkey Banana"], itemId = 164374, chance = 250, @@ -71,7 +75,8 @@ local bfaToys = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.ITEM, isToy = true, - method = CONSTANTS.DETECTION_METHODS.SPECIAL, + method = CONSTANTS.DETECTION_METHODS.USE, + items = { 173994 }, name = L["Bad Mojo Banana"], itemId = 164375, chance = 250, From 302c3edfe4350726fe99f0d1f1d18eb16ec713c2 Mon Sep 17 00:00:00 2001 From: RDW Date: Tue, 8 Aug 2023 06:23:56 +0200 Subject: [PATCH 2/2] Cleanup: Removed some NYI comments It's unlikely that these items will be added, and if so it's easily restored. --- Core/EventHandlers.lua | 4 --- DB/Toys/BattleForAzeroth.lua | 55 ------------------------------------ Locales.lua | 1 - 3 files changed, 60 deletions(-) diff --git a/Core/EventHandlers.lua b/Core/EventHandlers.lua index 1f726e1e..9c3dec8a 100644 --- a/Core/EventHandlers.lua +++ b/Core/EventHandlers.lua @@ -531,10 +531,6 @@ local islandExpeditionCollectibles = { "Enchanted Soup Stone", "Magic Monkey Banana", "Bad Mojo Banana", - ---- Not yet implemented? - -- "Regenerating Banana Bunch", -- NYI as of 18/01/19 - -- "Yaungol Oil Stove", -- NYI as of 18/01/19 - -- "Jinyu Light Globe", -- NYI as of 18/01/19 -- Mounts ---- 8.0 diff --git a/DB/Toys/BattleForAzeroth.lua b/DB/Toys/BattleForAzeroth.lua index 4e42e76c..683b6a35 100644 --- a/DB/Toys/BattleForAzeroth.lua +++ b/DB/Toys/BattleForAzeroth.lua @@ -27,28 +27,6 @@ local bfaToys = { chance = 250, coords = { { m = CONSTANTS.UIMAPIDS.BORALUS }, { m = CONSTANTS.UIMAPIDS.DAZARALOR } }, }, - -- ["Yaungol Oil Stove"] = { -- NYI as of 18/01/19 - -- cat = CONSTANTS.ITEM_CATEGORIES.BFA, - -- type = CONSTANTS.ITEM_TYPES.ITEM, - -- isToy = true, - -- method = CONSTANTS.DETECTION_METHODS.SPECIAL, - -- name = L["Yaungol Oil Stove"], - -- itemId = 164371, - -- chance = 250, - -- groupSize = 3, - -- }, - - -- ["Jinyu Light Globe"] = { -- NYI as of 18/01/19 - -- cat = CONSTANTS.ITEM_CATEGORIES.BFA, - -- type = CONSTANTS.ITEM_TYPES.ITEM, - -- isToy = true, - -- method = CONSTANTS.DETECTION_METHODS.SPECIAL, - -- name = L["Jinyu Light Globe"], - -- itemId = 164372, - -- chance = 250, - -- groupSize = 3, - -- }, - ["Enchanted Soup Stone"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.ITEM, @@ -82,17 +60,6 @@ local bfaToys = { chance = 250, coords = { { m = CONSTANTS.UIMAPIDS.BORALUS }, { m = CONSTANTS.UIMAPIDS.DAZARALOR } }, }, - -- ["Regenerating Banana Bunch"] = { -- NYI as of 18/01/19 - -- cat = CONSTANTS.ITEM_CATEGORIES.BFA, - -- type = CONSTANTS.ITEM_TYPES.ITEM, - -- isToy = true, - -- method = CONSTANTS.DETECTION_METHODS.SPECIAL, - -- name = L["Regenerating Banana Bunch"], - -- itemId = 164377, - -- chance = 250, - -- groupSize = 3, - -- }, - ["Brazier Cap"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.ITEM, @@ -292,17 +259,6 @@ local bfaToys = { chance = 10, coords = { { m = CONSTANTS.UIMAPIDS.STORMSONG_VALLEY }, { m = CONSTANTS.UIMAPIDS.ZULDAZAR } }, }, - -- ["Kojo's Master Matching Set"] = { -- Note: NYI as of 19/04/2019 - -- cat = CONSTANTS.ITEM_CATEGORIES.BFA, - -- type = CONSTANTS.ITEM_TYPES.ITEM, - -- isToy = true, - -- method = CONSTANTS.DETECTION_METHODS.USE, - -- name = L["Kojo's Master Matching Set"], - -- itemId = 166851, - -- items = { 166245 }, - -- chance = 10, - -- }, - ["Warbeast Kraal Dinner Bell"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.ITEM, @@ -336,17 +292,6 @@ local bfaToys = { chance = 10, coords = { { m = CONSTANTS.UIMAPIDS.VOLDUN } }, }, - -- ["Words of Akunda"] = { -- Note: NYI as of 19/04/2019 - -- cat = CONSTANTS.ITEM_CATEGORIES.BFA, - -- type = CONSTANTS.ITEM_TYPES.ITEM, - -- isToy = true, - -- method = CONSTANTS.DETECTION_METHODS.USE, - -- name = L["Words of Akunda"], - -- itemId = 165021, - -- items = { 166290 }, - -- chance = 10, - -- }, - ["Meerah's Jukebox"] = { cat = CONSTANTS.ITEM_CATEGORIES.BFA, type = CONSTANTS.ITEM_TYPES.ITEM, diff --git a/Locales.lua b/Locales.lua index b9b920f9..2724e4ed 100644 --- a/Locales.lua +++ b/Locales.lua @@ -1707,7 +1707,6 @@ L["Nerissa Heartless"] = true L["Blisterback Bloodtusk"] = true L["Warbringer Mal'Korak"] = true L["Armored Bonehoof Tauralus"] = true --- L["Bonecleaver's Skullboar"] = true // NYI as far as I can tell L["Sabriel the Bonecleaver"] = true L["Mawsworn Soulhunter"] = true L["Gorged Shadehound"] = true