diff --git a/AtlasLoot/Core/AtlasIntegration.lua b/AtlasLoot/Core/AtlasIntegration.lua index 2d39704..f7c0908 100644 --- a/AtlasLoot/Core/AtlasIntegration.lua +++ b/AtlasLoot/Core/AtlasIntegration.lua @@ -37,7 +37,7 @@ function AtlasLootBoss_OnClick(name) local zoneID = ATLAS_DROPDOWNS[AtlasOptions.AtlasType][AtlasOptions.AtlasZone]; local id = this.idnum; - + AtlasLoot_Lastboss = AtlasLootBossButtons[zoneID][id]; --If the loot table was already shown and boss clicked again, hide the loot table and fix boss list icons if getglobal(name.."_Selected"):IsVisible() then getglobal(name.."_Selected"):Hide(); diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index a1b0aef..bd5f3de 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -55,6 +55,7 @@ ATLASLOOT_INDENT = " "; AtlasLoot_Dewdrop = AceLibrary("Dewdrop-2.0"); AtlasLoot_DewdropSubMenu = AceLibrary("Dewdrop-2.0"); AtlasLoot_DewdropSubMenu2 = AceLibrary("Dewdrop-2.0"); +AtlasLoot_DifficultyAtlas = AceLibrary("Dewdrop-2.0"); --Variable to cap debug spam ATLASLOOT_DEBUGSHOWN = false; @@ -81,8 +82,6 @@ Hooked_Atlas_Refresh = nil; Hooked_Atlas_OnShow = nil; Hooked_AtlasScrollBar_Update = nil; ---Pre Sets for defficuilty menu -SelectedTable2TextSet = true isTablereference = false notPattern = false @@ -367,6 +366,7 @@ function AtlasLoot_OnVariablesLoaded() AtlasLootDefaultFrame_SelectedCategory:SetText(AL["Choose Table ..."]); AtlasLootDefaultFrame_SelectedTable:SetText(""); AtlasLootDefaultFrame_SelectedTable2:SetText(""); + AtlasLootItemsFrame_DifficultyAtlasButton:SetText("Select Difficulty"); AtlasLootDefaultFrame_SelectedCategory:Show(); AtlasLootDefaultFrame_SelectedTable:Show(); AtlasLootDefaultFrame_SelectedTable2:Show(); @@ -528,18 +528,30 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) --Ditch the Quicklook selector AtlasLoot_QuickLooks:Hide(); AtlasLootQuickLooksButton:Hide(); - + -- Hide the Filter Check-Box AtlasLootFilterCheck:Hide(); - + + -- Hide Selector + AtlasLootItemsFrame_DifficultyAtlasButton:Disable(); + AtlasLootItemsFrame_DifficultyAtlasButton:Hide(); + + -- Updates AtlasLoot_Lastboss if your in a main loot table + if AtlasLoot_Hold == false or AtlasLoot_Lastboss == nil then + AtlasLoot_Lastboss = dataID; + end dataSource_backup = dataSource; + if dataID == "SearchResult" or dataID == "WishList" then ItemindexID = ""; + AtlasLootItemsFrame_DifficultyAtlasButton:Disable(); + AtlasLootItemsFrame_DifficultyAtlasButton:Hide(); AtlasLootDefaultFrame_SubMenu2:Disable(); AtlasLootDefaultFrame_SelectedTable2:SetText(""); AtlasLootDefaultFrame_SelectedTable2:Hide(); - dataSource = {}; - -- Match the page number to display + AtlasLootItemsFrame_DifficultyAtlasButton:SetText("Select Difficulty"); + dataSource = {}; + -- Match the page number to display wlPage = tonumber(dataSource_backup:match("%d+$")); -- Aquiring items of the page if dataID == "SearchResult" then @@ -559,7 +571,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) else Type = dataSource[dataID].Type; end - + if Type ~= lastType then AtlasLoot_DifficultyDisable() if lastReference ~= nil then @@ -576,6 +588,13 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) AtlasLootFilterCheck:SetChecked(false); ATLASLOOT_FILTER_ENABLE = false end + if (AtlasLootItemsFrame:GetParent() == AlphaMapAlphaMapFrame or AtlasLootItemsFrame:GetParent() == AtlasFrame) then + AtlasMapMenu = true; + else + AtlasLootItemsFrame_DifficultyAtlasButton:Hide(); + AtlasLootItemsFrame_DifficultyAtlasButton:Disable(); + AtlasMapMenu = false; + end if Type == nil and ATLASLOOT_FILTER_ENABLE == false or dataID:match("MENU") or ATLASLOOT_FILTER_ENABLE and dataSource[AtlasLoot_CurrentBoss].Type == nil then -- disable difficulty menu AtlasLoot_DifficultyDisable() @@ -794,9 +813,13 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) else itemButton.droprate = nil; end - if (dataID == "SearchResult" or dataID == "WishList") and dataSource[dataID][i][8] then + if (dataID == "SearchResult" or dataID == "WishList") and dataSource[dataID][i][8] then itemButton.sourcePage = dataSource[dataID][i][8]; - end + elseif dataSource[dataID][i][8] ~= nil and dataSource[dataID][i][8]:match("=LT=") then + itemButton.sourcePage = string.sub(dataSource[dataID][i][8], 5); + else + itemButton.sourcePage = nil; + end if dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH] then itemButton.difficulty = dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]; else @@ -868,7 +891,8 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) AtlasLoot_BossName:SetText(AtlasLoot_TableNames[dataID][1]..affix); else AtlasLoot_BossName:SetText(boss); - end + end + --Consult the button registry to determine what nav buttons are required if dataID == "SearchResult" or dataID == "WishList" then if wlPage < wlPageMax then @@ -891,11 +915,9 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) end if tablebase.Back then getglobal("AtlasLootItemsFrame_BACK"):Show(); - getglobal("AtlasLootItemsFrame_BACK").lootpage = tablebase.Back; + getglobal("AtlasLootItemsFrame_BACK").lootpage = tablebase.Back; end end - - end --For Alphamap and Atlas integration, show a 'close' button to hide the loot table and restore the map view @@ -910,7 +932,6 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) if ATLASLOOT_FILTER_ENABLE == true and dataID ~= "FilterList" then AtlasLoot_HideNoUsableItems() end - if AtlasLoot.db.profile.ItemAutoQuery then AtlasLoot_QueryLootPage(); end end @@ -1004,8 +1025,8 @@ function AtlasLoot_GenerateAtlasMenu(dataID, pFrame) getglobal("AtlasLootItemsFrame_PREV"):Show(); getglobal("AtlasLootItemsFrame_PREV").lootpage = tablebase.Prev; end - if tablebase.Back then - getglobal("AtlasLootItemsFrame_BACK"):Show(); + if tablebase.Back then + getglobal("AtlasLootItemsFrame_BACK"):Show(); getglobal("AtlasLootItemsFrame_BACK").lootpage = tablebase.Back; end @@ -1096,6 +1117,10 @@ function AtlasLoot_NavButton_OnClick() AtlasLoot_ShowItemsFrame("SearchResult", this.lootpage, (AL["Search Result: %s"]):format(AtlasLootCharDB.LastSearchedText or ""), AtlasLootItemsFrame.refresh[4]); elseif strsub(this.lootpage, 1, 12) == "WishListPage" then AtlasLoot_ShowItemsFrame("WishList", this.lootpage, AL["Wishlist"], AtlasLootItemsFrame.refresh[4]); + elseif AtlasLoot_Hold == true then + AtlasLoot_ShowItemsFrame(AtlasLoot_Lastboss, AtlasLootItemsFrame.refresh[2], "", AtlasLootItemsFrame.refresh[4]); + -- Lets AtlasLoot_Lastboss be updated after going back to main table + AtlasLoot_Hold = false; else AtlasLoot_ShowItemsFrame(this.lootpage, AtlasLootItemsFrame.refresh[2], "", AtlasLootItemsFrame.refresh[4]); end diff --git a/AtlasLoot/Core/AtlasLoot.xml b/AtlasLoot/Core/AtlasLoot.xml index 81ab198..f934f3f 100644 --- a/AtlasLoot/Core/AtlasLoot.xml +++ b/AtlasLoot/Core/AtlasLoot.xml @@ -369,6 +369,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + this:SetAutoFocus(false); + this:SetTextInsets(0, 8, 0, 0); + + + AtlasLoot:AdvancedSearch(AtlasLootAdvancedSearch_SearchBox:GetText()); + this:ClearFocus(); + + + + + - - - - - - - - - - - - - - - - - this:SetAutoFocus(false); @@ -2052,85 +2019,33 @@ this:ClearFocus(); - + - - - - - - - - - - - - - this:SetAutoFocus(false); @@ -2140,85 +2055,33 @@ this:ClearFocus(); - + - - - - - - - - - - - - - this:SetAutoFocus(false); @@ -2228,85 +2091,33 @@ this:ClearFocus(); - + - - - - - - - - - - - - - this:SetAutoFocus(false); @@ -2316,42 +2127,43 @@ this:ClearFocus(); - + - - - + - + - + - + - - - this:SetAutoFocus(false); - this:SetTextInsets(0, 8, 0, 0); - - - AtlasLoot:AdvancedSearch(AtlasLootAdvancedSearch_SearchBox:GetText()); - this:ClearFocus(); - - - - + + + + + + + + + + + + + + + - - diff --git a/AtlasLoot/Core/LootButtons.lua b/AtlasLoot/Core/LootButtons.lua index 9140d5d..36377b9 100644 --- a/AtlasLoot/Core/LootButtons.lua +++ b/AtlasLoot/Core/LootButtons.lua @@ -263,6 +263,10 @@ function AtlasLootItem_OnClick(arg1) if(dataID and dataSource and AtlasLoot_IsLootTableAvailable(dataID)) then AtlasLoot_ShowItemsFrame(dataID, dataSource, AtlasLoot_TableNames[dataID][1], AtlasLootItemsFrame.refresh[4]); end + elseif (arg1=="LeftButton") and this.sourcePage ~= nil then + --Holds AtlasLoot_Lastboss so back button works + AtlasLoot_Hold = true; + AtlasLoot_ShowBossLoot(this.sourcePage, this.sourcePage, pFrame); end else if IsShiftKeyDown() then diff --git a/AtlasLoot/Core/Search.lua b/AtlasLoot/Core/Search.lua index 399fafd..0aad8f3 100644 --- a/AtlasLoot/Core/Search.lua +++ b/AtlasLoot/Core/Search.lua @@ -203,7 +203,7 @@ local SLOT_FILTERS = { ["thrown"] = "INVTYPE_THROWN", ["rangedright"] = "INVTYPE_RANGEDRIGHT", ["quiver"] = "INVTYPE_QUIVER", - ["relic"] = "INVTYPE_RELIC" + ["relic"] = "INVTYPE_RELIC", }; local TYPE_FILTERS = { @@ -217,25 +217,26 @@ local TYPE_FILTERS = { ["totem"] = "Totems", ["sigil"] = "Sigils", + ["axe1h"] = "One-Handed Axes", + ["axe2h"] = "Two-Handed Axes", + ["bows"] = "Bows", ["bow"] = "Bows", - ["crossbow"] = "Crossbows", - ["dagger"] = "Daggers", + ["guns"] = "Guns", ["gun"] = "Guns", - ["fishing poles"] = "Fishing Poles", - ["fist"] = "Fist Weapons", - ["miscellaneous"] = "Miscellaneous", - ["axe"] = "One-Handed Axes", - ["mace"] = "One-Handed Maces", - ["sword"] = "One-Handed Swords", + ["mace1h"] = "One-Handed Maces", + ["mace2h"] = "Two-Handed Maces", ["polearm"] = "Polearms", - ["stave"] = "Staves", - ["staves"] = "Staves", + ["sword1h"] = "One-Handed Swords", + ["sword2h"] = "Two-Handed Swords", ["staff"] = "Staves", + ["fist"] = "Fist Weapons", + ["generic"] = "", + ["dagger"] = "Daggers", ["thrown"] = "Thrown", - ["2haxe"] = "Two-Handed Axes", - ["2hmace"] = "Two-Handed Maces", - ["2hsword"] = "Two-Handed Swords", + ["crossbows"] = "Crossbows", + ["crossbow"] = "Crossbows", ["wand"] = "Wands", + ["fishingpole"] = "Fishing Poles", } local NON_EQUIPABLE_SLOTS = { diff --git a/AtlasLoot/Core/SearchAdvanced.lua b/AtlasLoot/Core/SearchAdvanced.lua index e7e8008..a095914 100644 --- a/AtlasLoot/Core/SearchAdvanced.lua +++ b/AtlasLoot/Core/SearchAdvanced.lua @@ -3,22 +3,14 @@ local modules = { "AtlasLoot_BurningCrusade", "AtlasLoot_Crafting", "AtlasLoot_O AtlasLoot_QualityMenu = AceLibrary("Dewdrop-2.0"); AtlasLoot_DifficultyMenu = AceLibrary("Dewdrop-2.0"); -AtlasLoot_DiffSubMenu = AceLibrary("Dewdrop-2.0"); AtlasLoot_EquipMenu = AceLibrary("Dewdrop-2.0"); AtlasLoot_EquipSubMenu = AceLibrary("Dewdrop-2.0"); -AtlasLoot_WeaponSubMenu = AceLibrary("Dewdrop-2.0"); -AtlasLoot_Argument1Menu = AceLibrary("Dewdrop-2.0"); -AtlasLoot_Argument1SubMenu = AceLibrary("Dewdrop-2.0"); +local MAX_ARGUMENTS = 6; +local ACTIVE_ARGUMENT = 0; -AtlasLoot_Argument2Menu = AceLibrary("Dewdrop-2.0"); -AtlasLoot_Argument2SubMenu = AceLibrary("Dewdrop-2.0"); - -AtlasLoot_Argument3Menu = AceLibrary("Dewdrop-2.0"); -AtlasLoot_Argument3SubMenu = AceLibrary("Dewdrop-2.0"); - -AtlasLoot_Argument4Menu = AceLibrary("Dewdrop-2.0"); -AtlasLoot_Argument4SubMenu = AceLibrary("Dewdrop-2.0"); +AtlasLoot_ArgumentMenus = {}; +AtlasLoot_ArgumentSubMenus = {}; local GREY = "|cff999999"; local RED = "|cffff0000"; @@ -37,32 +29,68 @@ AdvSearchSubMenuText = ""; AdvSearchSetup = false; AtlasLoot_FrameMenuList = { - ["EquipSubMenu"] = {AtlasLoot_EquipSubMenu, "AtlasLootAdvancedSearch_EquipSub", "Select Option", "type", "", "AtlasLootAdvancedSearch_WeaponSub"}; - ["MythicSubMenu"] = {AtlasLoot_DiffSubMenu, "AtlasLootAdvancedSearch_MythicSub", "Mythic+ 1", "difficulty", 5}; - ["WeaponSubMenu"] = {AtlasLoot_WeaponSubMenu, "AtlasLootAdvancedSearch_WeaponSub", "Select Weapon Type", "type", ""}; + ["EquipSubMenu"] = {AtlasLoot_EquipSubMenu, "AtlasLootAdvancedSearch_EquipSub", "Select Option", "type", ""}; } AtlasLoot_AdvancedSearchMenus = { ["Difficulty"] ={ [1] = { - {"Normal", "difficulty", AtlasLoot_Difficulty.Normal, "MythicSubMenu", "Disable"}, + {"Normal", "difficulty", AtlasLoot_Difficulty.Normal}, }, [2] = { - {"Heroic", "difficulty", AtlasLoot_Difficulty.Heroic, "MythicSubMenu", "Disable"}, + {"Heroic", "difficulty", AtlasLoot_Difficulty.Heroic}, }, [3] = { - {"Mythic/Ascended", "difficulty", AtlasLoot_Difficulty.Mythic, "MythicSubMenu", "Disable"}, + {"Mythic/Ascended", "difficulty", AtlasLoot_Difficulty.Mythic}, }, [4] = { - {"Mythic Plus", "difficulty", AtlasLoot_Difficulty.MythicPlus[1], "MythicSubMenu", "MythicPlus"}, + ["Mythic+ 1-10"] = { + {"Mythic 1", "difficulty", AtlasLoot_Difficulty.MythicPlus[1]}, + {"Mythic 2", "difficulty", AtlasLoot_Difficulty.MythicPlus[2]}, + {"Mythic 3", "difficulty", AtlasLoot_Difficulty.MythicPlus[3]}, + {"Mythic 4", "difficulty", AtlasLoot_Difficulty.MythicPlus[4]}, + {"Mythic 5", "difficulty", AtlasLoot_Difficulty.MythicPlus[5]}, + {"Mythic 6", "difficulty", AtlasLoot_Difficulty.MythicPlus[6]}, + {"Mythic 7", "difficulty", AtlasLoot_Difficulty.MythicPlus[7]}, + {"Mythic 8", "difficulty", AtlasLoot_Difficulty.MythicPlus[8]}, + {"Mythic 9", "difficulty", AtlasLoot_Difficulty.MythicPlus[9]}, + {"Mythic 10", "difficulty", AtlasLoot_Difficulty.MythicPlus[10]}, + }, }, - [5] = { - {"Bloodforged", "difficulty", AtlasLoot_Difficulty.Bloodforged, "MythicSubMenu", "Disable"}, + [5] = { + ["Mythic+ 11-20"] = { + {"Mythic 11", "difficulty", AtlasLoot_Difficulty.MythicPlus[11]}, + {"Mythic 12", "difficulty", AtlasLoot_Difficulty.MythicPlus[12]}, + {"Mythic 13", "difficulty", AtlasLoot_Difficulty.MythicPlus[13]}, + {"Mythic 14", "difficulty", AtlasLoot_Difficulty.MythicPlus[14]}, + {"Mythic 15", "difficulty", AtlasLoot_Difficulty.MythicPlus[15]}, + {"Mythic 16", "difficulty", AtlasLoot_Difficulty.MythicPlus[16]}, + {"Mythic 17", "difficulty", AtlasLoot_Difficulty.MythicPlus[17]}, + {"Mythic 18", "difficulty", AtlasLoot_Difficulty.MythicPlus[18]}, + {"Mythic 19", "difficulty", AtlasLoot_Difficulty.MythicPlus[19]}, + {"Mythic 20", "difficulty", AtlasLoot_Difficulty.MythicPlus[20]}, + }, }, - }; - - ["MythicPlus"] = { - + [6] = { + ["Mythic+ 21-30"] = { + {"Mythic 21", "difficulty", AtlasLoot_Difficulty.MythicPlus[21]}, + {"Mythic 22", "difficulty", AtlasLoot_Difficulty.MythicPlus[22]}, + {"Mythic 23", "difficulty", AtlasLoot_Difficulty.MythicPlus[23]}, + {"Mythic 24", "difficulty", AtlasLoot_Difficulty.MythicPlus[24]}, + {"Mythic 25", "difficulty", AtlasLoot_Difficulty.MythicPlus[25]}, + {"Mythic 26", "difficulty", AtlasLoot_Difficulty.MythicPlus[26]}, + {"Mythic 27", "difficulty", AtlasLoot_Difficulty.MythicPlus[27]}, + {"Mythic 28", "difficulty", AtlasLoot_Difficulty.MythicPlus[28]}, + {"Mythic 29", "difficulty", AtlasLoot_Difficulty.MythicPlus[29]}, + {"Mythic 30", "difficulty", AtlasLoot_Difficulty.MythicPlus[30]}, + }, + }, + [7] = { + {"Bloodforged", "difficulty", AtlasLoot_Difficulty.Bloodforged}, + }, + [8] = { + {RED.."Reset", "difficulty", "reset"}, + }, }; ["Quality"] = { @@ -84,6 +112,9 @@ AtlasLoot_AdvancedSearchMenus = { [4] = { {AtlasLoot_FixText("=q5=").."Legendary", "quality", "legendary"}, }, + [5] = { + {RED.."Reset", "quality", "reset"}, + }, }; ["Equip"] = { @@ -111,27 +142,33 @@ AtlasLoot_AdvancedSearchMenus = { [8] = { {"Feet", "equip", "feet", "EquipSubMenu", "ArmorType"}, }, - [9] = { - {"Back", "equip", "back", "EquipSubMenu", "Disable"}, - }, - [10] = { - {"Necklace", "equip", "neck", "EquipSubMenu", "Disable"}, - }, - [11] = { - {"Ring", "equip", "finger", "EquipSubMenu", "Disable"}, - }, - [12] = { - {"Trinket", "equip", "trinket", "EquipSubMenu", "Disable"}, - }, - [13] = { - {"Weapon/Shield", "equip", "#w", "EquipSubMenu", "WeaponEquip"}, - }, - [14] = { - {"Held in Off-Hand", "equip", "holdable", "EquipSubMenu", "Disable"}, + [9] = { + ["Accessories"] = { + {"Necklace", "equip", "neck", "EquipSubMenu", "Disable"}, + {"Back", "equip", "back", "EquipSubMenu", "Disable"}, + {"Ring", "equip", "finger", "EquipSubMenu", "Disable"}, + {"Trinket", "equip", "trinket", "EquipSubMenu", "Disable"}, + }, }, - [15] = { - {"Relic", "equip", "relic", "EquipSubMenu", "RelicType"}, + [10] = { + ["Weapons"] = { + {"One-Hand", "equip", "weapon", "EquipSubMenu", "WeaponType1H"}, + {"Two-Hand", "equip", "2h", "EquipSubMenu", "WeaponType2H"}, + {"Main Hand", "equip", "mainhand", "EquipSubMenu", "WeaponType1H"}, + {"Off Hand", "equip", "offhand", "EquipSubMenu", "WeaponType1H"}, + {"Ranged", "equip", "ranged", "EquipSubMenu", "WeaponTypeRanged"}, + {"Relic", "equip", "relic", "EquipSubMenu", "RelicType"}, + }, }, + [11] = { + ["Off-Hand"] = { + {"Shield", "equip", "shield", "EquipSubMenu", "Disable"}, + {"Held in Off-Hand", "equip", "holdable", "EquipSubMenu", "Disable"}, + } + }, + [12] = { + {RED.."Reset", "equip", "reset", "EquipSubMenu", "Disable"}, + }, }; ["ArmorType"] = { @@ -147,6 +184,9 @@ AtlasLoot_AdvancedSearchMenus = { [4] = { {"Plate", "type", "Plate"}, }, + [5] = { + {RED.."Reset", "type", "reset"}, + }, }; ["RelicType"] = { @@ -162,65 +202,72 @@ AtlasLoot_AdvancedSearchMenus = { [4] = { {"Sigil", "type", "sigil"}, }, + [5] = { + {RED.."Reset", "type", "reset"}, + }, }; - ["WeaponEquip"] = { + ["WeaponType1H"] = { [1] = { - {"One-Hand", "equip", "weapon", "WeaponSubMenu", "WeaponType"}, - }, - [2] = { - {"Two-Hand", "equip", "2h", "WeaponSubMenu", "WeaponType"}, - }, - [3] = { - {"Main Hand", "equip", "mainhand", "WeaponSubMenu", "WeaponType"}, - }, - [4] = { - {"Off Hand", "equip", "offhand", "WeaponSubMenu", "WeaponType"}, - }, - [5] = { - {"Ranged", "equip", "ranged", "WeaponSubMenu", "WeaponType"}, - } - }; - - ["WeaponType"] = { - [1] = { - {"Axe", "type", "axe"} + {"Axe", "type", "axe1h"} }, [2] = { - {"Mace", "type", "mace"} + {"Mace", "type", "mace1h"} }, [3] = { - {"Sword", "type", "sword"} + {"Sword", "type", "sword1h"} + }, + [4] = { + {"Dagger", "type", "dagger"} + }, + [5] = { + {"Fist Weapon", "type", "fist"} + }, + [6] = { + {RED.."Reset", "type", "reset"}, + }, + }; + + ["WeaponType2H"] = { + [1] = { + {"Axe", "type", "axe2h"} + }, + [2] = { + {"Mace", "type", "mace2h"} + }, + [3] = { + {"Sword", "type", "sword2h"} }, [4] = { {"Polearm", "type", "polearm"} }, [5] = { - {"Dagger", "type", "dagger"} + {"Staff", "type", "staff"} }, [6] = { - {"Staff", "type", "stave"} + {RED.."Reset", "type", "reset"}, }, - [7] = { - {"Fist Weapon", "type", "fist"} + + }; + + ["WeaponTypeRanged"] = { + [1] = { + {"Bow", "type", "bows"} }, - [8] = { - {"Bow", "type", "bow"} + [2] = { + {"Gun", "type", "guns"} }, - [9] = { - {"Gun", "type", "gun"} + [3] = { + {"Crossbow", "type", "crossbows"} }, - [10] = { - {"Crossbow", "type", "crossbow"} - }, - [11] = { + [4] = { {"Wand", "type", "wand"} }, - [12] = { + [5] = { {"Thrown", "type", "thrown"} }, - [13] = { - {"Shield", "type", "shield"} + [6] = { + {RED.."Reset", "type", "reset"}, }, }; } @@ -320,14 +367,6 @@ AdvancedSearchOptions = { ["equip"] = "", ["type"] = "", ["difficulty"] = "", - ["arg1"] = "minlvl", - ["arg1op"] = "=", - ["arg2"] = "", - ["arg2op"] = "", - ["arg3"] = "", - ["arg3op"] = "", - ["arg4"] = "", - ["arg4op"] = "", } function AtlasLoot_AdvancedSearchSetup() @@ -335,22 +374,69 @@ function AtlasLoot_AdvancedSearchSetup() AtlasLoot_AdvancedSearchRegister(AtlasLoot_EquipMenu, AtlasLootAdvancedSearch_Equip, AtlasLoot_AdvancedSearchMenus["Equip"]); AtlasLoot_AdvancedSearchRegister(AtlasLoot_DifficultyMenu, AtlasLootAdvancedSearch_Difficulty, AtlasLoot_AdvancedSearchMenus["Difficulty"]); - AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument1Menu, AtlasLootAdvancedSearch_Argument1, "1", AtlasLoot_AdvancedSearchArguments["Arguments"]); - AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument2Menu, AtlasLootAdvancedSearch_Argument2, "2", AtlasLoot_AdvancedSearchArguments["Arguments"]); - AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument3Menu, AtlasLootAdvancedSearch_Argument3, "3", AtlasLoot_AdvancedSearchArguments["Arguments"]); - AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument4Menu, AtlasLootAdvancedSearch_Argument4, "4", AtlasLoot_AdvancedSearchArguments["Arguments"]); + local addArg = CreateFrame("Button", "AtlasLootAdvancedSearch_ArgumentContainerAddArgBtn", AtlasLootAdvancedSearch_ArgumentContainer, "OptionsButtonTemplate"); + addArg:SetPoint("BOTTOMLEFT", AtlasLootAdvancedSearch_ArgumentContainer, "TOPLEFT", 110, 2); + addArg:SetSize(20, 20); + addArg:SetText("+"); + addArg:SetScript("OnClick", function(self, button) + AddArgumentContainer(); + end) - AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument1SubMenu, AtlasLootAdvancedSearch_Argument1Sub, "1", AtlasLoot_AdvancedSearchArguments["Operators"]); - AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument2SubMenu, AtlasLootAdvancedSearch_Argument2Sub, "2", AtlasLoot_AdvancedSearchArguments["Operators"]); - AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument3SubMenu, AtlasLootAdvancedSearch_Argument3Sub, "3", AtlasLoot_AdvancedSearchArguments["Operators"]); - AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_Argument4SubMenu, AtlasLootAdvancedSearch_Argument4Sub, "4", AtlasLoot_AdvancedSearchArguments["Operators"]); + local remArg = CreateFrame("Button", "AtlasLootAdvancedSearch_ArgumentContainerRemArgBtn", AtlasLootAdvancedSearch_ArgumentContainer, "OptionsButtonTemplate") + remArg:SetPoint("LEFT", AtlasLootAdvancedSearch_ArgumentContainerAddArgBtn, "RIGHT", 10, 0); + remArg:SetSize(20, 20); + remArg:SetText("-"); + remArg:SetScript("OnClick", function(self, button) + RemoveArgumentContainer(); + end) + remArg:Disable(); - --Setup Mythic+ dropdown options; - for i = 1, 30, 1 do - AtlasLoot_AdvancedSearchMenus["MythicPlus"][i] = { - {"Mythic+ "..i, "difficulty", AtlasLoot_Difficulty.MythicPlus[i]}; - } - end + for n = 1, MAX_ARGUMENTS do + AtlasLoot_ArgumentMenus[n] = AceLibrary("Dewdrop-2.0"); + AtlasLoot_ArgumentSubMenus[n] = AceLibrary("Dewdrop-2.0"); + + local btn = CreateFrame("Button", "AtlasLootAdvancedSearch_ArgumentContainer"..tostring(n), AtlasLootAdvancedSearch_ArgumentContainer, "OptionsButtonTemplate"); + btn:SetPoint("TOPLEFT", AtlasLootAdvancedSearch_ArgumentContainer, "TOPLEFT", 0, -((n-1) * 35)); + btn:SetSize(130, 20); + btn:SetScript("OnClick", function(self, button) + if AtlasLoot_ArgumentMenus[n]:IsOpen() then + AtlasLoot_ArgumentMenus[n]:Close(); + else + AtlasLoot_ArgumentMenus[n]:Open(self); + end + end) + btn:Hide(); + btn:SetText("Select Option"); + + local sub = CreateFrame("Button", "AtlasLootAdvancedSearch_ArgumentContainer"..tostring(n).."Sub", AtlasLootAdvancedSearch_ArgumentContainer, "OptionsButtonTemplate"); + sub:SetPoint("LEFT", btn, "RIGHT", 15, 0); + sub:SetSize(130, 20); + sub:SetScript("OnClick", function(self, button) + if AtlasLoot_ArgumentSubMenus[n]:IsOpen() then + AtlasLoot_ArgumentSubMenus[n]:Close(); + else + AtlasLoot_ArgumentSubMenus[n]:Open(self); + end + end) + sub:Hide(); + sub:Disable(); + + local txt = CreateFrame("EditBox", "AtlasLootAdvancedSearch_ArgumentContainer"..tostring(n).."Value", AtlasLootAdvancedSearch_ArgumentContainer, "InputBoxTemplate") + txt:SetPoint("LEFT", sub, "RIGHT", 15, 0); + txt:SetSize(65, 35); + txt:SetAutoFocus(false); + txt:SetTextInsets(0, 8, 0, 0); + txt:SetScript("OnEnterPressed", function(self) + self:ClearFocus(); + end) + txt:Hide(); + + AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_ArgumentMenus[n], _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(n)], tostring(n), AtlasLoot_AdvancedSearchArguments["Arguments"]); + AtlasLoot_AdvancedSearchArgumentRegister(AtlasLoot_ArgumentSubMenus[n], _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(n).."Sub"], tostring(n), AtlasLoot_AdvancedSearchArguments["Operators"]); + end + + --Reset Search options to defualt + AtlasLoot_AdvancedSearchReset(); AdvSearchSetup = true; end @@ -370,6 +456,12 @@ function AtlasLoot_AdvancedSearchShow() getglobal("AtlasLootItemsFrame_PREV"):Hide(); getglobal("AtlasLootItemsFrame_BACK"):Hide(); + --Clear these values to defualt + AdvSearchSubMenuEnabled = 0; + AdvSearchSubMenuText = ""; + AdvSearchSubMenu2Enabled = 0; + AdvSearchSubMenuText = ""; + if AtlasLootDefaultFrame_SubMenu2:IsEnabled() then AdvSearchSubMenu2Enabled = 1; AdvSearchSubMenu2Text = AtlasLootDefaultFrame_SelectedTable2:GetText(); @@ -402,9 +494,6 @@ function AtlasLoot_AdvancedSearchShow() getglobal("AtlasLootItem_"..i).spellitemID = 0; end - --Reset Search options - AtlasLoot_AdvancedSearchReset(); - AtlasLoot_BossName:SetText("Advanced Search"); AtlasLootAdvancedSearch:ClearAllPoints(); @@ -442,50 +531,76 @@ function AtlasLoot_AdvancedSearchReset() ["equip"] = "", ["type"] = "", ["difficulty"] = "", - ["arg1"] = "minlvl", - ["arg1op"] = "=", - ["arg2"] = "", - ["arg2op"] = "", - ["arg3"] = "", - ["arg3op"] = "", - ["arg4"] = "", - ["arg4op"] = "", } + for i = 1, MAX_ARGUMENTS do + AdvancedSearchOptions["arg"..tostring(i)] = ""; + AdvancedSearchOptions["arg"..tostring(i).."op"] = ""; + + RemoveArgumentContainer(); + end + + AtlasLootAdvancedSearch_LevelMin:SetText(UnitLevel("player")); + AtlasLootAdvancedSearch_LevelMax:SetText(UnitLevel("player")); + AtlasLootAdvancedSearch_ILevelMin:SetText(""); + AtlasLootAdvancedSearch_ILevelMax:SetText(""); + AtlasLootAdvancedSearch_Quality:SetText("Select Quality"); + AtlasLootAdvancedSearch_Equip:SetText("Select Item Type"); - AtlasLootAdvancedSearch_Difficulty:SetText("Select Difficulty"); - - AtlasLootAdvancedSearch_Argument1:SetText("Required Level"); - AtlasLootAdvancedSearch_Argument1Sub:SetText("Equals"); - AtlasLootAdvancedSearch_Argument1Value:SetText(UnitLevel("player")); - - AtlasLootAdvancedSearch_Argument2:SetText("Select Option"); - AtlasLootAdvancedSearch_Argument3:SetText("Select Option"); - AtlasLootAdvancedSearch_Argument4:SetText("Select Option"); - AtlasLootAdvancedSearch_EquipSub:Disable(); AtlasLootAdvancedSearch_EquipSub:SetText("Select Option") - AtlasLootAdvancedSearch_MythicSub:Disable(); - AtlasLootAdvancedSearch_MythicSub:SetText("Mythic+ 1"); - AtlasLootAdvancedSearch_WeaponSub:Disable(); - AtlasLootAdvancedSearch_WeaponSub:SetText("Select Weapon Type") - AtlasLootAdvancedSearch_Argument2Sub:Disable(); - AtlasLootAdvancedSearch_Argument2Sub:SetText("Select Option"); - AtlasLootAdvancedSearch_Argument2Value:Hide(); - AtlasLootAdvancedSearch_Argument2Value:SetText(""); - AtlasLootAdvancedSearch_Argument3Sub:Disable(); - AtlasLootAdvancedSearch_Argument3Sub:SetText("Select Option"); - AtlasLootAdvancedSearch_Argument3Value:Hide(); - AtlasLootAdvancedSearch_Argument3Value:SetText(""); - AtlasLootAdvancedSearch_Argument4Sub:Disable(); - AtlasLootAdvancedSearch_Argument4Sub:SetText("Select Option"); - AtlasLootAdvancedSearch_Argument4Value:Hide(); - AtlasLootAdvancedSearch_Argument4Value:SetText(""); + AtlasLootAdvancedSearch_Difficulty:SetText("Select Difficulty"); end +function AddArgumentContainer() + if ACTIVE_ARGUMENT == MAX_ARGUMENTS then AdvSearchArgButtonToggle() return end + ACTIVE_ARGUMENT = ACTIVE_ARGUMENT + 1; + + _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT)]:Show(); + _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT)]:SetText("Select Option"); + _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT).."Sub"]:Show(); + + AdvSearchArgButtonToggle() +end + +function RemoveArgumentContainer() + if ACTIVE_ARGUMENT == 0 then AdvSearchArgButtonToggle() return end + + AdvancedSearchOptions["arg"..tostring(ACTIVE_ARGUMENT)] = ""; + AdvancedSearchOptions["arg"..tostring(ACTIVE_ARGUMENT).."op"] = ""; + + _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT)]:Hide(); + _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT).."Sub"]:Disable(); + _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT).."Sub"]:Hide(); + _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(ACTIVE_ARGUMENT).."Value"]:Hide(); + + ACTIVE_ARGUMENT = ACTIVE_ARGUMENT - 1; + AdvSearchArgButtonToggle() +end + +function AdvSearchArgButtonToggle() + if ACTIVE_ARGUMENT == MAX_ARGUMENTS then + AtlasLootAdvancedSearch_ArgumentContainerAddArgBtn:Disable() + else + AtlasLootAdvancedSearch_ArgumentContainerAddArgBtn:Enable() + end + + if ACTIVE_ARGUMENT == 0 then + AtlasLootAdvancedSearch_ArgumentContainerRemArgBtn:Disable() + else + AtlasLootAdvancedSearch_ArgumentContainerRemArgBtn:Enable() + end +end + +AdvSearchDefaultText = { + ["quality"] = "Select Quality", + ["equip"] = "Select Item Type", + ["type"] = "Select Option", + ["difficulty"] = "Select Difficulty" +} function AtlasLoot_AdvancedSearchMenuClick(Object, VariableToSet, VariableValue, ChildMenu, ChildMenuRegister) --Setups child menus and sets search options to default @@ -497,6 +612,14 @@ function AtlasLoot_AdvancedSearchMenuClick(Object, VariableToSet, VariableValue, if(AtlasLoot_FrameMenuList[ChildMenu][6]) then getglobal(AtlasLoot_FrameMenuList[ChildMenu][6]):Disable(); end + if VariableValue == "reset" then + AdvancedSearchOptions[VariableToSet] = ""; + Object[1]:SetText(AdvSearchDefaultText[VariableToSet]); + Object[2]:Close(); + + getglobal(AtlasLoot_FrameMenuList[ChildMenu][2]):SetText(AtlasLoot_FrameMenuList[ChildMenu][3]) + return + end else AtlasLoot_AdvancedSearchRegister(AtlasLoot_FrameMenuList[ChildMenu][1], getglobal(AtlasLoot_FrameMenuList[ChildMenu][2]), AtlasLoot_AdvancedSearchMenus[ChildMenuRegister]); AdvancedSearchOptions[AtlasLoot_FrameMenuList[ChildMenu][4]] = AtlasLoot_FrameMenuList[ChildMenu][5]; @@ -508,6 +631,12 @@ function AtlasLoot_AdvancedSearchMenuClick(Object, VariableToSet, VariableValue, end end end + if VariableValue == "reset" then + AdvancedSearchOptions[VariableToSet] = ""; + Object[1]:SetText(AdvSearchDefaultText[VariableToSet]); + Object[2]:Close(); + return + end AdvancedSearchOptions[VariableToSet] = VariableValue; Object[1]:SetText(Object[3]); Object[2]:Close(); @@ -568,6 +697,24 @@ function AtlasLoot_AdvancedSearchRegister(DropDown, DropDownObject, MenuOption) 'func', function() DropDown:Close() end, 'notCheckable', true ) + elseif level == 2 then + if value then + for k,v in ipairs(value) do + DropDown:AddLine( + 'text', v[1], + 'textR', 1, + 'textG', 0.82, + 'textB', 0, + 'func', AtlasLoot_AdvancedSearchMenuClick, + 'arg1', {DropDownObject, DropDown, v[1]}, + 'arg2', v[2], + 'arg3', v[3], + 'arg4', v[4], + 'arg5', v[5], + 'notCheckable', true + ) + end + end end end, 'dontHook', true @@ -578,24 +725,24 @@ function AtlasLoot_AdvancedSearchArgumentClick(Object, VariableToSet, VariableVa if IsOperator and VariableValue == "reset" then AdvancedSearchOptions["arg"..VariableToSet.."op"] = ""; - getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):SetText(""); - getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):Hide(); + getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):SetText(""); + getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):Hide(); Object[1]:SetText("Select Option"); Object[2]:Close(); elseif IsOperator then AdvancedSearchOptions["arg"..VariableToSet.."op"] = VariableValue; - getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):Show(); + getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):Show(); Object[1]:SetText(Object[3]); Object[2]:Close(); elseif VariableValue == "reset" then - getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Sub"):SetText("Select Option"); - getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Sub"):Disable(); + getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Sub"):SetText("Select Option"); + getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Sub"):Disable(); - getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):SetText(""); - getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):Hide(); + getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):SetText(""); + getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):Hide(); AdvancedSearchOptions["arg"..VariableToSet] = ""; AdvancedSearchOptions["arg"..VariableToSet.."op"] = ""; @@ -603,12 +750,12 @@ function AtlasLoot_AdvancedSearchArgumentClick(Object, VariableToSet, VariableVa Object[1]:SetText("Select Option"); Object[2]:Close(); else - getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Sub"):SetText("Select Option"); - getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Sub"):Enable(); + getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Sub"):SetText("Select Option"); + getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Sub"):Enable(); AdvancedSearchOptions["arg"..VariableToSet.."op"] = ""; - getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):SetText(""); - getglobal("AtlasLootAdvancedSearch_Argument"..VariableToSet.."Value"):Hide(); + getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):SetText(""); + getglobal("AtlasLootAdvancedSearch_ArgumentContainer"..VariableToSet.."Value"):Hide(); AdvancedSearchOptions["arg"..VariableToSet] = VariableValue; Object[1]:SetText(Object[3]); @@ -749,7 +896,7 @@ function AtlasLoot_AdvancedSearchArgumentRegister(DropDown, DropDownObject, Argu ) end -function AtlasLoot:AdvancedSearch(Text, args) +function AtlasLoot:AdvancedSearch(Text) if not Text then return end Text = strtrim(Text); local advSearchString = Text or ""; @@ -763,10 +910,21 @@ function AtlasLoot:AdvancedSearch(Text, args) return str; end - local function AdvancedSearchFixType(slot, subType) - if slot == "2h" and (subType == "axe" or subType == "sword" or subType == "mace") then - return slot..subType; + local function GetTextByName(name) + if (_G["AtlasLootAdvancedSearch_"..name]) then + return _G["AtlasLootAdvancedSearch_"..name]:GetText() end + + return nil; + end + + local function FixRangedSlot(subType) + if (subType == "wand" or subType == "gun" or subType == "crossbow") then + return "rangedright"; + elseif subType == "thrown" then + return "thrown"; + end + return "ranged"; end if AdvancedSearchOptions["quality"] ~= "" then @@ -774,11 +932,13 @@ function AtlasLoot:AdvancedSearch(Text, args) end if AdvancedSearchOptions["equip"] ~= "" then + if AdvancedSearchOptions["equip"] == "ranged" and AdvancedSearchOptions["type"] ~= ""then + AdvancedSearchOptions["equip"] = FixRangedSlot(AdvancedSearchOptions["type"]); + end advSearchString = AppendSearchString(advSearchString, "slot="..AdvancedSearchOptions["equip"]); end if AdvancedSearchOptions["type"] ~= "" and AdvancedSearchOptions["type"] then - AdvancedSearchOptions["type"] = AdvancedSearchFixType(AdvancedSearchOptions["equip"], AdvancedSearchOptions["type"]) or AdvancedSearchOptions["type"]; advSearchString = AppendSearchString(advSearchString, "type="..AdvancedSearchOptions["type"]); end @@ -786,16 +946,34 @@ function AtlasLoot:AdvancedSearch(Text, args) advSearchString = AppendSearchString(advSearchString, "dif="..AdvancedSearchOptions["difficulty"]); end - for i = 1, 4, 1 do + if (GetTextByName("LevelMin") and GetTextByName("LevelMin") ~= "") then + advSearchString = AppendSearchString(advSearchString, "minlvl>="..GetTextByName("LevelMin")); + end + + if (GetTextByName("LevelMax") and GetTextByName("LevelMax") ~= "") then + advSearchString = AppendSearchString(advSearchString, "minlvl<="..GetTextByName("LevelMax")); + end + + if (GetTextByName("ILevelMin") and GetTextByName("ILevelMin") ~= "") then + advSearchString = AppendSearchString(advSearchString, "ilvl>="..GetTextByName("ILevelMin")); + end + + if (GetTextByName("ILevelMax") and GetTextByName("ILevelMax") ~= "") then + advSearchString = AppendSearchString(advSearchString, "ilvl<="..GetTextByName("ILevelMax")); + end + + for i = 1, ACTIVE_ARGUMENT, 1 do if AdvancedSearchOptions["arg"..i] ~= "" then + local arg = _G["AtlasLootAdvancedSearch_ArgumentContainer"..tostring(i).."Value"]:GetText(); if AdvancedSearchOptions["arg"..i.."op"] == "" then AdvancedSearchOptions["arg"..i.."op"] = ">" - args[i] = "0"; - print(args[i]); + arg = "0"; end - advSearchString = AppendSearchString(advSearchString, AdvancedSearchOptions["arg"..i]..AdvancedSearchOptions["arg"..i.."op"]..args[i]); + advSearchString = AppendSearchString(advSearchString, AdvancedSearchOptions["arg"..i]..AdvancedSearchOptions["arg"..i.."op"]..arg); end end + + AtlasLoot:Search(string.lower(advSearchString)); end \ No newline at end of file diff --git a/AtlasLoot/Core/TextParsing.lua b/AtlasLoot/Core/TextParsing.lua index 0b61279..f1864f0 100644 --- a/AtlasLoot/Core/TextParsing.lua +++ b/AtlasLoot/Core/TextParsing.lua @@ -132,7 +132,7 @@ function AtlasLoot_FixText(text) text = gsub(text, "#e22#", AL["Combat Pet"]); text = gsub(text, "#e23#", AL["Fireworks"]); text = gsub(text, "#e24#", AL["Fishing Lure"]); - + -- Labels for Loot Descriptions text = gsub(text, "#m1#", AL["Classes:"]); text = gsub(text, "#m2#", AL["This Item Begins a Quest"]); @@ -699,6 +699,16 @@ function AtlasLoot_FixText(text) text = gsub(text, "#aq40s8#", AL["Doomcaller's Attire"]); text = gsub(text, "#aq40s9#", AL["Conqueror's Battlegear"]); + -- Teir Tokens + text = gsub(text, "#tt1#", AL["Tier 1 Set Token"]); + text = gsub(text, "#tt2#", AL["Tier 2 Set Token"]); + text = gsub(text, "#tt2.5#", AL["Tier 2.5 Set Token"]); + text = gsub(text, "#tt3#", AL["Tier 3 Set Token"]); + text = gsub(text, "#tt4#", AL["Tier 4 Set Token"]); + text = gsub(text, "#tt5#", AL["Tier 5 Set Token"]); + text = gsub(text, "#tt6#", AL["Tier 6 Set Token"]); + text = gsub(text, "#tt7#", AL["Tier 7 Set Token"]); + -- Dungeon 1 Sets text = gsub(text, "#t0s1#", AL["Wildheart Raiment"]); text = gsub(text, "#t0s2#", AL["Beaststalker Armor"]); diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua index b097464..4b8b95d 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua @@ -25,6 +25,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Dewdrop = AceLibrary("Dewdrop-2.0"); AtlasLoot_DewdropSubMenu = AceLibrary("Dewdrop-2.0"); AtlasLoot_DewdropSubMenu2 = AceLibrary("Dewdrop-2.0"); +AtlasLoot_DifficultyAtlas = AceLibrary("Dewdrop-2.0"); indexID = 2 ItemindexID = "" @@ -33,7 +34,7 @@ AtlasLoot_Data["AtlasLootFallback"] = { }; --[[ -AtlasLoot_DewDropClick(tablename, text, tabletype, tabletype2): +AtlasLoot_DewDropClick(tablename, text, tabletype): tablename - Name of the loot table in the database text - Heading for the loot table tabletype - Whether the tablename indexes an actual table or needs to generate a submenu @@ -44,10 +45,12 @@ function AtlasLoot_DewDropClick(tablename, text, tabletype) --Definition of where I want the loot table to be shown pFrame = { "TOPLEFT", "AtlasLootDefaultFrame_LootBackground", "TOPLEFT", "2", "-2" }; --If the button clicked was linked to a loot table - if tabletype == "Table" then - --Show the loot table - AtlasLoot_ShowItemsFrame(tablename, "", text, pFrame); + Hold = false; + if tabletype == "Table" then + --Show the loot table + AtlasLoot_ShowBossLoot(tablename, tablename, pFrame); --Save needed info for fuure re-display of the table + AtlasLoot_Lastboss = tablename; AtlasLoot.db.profile.LastBoss = tablename; --Purge the text label for the submenu and disable the submenu AtlasLootDefaultFrame_SubMenu:Disable(); @@ -57,6 +60,7 @@ function AtlasLoot_DewDropClick(tablename, text, tabletype) else --Enable the submenu button AtlasLootDefaultFrame_SubMenu:Enable(); + AtlasLoot_Lastboss = AtlasLoot_DewDropDown_SubTables[tablename][1][2]; --Show the first loot table associated with the submenu AtlasLoot_ShowBossLoot(AtlasLoot_DewDropDown_SubTables[tablename][1][2], AtlasLoot_DewDropDown_SubTables[tablename][1][1], pFrame); --Save needed info for fuure re-display of the table @@ -157,11 +161,32 @@ function AtlasLoot_DewDropSubMenu2Click(raidtablename, itemID, itemColour) end end +function AtlasLoot_DifficultyAtlasClick(raidtablename, itemID, itemColour) + if ATLASLOOT_FILTER_ENABLE == true then --used to refresh loottable when filter is enabled + AtlasLoot_FilterEnableButton() + ReEnableFilter = true + end + -- gets itemID reference + AtlasLootDefaultFrame_GetRaidDifficulty(raidtablename, itemID, itemColour) + --Show the select loot table + AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4]); + --Set text for difficulty + AtlasLootItemsFrame_DifficultyAtlasButton:SetText(DropTablename); + AtlasLoot_DifficultyAtlas:Close(1); + if ReEnableFilter then --used to refresh loottable when filter is enabled + AtlasLoot_FilterEnableButton() + end +end + function AtlasLoot_DifficultyDisable() --Disables Difficulty Menu isTablereference = false notPattern = false + AtlasLootItemsFrame_DifficultyAtlasButton:Hide(); + AtlasLootItemsFrame_DifficultyAtlasButton:Disable(); + AtlasLoot_DifficultyAtlas:Unregister(AtlasLootItemsFrame_DifficultyAtlasButton); AtlasLoot_DewdropSubMenu2:Unregister(AtlasLootDefaultFrame_SubMenu2); AtlasLootDefaultFrame_SubMenu2:Disable(); + AtlasLootItemsFrame_DifficultyAtlasButton:SetText("Select Difficulty"); AtlasLootDefaultFrame_SelectedTable2:SetText(""); AtlasLootDefaultFrame_SelectedTable2:Hide(); DewDrop2Enable = false @@ -170,15 +195,26 @@ end function AtlasLoot_DifficultyEnable(dataID, dataSource) --Enables Difficulty Menu if not AtlasLoot_Difficulty[dataSource[dataID].Type] then return end - - AtlasLootDefaultFrame_SubMenu2:Enable(); - AtlasLoot_DewdropSubMenu2:Unregister(AtlasLootDefaultFrame_SubMenu2); - AtlasLoot_DewdropSubMenu2Register(AtlasLoot_Difficulty[dataSource[dataID].Type]); - if SelectedTable2TextSet == false then - AtlasLootDefaultFrame_SelectedTable2:SetText(AtlasLoot_Difficulty[dataSource[dataID].Type][1][1][1]) + if AtlasMapMenu == true then + AtlasLootItemsFrame_DifficultyAtlasButton:Show(); + AtlasLootItemsFrame_DifficultyAtlasButton:Enable(); + AtlasLoot_DifficultyAtlas:Unregister(AtlasLootItemsFrame_DifficultyAtlasButton); + AtlasLoot_DifficultyAtlasRegister(AtlasLoot_Difficulty[dataSource[dataID].Type]); + if SelectedTable2TextSet == false then + AtlasLootItemsFrame_DifficultyAtlasButton:SetText(AtlasLoot_Difficulty[dataSource[dataID].Type][1][1][1]) + end + SelectedTable2TextSet = true + else + AtlasLootDefaultFrame_SubMenu2:Enable(); + AtlasLoot_DewdropSubMenu2:Unregister(AtlasLootDefaultFrame_SubMenu2); + AtlasLoot_DewdropSubMenu2Register(AtlasLoot_Difficulty[dataSource[dataID].Type]); + if SelectedTable2TextSet == false then + AtlasLootDefaultFrame_SelectedTable2:SetText(AtlasLoot_Difficulty[dataSource[dataID].Type][1][1][1]) + end + AtlasLootDefaultFrame_SelectedTable2:Show(); + SelectedTable2TextSet = true end - AtlasLootDefaultFrame_SelectedTable2:Show(); - SelectedTable2TextSet = true + end function AtlasLootDefaultFrame_GetRaidDifficulty(raidtablename, itemID, itemColour) @@ -370,6 +406,140 @@ function AtlasLoot_DewdropSubMenu2Register(loottable) ) end +function AtlasLoot_DifficultyAtlasRegister(loottable) + AtlasLoot_DifficultyAtlas:Register(AtlasLootItemsFrame_DifficultyAtlasButton, + 'point', function(parent) + return "BOTTOM", "TOP" + end, + 'children', function(level, value) + if level == 1 then + if AtlasLoot_Difficulty then + for k,v in ipairs(loottable) do + --If a link to show a submenu + if (type(v[1]) == "table") and (type(v[1][1]) == "string") then + local checked = false; + if v[1][3] == "Submenu" then + AtlasLoot_DifficultyAtlas:AddLine( + 'text', v[1][1], + 'textR', 1, + 'textG', 0.82, + 'textB', 0, + 'func', AtlasLoot_DifficultyAtlasClick, + 'arg1', v[1][1], + 'arg2', v[1][2], + 'arg3', v[1][3], + 'arg4', v[1][4], + 'notCheckable', true + ) + elseif v[1][1] ~= "" then + AtlasLoot_DifficultyAtlas:AddLine( + 'text', v[1][1], + 'textR', 1, + 'textG', 0.82, + 'textB', 0, + 'func', AtlasLoot_DifficultyAtlasClick, + 'arg1', v[1][1], + 'arg2', v[1][2], + 'arg3', v[1][3], + 'arg4', v[1][4], + 'notCheckable', true + ) + end + else + local lock=0; + --If an entry linked to a subtable + for i,j in pairs(v) do + if lock==0 then + AtlasLoot_DifficultyAtlas:AddLine( + 'text', i, + 'textR', 1, + 'textG', 0.82, + 'textB', 0, + 'hasArrow', true, + 'value', j, + 'notCheckable', true + ) + lock=1; + end + end + end + end + end + --Close button + AtlasLoot_DifficultyAtlas:AddLine( + 'text', AL["Close Menu"], + 'textR', 0, + 'textG', 1, + 'textB', 1, + 'func', function() AtlasLoot_DifficultyAtlas:Close() end, + 'notCheckable', true + ) + elseif level == 2 then + if value then + for k,v in ipairs(value) do + if type(v) == "table" then + if (type(v[1]) == "string") then + local checked = false; + --If an entry to show a submenu + if v[4] == "Header" then + AtlasLoot_Dewdrop:AddLine( + 'text', v[1], + 'textR', 0.2, + 'textG', 0.82, + 'textB', 0.5, + 'func', AtlasLoot_DifficultyAtlasClick, + 'arg1', v[1], + 'arg2', v[2], + 'arg3', v[3], + 'arg4', v[4], + 'notCheckable', true + ) + elseif v[3] == "Submenu" then + AtlasLoot_DifficultyAtlas:AddLine( + 'text', v[1], + 'textR', 1, + 'textG', 0.82, + 'textB', 0, + 'func', AtlasLoot_DifficultyAtlasClick, + 'arg1', v[1], + 'arg2', v[2], + 'arg3', v[3], + 'arg4', v[4], + 'notCheckable', true + ) + else + AtlasLoot_DifficultyAtlas:AddLine( + 'text', v[1], + 'textR', 1, + 'textG', 0.82, + 'textB', 0, + 'func', AtlasLoot_DifficultyAtlasClick, + 'arg1', v[1], + 'arg2', v[2], + 'arg3', v[3], + 'arg4', v[4], + 'notCheckable', true + ) + end + end + end + end + end + AtlasLoot_DifficultyAtlas:AddLine( + 'text', AL["Close Menu"], + 'textR', 0, + 'textG', 1, + 'textB', 1, + 'func', function() AtlasLoot_DifficultyAtlas:Close() end, + 'notCheckable', true + ) + end + end, + 'dontHook', true + ) +end + + --[[ AtlasLoot_DewdropSubMenuRegister(loottable): loottable - Table defining the sub menu @@ -674,9 +844,6 @@ function AtlasLoot_SetNewStyle(style) "AtlasLootDefaultFrameLastResultButton", "AtlasLootDefaultFrameWishListButton", "AtlasLootDefaultFrameAdvancedSearchButton", - "AtlasLootAdvancedSearch_SearchButton", - "AtlasLootAdvancedSearch_SearchClearButton", - "AtlasLootAdvancedSearch_LastResultButton" } if style == "new" then diff --git a/AtlasLoot/DefaultFrame/DewDropDown.lua b/AtlasLoot/DefaultFrame/DewDropDown.lua index 66b6351..d4eeb89 100644 --- a/AtlasLoot/DefaultFrame/DewDropDown.lua +++ b/AtlasLoot/DefaultFrame/DewDropDown.lua @@ -286,22 +286,22 @@ AtlasLoot_DewDropDown = { }, [4] = { - { AL["Crafting"], "CRAFTINGMENU", "Table", "Submenu2Table" }, + { AL["Crafting"], "CRAFTINGMENU", "Table" }, }, [5] = { - { AL["Sets/Collections"], "SETMENU", "Table", "Submenu2Table" }, + { AL["Sets/Collections"], "SETMENU", "Table" }, }, [6] = { - { AL["PvP Rewards"], "PVPMENU", "Table", "Submenu2Table" }, + { AL["PvP Rewards"], "PVPMENU", "Table" }, }, [7] = { - { AL["World Bosses"], "WorldBosses", "Submenu", "Submenu2Table" }, + { AL["World Bosses"], "WorldBosses", "Submenu" }, }, [8] = { - { AL["Reputation Factions"], "REPMENU", "Table", "Submenu2Table" }, + { AL["Reputation Factions"], "REPMENU", "Table" }, }, [9] = { - { AL["World Events"], "WORLDEVENTMENU", "Table", "Submenu2Table" }, + { AL["World Events"], "WORLDEVENTMENU", "Table" }, }, }; diff --git a/AtlasLoot/Locales/constants.en.lua b/AtlasLoot/Locales/constants.en.lua index ea629bc..c012215 100644 --- a/AtlasLoot/Locales/constants.en.lua +++ b/AtlasLoot/Locales/constants.en.lua @@ -125,7 +125,16 @@ if AL then AL["Mythic Tier 7"] = true; AL["Mythic Tier 8"] = true; AL["Mythic Tier 9"] = true; - AL["Mythic Tier 10"] = true; + AL["Mythic Tier 10"] = true; + AL["Tier 1 Set Token"] = true; + AL["Tier 2 Set Token"] = true; + AL["Tier 2.5 Set Token"] = true; + AL["Tier 3 Set Token"] = true; + AL["Tier 4 Set Token"] = true; + AL["Tier 5 Set Token"] = true; + AL["Tier 6 Set Token"] = true; + AL["Tier 7 Set Token"] = true; + AL["Tier 8 Set Token"] = true; -- Slash commands AL["reset"] = true; diff --git a/AtlasLoot/TableRegister/loottables.en.lua b/AtlasLoot/TableRegister/loottables.en.lua index 0999347..d5adcd5 100644 --- a/AtlasLoot/TableRegister/loottables.en.lua +++ b/AtlasLoot/TableRegister/loottables.en.lua @@ -1534,6 +1534,17 @@ end AtlasLoot_TableNames["T1T2Warlock"] = { LOCALIZED_CLASS_NAMES_MALE["WARLOCK"], "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T1T2Warrior"] = { LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T1T2DPSWarrior"] = { LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "AtlasLootOriginalWoW" }; + + AtlasLoot_TableNames["T1Bracers"] = {"Teir 1 Bracers", "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["T1Belts"] = {"Teir 1 Belts", "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["T1Gloves"] = {"Teir 1 Gloves", "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["T1Shoulders"] = {"Teir 1 Shoulders", "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["T1Boots"] = {"Teir 1 Boots", "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["T1Legs"] = {"Teir 1 Legs", "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["T1Helms"] = {"Teir 1 Helms", "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["T1Chests"] = {"Teir 1 Chests", "AtlasLootOriginalWoW" }; + + -- T1/T2 Sets HEROIC FLEX AtlasLoot_TableNames["T1T2Druid25Man"] = { "Druid", "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T1T2Hunter25Man"] = { LOCALIZED_CLASS_NAMES_MALE["HUNTER"], "AtlasLootOriginalWoW" }; diff --git a/AtlasLoot_BurningCrusade/burningcrusade.lua b/AtlasLoot_BurningCrusade/burningcrusade.lua index c41a2b8..7e11405 100644 --- a/AtlasLoot_BurningCrusade/burningcrusade.lua +++ b/AtlasLoot_BurningCrusade/burningcrusade.lua @@ -1411,10 +1411,8 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 4, 30096, "", "=q4=Girdle of the Invulnerable", "=ds=#s10#, #a4#", "", "14%"}; { 5, 30627, "", "=q4=Tsunami Talisman", "=ds=#s14#", "", "15%"}; { 6, 30095, "", "=q4=Fang of the Leviathan", "=ds=#h3#, #w10#", "", "14%"}; - { 16, 30239, "", "=q4=Gloves of the Vanquished Champion", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "63%"}; - { 17, 30240, "", "=q4=Gloves of the Vanquished Defender", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "67%"}; - { 18, 30241, "", "=q4=Gloves of the Vanquished Hero", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "65%"}; - { 20, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; + { 16, 30240, "", "=q4=Gloves of the Vanquished Defender", "=ds=#tt5#", "", "100%"}; + { 18, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; Prev = "CFRSerpentLurker"; Next = "CFRSerpentKarathress"; Type = "BCRaid"; @@ -1429,10 +1427,8 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 4, 30663, "", "=q4=Fathom-Brooch of the Tidewalker", "=ds=#s14#, =q1=#m1# =ds=#c7#", "", "15%"}; { 5, 30626, "", "=q4=Sextant of Unstable Currents", "=ds=#s14#", "", "14%"}; { 6, 30090, "", "=q4=World Breaker", "=ds=#h2#, #w6#", "", "15%"}; - { 16, 30245, "", "=q4=Leggings of the Vanquished Champion", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "62%"}; - { 17, 30246, "", "=q4=Leggings of the Vanquished Defender", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "61%"}; - { 18, 30247, "", "=q4=Leggings of the Vanquished Hero", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "62%"}; - { 20, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; + { 16, 30246, "", "=q4=Leggings of the Vanquished Defender", "=ds=#tt5#", "", "100%"}; + { 18, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; Prev = "CFRSerpentLeotheras"; Next = "CFRSerpentMorogrim"; Type = "BCRaid"; @@ -1475,12 +1471,10 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 10, 30103, "", "=q4=Fang of Vashj", "=ds=#h1#, #w4#", "", "14%"}; { 11, 30108, "", "=q4=Lightfathom Scepter", "=ds=#h3#, #w6#", "", "14%"}; { 12, 30105, "", "=q4=Serpent Spine Longbow", "=ds=#w2#", "", "13%"}; - { 16, 30242, "", "=q4=Helm of the Vanquished Champion", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "61%"}; - { 17, 30243, "", "=q4=Helm of the Vanquished Defender", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "62%"}; - { 18, 30244, "", "=q4=Helm of the Vanquished Hero", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "63%"}; - { 20, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; - { 22, 29906, "", "=q1=Vashj's Vial Remnant", "=ds=#m3#", "", "35%"}; - { 23, 450000, "", "=q5=Intact Vial of Lady Vashj", "", "", "5%"}; + { 16, 30243, "", "=q4=Helm of the Vanquished Defender", "=ds=#tt5#", "", "100%"}; + { 18, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; + { 19, 29906, "", "=q1=Vashj's Vial Remnant", "=ds=#m3#", "", "35%"}; + { 21, 450000, "", "=q5=Intact Vial of Lady Vashj", "", "", "5%"}; Prev = "CFRSerpentMorogrim"; Type = "BCRaid"; }; @@ -1532,11 +1526,9 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 4, 28801, "", "=q4=Maulgar's Warhelm", "=ds=#s1#, #a3#", "", "21.32%"}; { 5, 28795, "", "=q4=Bladespire Warbands", "=ds=#s8#, #a4#", "", "12.02%"}; { 6, 28800, "", "=q4=Hammer of the Naaru", "=ds=#h2#, #w6#", "", "15.87%"}; - { 16, 29763, "", "=q4=Pauldrons of the Fallen Champion", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "22.68%"}; - { 17, 29764, "", "=q4=Pauldrons of the Fallen Defender", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "34.69%"}; - { 18, 29762, "", "=q4=Pauldrons of the Fallen Hero", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "25.62%"}; - { 20, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; - { 21, 816252, "", "=q3=Formula: Enchant Weapon - Undaunted Might", "=ds=#p4# (375)", "", "5%"}; + { 16, 29764, "", "=q4=Pauldrons of the Fallen Defender", "=ds=#tt4#", "", "100%"}; + { 18, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; + { 19, 816252, "", "=q3=Formula: Enchant Weapon - Undaunted Might", "=ds=#p4# (375)", "", "5%"}; Next = "GruulGruul"; Type = "BCRaid"; }; @@ -1554,14 +1546,12 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 8, 28823, "", "=q4=Eye of Gruul", "=ds=#s14#", "", "6.73%"}; { 9, 28830, "", "=q4=Dragonspine Trophy", "=ds=#s14#", "", "11.72%"}; { 11, 31750, "", "=q1=Earthen Signet", "=ds=#m3#", "", "100%"}; - { 16, 29766, "", "=q4=Leggings of the Fallen Champion", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "23.69%"}; - { 17, 29767, "", "=q4=Leggings of the Fallen Defender", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "17.46%"}; - { 18, 29765, "", "=q4=Leggings of the Fallen Hero", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "30.17%"}; - { 20, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; - { 22, 28802, "", "=q4=Bloodmaw Magus-Blade", "=ds=#h3#, #w10#", "", "9.23%"}; - { 23, 28794, "", "=q4=Axe of the Gronn Lords", "=ds=#h2#, #w1#", "", "6.73%"}; - { 24, 28825, "", "=q4=Aldori Legacy Defender", "=ds=#w8#", "", "2.99%"}; - { 25, 28826, "", "=q4=Shuriken of Negation", "=ds=#w11#", "", "16.21%"}; + { 16, 29767, "", "=q4=Leggings of the Fallen Defender", "=ds=#tt4#", "", "100%"}; + { 18, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; + { 20, 28802, "", "=q4=Bloodmaw Magus-Blade", "=ds=#h3#, #w10#", "", "9.23%"}; + { 21, 28794, "", "=q4=Axe of the Gronn Lords", "=ds=#h2#, #w1#", "", "6.73%"}; + { 22, 28825, "", "=q4=Aldori Legacy Defender", "=ds=#w8#", "", "2.99%"}; + { 23, 28826, "", "=q4=Shuriken of Negation", "=ds=#w11#", "", "16.21%"}; Prev = "GruulsLairHighKingMaulgar"; Type = "BCRaid"; }; @@ -1890,18 +1880,16 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 12, 28783, "", "=q4=Eredar Wand of Obliteration", "=ds=#w12#"}; { 14, 34845, "", "=q4=Pit Lord's Satchel", "=ds=#e1# #m15#"}; { 15, 34846, "", "=q2=Black Sack of Gems", "=ds=#e1#"}; - { 16, 29754, "", "=q4=Chestguard of the Fallen Champion", "=q1=#m1# =ds=#c4#, #c6#, #c7#"}; - { 17, 29753, "", "=q4=Chestguard of the Fallen Defender", "=q1=#m1# =ds=#c1#, #c5#, #c9#"}; - { 18, 29755, "", "=q4=Chestguard of the Fallen Hero", "=q1=#m1# =ds=#c2#, #c3#, #c8#"}; - { 20, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; - { 22, 32385, "", "=q4=Magtheridon's Head", "=ds=#m2#", "", "100%"}; - { 23, 28791, "", "=q4=Ring of the Recalcitrant", "=q1=#m4#: =ds=#s13#"}; - { 24, 28790, "", "=q4=Naaru Lightwarden's Band", "=q1=#m4#: =ds=#s13#"}; - { 25, 28793, "", "=q4=Band of Crimson Fury", "=q1=#m4#: =ds=#s13#"}; - { 26, 28792, "", "=q4=A'dal's Signet of Defense", "=q1=#m4#: =ds=#s13#"}; - { 28, 816252, "", "=q3=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}; + { 16, 29753, "", "=q4=Chestguard of the Fallen Defender", "=ds=#tt4#", "", "100%"}; + { 18, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; + { 19, 32385, "", "=q4=Magtheridon's Head", "=ds=#m2#", "", "100%"}; + { 20, 28791, "", "=q4=Ring of the Recalcitrant", "=q1=#m4#: =ds=#s13#"}; + { 21, 28790, "", "=q4=Naaru Lightwarden's Band", "=q1=#m4#: =ds=#s13#"}; + { 22, 28793, "", "=q4=Band of Crimson Fury", "=q1=#m4#: =ds=#s13#"}; + { 23, 28792, "", "=q4=A'dal's Signet of Defense", "=q1=#m4#: =ds=#s13#"}; + { 25, 816252, "", "=q3=Formula: Enchant Weapon - Undaunted Might", "=ds=#p4# (375)", "", "5%"}; + { 26, 428775, "", "=q4=Bor -o G'urth, the Hand of Death", "=ds=#w7#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Mythic}; + { 37, 428776, "", "=q4=Lebed -o G'urth, the Finger of Death", "=ds=#w7#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Mythic}; Type = "BCRaid"; }; @@ -2070,9 +2058,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 5, 28649, "", "=q4=Garona's Signet Ring", "=ds=#s13#", "", "12.07%"}; { 6, 28633, "", "=q4=Staff of Infinite Mysteries", "=ds=#h2#, #w9#", "", "12.28%"}; { 8, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; - { 16, 29757, "", "=q4=Gloves of the Fallen Champion", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "29.42%"}; - { 17, 29758, "", "=q4=Gloves of the Fallen Defender", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "23.60%"}; - { 18, 29756, "", "=q4=Gloves of the Fallen Hero", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "21.66%"}; + { 16, 29758, "", "=q4=Gloves of the Fallen Defender", "=ds=#tt4#", "", "100%"}; Prev = "KaraNightbane"; Next = "KaraIllhoof"; Type = "BCRaid"; @@ -2180,10 +2166,8 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 11, 28773, "", "=q4=Gorehowl", "=ds=#h2#, #w1#", "", "12.63%"}; { 12, 28771, "", "=q4=Light's Justice", "=ds=#h3#, #w6#", "", "11.17%"}; { 13, 28772, "", "=q4=Sunfury Bow of the Phoenix", "=ds=#w2#", "", "9.97%"}; - { 16, 29760, "", "=q4=Helm of the Fallen Champion", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "23.01%"}; - { 17, 29761, "", "=q4=Helm of the Fallen Defender", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "26.73%"}; - { 18, 29759, "", "=q4=Helm of the Fallen Hero", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "20.48%"}; - { 20, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; + { 16, 29761, "", "=q4=Helm of the Fallen Defender", "=ds=#tt4#", "", "100%"}; + { 18, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; { 28, 499438, "", "=q4=Smoldering Emberwyrm", "=ds=#e12#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Heroic, "" }; Prev = "KaraChess"; Type = "BCRaid"; @@ -2952,10 +2936,8 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 5, 32515, "", "=q4=Wristguards of Determination", "=ds=#s8#, #a4#", "", "13%"}; { 6, 30619, "", "=q4=Fel Reaver's Piston", "=ds=#s14#", "", "13%"}; { 7, 30450, "", "=q4=Warp-Spring Coil", "=ds=#s14#, =q1=#m1# =ds=#c6#", "", "12%"}; - { 16, 30248, "", "=q4=Pauldrons of the Vanquished Champion", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "61%"}; - { 17, 30249, "", "=q4=Pauldrons of the Vanquished Defender", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "62%"}; - { 18, 30250, "", "=q4=Pauldrons of the Vanquished Hero", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "61%"}; - { 20, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; + { 16, 30249, "", "=q4=Pauldrons of the Vanquished Defender", "=ds=#tt5#", "", "100%"}; + { 18, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; Prev = "TKEyeAlar"; Next = "TKEyeSolarian"; Type = "BCRaid"; @@ -2999,17 +2981,15 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 11, 29996, "", "=q4=Rod of the Sun King", "=ds=#h1#, #w6#", "", "15%"}; { 12, 29988, "", "=q4=The Nexus Key", "=ds=#h2#, #w9#", "", "14%"}; { 14, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; - { 16, 30236, "", "=q4=Chestguard of the Vanquished Champion", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "69%"}; - { 17, 30237, "", "=q4=Chestguard of the Vanquished Defender", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "68%"}; - { 18, 30238, "", "=q4=Chestguard of the Vanquished Hero", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "66%"}; - { 20, 32458, "", "=q4=Ashes of Al'ar", "=ds=#e12#", "", "2%"}; - { 22, 32405, "", "=q4=Verdant Sphere", "=ds=#m2#", "", "100%"}; - { 23, 30018, "", "=q4=Lord Sanguinar's Claim", "=q1=#m4#: =ds=#s2#"}; - { 24, 30017, "", "=q4=Telonicus's Pendant of Mayhem", "=q1=#m4#: =ds=#s2#"}; - { 25, 30007, "", "=q4=The Darkener's Grasp", "=q1=#m4#: =ds=#s2#"}; - { 26, 30015, "", "=q4=The Sun King's Talisman", "=q1=#m4#: =ds=#s2#"}; - { 28, 29905, "", "=q1=Kael's Vial Remnant", "=ds=#m3#", "", "37%"}; - { 29, 450001, "", "=q5=Intact Vial of Kael'thas Sunstrider", "", "", "5%"}; + { 16, 30237, "", "=q4=Chestguard of the Vanquished Defender", "=ds=#tt5#", "", "100%"}; + { 18, 32458, "", "=q4=Ashes of Al'ar", "=ds=#e12#", "", "2%"}; + { 19, 32405, "", "=q4=Verdant Sphere", "=ds=#m2#", "", "100%"}; + { 20, 30018, "", "=q4=Lord Sanguinar's Claim", "=q1=#m4#: =ds=#s2#"}; + { 21, 30017, "", "=q4=Telonicus's Pendant of Mayhem", "=q1=#m4#: =ds=#s2#"}; + { 22, 30007, "", "=q4=The Darkener's Grasp", "=q1=#m4#: =ds=#s2#"}; + { 23, 30015, "", "=q4=The Sun King's Talisman", "=q1=#m4#: =ds=#s2#"}; + { 25, 29905, "", "=q1=Kael's Vial Remnant", "=ds=#m3#", "", "37%"}; + { 26, 450001, "", "=q5=Intact Vial of Kael'thas Sunstrider", "", "", "5%"}; Prev = "TKEyeSolarian"; Type = "BCRaid"; }; diff --git a/AtlasLoot_OriginalWoW/originalwow.lua b/AtlasLoot_OriginalWoW/originalwow.lua index 53dd339..7af9bce 100644 --- a/AtlasLoot_OriginalWoW/originalwow.lua +++ b/AtlasLoot_OriginalWoW/originalwow.lua @@ -412,8 +412,8 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 6, 21625, "", "=q4=Scarab Brooch", "=ds=#s14#", "", "21.46%"}; { 7, 22399, "", "=q4=Idol of Health", "=ds=#s16#, #w14#", "", "7.32%"}; { 8, 21622, "", "=q4=Sharpened Silithid Femur", "=ds=#h3#, #w10#", "", "15.12%"}; - { 10, 20932, "", "=q4=Qiraji Bindings of Dominance", "=q1=#m1# =ds=#c8#, #c3#, #c7#, #c1#, #c4#", "", "100%"}; - { 11, 20928, "", "=q4=Qiraji Bindings of Command", "=q1=#m1# =ds=#c5#, #c6#, #c9#, #c2#", "", "100%"}; + { 10, 20932, "", "=q4=Qiraji Bindings of Dominance", "=ds=#tt2.5#", "", "100%"}; + { 11, 20928, "", "=q4=Qiraji Bindings of Command","=ds=#tt2.5#", "", "100%"}; { 16, 21237, "", "=q4=Imperial Qiraji Regalia", "=ds=#m3#", "", "3.19%"}; { 17, 21273, "", "=q4=Blessed Qiraji Acolyte Staff", "=q1=#m4#, =ds=#w9#"}; { 18, 21275, "", "=q4=Blessed Qiraji Augur Staff", "=q1=#m4#, =ds=#w9#"}; @@ -435,8 +435,8 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 4, 21618, "", "=q4=Hive Defiler Wristguards", "=ds=#s8#, #a4#", "", "10.34%"}; { 6, 21620, "", "=q4=Ring of the Martyr", "=ds=#s13#", "", "12.97%"}; { 7, 21616, "", "=q4=Huhuran's Stinger", "=ds=#w2#", "", "5.71%"}; - { 9, 20932, "", "=q4=Qiraji Bindings of Dominance", "=q1=#m1# =ds=#c8#, #c3#, #c7#, #c1#, #c4#", "", "100%"}; - { 10, 20928, "", "=q4=Qiraji Bindings of Command", "=q1=#m1# =ds=#c5#, #c6#, #c9#, #c2#", "", "100%"}; + { 9, 20932, "", "=q4=Qiraji Bindings of Dominance", "=ds=#tt2.5#", "", "100%"}; + { 10, 20928, "", "=q4=Qiraji Bindings of Command","=ds=#tt2.5#", "", "100%"}; { 16, 21237, "", "=q4=Imperial Qiraji Regalia", "=ds=#m3#", "", "4.31%"}; { 17, 21273, "", "=q4=Blessed Qiraji Acolyte Staff", "=q1=#m4#, =ds=#w9#"}; { 18, 21275, "", "=q4=Blessed Qiraji Augur Staff", "=q1=#m4#, =ds=#w9#"}; @@ -465,19 +465,19 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 13, 21272, "", "=q4=Blessed Qiraji Musket", "=q1=#m4#, =ds=#w5#"}; { 14, 21244, "", "=q4=Blessed Qiraji Pugio", "=q1=#m4#, =ds=#h1#, #w4#"}; { 15, 21269, "", "=q4=Blessed Qiraji Bulwark", "=q1=#m4#, =ds=#w8#"}; - { 16, 20926, "", "=q4=Vek'nilash's Circlet", "=q1=#m1# =ds=#c8#, #c3#, #c5#, #c9#", "", "100%"}; - { 17, 21604, "", "=q4=Bracelets of Royal Redemption", "=ds=#s8#, #a1#", "", "12.51%"}; - { 18, 21605, "", "=q4=Gloves of the Hidden Temple", "=ds=#s9#, #a2#", "", "15.45%"}; - { 19, 21609, "", "=q4=Regenerating Belt of Vek'nilash", "=ds=#s10#, #a2#", "", "13.35%"}; - { 20, 21607, "", "=q4=Grasp of the Fallen Emperor", "=ds=#s10#, #a3#", "", "2.72%"}; - { 21, 21606, "", "=q4=Belt of the Fallen Emperor", "=ds=#s10#, #a4#", "", "12.22%"}; - { 22, 21679, "", "=q4=Kalimdor's Revenge", "=ds=#h2#, #w10#", "", "9.25%"}; - { 23, 21608, "", "=q4=Amulet of Vek'nilash", "=ds=#s2#", "", "14.25%"}; - { 24, 20726, "", "=q3=Formula: Enchant Gloves - Threat", "=ds=#p4# (300)", "", "6.24%"}; - { 26, 21237, "", "=q4=Imperial Qiraji Regalia", "=ds=#m3#", "", "5.00%"}; - { 27, 21273, "", "=q4=Blessed Qiraji Acolyte Staff", "=q1=#m4#, =ds=#w9#"}; - { 28, 21275, "", "=q4=Blessed Qiraji Augur Staff", "=q1=#m4#, =ds=#w9#"}; - { 29, 21268, "", "=q4=Blessed Qiraji War Hammer", "=q1=#m4#, =ds=#h1#, #w6#"}; + { 16, 20930, "", "=q4=Diadem of the Desert Prince", "=ds=#tt2.5#", "", "100%"}; + { 16, 21604, "", "=q4=Bracelets of Royal Redemption", "=ds=#s8#, #a1#", "", "12.51%"}; + { 17, 21605, "", "=q4=Gloves of the Hidden Temple", "=ds=#s9#, #a2#", "", "15.45%"}; + { 18, 21609, "", "=q4=Regenerating Belt of Vek'nilash", "=ds=#s10#, #a2#", "", "13.35%"}; + { 29, 21607, "", "=q4=Grasp of the Fallen Emperor", "=ds=#s10#, #a3#", "", "2.72%"}; + { 20, 21606, "", "=q4=Belt of the Fallen Emperor", "=ds=#s10#, #a4#", "", "12.22%"}; + { 21, 21679, "", "=q4=Kalimdor's Revenge", "=ds=#h2#, #w10#", "", "9.25%"}; + { 22, 21608, "", "=q4=Amulet of Vek'nilash", "=ds=#s2#", "", "14.25%"}; + { 23, 20726, "", "=q3=Formula: Enchant Gloves - Threat", "=ds=#p4# (300)", "", "6.24%"}; + { 25, 21237, "", "=q4=Imperial Qiraji Regalia", "=ds=#m3#", "", "5.00%"}; + { 26, 21273, "", "=q4=Blessed Qiraji Acolyte Staff", "=q1=#m4#, =ds=#w9#"}; + { 27, 21275, "", "=q4=Blessed Qiraji Augur Staff", "=q1=#m4#, =ds=#w9#"}; + { 28, 21268, "", "=q4=Blessed Qiraji War Hammer", "=q1=#m4#, =ds=#h1#, #w6#"}; Prev = "AQ40Huhuran"; Next = "AQ40Ouro"; Type = "ClassicRaid"; @@ -490,8 +490,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 4, 23570, "", "=q4=Jom Gabbar", "=ds=#s14#", "", "2.80%"}; { 5, 23557, "", "=q4=Larvae of the Great Worm", "=ds=#w5#", "", "3.95%"}; { 6, 21610, "", "=q4=Wormscale Blocker", "=ds=#w8#", "", "16.54%"}; - { 8, 20927, "", "=q4=Ouro's Intact Hide", "=q1=#m1# =ds=#c3#, #c5#, #c6#, #c9#", "", "100%"}; - { 9, 20931, "", "=q4=Skin of the Great Sandworm", "=q1=#m1# =ds=#c8#, #c7#, #c1#, #c2#, #c4#", "", "100%"}; + { 8, 20931, "", "=q4=Hardened Qiraj Chitin", "=ds=#tt2.5#", "", "100%"}; { 16, 21237, "", "=q4=Imperial Qiraji Regalia", "=ds=#m3#", "", "5.20%"}; { 17, 21273, "", "=q4=Blessed Qiraji Acolyte Staff", "=q1=#m4# =ds=#w9#"}; { 18, 21275, "", "=q4=Blessed Qiraji Augur Staff", "=q1=#m4# =ds=#w9#"}; @@ -520,17 +519,16 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 12, 21126, "", "=q4=Death's Sting", "=ds=#h1#, #w4#", "", "6.84%"}; { 13, 21134, "", "=q4=Dark Edge of Insanity", "=ds=#h2#, #w1#", "", "5.93%"}; { 14, 21839, "", "=q4=Scepter of the False Prophet", "=ds=#h3#, #w6#", "", "4.75%"}; - { 16, 20933, "", "=q4=Husk of the Old God", "=q1=#m1# =ds=#c8#, #c3#, #c1#, #c5#", "", "100%"}; - { 17, 20929, "", "=q4=Carapace of the Old God", "=q1=#m1# =ds=#c7#, #c6#, #c9#, #c2#, #c4#", "", "100%"}; - { 19, 21221, "", "=q4=Eye of C'Thun", "=ds=#m2#", "", "100%"}; - { 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#", "", "", [AtlasLoot_Difficulty.DUPLICATE] = "(Druid)" }, - { 26, 22589, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c3#", "", "", [AtlasLoot_Difficulty.DUPLICATE] = "(Mage)" }, - { 27, 22631, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c5#", "", "", [AtlasLoot_Difficulty.DUPLICATE] = "(Priest)" }, - { 28, 22630, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c8#", "", "", [AtlasLoot_Difficulty.DUPLICATE] = "(Warlock)" }, + { 16, 20933, "", "=q4=Husk of the Old God", "=ds=#tt2.5#", "", "100%"}; + { 18, 21221, "", "=q4=Eye of C'Thun", "=ds=#m2#", "", "100%"}; + { 19, 21710, "", "=q4=Cloak of the Fallen God", "=q1=#m4#: =ds=#s4#"}; + { 20, 21712, "", "=q4=Amulet of the Fallen God", "=q1=#m4#: =ds=#s2#"}; + { 21, 21709, "", "=q4=Ring of the Fallen God", "=q1=#m4#: =ds=#s13#"}; + { 23, 22734, "", "=q1=Base of Atiesh", "=ds=#m3#"}; + { 24, 22632, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c1#", "", "", [AtlasLoot_Difficulty.DUPLICATE] = "(Druid)" }, + { 25, 22589, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c3#", "", "", [AtlasLoot_Difficulty.DUPLICATE] = "(Mage)" }, + { 26, 22631, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c5#", "", "", [AtlasLoot_Difficulty.DUPLICATE] = "(Priest)" }, + { 27, 22630, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c8#", "", "", [AtlasLoot_Difficulty.DUPLICATE] = "(Warlock)" }, Prev = "AQ40Ouro"; Next = "AQ40Trash1"; Type = "ClassicRaid"; @@ -1450,10 +1448,8 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 9, 19147, "", "=q4=Ring of Spell Power", "=ds=#s13#", "", "2.23%"}; { 10, 18878, "", "=q4=Sorcerous Dagger", "=ds=#h3#, #w4#", "", "2.23%"}; { 11, 17077, "", "=q4=Crimson Shocker", "=ds=#w12#", "", "1.60%"}; - { 16, 2522355, "", "=q4=Molten Bracers", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522362, "", "=q4=Molten Wristgaurds", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522369, "", "=q4=Molten Bindings", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; - { 20, 17329, "", "=q1=Hand of Lucifron", "=ds=#m3#"}; + { 16, 2522362, "", "=q4=Molten Wristgaurds", "=ds=#tt1#", "", "100%", "=LT=T1Bracers"}; + { 18, 17329, "", "=q1=Hand of Lucifron", "=ds=#m3#"}; Next = "MCMagmadar"; Type = "ClassicRaid"; }; @@ -1474,9 +1470,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 13, 18822, "", "=q4=Obsidian Edged Blade", "=ds=#h2#, #w10#", "", "5.68%"}; { 14, 17073, "", "=q4=Earthshaker", "=ds=#h2#, #w6#", "", "16.75%"}; { 15, 17069, "", "=q4=Striker's Mark", "=ds=#w2#", "", "16.37%"}; - { 16, 2522358, "", "=q4=Molten Legplates", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522359, "", "=q4=Molten Leggaurds", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522366, "", "=q4=Molten Leggings", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; + { 16, 2522359, "", "=q4=Molten Leggaurds", "=ds=#tt1#", "", "100%", "=LT=T1Legs"}; Prev = "MCLucifron"; Next = "MCGehennas"; Type = "ClassicRaid"; @@ -1493,10 +1487,8 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 8, 19147, "", "=q4=Ring of Spell Power", "=ds=#s13#", "", "3.78%"}; { 9, 18878, "", "=q4=Sorcerous Dagger", "=ds=#h3#, #w4#", "", "3.79%"}; { 10, 17077, "", "=q4=Crimson Shocker", "=ds=#w12#", "", "3.34%"}; - { 16, 2522352, "", "=q4=Molten Waistgaurd", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522364, "", "=q4=Molten Girdle", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522371, "", "=q4=Molten Belt", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; - { 20, 17331, "", "=q1=Hand of Gehennas", "=ds=#m3#"}; + { 16, 2522364, "", "=q4=Molten Girdle", "=ds=#tt1#", "", "100%", "=LT=T1Gloves"}; + { 18, 17331, "", "=q1=Hand of Gehennas", "=ds=#m3#"}; Prev = "MCMagmadar"; Next = "MCGarr"; Type = "ClassicRaid"; @@ -1518,13 +1510,11 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 13, 18822, "", "=q4=Obsidian Edged Blade", "=ds=#h2#, #w10#", "", "4.09%"}; { 14, 17105, "", "=q4=Aurastone Hammer", "=ds=#h3#, #w6#", "", "12.67%"}; { 15, 17066, "", "=q4=Drillborer Disk", "=ds=#w8#", "", "11.85%"}; - { 16, 2522353, "", "=q4=Molten Helmet", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522360, "", "=q4=Molten Headpiece", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522367, "", "=q4=Molten Circlet", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; - { 20, 18564, "", "=q5=Bindings of the Windseeker", "=ds=#m3#, =q1=#m9#", "", "3.74%", [AtlasLoot_Difficulty.DUPLICATE] = "(Right)"}; - { 21, 19019, "", "=q5=Thunderfury, Blessed Blade of the Windseeker", "=q1=#m4#: =ds=#h1#, #w10#"}; - { 22, 17782, "", "=q5=Talisman of Binding Shard", "=ds=#s2#", "", ""}; - { 23, 11879, "", "=q5=Medallion of Binding Shard", "=ds=#s2#", "", ""}; + { 16, 2522360, "", "=q4=Molten Headpiece", "=ds=#tt1#", "", "100%", "=LT=T1Helms"}; + { 18, 18564, "", "=q5=Bindings of the Windseeker", "=ds=#m3#, =q1=#m9#", "", "3.74%", [AtlasLoot_Difficulty.DUPLICATE] = "(Right)"}; + { 19, 19019, "", "=q5=Thunderfury, Blessed Blade of the Windseeker", "=q1=#m4#: =ds=#h1#, #w10#"}; + { 21, 17782, "", "=q5=Talisman of Binding Shard", "=ds=#s2#", "", ""}; + { 22, 11879, "", "=q5=Medallion of Binding Shard", "=ds=#s2#", "", ""}; Prev = "MCGehennas"; Next = "MCShazzrah"; Type = "ClassicRaid"; @@ -1541,10 +1531,8 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 8, 19147, "", "=q4=Ring of Spell Power", "=ds=#s13#", "", "1.99%"}; { 9, 18878, "", "=q4=Sorcerous Dagger", "=ds=#h3#, #w4#", "", "2.27%"}; { 10, 17077, "", "=q4=Crimson Shocker", "=ds=#w12#", "", "3.32%"}; - { 16, 2522356, "", "=q4=Molten Gauntlets", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522363, "", "=q4=Molten Handgaurds", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522370, "", "=q4=Molten Gloves", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; - { 20, 17332, "", "=q1=Hand of Shazzrah", "=ds=#m3#"}; + { 16, 2522363, "", "=q4=Molten Handgaurds", "=ds=#tt1#", "", "100%", "=LT=T1Belts"}; + { 18, 17332, "", "=q1=Hand of Shazzrah", "=ds=#m3#"}; Prev = "MCGarr"; Next = "MCGeddon"; Type = "ClassicRaid"; @@ -1563,11 +1551,9 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 10, 18820, "", "=q4=Talisman of Ephemeral Power", "=ds=#s14#", "", "2.68%"}; { 11, 19142, "", "=q4=Fire Runed Grimoire", "=ds=#s15#", "", "2.59%"}; { 12, 18822, "", "=q4=Obsidian Edged Blade", "=ds=#h2#, #w10#", "", "2.70%"}; - { 16, 2522354, "", "=q4=Molten Pauldrons", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522361, "", "=q4=Molten Spaulders", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522368, "", "=q4=Molten Shoulderpads", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; - { 20, 18563, "", "=q5=Bindings of the Windseeker", " =ds=#m3#, =q1=#m10#", "", "3.78%", [AtlasLoot_Difficulty.DUPLICATE] = "(Left)"}; - { 21, 19019, "", "=q5=Thunderfury, Blessed Blade of the Windseeker", "=q1=#m4#: =ds=#h1#, #w10#"}; + { 16, 2522361, "", "=q4=Molten Spaulders", "=ds=#tt1#", "", "100%", "=LT=T1Shoulders"}; + { 18, 18563, "", "=q5=Bindings of the Windseeker", " =ds=#m3#, =q1=#m10#", "", "3.78%", [AtlasLoot_Difficulty.DUPLICATE] = "(Left)"}; + { 19, 19019, "", "=q5=Thunderfury, Blessed Blade of the Windseeker", "=q1=#m4#: =ds=#h1#, #w10#"}; Prev = "MCShazzrah"; Next = "MCGolemagg"; Type = "ClassicRaid"; @@ -1588,11 +1574,9 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 12, 18822, "", "=q4=Obsidian Edged Blade", "=ds=#h2#, #w10#", "", "2.89%"}; { 13, 18842, "", "=q4=Staff of Dominance", "=ds=#w9#", "", "18.95%"}; { 14, 17072, "", "=q4=Blastershot Launcher", "=ds=#w5#", "", "17.83%"}; - { 16, 2522349, "", "=q4=Molten Breastplate", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522350, "", "=q4=Molten Tunic", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522351, "", "=q4=Molten Robe", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; - { 20, 17203, "", "=q4=Sulfuron Ingot", "=ds=#m3#", "", "11.98%"}; - { 21, 17182, "", "=q5=Sulfuras, Hand of Ragnaros", "=q1=#m4#: =ds=#h2#, #w6#"}; + { 16, 2522350, "", "=q4=Molten Tunic", "=ds=#tt1#", "", "100%", "=LT=T1Chests"}; + { 18, 17203, "", "=q4=Sulfuron Ingot", "=ds=#m3#", "", "11.98%"}; + { 19, 17182, "", "=q5=Sulfuras, Hand of Ragnaros", "=q1=#m4#: =ds=#h2#, #w6#"}; Prev = "MCGeddon"; Next = "MCSulfuron"; Type = "ClassicRaid"; @@ -1610,10 +1594,8 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 9, 18878, "", "=q4=Sorcerous Dagger", "=ds=#h3#, #w4#", "", "2.53%"}; { 10, 17074, "", "=q4=Shadowstrike", "=ds=#w7#", "", "23.50%"}; { 11, 17077, "", "=q4=Crimson Shocker", "=ds=#w12#", "", "2.26%"}; - { 16, 2522357, "", "=q4=Molten Sabatons", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522365, "", "=q4=Molten Boots", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522372, "", "=q4=Molten Boots", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; - { 21, 17330, "", "=q1=Hand of Sulfuron", "=ds=#m3#"}; + { 16, 2522365, "", "=q4=Molten Boots", "=ds=#tt1#", "", "100%", "=LT=T1Boots"}; + { 18, 17330, "", "=q1=Hand of Sulfuron", "=ds=#m3#"}; Prev = "MCGolemagg"; Next = "MCMajordomo"; Type = "ClassicRaid"; @@ -1657,14 +1639,12 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 12, 17104, "", "=q4=Spinal Reaper", "=ds=#h2#, #w1#", "", " 4.63%"}; { 13, 17106, "", "=q4=Malistar's Defender", "=ds=#w8#", "", "13.88%"}; { 15, 21110, "", "=q1=Draconic for Dummies", "=ds=#m3#", "", "100%"}; - { 16, 2522458, "", "=q4=Chromatic Legplates", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522459, "", "=q4=Chromatic Leggaurds", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522466, "", "=q4=Chromatic Leggings", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; - { 20, 17204, "", "=q5=Eye of Sulfuras", "=ds=#m3#", "", "3.42%"}; - { 21, 17182, "", "=q5=Sulfuras, Hand of Ragnaros", "=q1=#m4#: =ds=#h2#, #w6#"}; - { 23, 19017, "", "=q1=Essence of the Firelord", "=ds=#m3#", "", "0.46%"}; - { 24, 19019, "", "=q5=Thunderfury, Blessed Blade of the Windseeker", "=q1=#m4#: =ds=#h1#, #w10#"}; - { 26, 102107, "", "=q4=Reins of the Magmatic Steed", "=ds=#e12#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Heroic}; + { 16, 2522459, "", "=q4=Chromatic Leggaurds", "=ds=#tt2#", "", "100%"}; + { 18, 17204, "", "=q5=Eye of Sulfuras", "=ds=#m3#", "", "3.42%"}; + { 19, 17182, "", "=q5=Sulfuras, Hand of Ragnaros", "=q1=#m4#: =ds=#h2#, #w6#"}; + { 21, 19017, "", "=q1=Essence of the Firelord", "=ds=#m3#", "", "0.46%"}; + { 22, 19019, "", "=q5=Thunderfury, Blessed Blade of the Windseeker", "=q1=#m4#: =ds=#h1#, #w10#"}; + { 24, 102107, "", "=q4=Reins of the Magmatic Steed", "=ds=#e12#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Heroic}; Prev = "MCMajordomo"; Next = "MCTrashMobs"; Type = "ClassicRaid"; @@ -1718,9 +1698,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 9, 19397, "", "=q4=Ring of Blackrock", "=ds=#s13#", "", "6.67%"}; { 10, 19357, "", "=q4=Herald of Woe", "=ds=#h2#, #w6#", "", "16.67%"}; { 11, 19405, "", "=q4=Malfurion's Blessed Bulwark", "=ds=#s5#, #a2#", "", "16.67%"}; - { 16, 2522455, "", "=q4=Chromatic Bracers", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522462, "", "=q4=Chromatic Wristgaurds", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522469, "", "=q4=Chromatic Bindings", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; + { 16, 2522462, "", "=q4=Chromatic Wristgaurds", "=ds=#tt2#", "", "100%"}; Next = "BWLVaelastrasz"; Type = "ClassicRaid"; }; @@ -1735,9 +1713,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 7, 19430, "", "=q4=Shroud of Pure Thought", "=ds=#s4#", "", "16.67%"}; { 8, 19403, "", "=q4=Band of Forced Concentration", "=ds=#s13#", "", "16.67%"}; { 9, 19367, "", "=q4=Dragon's Touch", "=ds=#w12#", "", "16.67%"}; - { 16, 2522457, "", "=q4=Chromatic Waistgaurd", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522464, "", "=q4=Chromatic Girdle", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522471, "", "=q4=Chromatic Belt", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; + { 16, 2522464, "", "=q4=Chromatic Girdle", "=ds=#tt2#", "", "100%"}; Prev = "BWLRazorgore"; Next = "BWLLashlayer"; Type = "ClassicRaid"; @@ -1755,10 +1731,8 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 9, 19365, "", "=q4=Claw of the Black Drake", "=ds=#h3#, #w13#", "", "12.5%"}; { 10, 14000, "", "=q4=Ring of Trinity Force", "=ds=#h3#, #w13#", "", "12.5%"}; { 11, 19432, "", "=q4=Circle of Applied Force", "=ds=#s13#", "", "16.67%"}; - { 16, 2522458, "", "=q4=Chromatic Sabatons", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522465, "", "=q4=Chromatic Boots", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522472, "", "=q4=Chromatic Sandals", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; - { 20, 20383, "", "=q1=Head of the Broodlord Lashlayer", "=ds=#m3#", "", "100%"}; + { 16, 2522465, "", "=q4=Chromatic Boots", "=ds=#tt2#", "", "100%"}; + { 18, 20383, "", "=q1=Head of the Broodlord Lashlayer", "=ds=#m3#", "", "100%"}; Prev = "BWLVaelastrasz"; Next = "BWLFiremaw"; Type = "ClassicRaid"; @@ -1779,9 +1753,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 12, 19402, "", "=q4=Legguards of the Fallen Crusader", "=ds=#s11#, #a4#", "", "12.5%"}; { 13, 19397, "", "=q4=Ring of Blackrock", "=ds=#s13#", "", "6.67%"}; { 14, 19395, "", "=q4=Rejuvenating Gem", "=ds=#s14#", "", "6.67%"}; - { 16, 2522456, "", "=q4=Chromatic Gauntlets", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522463, "", "=q4=Chromatic Girdle", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522470, "", "=q4=Chromatic Belt", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; + { 16, 2522463, "", "=q4=Chromatic Girdle", "=ds=#tt2#", "", "100%"}; Prev = "BWLLashlayer"; Next = "BWLEbonroc"; Type = "ClassicRaid"; @@ -1800,9 +1772,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 10, 19353, "", "=q4=Drake Talon Cleaver", "=ds=#h2#, #w1#", "", "6.67%"}; { 11, 19355, "", "=q4=Shadow Wing Focus Staff", "=ds=#w9#", "", "6.67%"}; { 12, 19368, "", "=q4=Dragonbreath Hand Cannon", "=ds=#w5#", "", "16.67%"}; - { 16, 2522456, "", "=q4=Chromatic Gauntlets", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522463, "", "=q4=Chromatic Girdle", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522470, "", "=q4=Chromatic Belt", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; + { 16, 2522463, "", "=q4=Chromatic Girdle", "=ds=#tt2#", "", "100%"}; Prev = "BWLFiremaw"; Next = "BWLFlamegor"; Type = "ClassicRaid"; @@ -1821,9 +1791,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 10, 19357, "", "=q4=Herald of Woe", "=ds=#h2#, #w6#", "", "16.67%"}; { 11, 19355, "", "=q4=Shadow Wing Focus Staff", "=ds=#w9#", "", "6.67%"}; { 12, 19367, "", "=q4=Dragon's Touch", "=ds=#w12#", "", "16.67%"}; - { 16, 2522456, "", "=q4=Chromatic Gauntlets", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522463, "", "=q4=Chromatic Girdle", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522470, "", "=q4=Chromatic Belt", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; + { 16, 2522463, "", "=q4=Chromatic Girdle", "=ds=#tt2#", "", "100%"}; Prev = "BWLEbonroc"; Next = "BWLChromaggus"; Type = "ClassicRaid"; @@ -1843,9 +1811,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 12, 19352, "", "=q4=Chromatically Tempered Sword", "=ds=#h1#, #w10#", "", "10%"}; { 13, 19349, "", "=q4=Elementium Reinforced Bulwark", "=ds=#w8#", "", "10%"}; { 14, 19361, "", "=q4=Ashjre'thul, Crossbow of Smiting", "=ds=#w3#", "", "10%"}; - { 16, 2522454, "", "=q4=Chromatic Pauldrons", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522461, "", "=q4=Chromatic Spaulders", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522468, "", "=q4=Chromatic Shoulderpads", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; + { 16, 2522461, "", "=q4=Chromatic Spaulders", "=ds=#tt2#", "", "100%"}; Prev = "BWLFlamegor"; Next = "BWLNefarian"; Type = "ClassicRaid"; @@ -1865,14 +1831,12 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 11, 19360, "", "=q4=Lok'amir il Romathis", "=ds=#h3#, #w6#", "", "16.67%"}; { 12, 19356, "", "=q4=Staff of the Shadow Flame", "=ds=#w9#", "", "16.67%%"}; { 13, 14001, "", "=q4=Archimtiros' Ring of Armageddon", "=ds=#s13#", "", "16.67%%"}; - { 16, 2522449, "", "=q4=Chromatic Breastplate", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522450, "", "=q4=Chromatic Tunic", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522451, "", "=q4=Chromatic Robe", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; - { 20, 19003, "", "=q4=Head of Nefarian", "=ds=#m2#", "", "100%"}; - { 21, 19383, "", "=q4=Master Dragonslayer's Medallion", "=q1=#m4#: =ds=#s2#"}; - { 22, 19384, "", "=q4=Master Dragonslayer's Ring", "=q1=#m4#: =ds=#s13#"}; - { 23, 19366, "", "=q4=Master Dragonslayer's Orb", "=q1=#m4#: =ds=#s15#"}; - { 25, 21138, "", "=q1=Red Scepter Shard", "=ds=#m3#", "", "100%"}; + { 16, 2522450, "", "=q4=Chromatic Tunic", "=ds=#tt2#", "", "100%"}; + { 18, 19003, "", "=q4=Head of Nefarian", "=ds=#m2#", "", "100%"}; + { 19, 19383, "", "=q4=Master Dragonslayer's Medallion", "=q1=#m4#: =ds=#s2#"}; + { 20, 19384, "", "=q4=Master Dragonslayer's Ring", "=q1=#m4#: =ds=#s13#"}; + { 21, 19366, "", "=q4=Master Dragonslayer's Orb", "=q1=#m4#: =ds=#s15#"}; + { 23, 21138, "", "=q1=Red Scepter Shard", "=ds=#m3#", "", "100%"}; Prev = "BWLChromaggus"; Next = "BWLTrashMobs"; Type = "ClassicRaid"; @@ -4293,252 +4257,221 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") ----------------- AtlasLoot_Data["NAXPatchwerk"] = { - { 1, 22726, "", "=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%" }, - { 5, 22361, "", "=q4=Desecrated Spaulders", "=q1=#m1# =ds=#c7#, #c1#, #c2#, #c4#","", "33.33%" }, - { 6, 22354, "", "=q4=Desecrated Pauldrons", "=q1=#m1# =ds=#c6#, #c9#","", "33.33%" }, - { 7, 0,"","","" }, - { 8, 22960, "", "=q4=Cloak of Suturing", "=ds=#s4#","", "20%" }, - { 9, 22815, "", "=q4=Severance", "=ds=#h2#, #w1#","", "20%" }, - { 10, 22820, "", "=q4=Wand of Fates", "=ds=#w12#","", "20%" }, - { 11, 22818, "", "=q4=The Plague Bearer", "=ds=#w8#","", "20%" }, - { 12, 22961, "", "=q4=Band of Reanimation", "=ds=#s13#","", "20%" }, + { 1, 22960, "", "=q4=Cloak of Suturing", "=ds=#s4#","", "20%" }, + { 2, 22815, "", "=q4=Severance", "=ds=#h2#, #w1#","", "20%" }, + { 3, 22820, "", "=q4=Wand of Fates", "=ds=#w12#","", "20%" }, + { 4, 22818, "", "=q4=The Plague Bearer", "=ds=#w8#","", "20%" }, + { 5, 22961, "", "=q4=Band of Reanimation", "=ds=#s13#","", "20%" }, + -- { 4, 22368, "", "=q4=Desecrated Shoulderpads", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "33.33%" }, + { 16, 22361, "", "=q4=Desecrated Spaulders", "=ds=#tt3#","", "100%" }, + -- { 6, 22354, "", "=q4=Desecrated Pauldrons", "=q1=#m1# =ds=#c6#, #c9#","", "33.33%" }, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, + Next = "NAXGrobbulus"; Type = "ClassicRaid"; }; AtlasLoot_Data["NAXGrobbulus"] = { - { 1, 22726, "", "=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%" }, - { 5, 22361, "", "=q4=Desecrated Spaulders", "=q1=#m1# =ds=#c7#, #c1#, #c2#, #c4#","","33.33%" }, - { 6, 22354, "", "=q4=Desecrated Pauldrons", "=q1=#m1# =ds=#c6#, #c9#","","33.33%" }, - { 7, 0,"","","" }, - { 8, 22968, "", "=q4=Glacial Mantle", "=ds=#s3#, #a1#", "", "20%" }, - { 9, 22967, "", "=q4=Icy Scale Spaulders", "=ds=#s3#, #a3#", "", "20%" }, - { 10, 22803, "", "=q4=Midnight Haze", "=ds=#h3#, #w4#", "", "20%" }, - { 11, 22988, "", "=q4=The End of Dreams", "=ds=#h3#, #w6#","","20%" }, - { 12, 22810, "", "=q4=Toxin Injector", "=ds=#w5#", "","20%" }, + { 1, 22968, "", "=q4=Glacial Mantle", "=ds=#s3#, #a1#", "", "20%" }, + { 2, 22967, "", "=q4=Icy Scale Spaulders", "=ds=#s3#, #a3#", "", "20%" }, + { 3, 22803, "", "=q4=Midnight Haze", "=ds=#h3#, #w4#", "", "20%" }, + { 4, 22988, "", "=q4=The End of Dreams", "=ds=#h3#, #w6#","","20%" }, + { 5, 22810, "", "=q4=Toxin Injector", "=ds=#w5#", "","20%" }, + --{ 4, 22368, "", "=q4=Desecrated Shoulderpads", "=q1=#m1# =ds=#c8#, #c3#, #c5#","","33.33%" }, + { 16, 22361, "", "=q4=Desecrated Spaulders", "=ds=#tt3#","","100%" }, + --{ 6, 22354, "", "=q4=Desecrated Pauldrons", "=q1=#m1# =ds=#c6#, #c9#","","33.33%" }, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXPatchwerk"; Next = "NAXGluth"; Type = "ClassicRaid"; }; AtlasLoot_Data["NAXGluth"] = { - { 1, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#","","30%" }, - { 2, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, - { 3, 0,"","","" }, - { 4, 22983, "", "=q4=Rime Covered Mantle", "=ds=#s3#, #a1#", "", "20%" }, - { 5, 22813, "", "=q4=Claymore of Unholy Might", "=ds=#h2#, #w10#", "","20%" }, - { 6, 23075, "", "=q4=Death's Bargain", "=ds=#w8#", "","20%" }, - { 7, 22994, "", "=q4=Digested Hand of Power", "=ds=#s15#","","20%"}, - { 8, 22981, "", "=q4=Gluth's Missing Collar", "=ds=#s2#","","20%" }, - { 9, 0,"","","" }, - { 10, 0,"","","" }, - { 11, 0,"","","" }, - { 12, 0,"","","" }, - { 13, 0,"","","" }, - { 14, 0,"","","" }, - { 15, 0,"","","" }, - { 16, 22368, "", "=q4=Desecrated Shoulderpads", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "8.33%" }, - { 17, 22361, "", "=q4=Desecrated Spaulders", "=q1=#m1# =ds=#c7#, #c1#, #c2#, #c4#","", "8.33%" }, - { 18, 22354, "", "=q4=Desecrated Pauldrons", "=q1=#m1# =ds=#c6#, #c9#","", "8.33%" }, - { 19, 22369, "", "=q4=Desecrated Bindings", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "8.33%" }, - { 20, 22362, "", "=q4=Desecrated Wristguards", "=q1=#m1# =ds=#c4#, #c7#, #c2#, #c1#","", "8.33%" }, - { 21, 22355, "", "=q4=Desecrated Bracers", "=q1=#m1# =ds=#c9#, #c6#","", "8.33%" }, - { 22, 22370, "", "=q4=Desecrated Belt", "=q1=#m1# =ds=#c5#, #c3#, #c8#","","8.33%" }, - { 23, 22363, "", "=q4=Desecrated Girdle", "=q1=#m1# =ds=#c7#, #c1#, #c2#, #c4#","", "8.33%" }, - { 24, 22356, "", "=q4=Desecrated Waistguard", "=q1=#m1# =ds=#c6#, #c9#","", "8.33%" }, - { 25, 22372, "", "=q4=Desecrated Sandals", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "8.33%" }, - { 26, 22365, "", "=q4=Desecrated Boots", "=q1=#m1# =ds=#c7#, #c1#, #c2#, #c4#","", "8.33%" }, - { 27, 22358, "", "=q4=Desecrated Sabatons", "=q1=#m1# =ds=#c6#, #c9#","", "8.33%" }, + { 1, 22983, "", "=q4=Rime Covered Mantle", "=ds=#s3#, #a1#", "", "20%" }, + { 2, 22813, "", "=q4=Claymore of Unholy Might", "=ds=#h2#, #w10#", "","20%" }, + { 3, 23075, "", "=q4=Death's Bargain", "=ds=#w8#", "","20%" }, + { 4, 22994, "", "=q4=Digested Hand of Power", "=ds=#s15#","","20%"}, + { 5, 22981, "", "=q4=Gluth's Missing Collar", "=ds=#s2#","","20%" }, + --{ 16, 22368, "", "=q4=Desecrated Shoulderpads", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "8.33%" }, + { 16, 22361, "", "=q4=Desecrated Spaulders", "=ds=#tt3#","", "8.33%" }, + --{ 18, 22354, "", "=q4=Desecrated Pauldrons", "=q1=#m1# =ds=#c6#, #c9#","", "8.33%" }, + --{ 19, 22369, "", "=q4=Desecrated Bindings", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "8.33%" }, + { 17, 22362, "", "=q4=Desecrated Wristguards", "=ds=#tt3#","", "8.33%" }, + --{ 21, 22355, "", "=q4=Desecrated Bracers", "=q1=#m1# =ds=#c9#, #c6#","", "8.33%" }, + --{ 22, 22370, "", "=q4=Desecrated Belt", "=q1=#m1# =ds=#c5#, #c3#, #c8#","","8.33%" }, + { 18, 22363, "", "=q4=Desecrated Girdle", "=ds=#tt3#","", "8.33%" }, + --{ 24, 22356, "", "=q4=Desecrated Waistguard", "=q1=#m1# =ds=#c6#, #c9#","", "8.33%" }, + --{ 25, 22372, "", "=q4=Desecrated Sandals", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "8.33%" }, + { 19, 22365, "", "=q4=Desecrated Boots", "=ds=#tt3#","", "8.33%" }, + --{ 27, 22358, "", "=q4=Desecrated Sabatons", "=q1=#m1# =ds=#c6#, #c9#","", "8.33%" }, + { 21, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 22, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXGrobbulus"; Next = "NAXThaddius"; Type = "ClassicRaid"; }; AtlasLoot_Data["NAXThaddius"] = { - { 1, 22726, "", "=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%"}, - { 5, 22360, "", "=q4=Desecrated Headpiece", "=q1=#m1# =ds=#c7#, #c1#, #c2#, #c4#" ,"", "66.67%"}, - { 6, 22353, "", "=q4=Desecrated Helmet", "=q1=#m1# =ds=#c6#, #c9#","", "66.67%" }, - { 7, 0,"","","" }, - { 8, 23070, "", "=q4=Leggings of Polarity", "=ds=#s11#, #a1#" ,"", "20%"}, - { 9, 23000, "", "=q4=Plated Abomination Ribcage", "=ds=#s5#, #a4#","", "20%" }, - { 10, 22808, "", "=q4=The Castigator", "=ds=#h1#, #w6#" ,"", "20%"}, - { 11, 22801, "", "=q4=Spire of Twilight", "=ds=#w9#" ,"", "20%"}, - { 12, 23001, "", "=q4=Eye of Diminution", "=ds=#s14#" ,"", "20%"}, + { 1, 23070, "", "=q4=Leggings of Polarity", "=ds=#s11#, #a1#" ,"", "20%"}, + { 2, 23000, "", "=q4=Plated Abomination Ribcage", "=ds=#s5#, #a4#","", "20%" }, + { 3, 22808, "", "=q4=The Castigator", "=ds=#h1#, #w6#" ,"", "20%"}, + { 4, 22801, "", "=q4=Spire of Twilight", "=ds=#w9#" ,"", "20%"}, + { 5, 23001, "", "=q4=Eye of Diminution", "=ds=#s14#" ,"", "20%"}, + --{ 4, 22367, "", "=q4=Desecrated Circlet", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "66.67%"}, + { 16, 22360, "", "=q4=Desecrated Headpiece", "=ds=#tt3#" ,"", "100%"}, + --{ 6, 22353, "", "=q4=Desecrated Helmet", "=q1=#m1# =ds=#c6#, #c9#","", "66.67%" }, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXGluth"; Next = "NAXAnubRekhan"; Type = "ClassicRaid"; }; AtlasLoot_Data["NAXAnubRekhan"] = { - { 1, 22726, "", "=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%" }, - { 5, 22362, "", "=q4=Desecrated Wristguards", "=q1=#m1# =ds=#c4#, #c7#, #c2#, #c1#","", "33.33%" }, - { 6, 22355, "", "=q4=Desecrated Bracers", "=q1=#m1# =ds=#c9#, #c6#", "", "33.33%" }, - { 7, 0,"","","" }, - { 8, 22938, "", "=q4=Cryptfiend Silk Cloak", "=ds=#s4#", "","20%" }, - { 9, 22936, "", "=q4=Wristguards of Vengeance", "=ds=#s8#, #a4#","", "20%" }, - { 10, 22937, "", "=q4=Gem of Nerubis", "=ds=#s15#","", "20%" }, - { 11, 22939, "", "=q4=Band of Unanswered Prayers", "=ds=#s13#","", "20%" }, - { 12, 22935, "", "=q4=Touch of Frost", "=ds=#s2#", "", "20%" }, + { 1, 22938, "", "=q4=Cryptfiend Silk Cloak", "=ds=#s4#", "","20%" }, + { 2, 22936, "", "=q4=Wristguards of Vengeance", "=ds=#s8#, #a4#","", "20%" }, + { 3, 22937, "", "=q4=Gem of Nerubis", "=ds=#s15#","", "20%" }, + { 4, 22939, "", "=q4=Band of Unanswered Prayers", "=ds=#s13#","", "20%" }, + { 5, 22935, "", "=q4=Touch of Frost", "=ds=#s2#", "", "20%" }, + --{ 4, 22369, "", "=q4=Desecrated Bindings", "=q1=#m1# =ds=#c8#, #c3#, #c5#", "","33.33%" }, + { 16, 22362, "", "=q4=Desecrated Wristguards", "=ds=#tt3#","", "100%" }, + --{ 6, 22355, "", "=q4=Desecrated Bracers", "=q1=#m1# =ds=#c9#, #c6#", "", "33.33%" }, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXThaddius"; Next = "NAXGrandWidowFearlina"; Type = "ClassicRaid"; }; AtlasLoot_Data["NAXGrandWidowFearlina"] = { - { 1, 22726, "", "=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%" }, - { 5, 22362, "", "=q4=Desecrated Wristguards", "=q1=#m1# =ds=#c4#, #c7#, #c2#, #c1#","", "33.33%" }, - { 6, 22355, "", "=q4=Desecrated Bracers", "=q1=#m1# =ds=#c9#, #c6#","", "33.33%" }, - { 7, 0,"","","" }, - { 8, 22941, "", "=q4=Polar Shoulder Pads", "=ds=#s3#, #a2#","", "20%" }, - { 9, 22940, "", "=q4=Icebane Pauldrons", "=ds=#s3#, #a4#","", "20%" }, - { 10, 22806, "", "=q4=Widow's Remorse", "=ds=#h1#, #w10#","", "20%" }, - { 11, 22942, "", "=q4=The Widow's Embrace", "=ds=#h3#, #w6#","", "20%" }, - { 12, 22943, "", "=q4=Malice Stone Pendant", "=ds=#s2#","", "20%" }, + { 1, 22941, "", "=q4=Polar Shoulder Pads", "=ds=#s3#, #a2#","", "20%" }, + { 2, 22940, "", "=q4=Icebane Pauldrons", "=ds=#s3#, #a4#","", "20%" }, + { 3, 22806, "", "=q4=Widow's Remorse", "=ds=#h1#, #w10#","", "20%" }, + { 4, 22942, "", "=q4=The Widow's Embrace", "=ds=#h3#, #w6#","", "20%" }, + { 5, 22943, "", "=q4=Malice Stone Pendant", "=ds=#s2#","", "20%" }, + --{ 4, 22369, "", "=q4=Desecrated Bindings", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "33.33%" }, + { 16, 22362, "", "=q4=Desecrated Wristguards", "=ds=#tt3#" ,"", "100%" }, + --{ 6, 22355, "", "=q4=Desecrated Bracers", "=q1=#m1# =ds=#c9#, #c6#","", "33.33%" }, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXAnubRekhan"; Next = "NAXMaexxna"; Type = "ClassicRaid"; }; AtlasLoot_Data["NAXMaexxna"] = { - { 1, 22726, "", "=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%" }, - { 5, 22364, "", "=q4=Desecrated Handguards", "=q1=#m1# =ds=#c4#, #c7#, #c2#, #c1#","", "67.66%" }, - { 6, 22357, "", "=q4=Desecrated Gauntlets", "=q1=#m1# =ds=#c9#, #c6#","", "67.66%" }, - { 7, 0,"","","" }, - { 8, 23220, "", "=q4=Crystal Webbed Robe", "=ds=#s5#, #a1#","", "20%" }, - { 9, 22804, "", "=q4=Maexxna's Fang", "=ds=#h1#, #w4#","", "20%" }, - { 10, 22807, "", "=q4=Wraith Blade", "=ds=#h3#, #w10#","", "20%" }, - { 11, 22947, "", "=q4=Pendant of Forgotten Names", "=ds=#s2#","", "20%" }, - { 12, 22954, "", "=q4=Kiss of the Spider", "=ds=#s14#","", "20%" }, + { 1, 23220, "", "=q4=Crystal Webbed Robe", "=ds=#s5#, #a1#","", "20%" }, + { 2, 22804, "", "=q4=Maexxna's Fang", "=ds=#h1#, #w4#","", "20%" }, + { 3, 22807, "", "=q4=Wraith Blade", "=ds=#h3#, #w10#","", "20%" }, + { 4, 22947, "", "=q4=Pendant of Forgotten Names", "=ds=#s2#","", "20%" }, + { 5, 22954, "", "=q4=Kiss of the Spider", "=ds=#s14#","", "20%" }, + --{ 4, 22371, "", "=q4=Desecrated Gloves", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "67.66%" }, + { 16, 22364, "", "=q4=Desecrated Handguards", "=ds=#tt3#","", "100%" }, + --{ 6, 22357, "", "=q4=Desecrated Gauntlets", "=q1=#m1# =ds=#c9#, #c6#","", "67.66%" }, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXGrandWidowFearlina"; Next = "NAXInstructorRAuvious"; Type = "ClassicRaid"; }; AtlasLoot_Data["NAXInstructorRAuvious"] = { - { 1, 22726, "", "=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%" }, - { 5, 22365, "", "=q4=Desecrated Boots", "=q1=#m1# =ds=#c7#, #c1#, #c2#, #c4#","", "33.33%" }, - { 6, 22358, "", "=q4=Desecrated Sabatons", "=q1=#m1# =ds=#c6#, #c9#","", "33.33%" }, - { 7, 0,"","","" }, - { 8, 23017, "", "=q4=Veil of Eclipse", "=ds=#s4#","", "16.67%" }, - { 9, 23219, "", "=q4=Girdle of the Mentor", "=ds=#s10#, #a4#","", "16.67%" }, - { 10, 23014, "", "=q4=Iblis, Blade of the Fallen Seraph", "=ds=#h1#, #w10#","", "16.67%" }, - { 11, 23009, "", "=q4=Wand of the Whispering Dead", "=ds=#w12#","", "16.67%" }, - { 12, 23004, "", "=q4=Idol of Longevity", "=ds=#s16#, #w14#","", "16.67%" }, - { 13, 23018, "", "=q4=Signet of the Fallen Defender", "=ds=#s13#","", "16.67%" }, + { 1, 23017, "", "=q4=Veil of Eclipse", "=ds=#s4#","", "16.67%" }, + { 2, 23219, "", "=q4=Girdle of the Mentor", "=ds=#s10#, #a4#","", "16.67%" }, + { 3, 23014, "", "=q4=Iblis, Blade of the Fallen Seraph", "=ds=#h1#, #w10#","", "16.67%" }, + { 4, 23009, "", "=q4=Wand of the Whispering Dead", "=ds=#w12#","", "16.67%" }, + { 5, 23004, "", "=q4=Idol of Longevity", "=ds=#s16#, #w14#","", "16.67%" }, + { 6, 23018, "", "=q4=Signet of the Fallen Defender", "=ds=#s13#","", "16.67%" }, + --{ 4, 22372, "", "=q4=Desecrated Sandals", "=q1=#m1# =ds=#c8#, #c3#, #c5#", "", "33.33%" }, + { 16, 22365, "", "=q4=Desecrated Boots", "=ds=#tt3#" ,"", "100%" }, + --{ 6, 22358, "", "=q4=Desecrated Sabatons", "=q1=#m1# =ds=#c6#, #c9#","", "33.33%" }, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXMaexxna"; Next = "NAXGothicderHarvester"; Type = "ClassicRaid"; }; AtlasLoot_Data["NAXGothicderHarvester"] = { - { 1, 22726, "", "=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%" }, - { 5, 22365, "", "=q4=Desecrated Boots", "=q1=#m1# =ds=#c7#, #c1#, #c2#, #c4#","", "33.33%" }, - { 6, 22358, "", "=q4=Desecrated Sabatons", "=q1=#m1# =ds=#c6#, #c9#","", "33.33%" }, - { 7, 0,"","","" }, - { 8, 23032, "", "=q4=Glacial Headdress", "=ds=#s1#, #a1#","", "20%" }, - { 9, 23021, "", "=q4=The Soul Harvester's Bindings", "=ds=#s8#, #a1#","", "20%" }, - { 10, 23020, "", "=q4=Polar Helmet", "=ds=#s1#, #a2#","", "20%" }, - { 11, 23073, "", "=q4=Boots of Displacement", "=ds=#s12#, #a2#","", "20%" }, - { 12, 23023, "", "=q4=Sadist's Collar", "=ds=#s2#","", "20%" }, + { 1, 23032, "", "=q4=Glacial Headdress", "=ds=#s1#, #a1#","", "20%" }, + { 2, 23021, "", "=q4=The Soul Harvester's Bindings", "=ds=#s8#, #a1#","", "20%" }, + { 3, 23020, "", "=q4=Polar Helmet", "=ds=#s1#, #a2#","", "20%" }, + { 4, 23073, "", "=q4=Boots of Displacement", "=ds=#s12#, #a2#","", "20%" }, + { 5, 23023, "", "=q4=Sadist's Collar", "=ds=#s2#","", "20%" }, + --{ 4, 22372, "", "=q4=Desecrated Sandals", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "33.33%" }, + { 16, 22365, "", "=q4=Desecrated Boots", "=ds=#tt3#" ,"", "100%" }, + --{ 6, 22358, "", "=q4=Desecrated Sabatons", "=q1=#m1# =ds=#c6#, #c9#","", "33.33%" }, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXInstructorRAuvious"; Next = "NAXTheFourHorsemen"; Type = "ClassicRaid"; }; AtlasLoot_Data["NAXTheFourHorsemen"] = { - { 1, 22726, "", "=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%" }, - { 5, 22350, "", "=q4=Desecrated Tunic", "=q1=#m1# =ds=#c7#, #c1#, #c2#, #c4#","", "33.33%" }, - { 6, 22349, "", "=q4=Desecrated Breastplate", "=q1=#m1# =ds=#c6#, #c9#","", "33.33%" }, - { 7, 0,"","","" }, - { 8, 23071, "", "=q4=Leggings of Apocalypse", "=ds=#s11#, #a2#","", "16.67%" }, - { 9, 22809, "", "=q4=Maul of the Redeemed Crusader", "=ds=#h2#, #w6#","", "16.67%" }, - { 10, 22691, "", "=q4=Corrupted Ashbringer", "=ds=#h2#, #w10#","", "16.67%" }, - { 11, 22811, "", "=q4=Soulstring", "=ds=#w2#","", "20%" }, - { 12, 23025, "", "=q4=Seal of the Damned", "=ds=#s13#","", "16.67%" }, - { 13, 23027, "", "=q4=Warmth of Forgiveness", "=ds=#s14#","", "16.67%" }, + { 1, 23071, "", "=q4=Leggings of Apocalypse", "=ds=#s11#, #a2#","", "16.67%" }, + { 2, 22809, "", "=q4=Maul of the Redeemed Crusader", "=ds=#h2#, #w6#","", "16.67%" }, + { 3, 22691, "", "=q4=Corrupted Ashbringer", "=ds=#h2#, #w10#","", "16.67%" }, + { 4, 22811, "", "=q4=Soulstring", "=ds=#w2#","", "20%" }, + { 5, 23025, "", "=q4=Seal of the Damned", "=ds=#s13#","", "16.67%" }, + { 6, 23027, "", "=q4=Warmth of Forgiveness", "=ds=#s14#","", "16.67%" }, + --{ 4, 22351, "", "=q4=Desecrated Robe", "=q1=#m1# =ds=#c8#, #c3#, #c5#","", "33.33%" }, + { 16, 22350, "", "=q4=Desecrated Tunic", "=ds=#tt3#" ,"", "100%" }, + --{ 6, 22349, "", "=q4=Desecrated Breastplate", "=q1=#m1# =ds=#c6#, #c9#","", "33.33%" }, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXGothicderHarvester"; Next = "NAXNothderPlaguebringer"; Type = "ClassicRaid"; }; AtlasLoot_Data["NAXNothderPlaguebringer"] = { - { 1, 22726, "", "=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%" }, - { 5, 22363, "", "=q4=Desecrated Girdle", "=q1=#m1# =ds=#c7#, #c1#, #c2#, #c4#","", "33.33%" }, - { 6, 22356, "", "=q4=Desecrated Waistguard", "=q1=#m1# =ds=#c6#, #c9#","", "33.33%" }, - { 7, 0,"","","" }, - { 8, 23030, "", "=q4=Cloak of the Scourge", "=ds=#s4#","", "14.29%" }, - { 9, 22816, "", "=q4=Hatchet of Sundered Bone", "=ds=#h1#, #w1#","", "14.29%" }, - { 10, 23005, "", "=q4=Totem of Flowing Water", "=ds=#s16#, #w15#","", "14.29%" }, - { 11, 23006, "", "=q4=Libram of Light", "=ds=#s16#, #w16#","", "14.29%" }, - { 12, 23029, "", "=q4=Noth's Frigid Heart", "=ds=#s15#","", "14.29%" }, - { 13, 23031, "", "=q4=Band of the Inevitable", "=ds=#s13#","", "14.29%" }, - { 14, 23028, "", "=q4=Hailstone Band", "=ds=#s13#","", "14.29%" }, + { 1, 23030, "", "=q4=Cloak of the Scourge", "=ds=#s4#","", "14.29%" }, + { 2, 22816, "", "=q4=Hatchet of Sundered Bone", "=ds=#h1#, #w1#","", "14.29%" }, + { 3, 23005, "", "=q4=Totem of Flowing Water", "=ds=#s16#, #w15#","", "14.29%" }, + { 4, 23006, "", "=q4=Libram of Light", "=ds=#s16#, #w16#","", "14.29%" }, + { 5, 23029, "", "=q4=Noth's Frigid Heart", "=ds=#s15#","", "14.29%" }, + { 6, 23031, "", "=q4=Band of the Inevitable", "=ds=#s13#","", "14.29%" }, + { 7, 23028, "", "=q4=Hailstone Band", "=ds=#s13#","", "14.29%" }, + --{ 4, 22370, "", "=q4=Desecrated Belt", "=q1=#m1# =ds=#c5#, #c3#, #c8#","", "33.33%" }, + { 16, 22363, "", "=q4=Desecrated Girdle", "=ds=#tt3#" ,"", "100%" }, + --{ 6, 22356, "", "=q4=Desecrated Waistguard", "=q1=#m1# =ds=#c6#, #c9#","", "33.33%" }, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXTheFourHorsemen"; Next = "NAXHeiganderUnclean"; Type = "ClassicRaid"; }; AtlasLoot_Data["NAXHeiganderUnclean"] = { - { 1, 22726, "", "=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%" }, - { 5, 22363, "", "=q4=Desecrated Girdle", "=q1=#m1# =ds=#c7#, #c1#, #c2#, #c4#","", "33.33%" }, - { 6, 22356, "", "=q4=Desecrated Waistguard", "=q1=#m1# =ds=#c6#, #c9#","", "33.33%" }, - { 7, 0,"","","" }, - { 8, 23035, "", "=q4=Preceptor's Hat", "=ds=#s1#, #a1#","", "20%" }, - { 9, 23033, "", "=q4=Icy Scale Coif", "=ds=#s1#, #a3#","", "20%" }, - { 10, 23019, "", "=q4=Icebane Helmet", "=ds=#s1#, #a4#","", "20%" }, - { 11, 23068, "", "=q4=Legplates of Carnage", "=ds=#s11#, #a4#","", "20%" }, - { 12, 23036, "", "=q4=Necklace of Necropsy", "=ds=#s2#","", "20%" }, + { 1, 23035, "", "=q4=Preceptor's Hat", "=ds=#s1#, #a1#","", "20%" }, + { 2, 23033, "", "=q4=Icy Scale Coif", "=ds=#s1#, #a3#","", "20%" }, + { 3, 23019, "", "=q4=Icebane Helmet", "=ds=#s1#, #a4#","", "20%" }, + { 4, 23068, "", "=q4=Legplates of Carnage", "=ds=#s11#, #a4#","", "20%" }, + { 5, 23036, "", "=q4=Necklace of Necropsy", "=ds=#s2#","", "20%" }, + --{ 4, 22370, "", "=q4=Desecrated Belt", "=q1=#m1# =ds=#c5#, #c3#, #c8#","", "33.33%" }, + { 16, 22363, "", "=q4=Desecrated Girdle", "=ds=#tt3#" ,"", "100%" }, + --{ 6, 22356, "", "=q4=Desecrated Waistguard", "=q1=#m1# =ds=#c6#, #c9#","", "33.33%" }, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXNothderPlaguebringer"; Next = "NAXLoatheb"; Type = "ClassicRaid"; }; AtlasLoot_Data["NAXLoatheb"] = { - { 1, 22726, "", "=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%" }, - { 5, 22359, "", "=q4=Desecrated Legguards", "=q1=#m1# =ds=#c7#, #c1#, #c2#, #c4#" ,"", "66.67%"}, - { 6, 22352, "", "=q4=Desecrated Legplates", "=q1=#m1# =ds=#c6#, #c9#","", "66.67%" }, - { 7, 0,"","","" }, - { 8, 23039, "", "=q4=The Eye of Nerub", "=ds=#w7#","", "20%" }, - { 9, 22800, "", "=q4=Brimstone Staff", "=ds=#w9#","", "20%" }, - { 10, 23037, "", "=q4=Ring of Spiritual Fervor", "=ds=#s13#","", "20%" }, - { 11, 23038, "", "=q4=Band of Unnatural Forces", "=ds=#s13#" ,"", "20%"}, - { 12, 23042, "", "=q4=Loatheb's Reflection", "=ds=#s14#","", "20%" }, + { 1, 23039, "", "=q4=The Eye of Nerub", "=ds=#w7#","", "20%" }, + { 2, 22800, "", "=q4=Brimstone Staff", "=ds=#w9#","", "20%" }, + { 3, 23037, "", "=q4=Ring of Spiritual Fervor", "=ds=#s13#","", "20%" }, + { 4, 23038, "", "=q4=Band of Unnatural Forces", "=ds=#s13#" ,"", "20%"}, + { 5, 23042, "", "=q4=Loatheb's Reflection", "=ds=#s14#","", "20%" }, + --{ 4, 22366, "", "=q4=Desecrated Leggings", "=q1=#m1# =ds=#c5#, #c3#, #c8#","", "66.67%" }, + { 16, 22359, "", "=q4=Desecrated Legguards", "=ds=#tt3#" ,"", "100%"}, + --{ 6, 22352, "", "=q4=Desecrated Legplates", "=q1=#m1# =ds=#c6#, #c9#","", "66.67%" }, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXHeiganderUnclean"; Next = "NAXSapphiron"; Type = "ClassicRaid"; @@ -4557,13 +4490,12 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 10, 23046, "", "=q4=The Restrained Essence of Sapphiron", "=ds=#s14#","","18.18%" }, { 11, 23041, "", "=q4=Slayer's Crest", "=ds=#s14#","","18.18%" }, { 12, 19761,"","Fang of the Frost Wyrm","=ds=#h3#, #w13#" }, - { 13, 0,"","","" }, - { 14, 0,"","","" }, - { 15, 0,"","","" }, { 16, 23545, "", "=q4=Power of the Scourge", "=ds=#s3# #e17#","","50%" }, { 17, 23547, "", "=q4=Resilience of the Scourge", "=ds=#s3# #e17#","","50%" }, { 18, 23549, "", "=q4=Fortitude of the Scourge", "=ds=#s3# #e17#","","50%" }, { 19, 23548, "", "=q4=Might of the Scourge", "=ds=#s3# #e17#" ,"","50%"}, + { 18, 22726, "", "=q5=Splinter of Atiesh", "=ds=#m3#", "", "30%" }, + { 19, 22727, "", "=q5=Frame of Atiesh", "=ds=#m2#" }, Prev = "NAXLoatheb"; Next = "NAXKelThuzad"; Type = "ClassicRaid"; @@ -4581,7 +4513,6 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 9, 22819, "", "=q4=Shield of Condemnation", "=ds=#w8#" ,"","18.18%"}, { 10, 23057, "", "=q4=Gem of Trapped Innocents", "=ds=#s2#" ,"","18.18%"}, { 11, 23053, "", "=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#" }, @@ -4594,7 +4525,6 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 22, 23065, "", "=q4=Ring of the Earthshatterer", "=ds=#s13# =q1=#m1# =ds=#c7#" ,"","22.22%"}, { 23, 23063, "", "=q4=Plagueheart Ring", "=ds=#s13# =q1=#m1# =ds=#c8#" ,"","22.22%"}, { 24, 23059, "", "=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#", "", "", [AtlasLoot_Difficulty.DUPLICATE] = "(Druid)" }, { 28, 22589, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c3#", "", "", [AtlasLoot_Difficulty.DUPLICATE] = "(Mage)" }, @@ -4618,14 +4548,10 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 10, 23221, "", "=q4=Misplaced Servo Arm", "=ds=#h1# #w6#" }, { 11, 23238, "", "=q4=Stygian Buckler", "=ds=#w8#" }, { 12, 23237, "", "=q4=Ring of the Eternal Flame", "=ds=#s13#" }, - { 13, 0,"","","" }, - { 14, 0,"","","" }, - { 15, 0,"","","" }, { 16, 22376, "", "=q3=Wartorn Cloth Scrap", "=ds=#m3#" }, { 17, 22373, "", "=q3=Wartorn Leather Scrap", "=ds=#m3#" }, { 18, 22374, "", "=q3=Wartorn Chain Scrap", "=ds=#m3#" }, { 19, 22375, "", "=q3=Wartorn Plate Scrap", "=ds=#m3#" }, - { 20, 0,"","","" }, { 21, 22708, "", "=q1=Fate of Ramaladni", "=ds=#m3#" }, { 22, 23055, "", "=q1=Word of Thawing", "=ds=#m20#" }, Prev = "NAXKelThuzad"; @@ -4648,14 +4574,12 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 10, 18713, "", "=q4=Rhok'delar, Longbow of the Ancient Keepers", "=q1=#m4#: =ds=#w2#, =q1=#m1# =ds=#c2#" }, { 12, 15410, "","=q3=Scale of Onyxia", "=ds=#e8#" }, { 13, 17966, "", "=q2=Onyxia Hide Backpack", "=ds=#m14# #e1#","", "100%"}, - { 16, 2522449, "", "=q4=Chromatic Breastplate", "=q1=#m1# =ds=#c4#, #c6#, #c7#", "", "33.33%"}; - { 17, 2522450, "", "=q4=Chromatic Tunic", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "33.33%"}; - { 18, 2522451, "", "=q4=Chromatic Robe", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "33.33%"}; - { 20, 18423, "", "=q4=Head of Onyxia","=ds=#m2#","", "100%" }, - { 21, 18404, "", "=q4=Onyxia Tooth Pendant", "=q1=#m4#: =ds=#s2#" }, - { 22, 18403, "", "=q4=Dragonslayer's Signet", "=q1=#m4#: =ds=#s13#" }, - { 23, 18406, "", "=q4=Onyxia Blood Talisman", "=q1=#m4#: =ds=#s14#" }, - { 25, 49636, "", "=q4=Reins of the Onyxian Drake", "=ds=#e12#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Heroic }; + { 16, 2522460, "", "=q4=Chromatic Headpiece", "=ds=#tt2#", "", "100%"}; + { 18, 18423, "", "=q4=Head of Onyxia","=ds=#m2#","", "100%" }, + { 19, 18404, "", "=q4=Onyxia Tooth Pendant", "=q1=#m4#: =ds=#s2#" }, + { 20, 18403, "", "=q4=Dragonslayer's Signet", "=q1=#m4#: =ds=#s13#" }, + { 21, 18406, "", "=q4=Onyxia Blood Talisman", "=q1=#m4#: =ds=#s14#" }, + { 23, 49636, "", "=q4=Reins of the Onyxian Drake", "=ds=#e12#", [AtlasLoot_Difficulty.MIN_DIF] = AtlasLoot_Difficulty.Heroic }; Type = "ClassicRaid"; }; @@ -5136,6 +5060,132 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") Type = "ClassicRaid"; }; + -- T1 Token Items + + AtlasLoot_Data["T1Bracers"] = { + { 1, 16830, "", "=q4=Cenarion Bracers", "=ds=#c1#", "", ""}; + { 2, 16850, "", "=q4=Giantstalker's Bracers", "=ds=#c2#", "", ""}; + { 3, 16799, "", "=q4=Arcanist Bindings", "=ds=#c3#", "", ""}; + { 4, 16857, "", "=q4=Lawbringer Bracers", "=ds=#c4#", "", ""}; + { 5, 16819, "", "=q4=Vambraces of Prophecy", "=ds=#c5#", "", ""}; + { 6, 16825, "", "=q4=Nightslayer Bracelets", "=ds=#c6#", "", ""}; + { 7, 16840, "", "=q4=Earthfury Bracers", "=ds=#c7#", "", ""}; + { 8, 16804, "", "=q4=Felheart Bracers", "=ds=#c8#", "", ""}; + { 9, 16861, "", "=q4=Bracers of Might", "=ds=#c9#", "", ""}; + { 10, 10483, "", "=q4=Wristguards of Might", "=ds=#c9#", "", ""}; + Back = AtlasLoot_Lastboss; + Type = "ClassicRaid"; + + }; + + AtlasLoot_Data["T1Belts"] = { + { 1, 16828, "", "=q4=Cenarion Belt", "=ds="..AL["Trash Mobs"], "", "0.16%"}; + { 2, 16851, "", "=q4=Giantstalker's Belt", "=ds="..AL["Trash Mobs"], "", "0.17%"}; + { 3, 16802, "", "=q4=Arcanist Belt", "=ds="..AL["Trash Mobs"], "", "0.16%"}; + { 4, 16858, "", "=q4=Lawbringer Belt", "=ds="..AL["Trash Mobs"], "", "0.10%"}; + { 5, 16817, "", "=q4=Girdle of Prophecy", "=ds="..AL["Trash Mobs"], "", "0.18%"}; + { 6, 16827, "", "=q4=Nightslayer Belt", "=ds="..AL["Trash Mobs"], "", "0.15%"}; + { 7, 16838, "", "=q4=Earthfury Belt", "=ds="..AL["Trash Mobs"], "", "0.07%"}; + { 8, 16806, "", "=q4=Felheart Belt", "=ds="..AL["Trash Mobs"], "", "0.19%"}; + { 9, 16864, "", "=q4=Belt of Might", "=ds="..AL["Trash Mobs"], "", "0.16%"}; + { 10, 10485, "", "=q4=Girdle of Might", "=ds="..AL["Trash Mobs"], ""}; + Back = AtlasLoot_Lastboss; + Type = "ClassicRaid"; + }; + + AtlasLoot_Data["T1Gloves"] = { + { 1, 16831, "", "=q4=Cenarion Gloves", "=ds="..BabbleBoss["Shazzrah"], "", "19.53%"}; + { 2, 16852, "", "=q4=Giantstalker's Gloves", "=ds="..BabbleBoss["Shazzrah"], "", "18.58%"}; + { 3, 16801, "", "=q4=Arcanist Gloves", "=ds="..BabbleBoss["Shazzrah"], "", "19.59%"}; + { 4, 16860, "", "=q4=Lawbringer Gauntlets", "=ds="..BabbleBoss["Gehennas"], "", "11.77%"}; + { 5, 16812, "", "=q4=Gloves of Prophecy", "=ds="..BabbleBoss["Gehennas"], "", "18.65%"}; + { 6, 16826, "", "=q4=Nightslayer Gloves", "=ds="..BabbleBoss["Gehennas"], "", "19.47%"}; + { 7, 16839, "", "=q4=Earthfury Gauntlets", "=ds="..BabbleBoss["Gehennas"], "", "7.38%"}; + { 8, 16805, "", "=q4=Felheart Gloves", "=ds="..BabbleBoss["Lucifron"], "", "14.89%"}; + { 9, 16863, "", "=q4=Gauntlets of Might", "=ds="..BabbleBoss["Lucifron"], "", "16.40%"}; + { 10, 10484, "", "=q4=Handguards of Might", "=ds="..BabbleBoss["Lucifron"], ""}; + Back = AtlasLoot_Lastboss; + Type = "ClassicRaid"; + }; + + + AtlasLoot_Data["T1Shoulders"] = { + { 1, 16836, "", "=q4=Cenarion Spaulders", "=ds="..BabbleBoss["Baron Geddon"], "", "19.52%"}; + { 2, 16848, "", "=q4=Giantstalker's Epaulets", "=ds="..BabbleBoss["Sulfuron Harbinger"], "", "19.64%"}; + { 3, 16797, "", "=q4=Arcanist Mantle", "=ds="..BabbleBoss["Baron Geddon"], "", "19.92%"}; + { 4, 16856, "", "=q4=Lawbringer Spaulders", "=ds="..BabbleBoss["Baron Geddon"], "", "12.62%"}; + { 5, 16816, "", "=q4=Mantle of Prophecy", "=ds="..BabbleBoss["Sulfuron Harbinger"], "", "21.06%"}; + { 6, 16823, "", "=q4=Nightslayer Shoulder Pads", "=ds="..BabbleBoss["Sulfuron Harbinger"], "", "20.66%"}; + { 7, 16844, "", "=q4=Earthfury Epaulets", "=ds="..BabbleBoss["Baron Geddon"], "", "7.29%"}; + { 8, 16807, "", "=q4=Felheart Shoulder Pads", "=ds="..BabbleBoss["Baron Geddon"], "", "19.78%"}; + { 9, 16868, "", "=q4=Pauldrons of Might", "=ds="..BabbleBoss["Sulfuron Harbinger"], "", "21.14%"}; + { 10, 10481, "", "=q4=Shoulderpads of Might", "=ds="..BabbleBoss["Sulfuron Harbinger"], ""}; + Back = AtlasLoot_Lastboss; + Type = "ClassicRaid"; + }; + + AtlasLoot_Data["T1Boots"] = { + { 1, 16829, "", "=q4=Cenarion Boots", "=ds="..BabbleBoss["Lucifron"], "", "10.72%"}; + { 2, 16849, "", "=q4=Giantstalker's Boots", "=ds="..BabbleBoss["Gehennas"], "", "14.54%"}; + { 3, 16800, "", "=q4=Arcanist Boots", "=ds="..BabbleBoss["Lucifron"], "", "12.06%"}; + { 4, 16859, "", "=q4=Lawbringer Boots", "=ds="..BabbleBoss["Lucifron"], "", "7.20%"}; + { 5, 16811, "", "=q4=Boots of Prophecy", "=ds="..BabbleBoss["Shazzrah"], "", "14.90%"}; + { 6, 16824, "", "=q4=Nightslayer Boots", "=ds="..BabbleBoss["Shazzrah"], "", "15.58%"}; + { 7, 16837, "", "=q4=Earthfury Boots", "=ds="..BabbleBoss["Lucifron"], "", "4.16%"}; + { 8, 16803, "", "=q4=Felheart Slippers", "=ds="..BabbleBoss["Shazzrah"], "", "15.28%"}; + { 9, 16862, "", "=q4=Sabatons of Might", "=ds="..BabbleBoss["Gehennas"], "", "14.48%"}; + { 10, 10487, "", "=q4=Stompers of Might", "=ds="..BabbleBoss["Gehennas"], ""}; + Back = AtlasLoot_Lastboss; + Type = "ClassicRaid"; + + }; + + AtlasLoot_Data["T1Legs"] = { + { 1, 16835, "", "=q4=Cenarion Leggings", "=ds="..BabbleBoss["Magmadar"], "", "12.90%"}; + { 2, 16847, "", "=q4=Giantstalker's Leggings", "=ds="..BabbleBoss["Magmadar"], "", "13.28%"}; + { 3, 16796, "", "=q4=Arcanist Leggings", "=ds="..BabbleBoss["Magmadar"], "", "14.57%"}; + { 4, 16855, "", "=q4=Lawbringer Legplates", "=ds="..BabbleBoss["Magmadar"], "", "8.54%"}; + { 5, 16814, "", "=q4=Pants of Prophecy", "=ds="..BabbleBoss["Magmadar"], "", "14.33%"}; + { 6, 16822, "", "=q4=Nightslayer Pants", "=ds="..BabbleBoss["Magmadar"], "", "13.83%"}; + { 7, 16843, "", "=q4=Earthfury Legguards", "=ds="..BabbleBoss["Magmadar"], "", "4.73%"}; + { 8, 16810, "", "=q4=Felheart Pants", "=ds="..BabbleBoss["Magmadar"], "", "13.75%"}; + { 9, 16867, "", "=q4=Legplates of Might", "=ds="..BabbleBoss["Magmadar"], "", "13.97%"}; + { 10, 10486, "", "=q4=Legguards of Might", "=ds="..BabbleBoss["Magmadar"], ""}; + Back = AtlasLoot_Lastboss; + Type = "ClassicRaid"; + }; + + AtlasLoot_Data["T1Helms"] = { + { 1, 16834, "", "=q4=Cenarion Helm", "=ds="..BabbleBoss["Garr"], "", ""}; + { 2, 16846, "", "=q4=Giantstalker's Helmet", "=ds="..BabbleBoss["Garr"], "", ""}; + { 3, 16795, "", "=q4=Arcanist Crown", "=ds="..BabbleBoss["Garr"], "", ""}; + { 4, 16795, "", "=q4=Arcanist Crown", "=ds="..BabbleBoss["Garr"], "", ""}; + { 5, 16854, "", "=q4=Lawbringer Helm", "=ds="..BabbleBoss["Garr"], "", ""}; + { 6, 16813, "", "=q4=Circlet of Prophecy", "=ds="..BabbleBoss["Garr"], "", ""}; + { 7, 16821, "", "=q4=Nightslayer Cover", "=ds="..BabbleBoss["Garr"], "", ""}; + { 8, 16842, "", "=q4=Earthfury Helmet", "=ds="..BabbleBoss["Garr"], "", ""}; + { 9, 16808, "", "=q4=Felheart Horns", "=ds="..BabbleBoss["Garr"], "", ""}; + { 10, 16866, "", "=q4=Helm of Might", "=ds="..BabbleBoss["Garr"], "", ""}; + { 11, 10480, "", "=q4=Faceguard of Might", "=ds="..BabbleBoss["Garr"], ""}; + Back = AtlasLoot_Lastboss; + Type = "ClassicRaid"; + }; + + AtlasLoot_Data["T1Chests"] = { + { 1, 16833, "", "=q4=Cenarion Vestments", "=ds="..BabbleBoss["Golemagg the Incinerator"], "", "15.21%"}; + { 2, 16845, "", "=q4=Giantstalker's Breastplate", "=ds="..BabbleBoss["Golemagg the Incinerator"], "", "15.83%"}; + { 3, 16798, "", "=q4=Arcanist Robes", "=ds="..BabbleBoss["Golemagg the Incinerator"], "", "16.51%"}; + { 4, 16853, "", "=q4=Lawbringer Chestguard", "=ds="..BabbleBoss["Golemagg the Incinerator"], "", "9.53%"}; + { 5, 16815, "", "=q4=Robes of Prophecy", "=ds="..BabbleBoss["Golemagg the Incinerator"], "", "15.65%"}; + { 6, 16820, "", "=q4=Nightslayer Chestpiece", "=ds="..BabbleBoss["Golemagg the Incinerator"], "", "16.76%"}; + { 7, 16841, "", "=q4=Earthfury Vestments", "=ds="..BabbleBoss["Golemagg the Incinerator"], "", "6.08%"}; + { 8, 16809, "", "=q4=Felheart Robes", "=ds="..BabbleBoss["Golemagg the Incinerator"], "", "15.66%"}; + { 9, 16865, "", "=q4=Breastplate of Might", "=ds="..BabbleBoss["Golemagg the Incinerator"], "", "15.28%"}; + { 10, 10482, "", "=q4=Chesttplate of Might", "=ds="..BabbleBoss["Golemagg the Incinerator"], ""}; + Back = AtlasLoot_Lastboss; + Type = "ClassicRaid"; + }; + ------------------------ --- Tier 3 Sets (T3) --- ------------------------