From 25ec779f360932ea3e3426bb5734272cb7269d47 Mon Sep 17 00:00:00 2001 From: Szyler Date: Thu, 29 Apr 2021 14:25:44 +0200 Subject: [PATCH] Working Attumen --- AtlasLoot/Core/AtlasLoot.lua | 15 +++---- AtlasLoot/Core/AtlasLoot.xml | 2 +- AtlasLoot/Core/TextParsing.lua | 2 +- AtlasLoot/Locales/constants.en.lua | 6 +-- AtlasLoot_BurningCrusade/burningcrusade.lua | 45 ++++++--------------- 5 files changed, 26 insertions(+), 44 deletions(-) diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index 199edbc..4c6e081 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -821,21 +821,21 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) --Decide whether to show the Heroic mode toggle --Checks if a heroic version of the loot table is available. NormalID, HeroicID, Normal25ID, Heroic25ID = AtlasLoot_GetLoottableHeroic(AtlasLootItemsFrame.refreshOri[1]) - + if AtlasLoot.db.profile.Bigraid and Normal25ID and NormalID then - AtlasLoot10Man25ManSwitch:SetText(AL["Show 10 Man Loot"]) + AtlasLoot10Man25ManSwitch:SetText(AL["Show Normal Loot"]) AtlasLoot10Man25ManSwitch.lootpage = NormalID AtlasLoot10Man25ManSwitch:Show() elseif AtlasLoot.db.profile.BigraidHeroic and Heroic25ID and HeroicID then - AtlasLoot10Man25ManSwitch:SetText(AL["Show 10 Man Loot"]) + AtlasLoot10Man25ManSwitch:SetText(AL["Show Normal Loot"]) AtlasLoot10Man25ManSwitch.lootpage = HeroicID AtlasLoot10Man25ManSwitch:Show() elseif AtlasLoot.db.profile.HeroicMode and HeroicID and Heroic25ID then - AtlasLoot10Man25ManSwitch:SetText(AL["Show 25 Man Loot"]); + AtlasLoot10Man25ManSwitch:SetText(AL["Show Heroic/Ascended Loot"]); AtlasLoot10Man25ManSwitch.lootpage = Heroic25ID AtlasLoot10Man25ManSwitch:Show(); elseif not AtlasLoot.db.profile.Bigraid and NormalID and Normal25ID then - AtlasLoot10Man25ManSwitch:SetText(AL["Show 25 Man Loot"]); + AtlasLoot10Man25ManSwitch:SetText(AL["Show Heroic/Ascended Loot"]); AtlasLoot10Man25ManSwitch.lootpage = Normal25ID; AtlasLoot10Man25ManSwitch:Show(); end @@ -845,6 +845,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) AtlasLootItemsFrame_Heroic:SetChecked(false) AtlasLootItemsFrame_Heroic:Enable() elseif AtlasLoot.db.profile.BigraidHeroic and Heroic25ID then + AtlasLoot10Man25ManSwitch:SetText(AL["Show Normal Loot"]) AtlasLootItemsFrame_Heroic:Show() AtlasLootItemsFrame_Heroic:SetChecked(true) if Normal25ID then @@ -1001,12 +1002,12 @@ function AtlasLoot_GenerateAtlasMenu(dataID, pFrame) BigraidCheck=string.sub(dataID, string.len(dataID)-4, string.len(dataID)); BigraiddataID=dataID.."25Man"; if BigraidCheck=="25Man" then - AtlasLoot10Man25ManSwitch:SetText(AL["Show 10 Man Loot"]); + AtlasLoot10Man25ManSwitch:SetText(AL["Show Normal Loot"]); AtlasLoot10Man25ManSwitch.lootpage = string.sub(dataID, 1, string.len(dataID)-5); AtlasLoot10Man25ManSwitch:Show(); else if dataSource[BigraiddataID] then - AtlasLoot10Man25ManSwitch:SetText(AL["Show 25 Man Loot"]); + AtlasLoot10Man25ManSwitch:SetText(AL["Show Heroic/Ascended Loot"]); AtlasLoot10Man25ManSwitch.lootpage = BigraiddataID; AtlasLoot10Man25ManSwitch:Show(); end diff --git a/AtlasLoot/Core/AtlasLoot.xml b/AtlasLoot/Core/AtlasLoot.xml index 93c93ce..3c6d35f 100644 --- a/AtlasLoot/Core/AtlasLoot.xml +++ b/AtlasLoot/Core/AtlasLoot.xml @@ -599,7 +599,7 @@ local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot"); - getglobal(this:GetName().."Text"):SetText(AL["Heroic Mode"]); + getglobal(this:GetName().."Text"):SetText(AL["Ascended Mode"]); AtlasLoot_HeroicModeToggle(); diff --git a/AtlasLoot/Core/TextParsing.lua b/AtlasLoot/Core/TextParsing.lua index 6ed0de0..0b61279 100644 --- a/AtlasLoot/Core/TextParsing.lua +++ b/AtlasLoot/Core/TextParsing.lua @@ -174,7 +174,7 @@ function AtlasLoot_FixText(text) -- Misc text = gsub(text, "#j1#", AL["Normal Mode"]); text = gsub(text, "#j2#", AL["Raid"]); - text = gsub(text, "#j3#", AL["Heroic Mode"]); + text = gsub(text, "#j3#", AL["Ascended Mode"]); text = gsub(text, "#j5#", AL["Dungeon Set 2 Summonable"]); text = gsub(text, "#j6#", AL["Dungeon Set 1"]); text = gsub(text, "#j7#", AL["Dungeon Set 2"]); diff --git a/AtlasLoot/Locales/constants.en.lua b/AtlasLoot/Locales/constants.en.lua index 3be1ab9..0ddb7b3 100644 --- a/AtlasLoot/Locales/constants.en.lua +++ b/AtlasLoot/Locales/constants.en.lua @@ -38,8 +38,8 @@ if AL then AL["Misc"] = true; AL["Miscellaneous"] = true; AL["Rewards"] = true; - AL["Show 10 Man Loot"] = true; - AL["Show 25 Man Loot"] = true; + AL["Show Normal Loot"] = true; + AL["Show Heroic/Ascended Loot"] = true; AL["Factions - Original WoW"] = true; AL["Factions - Burning Crusade"] = true; AL["Factions - Wrath of the Lich King"] = true; @@ -406,7 +406,7 @@ if AL then -- Labels for loot table sections AL["Additional Heroic Loot"] = true; - AL["Heroic Mode"] = true; + AL["Ascended Mode"] = true; AL["Normal Mode"] = true; AL["Raid"] = true; AL["Hard Mode"] = true; diff --git a/AtlasLoot_BurningCrusade/burningcrusade.lua b/AtlasLoot_BurningCrusade/burningcrusade.lua index a9d3261..88d69a3 100644 --- a/AtlasLoot_BurningCrusade/burningcrusade.lua +++ b/AtlasLoot_BurningCrusade/burningcrusade.lua @@ -2216,18 +2216,18 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") }; AtlasLoot_Data["KaraAttumen25Man"] = { - { 1, 28477, "", "=q4=Harbinger Bands", "=ds=#s8#, #a1#", "", "14.68%"}; - { 2, 28507, "", "=q4=Handwraps of Flowing Thought", "=ds=#s9#, #a1#", "", "12.44%"}; - { 3, 28508, "", "=q4=Gloves of Saintly Blessings", "=ds=#s9#, #a1#", "", "11.69%"}; - { 4, 28453, "", "=q4=Bracers of the White Stag", "=ds=#s8#, #a2#", "", "12.19%"}; - { 5, 28506, "", "=q4=Gloves of Dexterous Manipulation", "=ds=#s9#, #a2#", "", "14.68%"}; - { 6, 28503, "", "=q4=Whirlwind Bracers", "=ds=#s8#, #a3#", "", "9.20%"}; - { 7, 28454, "", "=q4=Stalker's War Bands", "=ds=#s8#, #a3#", "", "16.17%"}; - { 8, 28502, "", "=q4=Vambraces of Courage", "=ds=#s8#, #a4#", "", "10.70%"}; - { 9, 28505, "", "=q4=Gauntlets of Renewed Hope", "=ds=#s9#, #a4#", "", "10.95%"}; - { 16, 28509, "", "=q4=Worgen Claw Necklace", "=ds=#s2#", "", "17.16%"}; - { 17, 28510, "", "=q4=Spectral Band of Innervation", "=ds=#s13#", "", "10.70%"}; - { 18, 28504, "", "=q4=Steelhawk Crossbow", "=ds=#w3#", "", "12.44%"}; + { 1, 228477, "", "=q4=Harbinger Bands", "=ds=#s8#, #a1#", "", "14.68%"}; + { 2, 228507, "", "=q4=Handwraps of Flowing Thought", "=ds=#s9#, #a1#", "", "12.44%"}; + { 3, 228508, "", "=q4=Gloves of Saintly Blessings", "=ds=#s9#, #a1#", "", "11.69%"}; + { 4, 228453, "", "=q4=Bracers of the White Stag", "=ds=#s8#, #a2#", "", "12.19%"}; + { 5, 228506, "", "=q4=Gloves of Dexterous Manipulation", "=ds=#s9#, #a2#", "", "14.68%"}; + { 6, 228503, "", "=q4=Whirlwind Bracers", "=ds=#s8#, #a3#", "", "9.20%"}; + { 7, 228454, "", "=q4=Stalker's War Bands", "=ds=#s8#, #a3#", "", "16.17%"}; + { 8, 228502, "", "=q4=Vambraces of Courage", "=ds=#s8#, #a4#", "", "10.70%"}; + { 9, 228505, "", "=q4=Gauntlets of Renewed Hope", "=ds=#s9#, #a4#", "", "10.95%"}; + { 16, 228509, "", "=q4=Worgen Claw Necklace", "=ds=#s2#", "", "17.16%"}; + { 17, 228510, "", "=q4=Spectral Band of Innervation", "=ds=#s13#", "", "10.70%"}; + { 18, 228504, "", "=q4=Steelhawk Crossbow", "=ds=#w3#", "", "12.44%"}; { 19, 30480, "", "=q4=Fiery Warhorse's Reins", "=ds=#e12#", "", "0.25%"}; { 21, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; { 23, 23809, "", "=q3=Schematic: Stabilized Eternium Scope", "=ds=#p5# (375)", "", "1.00%"}; @@ -2480,7 +2480,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 20, 230683, "", "=q4=Glider's Greaves", "=ds=#s12#, #a4# =q2=#m16#", "", "8.60%"}; }; - AtlasLoot_Data["KaraAttumenHEROIC"] = { + AtlasLoot_Data["KaraAttumen25ManHEROIC"] = { { 1, 328477, "", "=q4=Harbinger Bands", "=ds=#s8#, #a1#", "", "14.68%"}; { 2, 328507, "", "=q4=Handwraps of Flowing Thought", "=ds=#s9#, #a1#", "", "12.44%"}; { 3, 328508, "", "=q4=Gloves of Saintly Blessings", "=ds=#s9#, #a1#", "", "11.69%"}; @@ -2499,25 +2499,6 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Next = "KaraMoroesHEROIC"; }; - AtlasLoot_Data["KaraAttumen25ManHEROIC"] = { - { 1, 228477, "", "=q4=Harbinger Bands", "=ds=#s8#, #a1#", "", "14.68%"}; - { 2, 228507, "", "=q4=Handwraps of Flowing Thought", "=ds=#s9#, #a1#", "", "12.44%"}; - { 3, 228508, "", "=q4=Gloves of Saintly Blessings", "=ds=#s9#, #a1#", "", "11.69%"}; - { 4, 228453, "", "=q4=Bracers of the White Stag", "=ds=#s8#, #a2#", "", "12.19%"}; - { 5, 228506, "", "=q4=Gloves of Dexterous Manipulation", "=ds=#s9#, #a2#", "", "14.68%"}; - { 6, 228503, "", "=q4=Whirlwind Bracers", "=ds=#s8#, #a3#", "", "9.20%"}; - { 7, 228454, "", "=q4=Stalker's War Bands", "=ds=#s8#, #a3#", "", "16.17%"}; - { 8, 228502, "", "=q4=Vambraces of Courage", "=ds=#s8#, #a4#", "", "10.70%"}; - { 9, 228505, "", "=q4=Gauntlets of Renewed Hope", "=ds=#s9#, #a4#", "", "10.95%"}; - { 16, 228509, "", "=q4=Worgen Claw Necklace", "=ds=#s2#", "", "17.16%"}; - { 17, 228510, "", "=q4=Spectral Band of Innervation", "=ds=#s13#", "", "10.70%"}; - { 18, 228504, "", "=q4=Steelhawk Crossbow", "=ds=#w3#", "", "12.44%"}; - { 19, 30480, "", "=q4=Fiery Warhorse's Reins", "=ds=#e12#", "", "0.25%"}; - { 21, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; - { 23, 23809, "", "=q3=Schematic: Stabilized Eternium Scope", "=ds=#p5# (375)", "", "1.00%"}; - Next = "KaraMoroesHEROIC"; - }; - AtlasLoot_Data["KaraMoroesHEROIC"] = { { 1, 228529, "", "=q4=Royal Cloak of Arathi Kings", "=ds=#s4#", "", "15.91%"}; { 2, 228570, "", "=q4=Shadow-Cloak of Dalaran", "=ds=#s4#", "", "12.18%"};