Merge pull request #750 from WowRarity/734-untested-tww-updates

Add a first batch of TWW collectibles
WowRarity · Aug 23, 2024 · 73697b0 · 73697b0
2 parents 6b7a78c + 5f93801
commit 73697b0
Show file tree

Hide file tree

Showing 10 changed files with 185 additions and 0 deletions.
diff --git a/DB/Mounts/TheWarWithin.lua b/DB/Mounts/TheWarWithin.lua
@@ -0,0 +1,82 @@
+local addonName, addonTable = ...
+
+local L = LibStub("AceLocale-3.0"):GetLocale("Rarity")
+local CONSTANTS = addonTable.constants
+
+local twwMounts = {
+	-- 11.0 mounts
+	["Reins of the Sureki Skyrazor"] = {
+		cat = CONSTANTS.ITEM_CATEGORIES.TWW,
+		type = CONSTANTS.ITEM_TYPES.MOUNT,
+		method = CONSTANTS.DETECTION_METHODS.NPC,
+		name = L["Reins of the Sureki Skyrazor"],
+		itemId = 224147,
+		spellId = 451486,
+		npcs = { 219778 },
+		groupSize = 5,
+		equalOdds = true,
+		chance = 100, -- No data available
+		instanceDifficulties = { [CONSTANTS.INSTANCE_DIFFICULTIES.MYTHIC_DUNGEON] = true },
+		coords = { { i = true, m = CONSTANTS.UIMAPIDS.NERUBAR_PALACE } },
+	},
+	["Beledar's Spawn"] = {
+		cat = CONSTANTS.ITEM_CATEGORIES.TWW,
+		type = CONSTANTS.ITEM_TYPES.MOUNT,
+		method = CONSTANTS.DETECTION_METHODS.NPC,
+		name = L["Beledar's Spawn"],
+		itemId = 223315,
+		spellId = 448941,
+		npcs = { 207802 },
+		chance = 100, -- No data available
+		coords = { { m = CONSTANTS.UIMAPIDS.HALLOWFALL } },
+	},
+	["Regurgitated Mole Reins"] = {
+		cat = CONSTANTS.ITEM_CATEGORIES.TWW,
+		type = CONSTANTS.ITEM_TYPES.MOUNT,
+		method = CONSTANTS.DETECTION_METHODS.NPC,
+		name = L["Regurgitated Mole Reins"],
+		itemId = 223501,
+		spellId = 449258,
+		npcs = { 220285 },
+		chance = 100, -- No data available
+		coords = { { m = CONSTANTS.UIMAPIDS.THE_RINGING_DEEPS } },
+	},
+	["Wick's Lead"] = {
+		cat = CONSTANTS.ITEM_CATEGORIES.TWW,
+		type = CONSTANTS.ITEM_TYPES.MOUNT,
+		method = CONSTANTS.DETECTION_METHODS.NPC,
+		name = L["Wick's Lead"],
+		itemId = 225548,
+		spellId = 449264,
+		npcs = { 210797 },
+		groupSize = 5,
+		equalOdds = true,
+		chance = 100, -- No data available
+		instanceDifficulties = { [CONSTANTS.INSTANCE_DIFFICULTIES.MYTHIC_DUNGEON] = true },
+		coords = { { m = CONSTANTS.UIMAPIDS.DARKFLAME_CLEFT, i = true } },
+	},
+	["Alunira"] = {
+		cat = CONSTANTS.ITEM_CATEGORIES.TWW,
+		type = CONSTANTS.ITEM_TYPES.MOUNT,
+		method = CONSTANTS.DETECTION_METHODS.COLLECTION,
+		name = L["Alunira"],
+		itemId = 223270,
+		collectedItemId = { 224025 },
+		spellId = 447213,
+		chance = 10,
+		coords = { { m = CONSTANTS.UIMAPIDS.ISLE_OF_DORN } },
+	},
+	["Dauntless Imperial Lynx"] = {
+		cat = CONSTANTS.ITEM_CATEGORIES.TWW,
+		type = CONSTANTS.ITEM_TYPES.MOUNT,
+		method = CONSTANTS.DETECTION_METHODS.USE,
+		name = L["Dauntless Imperial Lynx"],
+		itemId = 223318,
+		spellId = 448979,
+		items = { 228741 },
+		chance = 100, -- No data available
+		coords = { { i = true, m = CONSTANTS.UIMAPIDS.HALLOWFALL } },
+	},
+}
+
+Rarity.ItemDB.MergeItems(Rarity.ItemDB.mounts, twwMounts)
diff --git a/DB/Pets/TheWarWithin.lua b/DB/Pets/TheWarWithin.lua
@@ -0,0 +1,25 @@
+local addonName, addonTable = ...
+
+local L = LibStub("AceLocale-3.0"):GetLocale("Rarity")
+local CONSTANTS = addonTable.constants
+
+local twwPets = {
+	-- 11.0 pets
+	["Bop"] = {
+		cat = CONSTANTS.ITEM_CATEGORIES.TWW,
+		type = CONSTANTS.ITEM_TYPES.PET,
+		method = CONSTANTS.DETECTION_METHODS.NPC,
+		name = L["Bop"],
+		npcs = { 218523 },
+		itemId = 223155,
+		spellId = 446024,
+		chance = 5, -- No data available
+		creatureId = 222318,
+		groupSize = 5,
+		equalOdds = true,
+		instanceDifficulties = { [CONSTANTS.INSTANCE_DIFFICULTIES.MYTHIC_DUNGEON] = true },
+		coords = { { m = CONSTANTS.UIMAPIDS.CINDERBREW_MEADERY, i = true } },
+	},
+}
+
+Rarity.ItemDB.MergeItems(Rarity.ItemDB.pets, twwPets)
diff --git a/DB/SharedConstants.lua b/DB/SharedConstants.lua
@@ -124,6 +124,15 @@ C.UIMAPIDS = {
 	THE_THROUGHWAY = 2165,
 	CROSSROADS_OF_FATE = 2194, -- Dawn of the Infinite (subzone)
 	THE_EMERALD_DREAM = 2200,
+
+	-- The War Within zones
+	THE_RINGING_DEEPS = 2214,
+	HALLOWFALL = 2215,
+	ISLE_OF_DORN = 2248,
+	NERUBAR_PALACE = 2291,
+	DARKFLAME_CLEFT = 2303,
+	CINDERBREW_MEADERY = 2335,
+	THE_STONEVAULT = 2341,
 }
 
 -- Types of items
@@ -155,6 +164,7 @@ C.ITEM_CATEGORIES = {
 	BFA = "BFA",
 	SHADOWLANDS = "SHADOWLANDS",
 	DRAGONFLIGHT = "DRAGONFLIGHT",
+	TWW = "TWW",
 	HOLIDAY = "HOLIDAY",
 }
 

diff --git a/DB/Toys/TheWarWithin.lua b/DB/Toys/TheWarWithin.lua
@@ -0,0 +1,37 @@
+local addonName, addonTable = ...
+
+local L = LibStub("AceLocale-3.0"):GetLocale("Rarity")
+local CONSTANTS = addonTable.constants
+
+local twwToysAndItems = {
+	-- 11.0 items and toys
+	["Crackling Shard"] = {
+		cat = CONSTANTS.ITEM_CATEGORIES.TWW,
+		type = CONSTANTS.ITEM_TYPES.ITEM,
+		method = CONSTANTS.DETECTION_METHODS.ZONE,
+		name = L["Crackling Shard"],
+		itemId = 224025,
+		spellId = 450842, -- Irrelevant
+		zones = { tostring(CONSTANTS.UIMAPIDS.ISLE_OF_DORN) },
+		chance = 2000,
+		sourceText = L["Dropped by any mob in Isle of Dorn (except minor mobs). 10 of these can be combined to pierce Alunira's shield, allowing combat and a guaranteed drop of Alunira."],
+		coords = { { m = CONSTANTS.UIMAPIDS.ISLE_OF_DORN } },
+		repeatable = true,
+	},
+	["Malfunctioning Mechsuit"] = {
+		cat = CONSTANTS.ITEM_CATEGORIES.TWW,
+		type = CONSTANTS.ITEM_TYPES.ITEM,
+		method = CONSTANTS.DETECTION_METHODS.NPC,
+		name = L["Malfunctioning Mechsuit"],
+		npcs = { 219440 },
+		itemId = 226683,
+		spellId = 442358,
+		chance = 1, -- No data available
+		groupSize = 5,
+		equalOdds = true,
+		instanceDifficulties = { [CONSTANTS.INSTANCE_DIFFICULTIES.MYTHIC_DUNGEON] = true },
+		coords = { { m = CONSTANTS.UIMAPIDS.THE_STONEVAULT, i = true } },
+	},
+}
+
+Rarity.ItemDB.MergeItems(Rarity.ItemDB.toys, twwToysAndItems)
diff --git a/Icons/tww.blp b/Icons/tww.blp
diff --git a/Locales.lua b/Locales.lua
@@ -2,6 +2,18 @@ local L
 L = LibStub("AceLocale-3.0"):NewLocale("Rarity", "enUS", true)
 
 -- L["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"] = true
+L["Malfunctioning Mechsuit"] = true
+L["Dauntless Imperial Lynx"] = true
+L["Bop"] = true
+L["Dropped by any mob in Isle of Dorn (except minor mobs). 10 of these can be combined to pierce Alunira's shield, allowing combat and a guaranteed drop of Alunira."] =
+	true
+L["Crackling Shard"] = true
+L["Alunira"] = true
+L["Wick's Lead"] = true
+L["Regurgitated Mole Reins"] = true
+L["Beledar's Spawn"] = true
+L["Reins of the Sureki Skyrazor"] = true
+L["The War Within"] = true
 L["Noble Flying Carpet"] = true
 L["Clayscale Hornstrider"] = true
 L["Falling Star Catcher"] = true

diff --git a/Modules/Options/Options.lua b/Modules/Options/Options.lua
@@ -34,6 +34,7 @@ local LEGION = "LEGION"
 local BFA = "BFA"
 local SHADOWLANDS = "SHADOWLANDS"
 local DRAGONFLIGHT = "DRAGONFLIGHT"
+local TWW = "TWW"
 local HOLIDAY = "HOLIDAY"
 
 -- Methods of obtaining
@@ -870,6 +871,18 @@ function R:PrepareOptions()
 									Rarity.GUI:UpdateText()
 								end,
 							},
+							theWarWithin = {
+								type = "toggle",
+								order = newOrder(),
+								name = L["The War Within"],
+								get = function()
+									return self.db.profile.cats[TWW]
+								end,
+								set = function(info, val)
+									self.db.profile.cats[TWW] = val
+									Rarity.GUI:UpdateText()
+								end,
+							},
 						}, -- args
 					}, -- contentCategory
 					collectionType = {

diff --git a/Options_Defaults.lua b/Options_Defaults.lua
@@ -63,6 +63,7 @@ R.catIcons = {
 	[CONSTANTS.ITEM_CATEGORIES.BFA] = "bfa",
 	[CONSTANTS.ITEM_CATEGORIES.SHADOWLANDS] = "shadowlands",
 	[CONSTANTS.ITEM_CATEGORIES.DRAGONFLIGHT] = "dragonflight",
+	[CONSTANTS.ITEM_CATEGORIES.TWW] = "tww",
 }
 
 function R:PrepareDefaults()
@@ -132,6 +133,7 @@ function R:PrepareDefaults()
 				[CONSTANTS.ITEM_CATEGORIES.BFA] = true,
 				[CONSTANTS.ITEM_CATEGORIES.SHADOWLANDS] = true,
 				[CONSTANTS.ITEM_CATEGORIES.DRAGONFLIGHT] = true,
+				[CONSTANTS.ITEM_CATEGORIES.TWW] = true,
 			},
 			collectionType = {
 				[CONSTANTS.ITEM_TYPES.MOUNT] = true,

diff --git a/Rarity.toc b/Rarity.toc
@@ -81,6 +81,7 @@ DB\Mounts\Legion.lua
 DB\Mounts\BattleForAzeroth.lua
 DB\Mounts\Shadowlands.lua
 DB\Mounts\Dragonflight.lua
+DB\Mounts\TheWarWithin.lua
 
 ## Pets
 DB\Pets\HolidayEvents.lua
@@ -94,6 +95,7 @@ DB\Pets\Legion.lua
 DB\Pets\BattleForAzeroth.lua
 DB\Pets\Shadowlands.lua
 DB\Pets\Dragonflight.lua
+DB\Pets\TheWarWithin.lua
 
 ## Toys (and other items, for now...)
 DB\Toys\HolidayEvents.lua
@@ -107,6 +109,7 @@ DB\Toys\Legion.lua
 DB\Toys\BattleForAzeroth.lua
 DB\Toys\Shadowlands.lua
 DB\Toys\Dragonflight.lua
+DB\Toys\TheWarWithin.lua
 
 # Utility/Helpers
 Utils\DebugCache.lua

diff --git a/Utils/Sorting.lua b/Utils/Sorting.lua
@@ -25,6 +25,7 @@ local catOrder = {
 	[CONSTANTS.ITEM_CATEGORIES.BFA] = 8,
 	[CONSTANTS.ITEM_CATEGORIES.SHADOWLANDS] = 9,
 	[CONSTANTS.ITEM_CATEGORIES.DRAGONFLIGHT] = 10,
+	[CONSTANTS.ITEM_CATEGORIES.TWW] = 11,
 }
 
 local function compareCategory(a, b)