Integrating changes by Firsthunterz

snowflame0 · Oct 1, 2024 · c0c2f54 · c0c2f54
1 parent cad0e64
commit c0c2f54
Show file tree

Hide file tree

Showing 10 changed files with 541 additions and 361 deletions.
diff --git a/AtlasLootClassic/Data/ItemSet.lua b/AtlasLootClassic/Data/ItemSet.lua
@@ -1211,7 +1211,7 @@ if AtlasLoot:GameVersion_GE(AtlasLoot.CATA_VERSION_NUM) then
 	[40001018] = {{70944,70941,70945,70943,70942},4,4,378,1,{{2,99239},{4,99242}},nil,1018}, -- Normal Warrior Prot
 	[40011018] = {{71606,71608,71604,71605,71607},4,4,391,1,{{2,99239},{4,99242}},AL["Heroic %s"],1018}, -- Heroic Warrior Prot
 
-	-- T13
+       -- T13
     -- Death Knight
     [1056] = {{78792,78846,78758,78733,78811},4,4,384,32,{{2,105552},{4,105587}}}, -- TANK
 	[1057] = {{78782,78831,78754,78765,78802},4,4,384,32,{{2,105609},{4,105646}}}, -- DPS
@@ -1241,6 +1241,11 @@ if AtlasLoot:GameVersion_GE(AtlasLoot.CATA_VERSION_NUM) then
     -- Warrior
     [1073] = {{78783,78830,78752,78763,78801},4,4,384,1,{{2,105797},{4,105907}}}, -- DPS
     [1074] = {{78784,78829,78753,78764,78800},4,4,384,1,{{2,105908},{4,105911}}}, -- Prot
+    -- Misc Sets
+    [1087] = {{77949,77950},0,4,416,0,{{2,109939}}}, -- Fangs of the Father
+    [1088] = {{77947,77948},0,4,406,0,{{2,109956}}}, -- Maw of Oblivion
+    [1089] = {{77945,77946},0,4,397,0,{{2,109960}}}, -- Jaws of Retribution
+    [951] = {{63537,63538},0,4,359,0,{{2,95763}}}, -- Agony and Torment
 
     -- Death Knight
     [40001057] = {{78782,78831,78754,78765,78802},4,4,384,32,{{2,105609},{4,105646}},nil,1057}, -- LFR Death Knight DPS
@@ -1251,19 +1256,19 @@ if AtlasLoot:GameVersion_GE(AtlasLoot.CATA_VERSION_NUM) then
     [40011056] = {{78792,78846,78758,78773,78811},4,4,397,32,{{2,105552},{4,105587}},nil,1056},	-- Normal Death Knight Tanking
     [40021056] = {{78697,78751,78663,78678,78716},4,4,410,32,{{2,105552},{4,105587}},AL["Heroic %s"],1056},	-- Heroic Death Knight Tanking
     -- Druid
-    [40001058] = {{71098,71101,71100,71097,71099},2,4,384,1024,{{2,105725},{4,60142}},nil,1058}, -- LFR Druid Melee DPS
+    [40001058] = {{78789,78838,78760,78779,78808},2,4,384,1024,{{2,105725},{4,60142}},nil,1058}, -- LFR Druid Melee DPS
     [40011058] = {{77015,77017,77013,77014,77016},2,4,397,1024,{{2,105725},{4,60142}},nil,1058}, -- Normal Druid Melee DPS
     [40021058] = {{78694,78743,78665,78684,78713},2,4,410,1024,{{2,105725},{4,60142}},AL["Heroic %s"],1058}, -- Heroic Druid Melee DPS
 
-    [40001060] = {{71103,71106,71105,71102,71104},2,4,384,1024,{{2,105715},{4,105770}},nil,1060}, -- LFR Druid Restoration
+    [40001060] = {{78785,78835,78755,78775,78805},2,4,384,1024,{{2,105715},{4,105770}},nil,1060}, -- LFR Druid Restoration
     [40011060] = {{76750,76753,76752,76749,76751},2,4,397,1024,{{2,105715},{4,105770}},nil,1060}, -- Normal Druid Restoration
     [40021060] = {{78690,78740,78660,78680,78710},2,4,410,1024,{{2,105715},{4,105770}},AL["Heroic %s"],1060}, -- Heroic Druid Restoration
 
     [40001059] = {{78791,78839,78757,78771,78809},2,4,384,1024,{{2,105722},{4,105717}},nil,1059}, -- LFR Druid Balance
     [40011059] = {{77019,77022,77021,77018,77020},2,4,397,1024,{{2,105722},{4,105717}},nil,1059}, -- Normal Druid Balance
     [40021059] = {{78696,78744,78662,78676,78714},2,4,410,1024,{{2,105722},{4,105717}},AL["Heroic %s"],1059}, -- Heroic Druid Balance
     -- Hunter
-    [40001061] = {{78690,78740,78660,78680,78710},3,4,384,4,{{2,105732},{4,105921}},nil,1061}, -- LFR Hunter
+    [40001061] = {{78793,78832,78756,78769,78804},3,4,384,4,{{2,105732},{4,105921}},nil,1061}, -- LFR Hunter
     [40011061] = {{77030,77032,77028,77029,77031},3,4,397,4,{{2,105732},{4,105921}},nil,1061}, -- Normal Hunter
     [40021061] = {{78698,78737,78661,78674,78709},3,4,410,4,{{2,105732},{4,105921}},AL["Heroic %s"],1061}, -- Heroic Hunter
     -- Mage
@@ -1858,6 +1863,10 @@ if AtlasLoot:GameVersion_GE(AtlasLoot.CATA_VERSION_NUM) then
     ITEM_TO_SET_DATA.CATA = {
 		[60341] = 4000925, [60343] = 4000925, [60339] = 4000925, [60340] = 4000925, [60342] = 4000925,
 		[65181] = 4001925, [65183] = 4001925, [65179] = 4001925, [65180] = 4001925, [65182] = 4001925,
+                [77949] = 1087, [77950] = 1087,
+                [77947] = 1088, [77948] = 1088,
+                [77945] = 1089, [77946] = 1089,
+                [63537] = 951, [63538] = 951,
 	}
 end
 

diff --git a/AtlasLootClassic/Data/Token.lua b/AtlasLootClassic/Data/Token.lua
@@ -1121,7 +1121,8 @@ if AtlasLoot:GameVersion_GE(AtlasLoot.WRATH_VERSION_NUM) then
 		["BH_AL_PALADIN_D"] = {76875, 76877, 0, 73570, 73568, type = 9},
 		["BH_AL_PALADIN_T"] = {77004, 77006, type = 9},
 		--- Misc
-		[44951] = { { 41119, "24-40" }, type = 11 }
+		[44951] = { { 41119, "24-40" }, type = 11 },
+		[71086] = {71084, 71085}, -- Dragonwrath, Tarecgosa's Rest
 	}
 end
 

diff --git a/AtlasLootClassic_Collections/data-cata.lua b/AtlasLootClassic_Collections/data-cata.lua
@@ -66,8 +66,8 @@ local _RED = "|cffcc6666%s|r"
 local PURPLE = "|cff9900ff%s|r"
 -- local WHIT = "|cffffffff%s|r"
 
-data["JusticePoints"] = {
-    name = format(AL["'%s' Vendor"], AL["Justice Points"]),
+data["JusticePoints P1"] = {
+    name = format(AL["'%s' Vendor"], AL["Justice Points P1"]),
     ContentType = VENDOR_CONTENT,
     TableType = NORMAL_ITTYPE,
     gameVersion = AtlasLoot.CATA_VERSION_NUM,
@@ -195,8 +195,8 @@ data["JusticePoints"] = {
     }}
 }
 
-data["ValorPoints"] = {
-    name = format(AL["'%s' Vendor"], AL["Valor Points"]),
+data["ValorPoints P1"] = {
+    name = format(AL["'%s' Vendor"], AL["Valor Points P1"]),
     ContentType = VENDOR_CONTENT,
     TableType = NORMAL_ITTYPE,
     gameVersion = AtlasLoot.CATA_VERSION_NUM,
@@ -331,6 +331,143 @@ data["ValorPoints"] = {
     }}
 }
 
+data["ValorPoints P2"] = {
+    name = format(AL["'%s' Vendor"], AL["Valor Points P2"]),
+    ContentType = VENDOR_CONTENT,
+    TableType = NORMAL_ITTYPE,
+    gameVersion = AtlasLoot.CATA_VERSION_NUM,
+    items = {{
+        name = ALIL["Armor"] .. " - " .. ALIL["Cloth"],
+        [NORMAL_DIFF] = {
+        -- Mage
+        {1, 71289}, -- Firehawk Robes
+        {2, 71286}, -- Firehawk Gloves
+        {3, 71288}, -- Firehawk Leggings
+        -- Warlock
+        {5, 71284}, -- Balespider's Robes
+        {6, 71281}, -- Balespider's Handwraps
+        {7, 71283}, -- Balespider's Leggings
+        -- Priest
+        {16, 71274}, -- Robes of the Cleansing Flame
+        {17, 71271}, -- Handwraps of the Cleansing Flame
+        {18, 71273}, -- Legwraps of the Cleansing Flame
+        {20, 71279}, -- Vestment of the Cleansing Flame
+        {21, 71276}, -- Gloves of the Cleansing Flame
+        {22, 71278}, -- Leggings of the Cleansing Flame
+        -- Misc
+        {9, 71265}, -- Emberflame Bracers
+        {10, 71266} -- Firesoul Wristguards
+        }
+    }, {
+        name = ALIL["Armor"] .. " - " .. ALIL["Leather"],
+        [NORMAL_DIFF] = { -- Druid
+        {1, 71105}, -- Obsidian Arborweave Tunic
+        {2, 71102}, -- Obsidian Arborweave Handwraps
+        {3, 71104}, -- Obsidian Arborweave Legwraps
+        {5, 71100}, -- Obsidian Arborweave Raiment
+        {6, 71097}, -- Obsidian Arborweave Grips
+        {7, 71099}, -- Obsidian Arborweave Legguards
+        {9, 71110}, -- Obsidian Arborweave Vestment
+        {10, 71107}, -- Obsidian Arborweave Gloves
+        {11, 71109}, -- Obsidian Arborweave Leggings
+        -- Rouge
+        {16, 71045}, -- Dark Phoenix Tunic
+        {17, 71046}, -- Dark Phoenix Gloves
+        {18, 71048}, -- Dark Phoenix Legguards
+        -- Misc
+        {13, 71262}, -- Smolderskull Bindings
+        {14, 71130} -- Flamebinder Bracers
+        }
+    }, {
+        name = ALIL["Armor"] .. " - " .. ALIL["Mail"],
+        [NORMAL_DIFF] = { -- Shaman
+        {1, 71294}, -- Erupting Volcanic Hauberk
+        {2, 71292}, -- Erupting Volcanic Gloves 
+        {3, 71291}, -- Erupting Volcanic Kilt
+        {5, 71296}, -- Erupting Volcanic Tunic
+        {6, 71297}, -- Erupting Volcanic Handwraps
+        {7, 71299}, -- Erupting Volcanic Legwraps
+        {9, 71301}, -- Erupting Volcanic Cuirass
+        {10, 71302}, -- Erupting Volcanic Grips
+        {11, 71304}, -- Erupting Volcanic Legguards
+        -- Rouge
+        {16, 71054}, -- Flamewalker's Tunic
+        {17, 71050}, -- Flamewalker's Gloves
+        {18, 71052}, -- Flamewalker's Legguards
+        -- Misc
+        {13, 71263}, -- Bracers of Misting Ash
+        {14, 71264} -- Bracers of Forked Lightning
+        }
+    }, {
+        name = ALIL["Armor"] .. " - " .. ALIL["Plate"],
+        [NORMAL_DIFF] = { -- Paladin
+        {1, 71091}, -- Immolation Breastplate
+        {2, 71092}, -- Immolation Sapphirium Gloves
+        {3, 71094}, -- Immolation Sapphirium Greaves
+        {4, 71063}, -- Immolation Sapphirium Battleplate
+        {5, 71064}, -- Immolation Sapphirium Gauntlets
+        {6, 71066}, -- Immolation Sapphirium Legplates
+        {7, 70950}, -- Immolation Sapphirium Chestguard
+        {8, 70949}, -- Immolation Sapphirium Handguards
+        {9, 70947}, -- Immolation Sapphirium Legguards
+        -- DK
+        {11, 71058}, -- Elementium Deathplate Breastplate
+        {12, 71059}, -- Elementium Deathplate Gauntlets
+        {13, 71061}, -- Elementium Deathplate Greaves
+        {16, 70955}, -- Elementium Deathplate Chestguard
+        {17, 70953}, -- Elementium Deathplate Handguards
+        {18, 70952}, -- Elementium Deathplate Legguards
+        -- Warrior
+        {20, 71068}, -- Battleplate of the Molten Giant
+        {21, 71069}, -- Gauntlets of the Molten Giant
+        {22, 71071}, -- Legplates of the Molten Giant
+        {24, 70945}, -- Chestguard of the Molten Giant
+        {25, 70943}, -- Handguards of the Molten Giant
+        {26, 70942}, -- Legguards of the Molten Giant
+        -- Misc
+        {28, 71260}, -- Bracers of Imperious Truths
+        {29, 70937}, -- Bracers of Regal Force
+        {30, 71261} -- Gigantform Bracers
+        }
+    }, {
+        name = ALIL["Armor"] .. " - " .. ALIL["Neck"],
+        [NORMAL_DIFF] = { -- Head
+        {1, 71213}, -- Amulet of Burning Brilliance
+        {2, 71214}, -- Firemind Pendant
+        {3, 71129}, -- Necklace of Smoke Signals
+        {4, 71212}, -- Stoneheart Choker
+        {5, 70935} -- Stoneheart Necklace
+        }
+    }, {
+        name = ALIL["Armor"] .. " - " .. ALIL["Ring"],
+        [NORMAL_DIFF] = { -- Head
+        {1, 71210}, -- Crystalline Brimstone Ring
+        {2, 70940}, -- Deflecting Brimstone Band
+        {3, 71208}, -- Serrated Brimstone Signet
+        {4, 71211}, -- Soothing Brimstone Circle
+        {5, 71209} -- Splintered Brimstone Seal
+        }
+    }, {
+        name = ALIL["Relic"],
+        [NORMAL_DIFF] = { -- Head
+        {1, 70939}, -- Deathclutch Figurine
+        {2, 71147}, -- Relic of the Elemental Lords
+        {3, 71149}, -- Singed Plume of Aviana
+        {4, 71146}, -- Covenant of the Flame
+        {5, 71148} -- Soulflame Vial
+        }
+    }, {
+        name = ALIL["Wand"],
+        [NORMAL_DIFF] = { -- Head
+        {1, 71150}, -- Scorchvine Wand
+        {2, 71151}, -- Trail of Embers
+        {3, 71152}, -- Morningstar Shard
+        {4, 71154}, -- Giantslicer
+        {5, 71218} -- Deflecting Star
+        }
+    }}
+}
+
 -- shared!
 data["WorldEpicsCata"] = {
     name = AL["World Epics"],
@@ -364,7 +501,25 @@ data["WorldEpicsCata"] = {
             {20, 67146}, -- Woundsplicer Handwraps
             {21, 67132}, -- Grips of the Failed Immortal
             {22, 67142}, -- Zom's Electrostatic Cloak
-        }
+            }
+    }}
+}
+
+data["Weapon Sets"] = {
+    name = format(AL["%s Sets"], AL["Weapons"]),
+    ContentType = SET_CONTENT,
+    LoadDifficulty = LOAD_DIFF,
+    TableType = SET_ITTYPE,
+    gameVersion = AtlasLoot.CATA_VERSION_NUM,
+    items = {
+        { -- Misc
+            name = AL["Weapons"],
+            [NORMAL_DIFF] = {
+                { 1,  951 }, -- Agony and Torment / 359
+                { 2,  1089 }, -- Jaws of Retribution / 397
+                { 3, 1088 }, -- Maw of Oblivion / 406
+                { 4,  1087 }, -- Fangs of the Father / 416
+            }
     }}
 }
 
@@ -376,50 +531,44 @@ data["MountsCata"] = {
     CorrespondingFields = private.MOUNTS,
     items = {{
         name = AL["PvP"],
-        [NORMAL_DIFF] = {{1, 72140}, -- Vicious War Wolf
+        [NORMAL_DIFF] ={{ 1, [ATLASLOOT_IT_ALLIANCE] = 70909, [ATLASLOOT_IT_HORDE] = 70910 }, -- Vicious War Steed / Vicious War Wolf
                         {2, 71339}, -- Vicious Gladiator's Twilight Drake
-                        {3, 70910}, -- Ruthless Gladiator's Twilight Drake
+                        {3, 71954}, -- Ruthless Gladiator's Twilight Drake
         }
     }, { -- Drops
         name = AL["Drops"],
         [NORMAL_DIFF] = {{1, 63043}, -- Reins of the Vitreous Stone Drake
-                        {2, 63039}, -- Reins of the Drake of the West Wind
+                        {2, 63042}, -- Reins of the Phosphorescent Stone Drake
                         {3, 63040}, -- Reins of the Drake of the North Wind
-                        {4, 44168}, -- Reins of the Time-Lost Proto-Drake
-                        {5, 45693}, -- Mimiron's Head
-                        {6, 50818}, -- Invincible's Reins
-                        {7, 77069}, -- Smoldering Egg of Millagazor
-                        {8, 78924}, -- Flametalon of Alysrazor
-                        {9, 77068}, -- Life-Binder's Handmaiden
+                        {4, 63041}, -- Reins of the Drake of the South Wind
+                        {5, 69224}, -- Smoldering Egg of Millagazor
+                        {6, 71665}, -- Flametalon of Alysrazor
+                        {7, 77067}, -- Reins of the Blazing Drake
+                        {8, 77069}, -- Life-Binder's Handmaiden
+                        {9, 78919}, -- Experiment 12-B
                         {10, 69747}, -- Amani Battle Bear
+                        {11, 68823}, -- Armored Razzashi Raptor
+                        {12, 68824}, -- Swift Zulian Panther
+                        {13, 67151}, -- Reins of Poseidus
         }
     }, {
         name = AL["Crafting"],
         [NORMAL_DIFF] = {{1, 65891}, -- Vial of the Sands
-                        { 16, [ATLASLOOT_IT_ALLIANCE] = 44413, [ATLASLOOT_IT_HORDE] = 41508 }, -- Mekgineer's Chopper / Mechano-hog
-                        {3, 34061}, -- Turbo-Charged Flying Machine
-                        {4, 44558}, -- Magnificent Flying Carpet
-                        {5, 54797}, -- Frosty Flying Carpet
+                        {3, 60954}, -- Fossilized Raptor
+                        {5, 64883}, -- Scepter of Azj'Aqir
         }
     }, {
-        name = ALIL["Fishing"],
-        [NORMAL_DIFF] = {{1, 46109}, -- Sea Turtle
-        }
-    }, {
-        name = AL["Quest"],
-        [NORMAL_DIFF] = {{1, 63041}, -- Reins of the Drake of the South Wind
-                        {2, 44151}, -- Reins of the Blue Proto-Drake
-                        {3, 44178}, -- Reins of the Albino Drake
+        name = AL["Darkmoon Faire"],
+        [NORMAL_DIFF] = {{1, 73766}, -- Darkmoon Dancing Bear
+                        {2, 72140}, -- Swift Forest Strider
         }
     }, {
         name = ALIL["Achievements"],
         TableType = AC_ITTYPE,
-        [NORMAL_DIFF] = {{1, 44177}, -- Reins of the Violet Proto-Drake
-                        {2, 44160}, -- Reins of the Red Proto-Drake
-                        {3, 45801}, -- Reins of the Ironbound Proto-Drake
-                        {4, 45802}, -- Reins of the Rusted Proto-Drake
-                        {5, 51954}, -- Reins of the Bloodbathed Frostbrood Vanquisher
-                        {6, 51955}, -- Reins of the Icebound Frostbrood Vanquisher
+        [NORMAL_DIFF] = {{1, 62900, 4845}, -- Reins of the Volcanic Stone Drake
+                        {2, 62901, 4853}, -- Reins of the Drake of the East Wind
+                        {3, 69230, 5828}, -- Corrupted Egg of Millagazor
+                        {4, 77068, 6169}, -- Reins of the Twilight Harbinger
         }
     }}
 }
@@ -510,9 +659,10 @@ data["LegendarysCata"] = {
     CorrespondingFields = private.LEGENDARYS,
     items = {{
         name = AL["Legendaries"],
-        [NORMAL_ITTYPE] = {{1, 71086, "ac5839"}, -- Dragonwrath, Tarecgosa's Rest
+        [NORMAL_DIFF] = {
+        {1, 71086, "ac5839"}, -- Dragonwrath, Tarecgosa's Rest
         {16, 77949, "ac6181"}, -- Golad, Twilight of Aspects
-        {17, 77950, "ac6181"} -- 	Tiriosh, Nightmare of Ages
+        {17, 77950, "ac6181"} -- Tiriosh, Nightmare of Ages
         }
     }}
 }