From a01443e8b1f310b04e6474c1ca801ddcf63f16ab Mon Sep 17 00:00:00 2001 From: Szyler Date: Fri, 16 Apr 2021 18:36:56 +0200 Subject: [PATCH 1/4] Adding t3 warrior, Heroic Atiesh, Fang of the Frost Wyrm, fixed t1 and t2 warrior DPS title name, fixed heroic druid ring heroic ID --- AtlasLoot/Core/TextParsing.lua | 3 + AtlasLoot_OriginalWoW/originalwow.lua | 92 +++++++++++++-------------- 2 files changed, 49 insertions(+), 46 deletions(-) diff --git a/AtlasLoot/Core/TextParsing.lua b/AtlasLoot/Core/TextParsing.lua index ca869c9..e0e69c4 100644 --- a/AtlasLoot/Core/TextParsing.lua +++ b/AtlasLoot/Core/TextParsing.lua @@ -746,6 +746,7 @@ function AtlasLoot_FixText(text) text = gsub(text, "#t1s7#", AL["The Earthfury"]); text = gsub(text, "#t1s8#", AL["Felheart Raiment"]); text = gsub(text, "#t1s9#", AL["Battlegear of Might"]); + text = gsub(text, "#t1s10#", AL["Fury of Might"]); -- Tier 2 Sets text = gsub(text, "#t2s1#", AL["Stormrage Raiment"]); @@ -757,6 +758,7 @@ function AtlasLoot_FixText(text) text = gsub(text, "#t2s7#", AL["The Ten Storms"]); text = gsub(text, "#t2s8#", AL["Nemesis Raiment"]); text = gsub(text, "#t2s9#", AL["Battlegear of Wrath"]); + text = gsub(text, "#t2s10#", AL["Fury of Wrath"]); -- Tier 3 Sets text = gsub(text, "#t3s1#", AL["Dreamwalker Raiment"]); @@ -768,6 +770,7 @@ function AtlasLoot_FixText(text) text = gsub(text, "#t3s7#", AL["The Earthshatterer"]); text = gsub(text, "#t3s8#", AL["Plagueheart Raiment"]); text = gsub(text, "#t3s9#", AL["Dreadnaught's Battlegear"]); + text = gsub(text, "#t3s10#", AL["Fury's Battlegear"]); -- Tier 4 Sets text = gsub(text, "#t4s1_1#", AL["Malorne Harness"]); diff --git a/AtlasLoot_OriginalWoW/originalwow.lua b/AtlasLoot_OriginalWoW/originalwow.lua index 9a6acd6..66364b4 100644 --- a/AtlasLoot_OriginalWoW/originalwow.lua +++ b/AtlasLoot_OriginalWoW/originalwow.lua @@ -1626,11 +1626,11 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 20, 21710, "", "=q4=Cloak of the Fallen God", "=q1=#m4#: =ds=#s4#"}; { 21, 21712, "", "=q4=Amulet of the Fallen God", "=q1=#m4#: =ds=#s2#"}; { 22, 21709, "", "=q4=Ring of the Fallen God", "=q1=#m4#: =ds=#s13#"}; - { 24, 22734, "", "=q1=Base of Atiesh", "=ds=#m3#"}; - { 25, 22632, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c1#"}; - { 26, 22589, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c3#"}; - { 27, 22631, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c5#"}; - { 28, 22630, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c8#"}; + { 24, 222734, "", "=q1=Base of Atiesh", "=ds=#m3#"}; + { 25, 222632, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c1#"}; + { 26, 222589, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c3#"}; + { 27, 222631, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c5#"}; + { 28, 222630, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c8#"}; Prev = "AQ40OuroHEROIC"; }; @@ -6095,7 +6095,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 9, 23047, "", "=q4=Eye of the Dead", "=ds=#s14#" ,"","18.18%" }, { 10, 23046, "", "=q4=The Restrained Essence of Sapphiron", "=ds=#s14#","","18.18%" }, { 11, 23041, "", "=q4=Slayer's Crest", "=ds=#s14#","","18.18%" }, - { 12, 0,"","","" }, + { 12, 19761,"","Fang of the Frost Wyrm","=ds=#h3#, #w13#" }, { 13, 0,"","","" }, { 14, 0,"","","" }, { 15, 0,"","","" }, @@ -6174,7 +6174,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { ------------------------ AtlasLoot_Data["NAXPatchwerkHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 22368, "", "=q4=Desecrated Shoulderpads", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "33.33%" }, @@ -6190,7 +6190,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["NAXGrobbulusHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","","30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","","30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 22368, "", "=q4=Desecrated Shoulderpads", "=q1=#m1# =ds=#c8#, #c3#, #c5#","","33.33%" }, @@ -6207,7 +6207,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["NAXGluthHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","","30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","","30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 222983, "", "=q4=Rime Covered Mantle", "=ds=#s3#, #a1#", "", "20%" }, @@ -6239,7 +6239,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["NAXThaddiusHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","","30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","","30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 22367, "", "=q4=Desecrated Circlet", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "66.67%"}, @@ -6256,7 +6256,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["NAXAnubRekhanHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 22369, "", "=q4=Desecrated Bindings", "=q1=#m1# =ds=#c8#, #c3#, #c5#", "","33.33%" }, @@ -6273,7 +6273,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["NAXGrandWidowFearlinaHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 22369, "", "=q4=Desecrated Bindings", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "33.33%" }, @@ -6290,7 +6290,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["NAXMaexxnaHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 22371, "", "=q4=Desecrated Gloves", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "67.66%" }, @@ -6307,7 +6307,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["NAXInstructorRAuviousHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 22372, "", "=q4=Desecrated Sandals", "=q1=#m1# =ds=#c8#, #c3#, #c5#", "", "33.33%" }, @@ -6325,7 +6325,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["NAXGothicderHarvesterHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 22372, "", "=q4=Desecrated Sandals", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "33.33%" }, @@ -6342,7 +6342,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["NAXTheFourHorsemenHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 22351, "", "=q4=Desecrated Robe", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "33.33%" }, @@ -6360,7 +6360,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["NAXNothderPlaguebringerHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 22370, "", "=q4=Desecrated Belt", "=q1=#m1# =ds=#c5#, #c3#, #c8#","", "33.33%" }, @@ -6379,7 +6379,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["NAXHeiganderUncleanHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 22370, "", "=q4=Desecrated Belt", "=q1=#m1# =ds=#c5#, #c3#, #c8#","", "33.33%" }, @@ -6396,7 +6396,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["NAXLoathebHEROIC"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, + { 1, 222726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","", "30%" }, { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, { 3, 0,"","","" }, { 4, 22366, "", "=q4=Desecrated Leggings", "=q1=#m1# =ds=#c5#, #c3#, #c8#","", "66.67%" }, @@ -6424,7 +6424,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 9, 223047, "", "=q4=Eye of the Dead", "=ds=#s14#" ,"","18.18%" }, { 10, 223046, "", "=q4=The Restrained Essence of Sapphiron", "=ds=#s14#","","18.18%" }, { 11, 223041, "", "=q4=Slayer's Crest", "=ds=#s14#","","18.18%" }, - { 12, 0,"","","" }, + { 12, 219761,"","Fang of the Frost Wyrm","=ds=#h3#, #w13#" }, { 13, 0,"","","" }, { 14, 0,"","","" }, { 15, 0,"","","" }, @@ -6452,7 +6452,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 13, 691119, "", "=q4=The Phylactery of Kel'Thuzad", "=ds=#m2#","", "100%" }, { 14, 23207, "", "=q4=Mark of the Champion", "=q1=#m4# =ds=#s14#" }, { 15, 23206, "", "=q4=Mark of the Champion", "=q1=#m4# =ds=#s14#" }, - { 16, 23064, "", "=q4=Ring of the Dreamwalker", "=ds=#s13# =q1=#m1# =ds=#c1#","","22.22%" }, + { 16, 223064, "", "=q4=Ring of the Dreamwalker", "=ds=#s13# =q1=#m1# =ds=#c1#","","22.22%" }, { 17, 223067, "", "=q4=Ring of the Cryptstalker", "=ds=#s13# =q1=#m1# =ds=#c2#" ,"","22.22%"}, { 18, 223062, "", "=q4=Frostfire Ring", "=ds=#s13# =q1=#m1# =ds=#c3#" ,"","22.22%"}, { 19, 223066, "", "=q4=Ring of Redemption", "=ds=#s13# =q1=#m1# =ds=#c4#" ,"","22.22%"}, @@ -6462,11 +6462,11 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 23, 223063, "", "=q4=Plagueheart Ring", "=ds=#s13# =q1=#m1# =ds=#c8#" ,"","22.22%"}, { 24, 223059, "", "=q4=Ring of the Dreadnaught", "=ds=#s13# =q1=#m1# =ds=#c9#" ,"","22.22%"}, { 25, 0,"","","" }, - { 26, 22733, "", "=q1=Staff Head of Atiesh", "=ds=#m3#" }, - { 27, 22632, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c1#"}, - { 28, 22589, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c3#"}, - { 29, 22631, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c5#"}, - { 30, 22630, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c8#"}, + { 26, 222733, "", "=q1=Staff Head of Atiesh", "=ds=#m3#" }, + { 27, 222632, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c1#"}, + { 28, 222589, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c3#"}, + { 29, 222631, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c5#"}, + { 30, 222630, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c8#"}, Prev = "NAXSapphironHEROIC"; Next = "NAXTrashHEROIC"; }; @@ -7012,7 +7012,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 7, 10485, "", "=q4=Girdle of Might", "=ds="..AL["Trash Mobs"], ""}; { 8, 10486, "", "=q4=Legguards of Might", "=ds="..BabbleBoss["Magmadar"], ""}; { 9, 10487, "", "=q4=Stompers of Might", "=ds="..BabbleBoss["Gehennas"], ""}; - { 16, 0, "Ability_Warrior_BattleShout", "=q6=#t2s9#", "=ec1=#m31#"}; + { 16, 0, "Ability_Warrior_BattleShout", "=q6=#t2s10#", "=ec1=#m31#"}; { 17, 10904, "", "=q4=Faceguard of Wrath", "=ds="..BabbleBoss["Nefarian"], "", "13.65%"}; { 18, 10902, "", "=q4=Shoulderpads of Wrath", "=ds="..BabbleBoss["Chromaggus"], "", "16.83%"}; { 19, 10907, "", "=q4=Chestplate of Wrath", "=ds="..BabbleBoss["Nefarian"], "", "15.06%"}; @@ -7256,7 +7256,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 7, 210485, "", "=q4=Girdle of Might", "=ds="..AL["Trash Mobs"], ""}; { 8, 210486, "", "=q4=Legguards of Might", "=ds="..BabbleBoss["Magmadar"], ""}; { 9, 210487, "", "=q4=Stompers of Might", "=ds="..BabbleBoss["Gehennas"], ""}; - { 16, 0, "Ability_Warrior_BattleShout", "=q6=#t2s9#", "=ec1=#m31#"}; + { 16, 0, "Ability_Warrior_BattleShout", "=q6=#t2s10#", "=ec1=#m31#"}; { 17, 210904, "", "=q4=Faceguard of Wrath", "=ds="..BabbleBoss["Nefarian"], "", "13.65%"}; { 18, 210902, "", "=q4=Shoulderpads of Wrath", "=ds="..BabbleBoss["Chromaggus"], "", "16.83%"}; { 19, 210907, "", "=q4=Chestplate of Wrath", "=ds="..BabbleBoss["Nefarian"], "", "15.06%"}; @@ -7410,15 +7410,15 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { AtlasLoot_Data["T3DPSWarrior"] = { { 1, 0, "Ability_Warrior_BattleShout", "=q6=#t3s9#", "=ec1=#m35#"}; --- { 2, 22418, "", "=q4=Dreadnaught Helmet", "=ds="}; --- { 3, 22419, "", "=q4=Dreadnaught Pauldrons", "=ds="}; --- { 4, 22416, "", "=q4=Dreadnaught Breastplate", "=ds="}; --- { 5, 22423, "", "=q4=Dreadnaught Bracers", "=ds="}; --- { 6, 22421, "", "=q4=Dreadnaught Gauntlets", "=ds="}; --- { 7, 22422, "", "=q4=Dreadnaught Waistguard", "=ds="}; --- { 8, 22417, "", "=q4=Dreadnaught Legplates", "=ds="}; --- { 9, 22420, "", "=q4=Dreadnaught Sabatons", "=ds="}; --- { 10, 23059, "", "=q4=Ring of the Dreadnaught", "=ds="}; + { 2, 10488, "", "=q4=Dreadnaught Helmet", "=ds="}; + { 3, 10489, "", "=q4=Dreadnaught Pauldrons", "=ds="}; + { 4, 10490, "", "=q4=Dreadnaught Breastplate", "=ds="}; + { 5, 10491, "", "=q4=Dreadnaught Bracers", "=ds="}; + { 6, 10492, "", "=q4=Dreadnaught Gauntlets", "=ds="}; + { 7, 10493, "", "=q4=Dreadnaught Waistguard", "=ds="}; + { 8, 10494, "", "=q4=Dreadnaught Legplates", "=ds="}; + { 9, 10495, "", "=q4=Dreadnaught Sabatons", "=ds="}; + { 10, 10496, "", "=q4=Ring of the Dreadnaught", "=ds="}; Prev = "T1T2DPSWarrior"; Back = "T1T2T3SET"; }; @@ -7564,15 +7564,15 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { AtlasLoot_Data["T3DPSWarriorHEROIC"] = { { 1, 0, "Ability_Warrior_BattleShout", "=q6=#t3s9#", "=ec1=#m35#"}; --- { 2, 22418, "", "=q4=Dreadnaught Helmet", "=ds="}; --- { 3, 22419, "", "=q4=Dreadnaught Pauldrons", "=ds="}; --- { 4, 22416, "", "=q4=Dreadnaught Breastplate", "=ds="}; --- { 5, 22423, "", "=q4=Dreadnaught Bracers", "=ds="}; --- { 6, 22421, "", "=q4=Dreadnaught Gauntlets", "=ds="}; --- { 7, 22422, "", "=q4=Dreadnaught Waistguard", "=ds="}; --- { 8, 22417, "", "=q4=Dreadnaught Legplates", "=ds="}; --- { 9, 22420, "", "=q4=Dreadnaught Sabatons", "=ds="}; --- { 10, 23059, "", "=q4=Ring of the Dreadnaught", "=ds="}; + { 2, 210488, "", "=q4=Dreadnaught Helmet", "=ds="}; + { 3, 210489, "", "=q4=Dreadnaught Pauldrons", "=ds="}; + { 4, 210490, "", "=q4=Dreadnaught Breastplate", "=ds="}; + { 5, 210491, "", "=q4=Dreadnaught Bracers", "=ds="}; + { 6, 210492, "", "=q4=Dreadnaught Gauntlets", "=ds="}; + { 7, 210493, "", "=q4=Dreadnaught Waistguard", "=ds="}; + { 8, 210494, "", "=q4=Dreadnaught Legplates", "=ds="}; + { 9, 210495, "", "=q4=Dreadnaught Sabatons", "=ds="}; + { 10, 210496, "", "=q4=Ring of the Dreadnaught", "=ds="}; Prev = "T1T2DPSWarriorHEROIC"; Back = "T1T2T3SET"; }; From 186086c89a18751878b451e272d82645d6ed7c4a Mon Sep 17 00:00:00 2001 From: Szyler Date: Fri, 16 Apr 2021 20:52:32 +0200 Subject: [PATCH 2/4] Phylactery heroic --- AtlasLoot_OriginalWoW/originalwow.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AtlasLoot_OriginalWoW/originalwow.lua b/AtlasLoot_OriginalWoW/originalwow.lua index 66364b4..dab408f 100644 --- a/AtlasLoot_OriginalWoW/originalwow.lua +++ b/AtlasLoot_OriginalWoW/originalwow.lua @@ -6449,9 +6449,9 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 10, 223057, "", "=q4=Gem of Trapped Innocents", "=ds=#s2#" ,"","18.18%"}, { 11, 223053, "", "=q4=Stormrage's Talisman of Seething", "=ds=#s2#","","18.18%" }, { 12, 0,"","","" }, - { 13, 691119, "", "=q4=The Phylactery of Kel'Thuzad", "=ds=#m2#","", "100%" }, - { 14, 23207, "", "=q4=Mark of the Champion", "=q1=#m4# =ds=#s14#" }, - { 15, 23206, "", "=q4=Mark of the Champion", "=q1=#m4# =ds=#s14#" }, + { 13, 291119, "", "=q4=The Phylactery of Kel'Thuzad", "=ds=#m2#","", "100%" }, + { 14, 223207, "", "=q4=Mark of the Champion", "=q1=#m4# =ds=#s14#" }, + { 15, 223206, "", "=q4=Mark of the Champion", "=q1=#m4# =ds=#s14#" }, { 16, 223064, "", "=q4=Ring of the Dreamwalker", "=ds=#s13# =q1=#m1# =ds=#c1#","","22.22%" }, { 17, 223067, "", "=q4=Ring of the Cryptstalker", "=ds=#s13# =q1=#m1# =ds=#c2#" ,"","22.22%"}, { 18, 223062, "", "=q4=Frostfire Ring", "=ds=#s13# =q1=#m1# =ds=#c3#" ,"","22.22%"}, From 52c9b673c254e2779389423515578218d18fdc07 Mon Sep 17 00:00:00 2001 From: Szyler Date: Fri, 23 Apr 2021 23:12:34 +0200 Subject: [PATCH 3/4] New warrior set name fixes --- AtlasLoot/Locales/constants.en.lua | 3 +++ AtlasLoot_OriginalWoW/originalwow.lua | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/AtlasLoot/Locales/constants.en.lua b/AtlasLoot/Locales/constants.en.lua index 01923c9..9ba5274 100644 --- a/AtlasLoot/Locales/constants.en.lua +++ b/AtlasLoot/Locales/constants.en.lua @@ -878,6 +878,7 @@ if AL then AL["The Earthfury"] = true; AL["Felheart Raiment"] = true; AL["Battlegear of Might"] = true; + AL["Fury of Might"] = true; -- Tier 2 Sets AL["Stormrage Raiment"] = true; @@ -889,6 +890,7 @@ if AL then AL["The Ten Storms"] = true; AL["Nemesis Raiment"] = true; AL["Battlegear of Wrath"] = true; + AL["Fury of Wrath"] = true; -- Tier 3 Sets AL["Dreamwalker Raiment"] = true; @@ -900,6 +902,7 @@ if AL then AL["The Earthshatterer"] = true; AL["Plagueheart Raiment"] = true; AL["Dreadnaught's Battlegear"] = true; + AL["Fury's Battlegear"] = true; -- Tier 4 Sets AL["Malorne Harness"] = true; diff --git a/AtlasLoot_OriginalWoW/originalwow.lua b/AtlasLoot_OriginalWoW/originalwow.lua index dab408f..acbfcc8 100644 --- a/AtlasLoot_OriginalWoW/originalwow.lua +++ b/AtlasLoot_OriginalWoW/originalwow.lua @@ -7003,7 +7003,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["T1T2DPSWarrior"] = { - { 1, 0, "Ability_Warrior_BattleShout", "=q6=#t1s9#", "=ec1=#m30#"}; + { 1, 0, "Ability_Warrior_BattleShout", "=q6=#t1s10#", "=ec1=#m30#"}; { 2, 10480, "", "=q4=Faceguard of Might", "=ds="..BabbleBoss["Garr"], ""}; { 3, 10481, "", "=q4=Shoulderpads of Might", "=ds="..BabbleBoss["Sulfuron Harbinger"], ""}; { 4, 10482, "", "=q4=Chesttplate of Might", "=ds="..BabbleBoss["Golemagg the Incinerator"], ""}; From d7f093dc45f222e6b229d60af233dc6cbc57649a Mon Sep 17 00:00:00 2001 From: Szyler Date: Sun, 25 Apr 2021 00:55:22 +0200 Subject: [PATCH 4/4] Added t3 warrior + fixed lua error --- AtlasLoot/Core/TextParsing.lua | 2 +- AtlasLoot/Locales/constants.en.lua | 1 + AtlasLoot_OriginalWoW/originalwow.lua | 40 +++++++++++++-------------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/AtlasLoot/Core/TextParsing.lua b/AtlasLoot/Core/TextParsing.lua index e0e69c4..6ed0de0 100644 --- a/AtlasLoot/Core/TextParsing.lua +++ b/AtlasLoot/Core/TextParsing.lua @@ -770,7 +770,7 @@ function AtlasLoot_FixText(text) text = gsub(text, "#t3s7#", AL["The Earthshatterer"]); text = gsub(text, "#t3s8#", AL["Plagueheart Raiment"]); text = gsub(text, "#t3s9#", AL["Dreadnaught's Battlegear"]); - text = gsub(text, "#t3s10#", AL["Fury's Battlegear"]); + text = gsub(text, "#t3s10#", AL["Dreadborne Warplate"]); -- Tier 4 Sets text = gsub(text, "#t4s1_1#", AL["Malorne Harness"]); diff --git a/AtlasLoot/Locales/constants.en.lua b/AtlasLoot/Locales/constants.en.lua index 9ba5274..3be1ab9 100644 --- a/AtlasLoot/Locales/constants.en.lua +++ b/AtlasLoot/Locales/constants.en.lua @@ -903,6 +903,7 @@ if AL then AL["Plagueheart Raiment"] = true; AL["Dreadnaught's Battlegear"] = true; AL["Fury's Battlegear"] = true; + AL["Dreadborne Warplate"] = true; -- Tier 4 Sets AL["Malorne Harness"] = true; diff --git a/AtlasLoot_OriginalWoW/originalwow.lua b/AtlasLoot_OriginalWoW/originalwow.lua index acbfcc8..e96a583 100644 --- a/AtlasLoot_OriginalWoW/originalwow.lua +++ b/AtlasLoot_OriginalWoW/originalwow.lua @@ -7409,16 +7409,16 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["T3DPSWarrior"] = { - { 1, 0, "Ability_Warrior_BattleShout", "=q6=#t3s9#", "=ec1=#m35#"}; - { 2, 10488, "", "=q4=Dreadnaught Helmet", "=ds="}; - { 3, 10489, "", "=q4=Dreadnaught Pauldrons", "=ds="}; - { 4, 10490, "", "=q4=Dreadnaught Breastplate", "=ds="}; - { 5, 10491, "", "=q4=Dreadnaught Bracers", "=ds="}; - { 6, 10492, "", "=q4=Dreadnaught Gauntlets", "=ds="}; - { 7, 10493, "", "=q4=Dreadnaught Waistguard", "=ds="}; - { 8, 10494, "", "=q4=Dreadnaught Legplates", "=ds="}; - { 9, 10495, "", "=q4=Dreadnaught Sabatons", "=ds="}; - { 10, 10496, "", "=q4=Ring of the Dreadnaught", "=ds="}; + { 1, 0, "Ability_Warrior_BattleShout", "=q6=#t3s10#", "=ec1=#m35#"}; + { 2, 10490, "", "=q4=Dreadborne Helmet", "=ds="}; + { 3, 10491, "", "=q4=Dreadborne Pauldrons", "=ds="}; + { 4, 10488, "", "=q4=Dreadborne Breastplate", "=ds="}; + { 5, 10495, "", "=q4=Dreadborne Bracers", "=ds="}; + { 6, 10493, "", "=q4=Dreadborne Gauntlets", "=ds="}; + { 7, 10494, "", "=q4=Dreadborne Waistguard", "=ds="}; + { 8, 10489, "", "=q4=Dreadborne Legplates", "=ds="}; + { 9, 10492, "", "=q4=Dreadborne Sabatons", "=ds="}; + { 10, 10496, "", "=q4=Dreadborne Ring", "=ds="}; Prev = "T1T2DPSWarrior"; Back = "T1T2T3SET"; }; @@ -7563,16 +7563,16 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { }; AtlasLoot_Data["T3DPSWarriorHEROIC"] = { - { 1, 0, "Ability_Warrior_BattleShout", "=q6=#t3s9#", "=ec1=#m35#"}; - { 2, 210488, "", "=q4=Dreadnaught Helmet", "=ds="}; - { 3, 210489, "", "=q4=Dreadnaught Pauldrons", "=ds="}; - { 4, 210490, "", "=q4=Dreadnaught Breastplate", "=ds="}; - { 5, 210491, "", "=q4=Dreadnaught Bracers", "=ds="}; - { 6, 210492, "", "=q4=Dreadnaught Gauntlets", "=ds="}; - { 7, 210493, "", "=q4=Dreadnaught Waistguard", "=ds="}; - { 8, 210494, "", "=q4=Dreadnaught Legplates", "=ds="}; - { 9, 210495, "", "=q4=Dreadnaught Sabatons", "=ds="}; - { 10, 210496, "", "=q4=Ring of the Dreadnaught", "=ds="}; + { 1, 0, "Ability_Warrior_BattleShout", "=q6=#t3s10#", "=ec1=#m35#"}; + { 2, 210490, "", "=q4=Dreadborne Helmet", "=ds="}; + { 3, 210491, "", "=q4=Dreadborne Pauldrons", "=ds="}; + { 4, 210488, "", "=q4=Dreadborne Breastplate", "=ds="}; + { 5, 210495, "", "=q4=Dreadborne Bracers", "=ds="}; + { 6, 210493, "", "=q4=Dreadborne Gauntlets", "=ds="}; + { 7, 210494, "", "=q4=Dreadborne Waistguard", "=ds="}; + { 8, 210489, "", "=q4=Dreadborne Legplates", "=ds="}; + { 9, 210492, "", "=q4=Dreadborne Sabatons", "=ds="}; + { 10, 210496, "", "=q4=Dreadborne Ring", "=ds="}; Prev = "T1T2DPSWarriorHEROIC"; Back = "T1T2T3SET"; };