Some PvP Headers

ATTWoWAddon · Apr 18, 2024 · 2dae116 · 2dae116
1 parent 5e1fd0c
commit 2dae116
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 52 deletions.
diff --git a/.contrib/Parser/DATAS/08 - PvP/10 Dragonflight PvP Seasons/Dragonflight Season 1 Crimson.lua b/.contrib/Parser/DATAS/08 - PvP/10 Dragonflight PvP Seasons/Dragonflight Season 1 Crimson.lua
@@ -45,16 +45,14 @@ root(ROOTS.PVP, pvp(expansion(EXPANSION.DF, bubbleDown({ ["timeline"] = { ADDED_
 				-- Solo
 				ach(17339, {	-- Crimson Legend: Dragonflight Season 1
 					i(206343, {		-- Crimson Legend's Pennant (TOY!)
-					--	["description"] = "This toy called 'Crimson Legend's Pennant' will be retroactively awarded to this Feat of Strength in Patch 10.1. Until then the Item will not load.\n\nIt is only shown to provide awareness & will be tagged correctly once Patch 10.1 is out.",
+						["timeline"] = { ADDED_10_1_0, REMOVED_10_1_0 },
 					}),
 				}),
 				ach(16734, {	-- Crimson Soloist: Dragonflight Season 1
 					title(482),	-- Crimson Soloist <Name>
 				}),
 				-- Fashion
-				ach(16764, {		-- Crimson Carpet Fashion
-				--	["timeline"] = { ADDED_10_0_2_LAUNCH },
-				}),
+				ach(16764),	-- Crimson Carpet Fashion
 			})),
 			filter(MOUNTS, bubbleDownSelf({ ["timeline"] = { ADDED_10_0_2_LAUNCH, REMOVED_10_1_0 } }, {
 				i(201789, {	-- Vicious Sabertooth [A] (MOUNT!)

diff --git a/...trib/Parser/DATAS/08 - PvP/10 Dragonflight PvP Seasons/Dragonflight Season 2 Obsidian.lua b/...trib/Parser/DATAS/08 - PvP/10 Dragonflight PvP Seasons/Dragonflight Season 2 Obsidian.lua
@@ -49,9 +49,6 @@ root(ROOTS.PVP, pvp(expansion(EXPANSION.DF, bubbleDown({ ["timeline"] = { ADDED_
 				ach(17767, {	-- Obsidian Legend: Dragonflight Season 2
 					title(500),	-- Obsidian Legend <Name>
 				}),
-				--ach(00000, {	-- Obsidian Soloist: Dragonflight Season 2
-				--	title(),	-- Obsidian Soloist <Name>
-				--}),
 				-- Fashion
 				ach(18249),		-- Obsidian Tie Event
 			})),

diff --git a/.contrib/Parser/DATAS/08 - PvP/World.lua b/.contrib/Parser/DATAS/08 - PvP/World.lua
@@ -1,34 +1,58 @@
 -----------------------------------------------
 --      P L A Y E R   V S   P L A Y E R      --
 -----------------------------------------------
-root(ROOTS.PVP, pvp(n(-10058, {	-- World
-	expansion(EXPANSION.BFA, bubbleDown({ ["timeline"] = { "added 8.0.1" } }, {
+BOUNTY = createHeader({
+	readable = "Bounty",
+	icon = "Interface\\Icons\\Inv_bountyhunting",
+	text = {
+		en = "Bounty",
+		es = "Prima",
+		de = "Kopfgeld",
+		fr = "Prime",
+		it = "Premio",
+		pt = "Recompensa",
+		ru = "Премия",
+		ko = "하사품",
+		cn = "赏金任务",
+	},
+});
+WORLD_PVP = createHeader({
+	readable = "World PvP",
+	icon = [[~_.asset("Category_Zones")]],
+	text = {
+		en = "World PvP",
+	},
+});
+root(ROOTS.PVP, pvp(n(WORLD_PVP, {
+	expansion(EXPANSION.BFA, bubbleDown({ ["timeline"] = { ADDED_8_0_1_LAUNCH } }, {
 		n(ACHIEVEMENTS, {
 			ach(12567),	-- The Horde Slayer
 			ach(12568),	-- The Alliance Slayer
 		}),
-		n(BOUNTY, {	-- Bounty (for later). Contains every aspirant gear as well
+		n(BOUNTY, {
 			i(163825),	-- Plundered Supplies
-			i(170539),	-- Plunderer Supplies (Nazjartar and maybe Mechagnom)
+			i(170539, {	-- Plunderer Supplies
+				["timeline"] = { ADDED_8_2_0 },
+			}),
 		}),
-		n(-488,	{	-- War Chest
+		n(TREASURES, {
 			["description"] = "Contains Dread Aspirant Gear if you are Level 10-49 and Sinister Aspirant Gear at Level 50.",
 		}),
 		n(QUESTS, {
-			q(58274, bubbleDownSelf({["timeline"] = { "added 8.3.0.33062", REMOVED_9_0_1 } },{	-- Servant of N'Zoth
+			q(58274, bubbleDownSelf({["timeline"] = { ADDED_8_3_0, REMOVED_9_0_1 } },{	-- Servant of N'Zoth
 				["races"] = ALLIANCE_ONLY,
 				["description"] = "Granted upon killing 10 Horde players without dying after you became an Assassin.",
 				["g"] = {
-					title(414),	-- %s, Servant of N'Zoth
+					title(414),	-- <Name>, Servant of N'Zoth
 					i(173951),	-- N'lyeth, Sliver of N'Zoth (TOY!)
 					i(174020),	-- N'lyeth, Sliver of N'Zoth (Q Item)
 				},
 			})),
-			q(58273, bubbleDownSelf({["timeline"] = { "added 8.3.0.33062", REMOVED_9_0_1 } },{	-- Servant of N'Zoth
+			q(58273, bubbleDownSelf({["timeline"] = { ADDED_8_3_0, REMOVED_9_0_1 } },{	-- Servant of N'Zoth
 				["races"] = HORDE_ONLY,
 				["description"] = "Granted upon killing 10 Alliance players without dying after you became an Assassin.",
 				["g"] = {
-					title(414),	-- %s, Servant of N'Zoth
+					title(414),	-- <Name>, Servant of N'Zoth
 					i(173951),	-- N'lyeth, Sliver of N'Zoth (TOY!)
 					i(174020),	-- N'lyeth, Sliver of N'Zoth (Q Item)
 				},
@@ -47,9 +71,9 @@ root(ROOTS.PVP, pvp(n(-10058, {	-- World
 			})),
 		}),
 	})),
-	expansion(EXPANSION.SL, bubbleDown({ ["timeline"] = { ADDED_9_0_2 } }, {
-		n(BOUNTY, {	-- Bounty (for later). Contains every aspirant gear as well
-			i(184810),	-- Plundered Supplies [Shadowlands-Maldraxxus-(Ore)]
+	expansion(EXPANSION.SL, bubbleDown({ ["timeline"] = { ADDED_9_0_2_LAUNCH } }, {
+		n(BOUNTY, {
+			i(184810),	-- Plundered Supplies
 		}),
 	})),
 	expansion(EXPANSION.DF, bubbleDown({ ["timeline"] = { ADDED_10_0_2_LAUNCH } }, {
@@ -131,7 +155,7 @@ root(ROOTS.PVP, pvp(n(-10058, {	-- World
 					16599,	-- A Champion's Pursuit
 				}},
 				["g"] =	{
-					title(479),	-- Malicious %s
+					title(479),	-- Malicious <Name>
 				},
 			}),
 			ach(16613, {	-- Finder's Keepers

diff --git a/.contrib/Parser/lib/Headers/Common/Bounty.lua b/.contrib/Parser/lib/Headers/Common/Bounty.lua
diff --git a/locales/cn.lua b/locales/cn.lua
@@ -543,8 +543,6 @@ for key,value in pairs({
 		[-361] = GetSpellInfo(182108).." 塔",						-- Artillery Tower
 	-- BFA Outposts
 		[-397] = "哨站",												-- Outposts
-	-- BFA War Chest
-		[-488] = "战争宝箱",											-- Daily War Chest
 	-- Misc
 		[-493] = "要塞任务拾取",										-- Header for WoD Mission Loot
 	-- Blizzard Events and Anniversaries

diff --git a/locales/en.lua b/locales/en.lua
@@ -758,8 +758,6 @@ for key, value in pairs({
 		[-392] = "Interface\\Icons\\achievement_guildperk_hastyhearth",						-- Hearthfire Tavern (horde)
 	-- BFA Outposts
 		[-397] = "Interface\\Icons\\inv_icon_daily_mission_scroll",							-- Outposts
-	-- BFA War Chest
-		[-488] = "Interface\\Icons\\inv_misc_treasurechest04b",								-- Daily War Chest
 	-- Misc
 		[-493] = "Interface\\Icons\\Inv_icon_mission_complete_order",						-- Temporary Header WoD Mission Loot
 	-- Blizzard Events and Anniversaries
@@ -867,7 +865,6 @@ for key, value in pairs({
 	-- Is Used Somewhere
 		[-10048] = "Interface\\Icons\\buff_feltreasures",							-- Mage Tower
 		[-10050] = "Interface\\Icons\\buff_epichunter",								-- Nether Disruptor
-		[-10058] = app.asset("Category_Zones"),										-- World
 	-- 8.3
 		[-10071] = "Interface\\Icons\\Paladin_Protection",							-- Vision of N'zotth
 		[-10072] = "Interface\\Icons\\ability_deathwing_assualtaspects",			-- N'Zoth Assault
@@ -935,8 +932,6 @@ for key, value in pairs({
 		[-392] = C_Map.GetAreaInfo(7290),										-- Hearthfire Tavern
 	-- BFA Outposts
 		[-397] = "Outposts",													-- Outposts
-	-- BFA War Chest
-		[-488] = "War Chest",													-- Daily War Chest
 	-- Misc
 		[-493] = "Garrison Mission Loot",										-- Header for WoD Mission Loot
 	-- Blizzard Events and Anniversaries
@@ -1057,7 +1052,6 @@ for key, value in pairs({
 	------ ACHIEVEMENT HEADERS SECTION ------
 		[-10048] = BROKENSHORE_BUILDING_MAGETOWER,								-- Mage Tower
 		[-10050] = BROKENSHORE_BUILDING_NETHERDISRUPTOR,						-- Nether Disruptor
-		[-10058] = WORLD,														-- World
 	-- 8.3
 		[-10071] = "Visions of N'Zoth",
 		[-10072] = "N'Zoth Assault",

diff --git a/locales/fr.lua b/locales/fr.lua
@@ -524,8 +524,6 @@ for key,value in pairs({
 		[-255] = "Armure ancestrale",								-- Heritage
 	-- BFA Outposts
 		[-397] = "Avant-postes",									-- Outposts
-	-- BFA War Chest
-		[-488] = "Coffre de Guerre",								-- Daily War Chest
 	-- Misc
 		[-520] = "Pré-Lancement de l’Extension",					-- Expansion Pre-Launch
 		[-543] = "Invasions de Legion ",							-- Legion Invasions

diff --git a/locales/ru.lua b/locales/ru.lua
@@ -474,7 +474,7 @@ local L = app.L;
 		--TODO: L.ARTIFACT_RELIC_COMPLETION = "Artifact Relic Completion";
 		--TODO: L.NOT_TRADEABLE = "Not Tradeable";
 		--TODO: L.TRADEABLE = "Tradeable";
-		
+
 	-- Keybind usage
 		--TODO: L.ENABLED = "enabled";
 		--TODO: L.DISABLED = "disabled";
@@ -524,8 +524,6 @@ for key,value in pairs({
 		[-361] = "Артиллерийная башня",								-- Artillery Tower
 	-- BFA Outposts
 		[-397] = "Аванпосты",										-- Outposts
-	-- BFA War Chest
-		[-488] = "Трофейный сундук",								-- Daily War Chest
 	-- Misc
 		[-493] = "Сломанный лут с миссий",							-- Broken Mission Loot
 	-- Blizzard Events and Anniversaries