Clean up on PvP module

snowflame0 · Jun 1, 2024 · 9978594 · 9978594
1 parent 92d5cb5
commit 9978594
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 61 deletions.
diff --git a/AtlasLootClassic_Collections/data-cata.lua b/AtlasLootClassic_Collections/data-cata.lua
@@ -67,7 +67,7 @@ local PURPLE = "|cff9900ff%s|r"
 -- local WHIT = "|cffffffff%s|r"
 
 data["JusticePoints"] = {
-    name = format(AL["%s Vendor"], AL["Justice Points"]),
+    name = format(AL["'%s' Vendor"], AL["Justice Points"]),
     ContentType = VENDOR_CONTENT,
     TableType = NORMAL_ITTYPE,
     gameVersion = AtlasLoot.CATA_VERSION_NUM,
@@ -196,7 +196,7 @@ data["JusticePoints"] = {
 }
 
 data["ValorPoints"] = {
-    name = format(AL["%s Vendor"], AL["Valor Points"]),
+    name = format(AL["'%s' Vendor"], AL["Valor Points"]),
     ContentType = VENDOR_CONTENT,
     TableType = NORMAL_ITTYPE,
     gameVersion = AtlasLoot.CATA_VERSION_NUM,

diff --git a/AtlasLootClassic_Collections/data.lua b/AtlasLootClassic_Collections/data.lua
@@ -506,6 +506,7 @@ data["TierSets"] = {
 		AtlasLoot:GameVersion_GE(AtlasLoot.CATA_VERSION_NUM, {
             name = format(AL["Tier %s Sets"], "11"),
             CoinTexture = "CATA",
+			contentPhaseCata = 1,
 			[NORMAL_DIFF] = {
                 {1, 4000925}, -- Death Knight Normal DPS Set
                 {2, 4000926}, -- Death Knight Normal Tank Set
@@ -552,6 +553,7 @@ data["TierSets"] = {
         AtlasLoot:GameVersion_GE(AtlasLoot.CATA_VERSION_NUM, {
             name = format(AL["Tier %s Sets"], "12"),
             CoinTexture = "CATA",
+			contentPhaseCata = 2,
             [NORMAL_DIFF] = {
                 {1, 4000944}, -- Death Knight Normal DPS Set
                 {2, 4000945}, -- Death Knight Normal Tank Set
@@ -598,6 +600,7 @@ data["TierSets"] = {
         AtlasLoot:GameVersion_GE(AtlasLoot.CATA_VERSION_NUM, {
             name = format(AL["Tier %s Sets"], "13"),
             CoinTexture = "CATA",
+			contentPhaseCata = 3,
             [LFR_DIFF] = {
                 {1, 4000963}, -- Death Knight Normal DPS Set
                 {2, 4000964}, -- Death Knight Normal Tank Set
@@ -669,6 +672,7 @@ data["DungeonSets"] = {
 	name = AL["Dungeon Sets"],
 	ContentType = SET_CONTENT,
 	TableType = SET_ITTYPE,
+	gameVersion = AtlasLoot.BC_VERSION_NUM,
 	items = {
 		{ -- T0 / D1
 			name = format(AL["Dungeon Set %s"], "1"),
@@ -1417,6 +1421,7 @@ data["FishingExtravaganza"] = {
 	ContentType = WORLD_EVENT_CONTENT,
 	LoadDifficulty = NORMAL_DIFF,
 	TableType = NORMAL_ITTYPE,
+	gameVersion = AtlasLoot.CLASSIC_VERSION_NUM,
 	items = {
 		{ -- FishingExtravaganza
 			name = AL["Stranglethorn Fishing Extravaganza"],
@@ -1443,6 +1448,7 @@ data["LunarFestival"] = {
 	ContentType = WORLD_EVENT_CONTENT,
 	LoadDifficulty = NORMAL_DIFF,
 	TableType = NORMAL_ITTYPE,
+	gameVersion = AtlasLoot.CLASSIC_VERSION_NUM,
 	items = {
 		{ -- LunarFestival1
 			name = AL["Lunar Festival"],
@@ -1544,6 +1550,7 @@ data["Noblegarden"] = {
 	ContentType = WORLD_EVENT_CONTENT,
 	LoadDifficulty = NORMAL_DIFF,
 	TableType = NORMAL_ITTYPE,
+	gameVersion = AtlasLoot.CLASSIC_VERSION_NUM,
 	items = {
 		{ -- Noblegarden
 			name = AL["Brightly Colored Egg"],
@@ -1608,6 +1615,7 @@ data["HarvestFestival"] = {
 	ContentType = WORLD_EVENT_CONTENT,
 	LoadDifficulty = NORMAL_DIFF,
 	TableType = NORMAL_ITTYPE,
+	gameVersion = AtlasLoot.BC_VERSION_NUM,
 	items = {
 		{ -- HarvestFestival
 			name = AL["Harvest Festival"],
@@ -1687,6 +1695,7 @@ data["WinterVeil"] = {
 	ContentType = WORLD_EVENT_CONTENT,
 	LoadDifficulty = NORMAL_DIFF,
 	TableType = NORMAL_ITTYPE,
+	gameVersion = AtlasLoot.CLASSIC_VERSION_NUM,
 	items = {
 		{ -- Winterviel1
 			name = AL["Misc"],

diff --git a/AtlasLootClassic_PvP/data-cata.lua b/AtlasLootClassic_PvP/data-cata.lua
@@ -13,10 +13,10 @@ local format = string.format
 -- ----------------------------------------------------------------------------
 local addonname, private = ...
 local AtlasLoot = _G.AtlasLoot
-if AtlasLoot:GameVersion_LT(AtlasLoot.WRATH_VERSION_NUM) then
+if AtlasLoot:GameVersion_LT(AtlasLoot.CATA_VERSION_NUM) then
     return
 end
-local data = AtlasLoot.ItemDB:Add(addonname, 1, AtlasLoot.WRATH_VERSION_NUM)
+local data = AtlasLoot.ItemDB:Add(addonname, 1, AtlasLoot.CATA_VERSION_NUM)
 
 local AL = AtlasLoot.Locales
 local ALIL = AtlasLoot.IngameLocales
@@ -54,68 +54,12 @@ local GENERAL_CONTENT = data:AddContentType(GENERAL, ATLASLOOT_RAID40_COLOR)
 local HORDE, ALLIANCE, RANK_FORMAT = "Horde", "Alliance", AL["|cff33ff99Rank:|r %s"]
 local BLIZZARD_NYI = " |cff00ccff<NYI |T130946:12:20:0:0:32:16:4:28:0:16|t>|r"
 
-local _DUMMY_SET = {
-    name = AL["Sets"],
-    TableType = SET_ITTYPE,
-    [SET1_DIFF] = {{1, 3000780}, -- Warlock
-    {3, 3000777}, -- Priest / Heal
-    {4, 3000778}, -- Priest / Shadow
-    {6, 3000776}, -- Rogue
-    {8, 3000772}, -- Hunter
-    {10, 3000780}, -- Warrior / DD
-    {13, 3000768}, -- Deathknight
-    {16, 3000779}, -- Mage
-    {18, 3000773}, -- Druid / Heal
-    {19, 3000774}, -- Druid / Owl
-    {20, 3000775}, -- Druid / Feral
-    {22, 3000771}, -- Shaman / Heal
-    {23, 3000769}, -- Shaman / Ele
-    {24, 3000770}, -- Shaman / Enh
-    {26, 3000767}, -- Paladin / Heal
-    {27, 3000766} -- Paladin / DD
-    },
-    [SET2_DIFF] = {{1, 3001780}, -- Warlock
-    {3, 3001777}, -- Priest / Heal
-    {4, 3001778}, -- Priest / Shadow
-    {6, 3001776}, -- Rogue
-    {8, 3001772}, -- Hunter
-    {10, 3001780}, -- Warrior / DD
-    {13, 3001768}, -- Deathknight
-    {16, 3001779}, -- Mage
-    {18, 3001773}, -- Druid / Heal
-    {19, 3001774}, -- Druid / Owl
-    {20, 3001775}, -- Druid / Feral
-    {22, 3001771}, -- Shaman / Heal
-    {23, 3001769}, -- Shaman / Ele
-    {24, 3001770}, -- Shaman / Enh
-    {26, 3001767}, -- Paladin / Heal
-    {27, 3001766} -- Paladin / DD
-    },
-    [SET3_DIFF] = {{1, 3002780}, -- Warlock
-    {3, 3002777}, -- Priest / Heal
-    {4, 3002778}, -- Priest / Shadow
-    {6, 3002776}, -- Rogue
-    {8, 3002772}, -- Hunter
-    {10, 3002780}, -- Warrior / DD
-    {13, 3002768}, -- Deathknight
-    {16, 3002779}, -- Mage
-    {18, 3002773}, -- Druid / Heal
-    {19, 3002774}, -- Druid / Owl
-    {20, 3002775}, -- Druid / Feral
-    {22, 3002771}, -- Shaman / Heal
-    {23, 3002769}, -- Shaman / Ele
-    {24, 3002770}, -- Shaman / Enh
-    {26, 3002767}, -- Paladin / Heal
-    {27, 3002766} -- Paladin / DD
-    }
-}
-
 data["PvPMountsCata"] = {
     name = ALIL["Mounts"],
     ContentType = GENERAL_CONTENT,
     LoadDifficulty = LOAD_DIFF,
     CorrespondingFields = private.MOUNTS_LINK,
-    items = {{ -- PvPMountsPvP
+    items = {{ -- PvPMountsCata
         name = ALIL["Mounts"],
         [NORMAL_DIFF] = {
             {1, 72140}, -- Vicious War Wolf

diff --git a/AtlasLootClassic_PvP/data-wrath.lua b/AtlasLootClassic_PvP/data-wrath.lua
@@ -54,6 +54,7 @@ local GENERAL_CONTENT = data:AddContentType(GENERAL, ATLASLOOT_RAID40_COLOR)
 local HORDE, ALLIANCE, RANK_FORMAT = "Horde", "Alliance", AL["|cff33ff99Rank:|r %s"]
 local BLIZZARD_NYI = " |cff00ccff<NYI |T130946:12:20:0:0:32:16:4:28:0:16|t>|r"
 
+--[[
 local _DUMMY_SET = {
     name = AL["Sets"],
     TableType = SET_ITTYPE,
@@ -109,6 +110,7 @@ local _DUMMY_SET = {
     {27, 3002766} -- Paladin / DD
     }
 }
+--]]
 
 data["PvPMountsWrath"] = {
     name = ALIL["Mounts"],

diff --git a/AtlasLootClassic_PvP/data.lua b/AtlasLootClassic_PvP/data.lua
@@ -43,6 +43,7 @@ local SET_EXTRA_ITTYPE = data:AddExtraItemTableType("Set")
 local PVP_CONTENT = data:AddContentType(AL["Battlegrounds"], ATLASLOOT_PVP_COLOR)
 local GENERAL_CONTENT = data:AddContentType(GENERAL, ATLASLOOT_RAID40_COLOR)
 
+--[[
 local KEYS = {	-- Keys
 	name = AL["Keys"],
 	TableType = NORMAL_ITTYPE,
@@ -79,6 +80,7 @@ local KEYS = {	-- Keys
 		{ 30, 21986 },
 	},
 }
+--]]
 
 local HORDE, ALLIANCE, RANK_FORMAT = "Horde", "Alliance", AL["|cff33ff99Rank:|r %s"]
 local GetRankName, GetRankIcon = AtlasLoot.Data.Requirements.GetPvPRankName, AtlasLoot.Data.Requirements.GetPvPRankIcon