From e1255374b0ab4bb31a18c8b9be503e7b9bbfb11a Mon Sep 17 00:00:00 2001 From: merstrax Date: Tue, 2 Nov 2021 21:15:23 -0400 Subject: [PATCH] Revert "Started Ascension Module" This reverts commit 39893931784fc7ad371642ae71746c4d183de0c1. --- AtlasLoot/Core/AtlasLoot.lua | 12 +-- AtlasLoot/Core/TextParsing.lua | 2 - AtlasLoot/DefaultFrame/DewDropDown.lua | 20 +--- AtlasLoot/TableRegister/loottables.en.lua | 9 -- AtlasLoot_Ascension/AtlasLoot_Ascension.toc | 17 ---- AtlasLoot_Ascension/ascension.lua | 102 -------------------- AtlasLoot_BurningCrusade/burningcrusade.lua | 2 +- 7 files changed, 5 insertions(+), 159 deletions(-) delete mode 100644 AtlasLoot_Ascension/AtlasLoot_Ascension.toc delete mode 100644 AtlasLoot_Ascension/ascension.lua diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index a716534..260c1dd 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -547,7 +547,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) if dataID == "FilterList" then Type = lastType; else - Type = dataSource[dataID].Type or nil; + Type = dataSource[dataID].Type; end if Type ~= lastType then @@ -1153,8 +1153,6 @@ function AtlasLoot_GetLODModule(dataSource) return "AtlasLoot_WorldEvents"; elseif (dataSource=="AtlasLootWotLK") then return "AtlasLoot_WrathoftheLichKing"; - elseif(dataSource=="AtlasAscension") then - return "AtlasLoot_Ascension"; end end @@ -1163,14 +1161,12 @@ AtlasLoot_LoadAllModules() Used to load all available LoD modules ]] function AtlasLoot_LoadAllModules() - local orig, bc, wotlk, craft, world, asc; + local orig, bc, wotlk, craft, world; orig, _ = LoadAddOn("AtlasLoot_OriginalWoW"); bc, _ = LoadAddOn("AtlasLoot_BurningCrusade"); craft, _ = LoadAddOn("AtlasLoot_Crafting"); world, _ = LoadAddOn("AtlasLoot_WorldEvents"); wotlk, _ = LoadAddOn("AtlasLoot_WrathoftheLichKing"); - asc, _ = LoadAddOn("AtlasLoot_Ascension"); - local flag=0; if not orig then LoadAddOn("AtlasLoot_OriginalWoW"); @@ -1192,10 +1188,6 @@ function AtlasLoot_LoadAllModules() LoadAddOn("AtlasLoot_WrathoftheLichKing"); flag=1; end - if not asc then - LoadAddon("AtlasLoot_Ascension"); - flag=1; - end if flag == 1 then if ATLASLOOT_DEBUGMESSAGES then DEFAULT_CHAT_FRAME:AddMessage(GREEN..AL["AtlasLoot"]..": "..WHITE..AL["All Available Modules Loaded"]); diff --git a/AtlasLoot/Core/TextParsing.lua b/AtlasLoot/Core/TextParsing.lua index 875bda6..0b61279 100644 --- a/AtlasLoot/Core/TextParsing.lua +++ b/AtlasLoot/Core/TextParsing.lua @@ -1133,8 +1133,6 @@ function AtlasLoot_FixText(text) text = gsub(text, "#t10mark#", "|TInterface\\Icons\\ability_paladin_shieldofthetemplar:0|t"); text = gsub(text, "#valentineday#", "|TInterface\\Icons\\inv_valentinescard01:0|t"); text = gsub(text, "#valentineday2#", "|TInterface\\Icons\\inv_jewelry_necklace_43:0|t"); - text = gsub(text, "#felsoul#", "|TInterface\\PVPFrame\\PVP-ArenaPoints-Icon:14:14:2:-1|t"); - text = gsub(text, "#legcrest#", "|TInterface\\PVPFrame\\PVP-ArenaPoints-Icon:14:14:2:-1|t"); englishFaction, _ = UnitFactionGroup("player") if englishFaction == "Horde" then diff --git a/AtlasLoot/DefaultFrame/DewDropDown.lua b/AtlasLoot/DefaultFrame/DewDropDown.lua index 75676cd..66b6351 100644 --- a/AtlasLoot/DefaultFrame/DewDropDown.lua +++ b/AtlasLoot/DefaultFrame/DewDropDown.lua @@ -234,10 +234,10 @@ AtlasLoot_DewDropDown = { [11] = { { "Dungeons:", "WrathKeys", "Table", "Header" }, }, - [12] = { + [12] = { { BabbleZone["Ahn'kahet: The Old Kingdom"], "Ahnkahet", "Submenu" }, }, - [13] = { + [13] = { { BabbleZone["Azjol-Nerub"], "AzjolNerub", "Submenu" }, }, [14] = { @@ -303,16 +303,6 @@ AtlasLoot_DewDropDown = { [9] = { { AL["World Events"], "WORLDEVENTMENU", "Table", "Submenu2Table" }, }, - [10] = { - ["Ascension"] = { - [1] = { - { "Events:", "", "", "Header" }, - }, - [2] = { - { "Felforged", "Felforged", "Submenu"}, - }, - }, - }, }; AtlasLoot_DewDropDown_SubTables = { @@ -967,10 +957,4 @@ AtlasLoot_DewDropDown_SubTables = { { "", "ICCLichKing" }, { "", "ICCTrash25Man" }, }, - ["Felforged"] = { - {"", "SoulRewards"}, - {"", "FelProgression"}, - {"", "FelHeirloom"}, - {"", "LegionCrest"} - }, }; \ No newline at end of file diff --git a/AtlasLoot/TableRegister/loottables.en.lua b/AtlasLoot/TableRegister/loottables.en.lua index 7b7ae89..0999347 100644 --- a/AtlasLoot/TableRegister/loottables.en.lua +++ b/AtlasLoot/TableRegister/loottables.en.lua @@ -2413,15 +2413,6 @@ end AtlasLoot_TableNames["Arena1Weapons2"] = { AL["Arena Season 1 Weapons"], "AtlasLootBurningCrusade" }; AtlasLoot_TableNames["Arena0Weapons1_A"] = { AL["Arena Season 0 Weapons"], "AtlasLootBurningCrusade" }; AtlasLoot_TableNames["Arena0Weapons1_H"] = { AL["Arena Season 0 Weapons"], "AtlasLootBurningCrusade" }; - ------------------ ---- Ascension --- ------------------ - AtlasLoot_TableNames["SoulRewards"] = { "Soul Rewards", "AtlasLootAscension" }; - AtlasLoot_TableNames["FelProgression"] = { "Fel Progression", "AtlasLootAscension" }; - AtlasLoot_TableNames["FelHeirloom"] = { "Fel Heirloom", "AtlasLootAscension" }; - AtlasLoot_TableNames["LegionCrest"] = { "Legion Crest", "AtlasLootAscension" }; - ------------- --- Other --- ------------- diff --git a/AtlasLoot_Ascension/AtlasLoot_Ascension.toc b/AtlasLoot_Ascension/AtlasLoot_Ascension.toc deleted file mode 100644 index c1879a0..0000000 --- a/AtlasLoot_Ascension/AtlasLoot_Ascension.toc +++ /dev/null @@ -1,17 +0,0 @@ -## Interface: 30300 -## Title: AtlasLoot_Ascension -## Notes: AtlasLoot loot tables from Ascension -## Author: Original: Hegarol, Ascension: Skray/Szyler/Anch/Rvng -## Version: v6.0.0 -## X-Category: Map -## X-License: GPL v2 -## X-Website: https://discord.gg/uYCE2X2FgA -## Dependencies: AtlasLoot -## LoadOnDemand: 1 -## X-Curse-Packaged-Version: v6.0.0 -## X-Curse-Project-Name: Atlasloot Enhanced -## X-Curse-Project-ID: atlasloot-enhanced -## X-Curse-Repository-ID: wow/atlasloot-enhanced/mainline - -ascension.lua - diff --git a/AtlasLoot_Ascension/ascension.lua b/AtlasLoot_Ascension/ascension.lua deleted file mode 100644 index 9c4cb83..0000000 --- a/AtlasLoot_Ascension/ascension.lua +++ /dev/null @@ -1,102 +0,0 @@ -local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot"); -local BabbleBoss = AtlasLoot_GetLocaleLibBabble("LibBabble-Boss-3.0") -local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") - --- Index ---- Collections ----- Mounts ----- Pets ----- Appearances ----- Weapons ----- Incarnations ----- Illusions ----- Pet Cosmetics ---- Store Items ----- Convenience ----- Mounts ----- Pets ----- Toys ----- Appearances ----- Bundles ---- Event Items ----- Felforged ----- Seasonal - - -print("Ascension Module Loaded"); - ------------------------ - --- Event Items --- - ------------------------ - - ----------------- - --- Felforged --- - ----------------- - - AtlasLoot_Data["SoulRewards"] = { - { 1, 13, "", "=q5=Rites of the Felborne: Felborne", "5000#felsoul#"}; - { 2, 246191, "", "=q5=Rites of the Felborne: Fel Abiding Energy", "5000#felsoul#"}; - { 3, 246193, "", "=q5=Rites of the Felborne: Fel Strike", "5000#felsoul#"}; - { 5, 79240, "", "=q5=Wrathblade", "5000#felsoul#"}; - { 6, 79241, "", "=q5=Staff of Guldan", "5000#felsoul#"}; - { 7, 79242, "", "=q5=Unholy Ebon Halberd", "5000#felsoul#"}; - { 8, 124382, "", "=q5=Edict of Argus", "5000#felsoul#"}; - { 9, 124385, "", "=q5=Blazing Demonhilt Sword", "5000#felsoul#"}; - { 10, 499863, "", "=q5=Felreaver's Edge", "5000#felsoul#"}; - { 12, 79256, "", "=q5=Beastmaster's Whistle: Felhound", "5000#felsoul#"}; - { 13, 79258, "", "=q5=Beastmaster's Whistle: White Felbat", "5000#felsoul#"}; - { 14, 79260, "", "=q5=Beastmaster's Whistle: Armored Soulhound", "5000#felsoul#"}; - { 15, 79262, "", "=q5=Beastmaster's Whistle: Felflame Talbuk", "5000#felsoul#"}; - { 16, 405, "", "=q5=Demon Scroll: Red Imp", "2500#felsoul#"}; - { 18, 499940, "", "=q5=Reins of the Illidari Felstalker", "5000#felsoul#"}; - { 20, 79171, "", "=q5=Demon Hunter Blindfold", "5000#felsoul#"}; - { 22, 82304, "", "=q5=Zealous Felslinger's Girdle", "2280#felsoul#"}; - { 23, 82305, "", "=q5=Zealous Felslinger's Boots", "2550#felsoul#"}; - { 24, 82306, "", "=q5=Zealous Felslinger's Robe", "4450#felsoul#"}; - { 25, 82307, "", "=q5=Zealous Felslinger's Handwraps", "4450#felsoul#"}; - { 26, 82308, "", "=q5=Zealous Felslinger's Visage", "2550#felsoul#"}; - { 27, 82309, "", "=q5=Zealous Felslinger's Leggings", "4450#felsoul#"}; - { 28, 82310, "", "=q5=Zealous Felslinger's Epaulets", "2550#felsoul#"}; - { 29, 82312, "", "=q5=Zealous Felslinger's Cuffs", "2280#felsoul#"}; - }; - - AtlasLoot_Data["FelProgression"] = { - { 1, 3001008, "", "=q5=Felforged Tome: Apprentice Riding", "50#felsoul#"}; - { 2, 3001007, "", "=q5=Felforged Tome: Journeyman Riding", "1000#felsoul#"}; - { 3, 1030180, "", "=q5=Felforged Tome: Track Humanoid", "450#felsoul#"}; - { 5, 1008017, "", "=q5=Legion's Lexicon", "2500#felsoul#"}; - { 7, 409, "", "=q5=Insignia of the Burning Legion", "200#felsoul#"}; - { 8, 101428, "", "=q5=Greater Insignia of the Burning Legion", "2000#felsoul#"}; - { 16, 101255, "", "=q5=Felforged Reins of the Illidari Felstalker", "250#felsoul#"}; - { 18, 1008018, "", "=q1=Small Brown Pouch", "1#felsoul#"}; - { 19, 1008019, "", "=q1=Brown Leather Satchel", "5#felsoul#"}; - { 20, 1008023, "", "=q1=Large Brown Sack", "25#felsoul#"}; - { 21, 1008020, "", "=q1=Huge Brown Sack", "50#felsoul#"}; - { 22, 1008025, "", "=q1=Runecloth Bag", "75#felsoul#"}; - { 23, 1008022, "", "=q2=Traveler's Backpack", "100#felsoul#"}; - }; - - AtlasLoot_Data["FelHeirloom"] = { - { 1, 492672, "", "=q5=Magtheridon's Felforged Crown", "2550#felsoul#"}; - { 2, 492186, "", "=q5=Magtheridon's Felforged Spaulders", "2550#felsoul#"}; - { 3, 492194, "", "=q5=Magtheridon's Felforged Carapace", "4450#felsoul#"}; - { 4, 492191, "", "=q5=Magtheridon's Felforged Waistguard", "2280#felsoul#"}; - { 5, 492195, "", "=q5=Magtheridon's Felforged Leggaurds", "4450#felsoul#"}; - { 6, 492192, "", "=q5=Magtheridon's Felforged Sabatons", "2550#felsoul#"}; - { 7, 492189, "", "=q5=Magtheridon's Felforged Bracers", "2280#felsoul#"}; - { 8, 492190, "", "=q5=Magtheridon's Felforged Gauntlets", "4550#felsoul#"}; - { 9, 492193, "", "=q5=Magtheridon's Felforged Cloak", "2280#felsoul#"}; - { 16, 494213, "", "=q5=Archimonde's Felforged Crown", "2550#felsoul#"}; - { 17, 492286, "", "=q5=Archimonde's Felforged Pauldron", "2550#felsoul#"}; - { 18, 492294, "", "=q5=Archimonde's Felforged Carapace", "4450#felsoul#"}; - { 19, 492291, "", "=q5=Archimonde's Felforged Waistband", "2280#felsoul#"}; - { 20, 492295, "", "=q5=Archimonde's Felforged Leggings", "4450#felsoul#"}; - { 21, 492292, "", "=q5=Archimonde's Felforged Boots", "25500#felsoul#"}; - { 22, 492289, "", "=q5=Archimonde's Felforged Bracer", "2280#felsoul#"}; - { 23, 492290, "", "=q5=Archimonde's Felforged Gauntlet", "4550#felsoul#"}; - { 24, 492293, "", "=q5=Archimonde's Felforged Drape", "2280#felsoul#"}; - }; - - AtlasLoot_Data["LegionCrest"] = { - - }; - \ No newline at end of file diff --git a/AtlasLoot_BurningCrusade/burningcrusade.lua b/AtlasLoot_BurningCrusade/burningcrusade.lua index 222af8a..b0d546a 100644 --- a/AtlasLoot_BurningCrusade/burningcrusade.lua +++ b/AtlasLoot_BurningCrusade/burningcrusade.lua @@ -1900,7 +1900,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 26, 28792, "", "=q4=A'dal's Signet of Defense", "=q1=#m4#: =ds=#s13#"}; { 28, 816252, "", "=q2=Formula: Enchant Weapon - Undaunted Might", "=ds=#p4# (375)", "", "5%"}; { 29, 428775, "", "=q4=Bor -o G'urth, the Hand of Death", "=ds=#w7#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Mythic}; - { 30, 428776, "", "=q4=Lebed -o G'urth, the Finger of Death", "=ds=#w7#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Mythic}; + { 30, 428775, "", "=q4=Lebed -o G'urth, the Finger of Death", "=ds=#w7#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Mythic}; Type = "BCRaid"; };