diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index d893faf..7c75443 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -11,11 +11,8 @@ AtlasLoot_OnVariablesLoaded() AtlasLoot_SlashCommand(msg) AtlasLootOptions_Toggle() AtlasLoot_OnLoad() -AtlasLootBoss_OnClick() AtlasLoot_ShowItemsFrame() -AtlasLoot_GenerateAtlasMenu(dataID, pFrame) AtlasLoot_SetItemInfoFrame() -AtlasLootMenuItem_OnClick() AtlasLoot_NavButton_OnClick() AtlasLoot_IsLootTableAvailable(dataID) AtlasLoot_GetLODModule(dataSource) @@ -26,7 +23,7 @@ AtlasLoot_AddTooltip(frameb, tooltiptext) AL_FindId(name, difficulty) ]] -AtlasLoot = LibStub("AceAddon-3.0"):NewAddon("AtlasLoot", "AceTimer-3.0"); +AtlasLoot = LibStub("AceAddon-3.0"):NewAddon("AtlasLoot"); --Instance required libraries local BabbleBoss = AtlasLoot_GetLocaleLibBabble("LibBabble-Boss-3.0") @@ -164,7 +161,6 @@ Invoked by the VARIABLES_LOADED event. Now that we are sure all the assets the addon needs are in place, we can properly set up the mod ]] function AtlasLoot_OnVariablesLoaded() - local AtlasCheck = false; AtlasLoot.db = LibStub("AceDB-3.0"):New("AtlasLootDB"); AtlasLoot.db:RegisterDefaults(AtlasLootDBDefaults); if not AtlasLootCharDB then AtlasLootCharDB = {} end @@ -178,6 +174,12 @@ function AtlasLoot_OnVariablesLoaded() }; end + if IsAddOnLoaded("Atlas") then + ATLASLOOT_ATLASLOADED = true; + AtlasLootDefaultFrame_MapButton:Show(); + AtlasLootDefaultFrame_MapSelectButton:Show(); + end + --Add the loot browser to the special frames tables to enable closing wih the ESC key tinsert(UISpecialFrames, "AtlasLootDefaultFrame"); --Set up options frame @@ -435,8 +437,8 @@ function AtlasLoot:CreateToken(dataID) }; end --Fills table with items - for _, t in ipairs(AtlasLoot_Data[dataID]) do - for _, v in ipairs(t) do + for n, t in ipairs(AtlasLoot_Data[dataID]) do + for c, v in ipairs(t) do if type(v) == "table" then local item = Item:CreateFromID(v[2]); item:ContinueOnLoad(function(itemID) @@ -444,6 +446,9 @@ function AtlasLoot:CreateToken(dataID) table.insert(AtlasLoot_TokenData[orgID][1], {#AtlasLoot_TokenData[orgID][1] + 1, v[2], v[3], v[4], t.Name}); end end) + if #AtlasLoot_Data[dataID] == n and #t == c then + AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4], AtlasLootItemsFrame.refresh[5]); + end end end end @@ -474,13 +479,6 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum) return; end - --Check to see if Atlas is loaded and the table has a map - if dataSource[dataID].Map and IsAddOnLoaded("Atlas") then - AtlasLootDefaultFrame_MapButton:Show(); - else - AtlasLootDefaultFrame_MapButton:Hide(); - end - --Hide Advanced search if it is up and reshow Querybutton AtlasLootDefaultFrame_AdvancedSearchPanel:Hide(); @@ -495,6 +493,9 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum) -- Hide the Filter Check-Box AtlasLootFilterCheck:Hide(); + -- Hide the map header lable + Atlasloot_HeaderLabel:Hide(); + if dataID ~= "SearchResult" and dataID ~= "WishList" and dataSource ~= AtlasLoot_TokenData then dataSource = AtlasLoot_Data; end @@ -502,7 +503,26 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum) dataSource = AtlasLootCharDB; end - ATLASLOOT_CURRENTTYPE = dataSource[dataID].Type or ""; + -- Check to see if Atlas is loaded and the table has a map + if dataSource[dataID].Map and ATLASLOOT_ATLASLOADED then + AtlasLootDefaultFrame_MapButton:Enable(); + AtlasLootDefaultFrame_MapSelectButton:Enable(); + -- Stops map reseting to default while still in the same raid/instance table + if AtlasLootItemsFrame.refresh == nil or dataID ~= AtlasLootItemsFrame.refresh[1] then + AtlasLoot_MapMenu:Unregister(AtlasLootDefaultFrame_MapSelectButton); + ATLASLOOT_CURRENT_MAP = dataSource[dataID].Map + if AtlasLoot_MultiMapData[ATLASLOOT_CURRENT_MAP] ~= nil then + AtlasLoot:MapMenuRegister(ATLASLOOT_CURRENT_MAP); + end + AtlasLoot:MapSelect(ATLASLOOT_CURRENT_MAP); + end + else + AtlasLootDefaultFrame_MapSelectButton:Disable(); + AtlasLootDefaultFrame_MapButton:Disable(); + AtlasLootDefaultFrame_MapSelectButton:SetText("No Map"); + end + + ATLASLOOT_CURRENTTYPE = dataSource[dataID].Type or "Default"; AtlasLoot:ScrollFrameUpdate(); AtlasLoot_BossName:SetText(dataSource[dataID][tablenum].Name); @@ -535,7 +555,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum) else if(item[AtlasLoot_Difficulty.MIN_DIF]) then if item[AtlasLoot_Difficulty.MIN_DIF] > itemDif then - toShow = false; + toShow = false; end end IDfound = AL_FindId(item[2], min(AtlasLoot_Difficulty:getMaxDifficulty(dataSource[dataID].Type), itemDif)) or item[2]; diff --git a/AtlasLoot/Core/Atlasloot_Maps.lua b/AtlasLoot/Core/Atlasloot_Maps.lua index ff4f782..aecc495 100644 --- a/AtlasLoot/Core/Atlasloot_Maps.lua +++ b/AtlasLoot/Core/Atlasloot_Maps.lua @@ -3,6 +3,8 @@ local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot"); local BabbleSubZone = AtlasLoot_GetLocaleLibBabble("LibBabble-SubZone-3.0"); local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") +AtlasLoot_MapMenu = AceLibrary("Dewdrop-2.0"); + local BLUE = "|cff6666ff"; local GREY = "|cff999999"; local GREN = "|cff66cc33"; @@ -31,8 +33,7 @@ function AtlasLoot:MapOnShow() Atlasloot_HeaderLabel:Hide(); AtlasLoot:ScrollFrameUpdate(); else - local map = AtlasLootItemsFrame.refresh[2][AtlasLootItemsFrame.refresh[1]].Map; - if map then + if ATLASLOOT_CURRENT_MAP then AtlasLoot_BossName:Hide(); --Ditch the Quicklook selector AtlasLoot_QuickLooks:Hide(); @@ -51,23 +52,104 @@ function AtlasLoot:MapOnShow() getglobal("AtlasLootItem_"..i).itemID = 0; getglobal("AtlasLootItem_"..i).spellitemID = 0; end - AtlasLoot:SubTableScrollFrameUpdate(map, AtlasLoot_MapData); - AtlasLootDefaultFrame_Map:SetBackdrop({bgFile = "Interface\\AddOns\\Atlas\\Images\\Maps\\"..map}); AtlasLootDefaultFrame_Map:Show(); - Atlasloot_HeaderLabel:SetText( - AtlasLoot_MapData[map].ZoneName[1].._RED.." ["..AtlasLoot_MapData[map].Acronym.."]\n".. - WHITE.."Location: "..AtlasLoot_MapData[map].Location[1].."\n".. - "Level Range: "..AtlasLoot_MapData[map].LevelRange.."\n".. - "Minimum Level: "..AtlasLoot_MapData[map].MinLevel.."\n".. - "Player Limit: "..AtlasLoot_MapData[map].PlayerLimit - ); Atlasloot_HeaderLabel:Show(); AtlasLoot:ScrollFrameUpdate(true); - + AtlasLoot:SubTableScrollFrameUpdate(ATLASLOOT_CURRENT_MAP, AtlasLoot_MapData); end end end +function AtlasLoot:MapSelect(mapID) + AtlasLootDefaultFrame_Map:SetBackdrop({bgFile = "Interface\\AddOns\\Atlas\\Images\\Maps\\"..mapID}); + Atlasloot_HeaderLabel:SetText( + AtlasLoot_MapData[mapID].ZoneName[1].._RED.." ["..AtlasLoot_MapData[mapID].Acronym.."]\n".. + WHITE.."Location: "..AtlasLoot_MapData[mapID].Location[1].."\n".. + "Level Range: "..AtlasLoot_MapData[mapID].LevelRange.."\n".. + "Minimum Level: "..AtlasLoot_MapData[mapID].MinLevel.."\n".. + "Player Limit: "..AtlasLoot_MapData[mapID].PlayerLimit + ); + AtlasLootDefaultFrame_MapSelectButton:SetText(AtlasLoot_MapData[mapID].ZoneName[1]); +end + +function AtlasLoot_MapMenuClick(mapID) + if AtlasLootDefaultFrame_Map:IsVisible() then + AtlasLoot:SubTableScrollFrameUpdate(mapID, AtlasLoot_MapData); + end + AtlasLoot:MapSelect(mapID); + AtlasLootDefaultFrame_MapSelectButton:SetText(AtlasLoot_MapData[mapID].ZoneName[1]); + ATLASLOOT_CURRENT_MAP = mapID; + AtlasLoot_MapMenu:Close(); +end + +function AtlasLoot:MapMenuRegister(mapID) + AtlasLoot_MapMenu:Register(AtlasLootDefaultFrame_MapSelectButton, + 'point', function(parent) + return "TOP", "BOTTOM" + end, + 'children', function(level, value) + for k,v in pairs(AtlasLoot_MultiMapData[mapID]) do + AtlasLoot_MapMenu:AddLine( + 'text', AtlasLoot_MapData[v].ZoneName[1], + 'func', AtlasLoot_MapMenuClick, + 'arg1', v, + 'notCheckable', true + ) + end + --Close button + AtlasLoot_MapMenu:AddLine( + 'text', AL["Close Menu"], + 'textR', 0, + 'textG', 1, + 'textB', 1, + 'func', function() AtlasLoot_MapMenu:Close() end, + 'notCheckable', true + ) + end, + 'dontHook', true + ) +end + +AtlasLoot_MultiMapData = { + ["AuchManaTombs"] = {"AuchindounEnt","AuchManaTombs","AuchAuchenaiCrypts","AuchSethekkHalls","AuchShadowLabyrinth"}; + ["AuchAuchenaiCrypts"] = {"AuchindounEnt","AuchManaTombs","AuchAuchenaiCrypts","AuchSethekkHalls","AuchShadowLabyrinth"}; + ["AuchSethekkHalls"] = {"AuchindounEnt","AuchManaTombs","AuchAuchenaiCrypts","AuchSethekkHalls","AuchShadowLabyrinth"}; + ["AuchShadowLabyrinth"] = {"AuchindounEnt","AuchManaTombs","AuchAuchenaiCrypts","AuchSethekkHalls","AuchShadowLabyrinth"}; + ["BlackfathomDeeps"] = {"BlackfathomDeepsEnt","BlackfathomDeeps"}; + ["BlackrockDepths"] = {"BlackrockSpireEnt","BlackrockDepths"}; + ["BlackrockSpireLower"] = {"BlackrockSpireEnt","BlackrockSpireLower","BlackrockSpireUpper"}; + ["BlackrockSpireUpper"] = {"BlackrockSpireEnt","BlackrockSpireLower","BlackrockSpireUpper"}; + ["BlackwingLair"] = {"BlackrockSpireEnt","BlackwingLair",}; + ["MoltenCore"] = {"BlackrockSpireEnt","MoltenCore"}; + ["CFRTheSlavePens"] = {"CoilfangReservoirEnt","CFRTheSlavePens","CFRTheUnderbog","CFRTheSteamvault"}; + ["CFRTheUnderbog"] = {"CoilfangReservoirEnt","CFRTheSlavePens","CFRTheUnderbog","CFRTheSteamvault"}; + ["CFRTheSteamvault"] = {"CoilfangReservoirEnt","CFRTheSlavePens","CFRTheUnderbog","CFRTheSteamvault"}; + ["CFRSerpentshrineCavern"] = {"CoilfangReservoirEnt","CFRSerpentshrineCavern"}; + ["Gnomeregan"] = {"GnomereganEnt","Gnomeregan"}; + ["HCBloodFurnace"] = {"HCEnt","HCBloodFurnace", "HCHellfireRamparts","HCTheShatteredHalls"}; + ["HCHellfireRamparts"] = {"HCEnt","HCBloodFurnace", "HCHellfireRamparts", "HCTheShatteredHalls"}; + ["HCTheShatteredHalls"] = {"HCEnt","HCBloodFurnace", "HCHellfireRamparts", "HCTheShatteredHalls"}; + ["HCMagtheridonsLair"] = {"HCEnt", "HCMagtheridonsLair"}; + ["Maraudon"] = {"MaraudonEnt","Maraudon"}; + ["TheDeadmines"] = {"TheDeadminesEnt","TheDeadmines"}; + ["TheSunkenTemple"] = {"TheSunkenTempleEnt","TheSunkenTemple"}; + ["Uldaman"] = {"UldamanEnt","Uldaman"}; + ["WailingCaverns"] = {"WailingCavernsEnt","WailingCaverns"}; + ["DireMaulEast"] = {"DireMaulEnt","DireMaulNorth","DireMaulEast","DireMaulWest"}; + ["DireMaulNorth"] = {"DireMaulEnt","DireMaulNorth","DireMaulEast","DireMaulWest"}; + ["DireMaulWest"] = {"DireMaulEnt","DireMaulNorth","DireMaulEast","DireMaulWest"}; + ["CoTHyjal"] = {"CoTEnt","CoTHyjal"}; + ["CoTBlackMorass"] = {"CoTEnt","CoTHyjal","CoTBlackMorass","CoTOldHillsbrad"}; + ["CoTOldHillsbrad"] = {"CoTEnt","CoTHyjal","CoTBlackMorass","CoTOldHillsbrad"}; + ["CoTOldStratholme"] = {"CoTEnt","CoTOldStratholme"}; + ["KarazhanStart"] = {"KarazhanEnt","KarazhanStart","KarazhanEnd"}; + ["SMArmory"] = {"SMEnt","SMArmory","SMLibrary","SMCathedral","SMGraveyard"}; + ["SMLibrary"] = {"SMEnt","SMArmory","SMLibrary","SMCathedral","SMGraveyard"}; + ["SMCathedral"] = {"SMEnt","SMArmory","SMLibrary","SMCathedral","SMGraveyard"}; + ["SMGraveyard"] = {"SMEnt","SMArmory","SMLibrary","SMCathedral","SMGraveyard"}; + ["BlackTempleStart"] = {"BlackTempleStart","BlackTempleTop","BlackTempleBasement"}; +}; + AtlasLoot_MapData = { --************************************************ @@ -75,7 +157,7 @@ AtlasLoot_MapData = { --************************************************ ["AuchindounEnt"] = { - ZoneName = { BabbleZone["Auchindoun"].." ("..AtlasLocale["Entrance"]..")" }; + ZoneName = {AtlasLocale["Entrance"]}; Location = { BabbleZone["Terokkar Forest"], 3519 }; LevelRange = "63-70"; MinLevel = "55"; @@ -104,17 +186,17 @@ AtlasLoot_MapData = { { WHITE.."5) "..AtlasLocale["Meeting Stone"] }; }; ["BlackfathomDeepsEnt"] = { - ZoneName = { BabbleZone["Blackfathom Deeps"].." ("..AtlasLocale["Entrance"]..")", 719 }; + ZoneName = {AtlasLocale["Entrance"], 719 }; Location = { BabbleZone["Ashenvale"], 331 }; LevelRange = "20-28"; MinLevel = "19"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["BFD"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { BLUE.."B) "..BabbleZone["Blackfathom Deeps"], ZONE, 719 }; }; ["BlackrockSpireEnt"] = { - ZoneName = { BabbleZone["Blackrock Mountain"].." ("..AtlasLocale["Entrance"]..")", 25 }; + ZoneName = { AtlasLocale["Entrance"], 25 }; Location = { BabbleZone["Searing Gorge"].." / "..BabbleZone["Burning Steppes"], 51, 46 }; LevelRange = "54-60"; MinLevel = "45"; @@ -137,7 +219,7 @@ AtlasLoot_MapData = { { WHITE.."7) "..AtlasLocale["Scarshield Quartermaster "], NPC, 9046 }; }; ["CoilfangReservoirEnt"] = { - ZoneName = { BabbleZone["Coilfang Reservoir"].." ("..AtlasLocale["Entrance"]..")" }; + ZoneName = { AtlasLocale["Entrance"]}; Location = { BabbleZone["Zangarmarsh"], 3521 }; LevelRange = "61-70"; MinLevel = "55"; @@ -153,7 +235,7 @@ AtlasLoot_MapData = { { WHITE.."2) "..AtlasLocale["Mortog Steamhead"], NPC, 23373 }; }; ["CoTEnt"] = { - ZoneName = { BabbleZone["Caverns of Time"].." ("..AtlasLocale["Entrance"]..")" }; + ZoneName = { AtlasLocale["Entrance"]}; Location = { BabbleZone["Tanaris"], 440 }; LevelRange = "66-70"; MinLevel = "66"; @@ -181,7 +263,7 @@ AtlasLoot_MapData = { { WHITE..INDENT..AtlasLocale["Nozari "].." ("..AtlasLocale["Adult"]..")", NPC, 20131 }; }; ["DireMaulEnt"] = { - ZoneName = { BabbleZone["Dire Maul"].." ("..AtlasLocale["Entrance"]..")", 2557 }; + ZoneName = { AtlasLocale["Entrance"], 2557 }; Location = { BabbleZone["Feralas"], 357 }; LevelRange = "55-60"; MinLevel = "45"; @@ -199,11 +281,11 @@ AtlasLoot_MapData = { { WHITE..INDENT..AtlasLocale["Elder Mistwalker"].." ("..AtlasLocale["Lunar Festival"]..")", NPC, 15587 }; }; ["GnomereganEnt"] = { - ZoneName = { BabbleZone["Gnomeregan"].." ("..AtlasLocale["Entrance"]..")", 133 }; + ZoneName = { AtlasLocale["Entrance"], 133 }; Location = { BabbleZone["Dun Morogh"], 1 }; LevelRange = "24-32"; MinLevel = "20"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["Gnome"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { BLUE..INDENT..AtlasLocale["Meeting Stone"] }; @@ -217,7 +299,7 @@ AtlasLoot_MapData = { { WHITE.."4) "..AtlasLocale["Techbot"], NPC, 6231 }; }; ["HCEnt"] = { - ZoneName = { BabbleZone["Hellfire Citadel"].." ("..AtlasLocale["Entrance"]..")", 3545 }; + ZoneName = { AtlasLocale["Entrance"], 3545 }; Location = { BabbleZone["Hellfire Peninsula"], 3483 }; LevelRange = "59-70"; MinLevel = "55"; @@ -233,7 +315,7 @@ AtlasLoot_MapData = { { GREN.."2') "..AtlasLocale["Path to the Hellfire Ramparts and Shattered Halls"] }; }; ["KarazhanEnt"] = { - ZoneName = { BabbleZone["Karazhan"].." ("..AtlasLocale["Entrance"]..")", 2562 }; + ZoneName = { AtlasLocale["Entrance"], 2562 }; Location = { BabbleZone["Deadwind Pass"], 41 }; LevelRange = "70"; MinLevel = "68"; @@ -251,11 +333,11 @@ AtlasLoot_MapData = { { WHITE.."6) "..AtlasLocale["Charred Bone Fragment"], OBJECT, 181963 }; }; ["MaraudonEnt"] = { - ZoneName = { BabbleZone["Maraudon"].." ("..AtlasLocale["Entrance"]..")", 2100 }; + ZoneName = { AtlasLocale["Entrance"], 2100 }; Location = { BabbleZone["Desolace"], 405 }; LevelRange = "42-51"; MinLevel = "30"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["Mara"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { BLUE..INDENT..AtlasLocale["The Nameless Prophet"], NPC, 13718 }; @@ -268,11 +350,11 @@ AtlasLoot_MapData = { { WHITE.."4) "..AtlasLocale["Cavindra"], NPC, 13697 }; }; ["SMEnt"] = { - ZoneName = { BabbleZone["Scarlet Monastery"].." ("..AtlasLocale["Entrance"]..")", 796 }; + ZoneName = { AtlasLocale["Entrance"], 796 }; Location = { BabbleZone["Tirisfal Glades"], 85 }; LevelRange = "28-42"; MinLevel = "20"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["SM"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { BLUE.."B) "..BabbleZone["Graveyard"], ZONE, 796 }; @@ -281,11 +363,11 @@ AtlasLoot_MapData = { { BLUE.."E) "..BabbleZone["Library"], ZONE, 796 }; }; ["TheDeadminesEnt"] = { - ZoneName = { BabbleZone["The Deadmines"].." ("..AtlasLocale["Entrance"]..")", 1581 }; + ZoneName = { AtlasLocale["Entrance"], 1581 }; Location = { BabbleZone["Westfall"], 40 }; LevelRange = "16-22"; MinLevel = "10"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["VC"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { BLUE.."B) "..BabbleZone["The Deadmines"], ZONE, 1581 }; @@ -294,11 +376,11 @@ AtlasLoot_MapData = { { WHITE.."3) "..AtlasLocale["Foreman Thistlenettle"], NPC, 626 }; }; ["TheSunkenTempleEnt"] = { - ZoneName = { BabbleZone["Sunken Temple"].." ("..AtlasLocale["Entrance"]..")", 1417 }; + ZoneName = {AtlasLocale["Entrance"], 1417 }; Location = { BabbleZone["Swamp of Sorrows"], 8 }; LevelRange = "46-53"; MinLevel = "35"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["ST"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { BLUE..INDENT..AtlasLocale["Meeting Stone"] }; @@ -309,11 +391,11 @@ AtlasLoot_MapData = { { WHITE.."3) "..AtlasLocale["Zekkis"].." ("..AtlasLocale["Rare"]..", "..AtlasLocale["Lower"]..")", NPC, 5400 }; }; ["UldamanEnt"] = { - ZoneName = { BabbleZone["Uldaman"].." ("..AtlasLocale["Entrance"]..")", 1337 }; + ZoneName = { AtlasLocale["Entrance"], 1337 }; Location = { BabbleZone["Badlands"], 3 }; LevelRange = "36-42"; MinLevel = "30"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["Ulda"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { BLUE.."B) "..BabbleZone["Uldaman"], ZONE, 1337 }; @@ -325,11 +407,11 @@ AtlasLoot_MapData = { { GREN.."1') "..AtlasLocale["Digmaster Shovelphlange"].." ("..AtlasLocale["Rare"]..", "..AtlasLocale["Varies"]..")", NPC, 7057 }; }; ["WailingCavernsEnt"] = { - ZoneName = { BabbleZone["Wailing Caverns"].." ("..AtlasLocale["Entrance"]..")", 718 }; + ZoneName = { AtlasLocale["Entrance"], 718 }; Location = { BabbleZone["The Barrens"], 17 }; LevelRange = "16-25"; MinLevel = "10"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["WC"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { BLUE.."B) "..BabbleZone["Wailing Caverns"], ZONE, 718 }; @@ -353,7 +435,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Ashenvale"], 331 }; LevelRange = "20-28"; MinLevel = "19"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["BFD"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Ghamoo-ra"], NPC, 4887 }; @@ -447,7 +529,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Desolace"], 405 }; LevelRange = "42-51"; MinLevel = "30"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["Mara"]; { BLUE.."A) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Orange"]..")" }; { BLUE.."B) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Purple"]..")" }; @@ -470,7 +552,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Orgrimmar"], 1637 }; LevelRange = "12-18"; MinLevel = "8"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["RFC"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Maur Grimtotem"], NPC, 11834 }; @@ -485,7 +567,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["The Barrens"], 17 }; LevelRange = "33-42"; MinLevel = "25"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["RFD"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Tuten'kash"], NPC, 7355 }; @@ -503,7 +585,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["The Barrens"], 17 }; LevelRange = "23-33"; MinLevel = "17"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["RFK"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Roogug"], NPC, 6168 }; @@ -519,7 +601,7 @@ AtlasLoot_MapData = { { WHITE.."9) "..AtlasLocale["Earthcaller Halmgar"].." ("..AtlasLocale["Rare"]..")", NPC, 4842 }; }; ["TheRuinsofAhnQiraj"] = { - ZoneName = { BabbleZone["Ahn'Qiraj"]..": "..BabbleZone["Ruins of Ahn'Qiraj"], 3429 }; + ZoneName = { BabbleZone["Ruins of Ahn'Qiraj"], 3429 }; Location = { BabbleZone["Silithus"], 1377 }; LevelRange = "60-70"; MinLevel = "50"; @@ -545,11 +627,11 @@ AtlasLoot_MapData = { { GREN.."1') "..AtlasLocale["Safe Room"] }; }; ["TheTempleofAhnQiraj"] = { - ZoneName = { BabbleZone["Ahn'Qiraj"]..": "..BabbleZone["Temple of Ahn'Qiraj"], 3428 }; + ZoneName = { BabbleZone["Temple of Ahn'Qiraj"], 3428 }; Location = { BabbleZone["Silithus"], 1377 }; LevelRange = "60-70"; MinLevel = "50"; - PlayerLimit = "40"; + PlayerLimit = "10-25"; Acronym = AtlasLocale["AQ40"]; { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Brood of Nozdormu"], FACTION, 910 }; { BLUE.."A) "..AtlasLocale["Entrance"] }; @@ -580,7 +662,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["The Barrens"], 17 }; LevelRange = "16-25"; MinLevel = "10"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["WC"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Disciple of Naralex"], NPC, 3678 }; @@ -600,7 +682,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Tanaris"], 440 }; LevelRange = "42-48"; MinLevel = "35"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["ZF"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Antu'sul "], NPC, 8127 }; @@ -630,10 +712,10 @@ AtlasLoot_MapData = { --************************************************ ["BlackrockDepths"] = { - ZoneName = { BabbleZone["Blackrock Mountain"]..": "..BabbleZone["Blackrock Depths"], 1584 }; + ZoneName = { BabbleZone["Blackrock Depths"], 1584 }; Location = { BabbleZone["Searing Gorge"].." / "..BabbleZone["Burning Steppes"], 51, 46 }; LevelRange = "52-58"; - MinLevel = "40"; + MinLevel = "10-25"; PlayerLimit = "5"; Acronym = AtlasLocale["BRD"]; { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Shadowforge Key"], ITEM, 11000 }; @@ -702,11 +784,11 @@ AtlasLoot_MapData = { { WHITE.."25) "..AtlasLocale["Blacksmithing Plans"], OBJECT, 173232 }; }; ["BlackrockSpireLower"] = { - ZoneName = { BabbleZone["Blackrock Mountain"]..": "..BabbleZone["Blackrock Spire"].." ("..AtlasLocale["Lower"]..")", 1583 }; + ZoneName = { BabbleZone["Blackrock Spire"].." ("..AtlasLocale["Lower"]..")", 1583 }; Location = { BabbleZone["Searing Gorge"].." / "..BabbleZone["Burning Steppes"], 51, 46 }; LevelRange = "54-60"; MinLevel = "45"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["LBRS"]; { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Brazier of Invocation"].." ("..AtlasLocale["DS2"]..")", ITEM, 22057 }; { BLUE.."A) "..AtlasLocale["Entrance"] }; @@ -742,11 +824,11 @@ AtlasLoot_MapData = { { GREN.."1') "..AtlasLocale["Burning Felguard"].." ("..AtlasLocale["Rare"]..", "..AtlasLocale["Summon"]..")", NPC, 10263 }; }; ["BlackrockSpireUpper"] = { - ZoneName = { BabbleZone["Blackrock Mountain"]..": "..BabbleZone["Blackrock Spire"].." ("..AtlasLocale["Upper"]..")", 1583 }; + ZoneName = { BabbleZone["Blackrock Spire"].." ("..AtlasLocale["Upper"]..")", 1583 }; Location = { BabbleZone["Searing Gorge"].." / "..BabbleZone["Burning Steppes"], 51, 46 }; LevelRange = "56-61"; MinLevel = "45"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["UBRS"]; { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Brazier of Invocation"].." ("..AtlasLocale["DS2"]..")", ITEM, 22057 }; { BLUE.."A) "..AtlasLocale["Entrance"] }; @@ -770,11 +852,11 @@ AtlasLoot_MapData = { { WHITE.."10) "..BabbleZone["Blackwing Lair"], ZONE, 2677 }; }; ["BlackwingLair"] = { - ZoneName = { BabbleZone["Blackrock Mountain"]..": "..BabbleZone["Blackwing Lair"], 2677 }; + ZoneName = { BabbleZone["Blackwing Lair"], 2677 }; Location = { BabbleZone["Searing Gorge"].." / "..BabbleZone["Burning Steppes"], 51, 46 }; LevelRange = "60-70"; MinLevel = "60"; - PlayerLimit = "40"; + PlayerLimit = "10-25"; Acronym = AtlasLocale["BWL"]; { ORNG..AtlasLocale["Attunement Required"] }; { BLUE.."A) "..AtlasLocale["Entrance"] }; @@ -796,7 +878,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Dun Morogh"], 1 }; LevelRange = "24-32"; MinLevel = "20"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["Gnome"]; { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Workshop Key"].." ("..AtlasLocale["Back"]..")", ITEM, 6893 }; { BLUE.."A) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Front"]..")" }; @@ -820,11 +902,11 @@ AtlasLoot_MapData = { { WHITE.."8) "..AtlasLocale["Mekgineer Thermaplugg"], NPC, 7800 }; }; ["MoltenCore"] = { - ZoneName = { BabbleZone["Blackrock Mountain"]..": "..BabbleZone["Molten Core"], 2717 }; + ZoneName = { BabbleZone["Molten Core"], 2717 }; Location = { BabbleZone["Searing Gorge"].." / "..BabbleZone["Burning Steppes"], 51, 46 }; LevelRange = "60-70"; MinLevel = "50"; - PlayerLimit = "40"; + PlayerLimit = "10-25"; Acronym = AtlasLocale["MC"]; { ORNG..AtlasLocale["Attunement Required"] }; { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Hydraxian Waterlords"], FACTION, 749 }; @@ -885,7 +967,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Silverpine Forest"], 130 }; LevelRange = "17-25"; MinLevel = "10"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["SFK"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Rethilgore "], NPC, 3914 }; @@ -913,22 +995,22 @@ AtlasLoot_MapData = { { WHITE.."13) "..AtlasLocale["Archmage Arugal"], NPC, 4275 }; }; ["SMArmory"] = { - ZoneName = { BabbleZone["Scarlet Monastery"]..": "..BabbleZone["Armory"], 796 }; + ZoneName = { BabbleZone["Armory"], 796 }; Location = { BabbleZone["Tirisfal Glades"], 85 }; LevelRange = "33-40"; MinLevel = "20"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["Armory"]; { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["The Scarlet Key"], ITEM, 7146 }; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Herod "], NPC, 3975 }; }; ["SMCathedral"] = { - ZoneName = { BabbleZone["Scarlet Monastery"]..": "..BabbleZone["Cathedral"], 796 }; + ZoneName = { BabbleZone["Cathedral"], 796 }; Location = { BabbleZone["Tirisfal Glades"], 85 }; LevelRange = "36-42"; MinLevel = "20"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["Cath"]; { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["The Scarlet Key"], ITEM, 7146 }; { BLUE.."A) "..AtlasLocale["Entrance"] }; @@ -937,11 +1019,11 @@ AtlasLoot_MapData = { { WHITE..INDENT..AtlasLocale["High Inquisitor Whitemane"], NPC, 3977 }; }; ["SMGraveyard"] = { - ZoneName = { BabbleZone["Scarlet Monastery"]..": "..BabbleZone["Graveyard"], 796 }; + ZoneName = { BabbleZone["Graveyard"], 796 }; Location = { BabbleZone["Tirisfal Glades"], 85 }; LevelRange = "28-35"; MinLevel = "20"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["GY"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Interrogator Vishas"], NPC, 3983 }; @@ -954,11 +1036,11 @@ AtlasLoot_MapData = { { GREN..INDENT..AtlasLocale["Fallen Champion"].." ("..AtlasLocale["Rare"]..")", NPC, 6488 }; }; ["SMLibrary"] = { - ZoneName = { BabbleZone["Scarlet Monastery"]..": "..BabbleZone["Library"], 796 }; + ZoneName = { BabbleZone["Library"], 796 }; Location = { BabbleZone["Tirisfal Glades"], 85 }; LevelRange = "31-37"; MinLevel = "20"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["Lib"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Houndmaster Loksey"], NPC, 3974 }; @@ -1020,7 +1102,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Westfall"], 40 }; LevelRange = "16-22"; MinLevel = "10"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["VC"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { BLUE.."B) "..AtlasLocale["Exit"] }; @@ -1040,7 +1122,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Stormwind City"], 1519 }; LevelRange = "21-27"; MinLevel = "15"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["Stocks"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Targorr the Dread"].." ("..AtlasLocale["Varies"]..")", NPC, 1696 }; @@ -1055,7 +1137,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Swamp of Sorrows"], 8 }; LevelRange = "46-53"; MinLevel = "35"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["ST"]; { ORNG..AtlasLocale["AKA"]..": "..BabbleZone["The Temple of Atal'Hakkar"] }; { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Yeh'kinya's Scroll"].." ("..AtlasLocale["Avatar of Hakkar"]..")", ITEM, 10818 }; @@ -1088,7 +1170,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Badlands"], 3 }; LevelRange = "36-42"; MinLevel = "30"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["Ulda"]; { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["Staff of Prehistoria"].." ("..AtlasLocale["Ironaya"]..")", ITEM, 7733 }; { BLUE.."A) "..AtlasLocale["Entrance"].." ("..AtlasLocale["Front"]..")" }; @@ -1149,7 +1231,7 @@ AtlasLoot_MapData = { --************************************************ ["AuchAuchenaiCrypts"] = { - ZoneName = { BabbleZone["Auchindoun"]..": "..BabbleZone["Auchenai Crypts"], 3790 }; + ZoneName = { BabbleZone["Auchenai Crypts"], 3790 }; Location = { BabbleZone["Terokkar Forest"], 3519 }; LevelRange = "64-70"; MinLevel = "55"; @@ -1164,7 +1246,7 @@ AtlasLoot_MapData = { { WHITE..INDENT..AtlasLocale["D'ore"], NPC, 19412 }; }; ["AuchManaTombs"] = { - ZoneName = { BabbleZone["Auchindoun"]..": "..BabbleZone["Mana-Tombs"], 3792 }; + ZoneName = { BabbleZone["Mana-Tombs"], 3792 }; Location = { BabbleZone["Terokkar Forest"], 3519 }; LevelRange = "63-70"; MinLevel = "55"; @@ -1184,7 +1266,7 @@ AtlasLoot_MapData = { { WHITE..INDENT..AtlasLocale["Yor "].." ("..AtlasLocale["Summon"]..", "..AtlasLocale["Heroic"]..")", NPC, 22930 }; }; ["AuchSethekkHalls"] = { - ZoneName = { BabbleZone["Auchindoun"]..": "..BabbleZone["Sethekk Halls"], 3791 }; + ZoneName = {BabbleZone["Sethekk Halls"], 3791 }; Location = { BabbleZone["Terokkar Forest"], 3519 }; LevelRange = "66-70"; MinLevel = "55"; @@ -1201,7 +1283,7 @@ AtlasLoot_MapData = { { WHITE.."3) "..AtlasLocale["Talon King Ikiss"], NPC, 18473 }; }; ["AuchShadowLabyrinth"] = { - ZoneName = { BabbleZone["Auchindoun"]..": "..BabbleZone["Shadow Labyrinth"], 3789 }; + ZoneName = { BabbleZone["Shadow Labyrinth"], 3789 }; Location = { BabbleZone["Terokkar Forest"], 3519 }; LevelRange = "69-70"; MinLevel = "65"; @@ -1225,7 +1307,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Shadowmoon Valley"], 3520 }; LevelRange = "70"; MinLevel = "70"; - PlayerLimit = "25"; + PlayerLimit = "10-25"; Acronym = AtlasLocale["BT"]; { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Ashtongue Deathsworn"], FACTION, 1012 }; { BLUE.."A) "..AtlasLocale["Entrance"] }; @@ -1246,7 +1328,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Shadowmoon Valley"], 3520 }; LevelRange = "70"; MinLevel = "70"; - PlayerLimit = "25"; + PlayerLimit = "10-25"; Acronym = AtlasLocale["BT"]; { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Ashtongue Deathsworn"], FACTION, 1012 }; { BLUE.."B) "..AtlasLocale["Entrance"] }; @@ -1263,7 +1345,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Shadowmoon Valley"], 3520 }; LevelRange = "70"; MinLevel = "70"; - PlayerLimit = "25"; + PlayerLimit = "10-25"; Acronym = AtlasLocale["BT"]; { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Ashtongue Deathsworn"], FACTION, 1012 }; { BLUE.."D) "..AtlasLocale["Entrance"] }; @@ -1276,11 +1358,11 @@ AtlasLoot_MapData = { { WHITE.."11) "..AtlasLocale["Illidan Stormrage "], NPC, 22917 }; }; ["CFRSerpentshrineCavern"] = { - ZoneName = { BabbleZone["Coilfang Reservoir"]..": "..BabbleZone["Serpentshrine Cavern"], 3607 }; + ZoneName = { BabbleZone["Serpentshrine Cavern"], 3607 }; Location = { BabbleZone["Zangarmarsh"], 3521 }; LevelRange = "70"; MinLevel = "70"; - PlayerLimit = "25"; + PlayerLimit = "10-25"; Acronym = AtlasLocale["SC"]; { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["Cenarion Expedition"], FACTION, 942 }; { BLUE.."A) "..AtlasLocale["Entrance"] }; @@ -1293,7 +1375,7 @@ AtlasLoot_MapData = { { WHITE.."6) "..AtlasLocale["Lady Vashj "], NPC, 21212 }; }; ["CFRTheSlavePens"] = { - ZoneName = { BabbleZone["Coilfang Reservoir"]..": "..BabbleZone["The Slave Pens"], 3717 }; + ZoneName = { BabbleZone["The Slave Pens"], 3717 }; Location = { BabbleZone["Zangarmarsh"], 3521 }; LevelRange = "61-69"; MinLevel = "55"; @@ -1311,7 +1393,7 @@ AtlasLoot_MapData = { { WHITE.."7) "..AtlasLocale["Quagmirran"], NPC, 17942 }; }; ["CFRTheSteamvault"] = { - ZoneName = { BabbleZone["Coilfang Reservoir"]..": "..BabbleZone["The Steamvault"], 3715 }; + ZoneName = { BabbleZone["The Steamvault"], 3715 }; Location = { BabbleZone["Zangarmarsh"], 3521 }; LevelRange = "69-70"; MinLevel = "55"; @@ -1329,7 +1411,7 @@ AtlasLoot_MapData = { { WHITE.."4) "..AtlasLocale["Warlord Kalithresh"], NPC, 17798 }; }; ["CFRTheUnderbog"] = { - ZoneName = { BabbleZone["Coilfang Reservoir"]..": "..BabbleZone["The Underbog"], 3716 }; + ZoneName = { BabbleZone["The Underbog"], 3716 }; Location = { BabbleZone["Zangarmarsh"], 3521 }; LevelRange = "62-70"; MinLevel = "55"; @@ -1347,7 +1429,7 @@ AtlasLoot_MapData = { { WHITE.."5) "..AtlasLocale["The Black Stalker"], NPC, 17882 }; }; ["CoTBlackMorass"] = { - ZoneName = { BabbleZone["Caverns of Time"]..": "..BabbleZone["The Black Morass"], 2366 }; + ZoneName = { BabbleZone["The Black Morass"], 2366 }; Location = { BabbleZone["Tanaris"], 440 }; LevelRange = "68-70"; MinLevel = "66"; @@ -1367,11 +1449,11 @@ AtlasLoot_MapData = { { WHITE..INDENT..AtlasLocale["Medivh"], NPC, 15608 }; }; ["CoTHyjal"] = { - ZoneName = { BabbleZone["Caverns of Time"]..": "..BabbleZone["Hyjal Summit"], 3606 }; + ZoneName = { BabbleZone["Hyjal Summit"], 3606 }; Location = { BabbleZone["Tanaris"], 440 }; LevelRange = "70"; MinLevel = "70"; - PlayerLimit = "25"; + PlayerLimit = "10-25"; Acronym = AtlasLocale["CoT3"]; { PURP..AtlasLocale["Event"]..": "..AtlasLocale["Battle for Mount Hyjal"] }; { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Scale of the Sands"], FACTION, 990 }; @@ -1390,7 +1472,7 @@ AtlasLoot_MapData = { { WHITE..INDENT..AtlasLocale["Tydormu "], NPC, 23381 }; }; ["CoTOldHillsbrad"] = { - ZoneName = { BabbleZone["Caverns of Time"]..": "..BabbleZone["Old Hillsbrad Foothills"], 2367 }; + ZoneName = { BabbleZone["Old Hillsbrad Foothills"], 2367 }; Location = { BabbleZone["Tanaris"], 440 }; LevelRange = "66-70"; MinLevel = "66"; @@ -1469,7 +1551,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Blade's Edge Mountains"], 3522 }; LevelRange = "70"; MinLevel = "65"; - PlayerLimit = "25"; + PlayerLimit = "10-25"; Acronym = AtlasLocale["GL"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["High King Maulgar "], NPC, 18831 }; @@ -1480,7 +1562,7 @@ AtlasLoot_MapData = { { WHITE.."2) "..AtlasLocale["Gruul the Dragonkiller"], NPC, 19044 }; }; ["HCBloodFurnace"] = { - ZoneName = { BabbleZone["Hellfire Citadel"]..": "..BabbleZone["The Blood Furnace"], 3713 }; + ZoneName = { BabbleZone["The Blood Furnace"], 3713 }; Location = { BabbleZone["Hellfire Peninsula"], 3483 }; LevelRange = "60-68"; MinLevel = "55"; @@ -1495,7 +1577,7 @@ AtlasLoot_MapData = { { WHITE.."3) "..AtlasLocale["Keli'dan the Breaker"], NPC, 17377 }; }; ["HCHellfireRamparts"] = { - ZoneName = { BabbleZone["Hellfire Citadel"]..": "..BabbleZone["Hellfire Ramparts"], 3562 }; + ZoneName = { BabbleZone["Hellfire Ramparts"], 3562 }; Location = { BabbleZone["Hellfire Peninsula"], 3483 }; LevelRange = "59-67"; MinLevel = "55"; @@ -1512,17 +1594,17 @@ AtlasLoot_MapData = { { WHITE..INDENT..AtlasLocale["Reinforced Fel Iron Chest"], OBJECT, 185168 }; }; ["HCMagtheridonsLair"] = { - ZoneName = { BabbleZone["Hellfire Citadel"]..": "..BabbleZone["Magtheridon's Lair"], 3836 }; + ZoneName = { BabbleZone["Magtheridon's Lair"], 3836 }; Location = { BabbleZone["Hellfire Peninsula"], 3483 }; LevelRange = "70"; MinLevel = "65"; - PlayerLimit = "25"; + PlayerLimit = "10-25"; Acronym = AtlasLocale["Mag"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Magtheridon"], NPC, 17257 }; }; ["HCTheShatteredHalls"] = { - ZoneName = { BabbleZone["Hellfire Citadel"]..": "..BabbleZone["The Shattered Halls"], 3714 }; + ZoneName = { BabbleZone["The Shattered Halls"], 3714 }; Location = { BabbleZone["Hellfire Peninsula"], 3483 }; LevelRange = "69-70"; MinLevel = "55"; @@ -1552,7 +1634,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Deadwind Pass"], 41 }; LevelRange = "70"; MinLevel = "68"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["Kara"]; { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Violet Eye"], FACTION, 967 }; { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["The Master's Key"], ITEM, 24490 }; @@ -1609,7 +1691,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Deadwind Pass"], 41 }; LevelRange = "70"; MinLevel = "68"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["Kara"]; { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Violet Eye"], FACTION, 967 }; { ORNG..AtlasLocale["Key"]..": "..AtlasLocale["The Master's Key"], ITEM, 24490 }; @@ -1667,7 +1749,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Isle of Quel'Danas"], 4080 }; LevelRange = "70"; MinLevel = "70"; - PlayerLimit = "25"; + PlayerLimit = "10-25"; Acronym = AtlasLocale["SuP"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE.."1) "..AtlasLocale["Kalecgos"], NPC, 24850 }; @@ -1683,7 +1765,7 @@ AtlasLoot_MapData = { { WHITE.."4) "..AtlasLocale["Kil'jaeden "], NPC, 25315 }; }; ["TempestKeepArcatraz"] = { - ZoneName = { BabbleZone["Tempest Keep"]..": "..BabbleZone["The Arcatraz"], 3846 }; + ZoneName = {BabbleZone["The Arcatraz"], 3846 }; Location = { BabbleZone["Netherstorm"], 3523 }; LevelRange = "69-70"; MinLevel = "68"; @@ -1704,7 +1786,7 @@ AtlasLoot_MapData = { { WHITE..INDENT..AtlasLocale["Millhouse Manastorm"], NPC, 20977 }; }; ["TempestKeepBotanica"] = { - ZoneName = { BabbleZone["Tempest Keep"]..": "..BabbleZone["The Botanica"], 3847 }; + ZoneName = { BabbleZone["The Botanica"], 3847 }; Location = { BabbleZone["Netherstorm"], 3523 }; LevelRange = "69-70"; MinLevel = "68"; @@ -1721,7 +1803,7 @@ AtlasLoot_MapData = { { WHITE.."5) "..AtlasLocale["Warp Splinter"], NPC, 17977 }; }; ["TempestKeepMechanar"] = { - ZoneName = { BabbleZone["Tempest Keep"]..": "..BabbleZone["The Mechanar"], 3849 }; + ZoneName = { BabbleZone["The Mechanar"], 3849 }; Location = { BabbleZone["Netherstorm"], 3523 }; LevelRange = "68-70"; MinLevel = "68"; @@ -1740,11 +1822,11 @@ AtlasLoot_MapData = { { WHITE.."5) "..AtlasLocale["Pathaleon the Calculator"], NPC, 19220 }; }; ["TempestKeepTheEye"] = { - ZoneName = { BabbleZone["Tempest Keep"]..": "..BabbleZone["The Eye"], 3842 }; + ZoneName = { BabbleZone["The Eye"], 3842 }; Location = { BabbleZone["Netherstorm"], 3523 }; LevelRange = "70"; MinLevel = "70"; - PlayerLimit = "25"; + PlayerLimit = "10-25"; Acronym = AtlasLocale["Eye"]; { ORNG..AtlasLocale["Reputation"]..": "..AtlasLocale["The Sha'tar"], FACTION, 935 }; { BLUE.."A) "..AtlasLocale["Entrance"] }; @@ -1762,7 +1844,7 @@ AtlasLoot_MapData = { Location = { BabbleZone["Ghostlands"], 3433 }; LevelRange = "70"; MinLevel = "68"; - PlayerLimit = "10"; + PlayerLimit = "5"; Acronym = AtlasLocale["ZA"]; { BLUE.."A) "..AtlasLocale["Entrance"] }; { BLUE..INDENT..AtlasLocale["Harrison Jones"], NPC, 24358 }; @@ -2012,8 +2094,8 @@ AtlasLoot_MapData = { Location = { BabbleZone["Eastern Plaguelands"], 65 }; LevelRange = "60+"; MinLevel = "60"; - PlayerLimit = "40"; - Acronym = AtlasLocale["Nax60"]; + PlayerLimit = "10-25"; + Acronym = "Nax60"; { BLUE.."A) "..AtlasLocale["Entrance"] }; { WHITE..INDENT.."1) "..AtlasLocale["Patchwerk"], NPC, 16028 }; { WHITE..INDENT.."2) "..AtlasLocale["Grobbulus"], NPC, 15931 }; @@ -2098,8 +2180,11 @@ AtlasLoot_MapData = { Location = { BabbleZone["Dustwallow Marsh"], 15 }; LevelRange = "60+"; MinLevel = "60"; - PlayerLimit = "40"; - { WHITE.."3) "..AtlasLocale["Onyxia"], NPC, 10183 }; + PlayerLimit = "10-25"; + { BLUE.."A) "..AtlasLocale["Entrance"] }; + { WHITE.."1) "..AtlasLocale["Onyxian Warders"], NPC, 12129 }; + { WHITE.."2) "..AtlasLocale["Whelp Eggs"] }; + { WHITE.."3) "..AtlasLocale["Onyxia"], NPC, 10184 }; }; ["RubySanctum"] = { ZoneName = { BabbleSubZone["Chamber of the Aspects"]..": "..BabbleZone["The Ruby Sanctum"], 4987 }; diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua index 636c92d..1741ea6 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua @@ -297,6 +297,7 @@ function AtlasLoot_SetNewStyle(style) "AtlasLootDefaultFrame_AdvancedSearchPanel_SearchButton", "AtlasLootDefaultFrame_AdvancedSearchPanel_ClearButton", "AtlasLootDefaultFrame_MapButton", + "AtlasLootDefaultFrame_MapSelectButton", } if style == "new" then diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua index fa40b95..9d1b377 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua @@ -46,7 +46,7 @@ local mainframe = CreateFrame("FRAME", "AtlasLootDefaultFrame", UIParent); local closebtn = CreateFrame("Button", "AtlasLootDefaultFrame_CloseButton", AtlasLootDefaultFrame, "UIPanelCloseButton"); closebtn:SetPoint("TOPRIGHT", AtlasLootDefaultFrame, "TOPRIGHT",-10,-10); closebtn:SetScript("OnClick", function() AtlasLootDefaultFrame:Hide() end); - closebtn:SetScript("OnShow", function(self) self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ) end); + closebtn:SetFrameLevel( (closebtn:GetParent()):GetFrameLevel() + 1 ); --Load All Addon Moduels Button local loadModulebtn = CreateFrame("Button", "AtlasLootDefaultFrame_LoadModules", AtlasLootDefaultFrame, "OptionsButtonTemplate"); @@ -54,9 +54,7 @@ local loadModulebtn = CreateFrame("Button", "AtlasLootDefaultFrame_LoadModules", loadModulebtn:SetPoint("TOPRIGHT", AtlasLootDefaultFrame, "TOPRIGHT",-38,-15); loadModulebtn:SetText(AL["Load Modules"]); loadModulebtn:SetScript("OnClick", function() AtlasLoot_LoadAllModules() end); - loadModulebtn:SetScript("OnShow", function(self) - self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ); - end); + loadModulebtn:SetFrameLevel( (loadModulebtn:GetParent()):GetFrameLevel() + 1 ); --Options Button local optionsbtn = CreateFrame("Button", "AtlasLootDefaultFrame_Options", AtlasLootDefaultFrame, "OptionsButtonTemplate"); @@ -64,9 +62,7 @@ local optionsbtn = CreateFrame("Button", "AtlasLootDefaultFrame_Options", AtlasL optionsbtn:SetPoint("TOPLEFT", AtlasLootDefaultFrame, "TOPLEFT",40,-15); optionsbtn:SetText(AL["Options"]); optionsbtn:SetScript("OnClick", function() AtlasLootOptions_Toggle() end); - optionsbtn:SetScript("OnShow", function(self) - self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ); - end); + optionsbtn:SetFrameLevel( (optionsbtn:GetParent()):GetFrameLevel() + 1 ); --Moduel Menu Button local menubtn = CreateFrame("Button", "AtlasLootDefaultFrame_Menu", AtlasLootDefaultFrame, "OptionsButtonTemplate"); @@ -84,9 +80,7 @@ local menubtn = CreateFrame("Button", "AtlasLootDefaultFrame_Menu", AtlasLootDef AtlasLoot_Dewdrop:Open(self); end end); - menubtn:SetScript("OnShow", function(self) - self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ); - end); + menubtn:SetFrameLevel( (menubtn:GetParent()):GetFrameLevel() + 1 ); --SubMenu Button local submenubtn = CreateFrame("Button", "AtlasLootDefaultFrame_SubMenu", AtlasLootDefaultFrame, "OptionsButtonTemplate"); @@ -97,6 +91,7 @@ local submenubtn = CreateFrame("Button", "AtlasLootDefaultFrame_SubMenu", AtlasL submenubtn.Lable:SetText("Select Subcategory"); submenubtn.Lable:Show(); submenubtn:SetText(AL["Select Sub-Table"]); + submenubtn:SetFrameLevel( (submenubtn:GetParent()):GetFrameLevel() + 1 ); submenubtn:SetScript("OnClick", function(self) if AtlasLoot_DewdropSubMenu:IsOpen() then AtlasLoot_DewdropSubMenu:Close(); @@ -104,9 +99,6 @@ local submenubtn = CreateFrame("Button", "AtlasLootDefaultFrame_SubMenu", AtlasL AtlasLoot_DewdropSubMenu:Open(self); end end); - submenubtn:SetScript("OnShow", function(self) - self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ); - end); --Expansion Menu Button local expansionmenubtn = CreateFrame("Button", "AtlasLootDefaultFrame_ExpansionMenu", AtlasLootDefaultFrame, "OptionsButtonTemplate"); @@ -124,9 +116,7 @@ local expansionmenubtn = CreateFrame("Button", "AtlasLootDefaultFrame_ExpansionM AtlasLoot_DewdropExpansionMenu:Open(self); end end); - expansionmenubtn:SetScript("OnShow", function(self) - self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ); - end); + expansionmenubtn:SetFrameLevel( (expansionmenubtn:GetParent()):GetFrameLevel() + 1 ); --Loot Background local lootbground = CreateFrame("Frame", "AtlasLootDefaultFrame_LootBackground", AtlasLootDefaultFrame); @@ -235,10 +225,8 @@ local searchbox = CreateFrame("EditBox","AtlasLootDefaultFrameSearchBox",AtlasLo local searchbtn = CreateFrame("Button","AtlasLootDefaultFrameSearchButton",AtlasLootDefaultFrame,"UIPanelButtonTemplate2"); searchbtn:SetSize(69,32); searchbtn:SetPoint("LEFT","AtlasLootDefaultFrameSearchBox","RIGHT",2,0); - searchbtn:SetScript("OnShow", function(self) - self:SetText(AL["Search"]); - self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ); - end); + searchbtn:SetText(AL["Search"]); + searchbtn:SetFrameLevel( (searchbtn:GetParent()):GetFrameLevel() + 1 ); searchbtn:SetScript("OnClick", function() AtlasLoot:Search(AtlasLootDefaultFrameSearchBox:GetText()); AtlasLootDefaultFrameSearchBox:ClearFocus(); @@ -252,18 +240,16 @@ local searchopt = CreateFrame("Button", "AtlasLootDefaultFrameSearchOptionsButto searchopt:SetPushedTexture("Interface\\Buttons\\UI-SpellbookIcon-NextPage-Down"); searchopt:SetDisabledTexture("Interface\\Buttons\\UI-SpellbookIcon-NextPage-Disabled"); searchopt:SetHighlightTexture("Interface\\Buttons\\UI-Common-MouseHilight","ADD"); - searchopt:SetScript("OnShow", function(self) self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ) end); + searchopt:SetFrameLevel( (searchopt:GetParent()):GetFrameLevel() + 1 ); searchopt:SetScript("OnClick", function(self) AtlasLoot:ShowSearchOptions(self) end) --Clear Search Button local searchclear = CreateFrame("Button","AtlasLootDefaultFrameSearchClearButton",AtlasLootDefaultFrameSearchBox,"UIPanelButtonTemplate2"); searchclear:SetSize(58,32); searchclear:SetPoint("LEFT",AtlasLootDefaultFrameSearchOptionsButton,"RIGHT",-2,0); - searchclear:SetScript("OnShow", function(self) - self:SetText(AL["Clear"]); - self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ); - end); - searchclear:SetScript("OnClick", function() + searchclear:SetText(AL["Clear"]); + searchclear:SetFrameLevel( (searchclear:GetParent()):GetFrameLevel() + 1 ); + searchclear:SetScript("OnClick", function() AtlasLootDefaultFrameSearchBox:SetText(""); AtlasLootDefaultFrameSearchBox:ClearFocus(); end); @@ -272,20 +258,16 @@ local searchclear = CreateFrame("Button","AtlasLootDefaultFrameSearchClearButton local lastresult = CreateFrame("Button","AtlasLootDefaultFrameLastResultButton",AtlasLootDefaultFrameSearchBox,"UIPanelButtonTemplate2"); lastresult:SetSize(100,32); lastresult:SetPoint("LEFT",AtlasLootDefaultFrameSearchClearButton,"RIGHT",1,0); - lastresult:SetScript("OnShow", function(self) - self:SetText(AL["Last Result"]); - self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ); - end); + lastresult:SetText(AL["Last Result"]); + lastresult:SetFrameLevel( (lastresult:GetParent()):GetFrameLevel() + 1 ); lastresult:SetScript("OnClick", function() AtlasLoot:ShowSearchResult() end); -- Advanced Search Button local advSearch = CreateFrame("Button","AtlasLootDefaultFrameAdvancedSearchButton", AtlasLootDefaultFrame,"UIPanelButtonTemplate2"); advSearch:SetSize(95,32); advSearch:SetPoint("LEFT",AtlasLootDefaultFrameLastResultButton,"RIGHT",2); - advSearch:SetScript("OnShow", function(self) - self:SetText("Advanced"); - self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ); - end) + advSearch:SetText("Advanced"); + advSearch:SetFrameLevel( (advSearch:GetParent()):GetFrameLevel() + 1 ); advSearch:SetScript("OnClick", function() AtlasLoot_AdvancedSearchShow(); AtlasLootDefaultFrameSearchBox:ClearFocus(); @@ -310,23 +292,25 @@ local scrollFrame = CreateFrame("Frame", "Atlasloot_Difficulty_ScrollFrame", Atl scrollFrame.Lable:SetFont("GameFontNormal", 24); function AtlasLoot:ScrollFrameUpdate(hide) - local maxValue = #AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE]; - FauxScrollFrame_Update(scrollFrame.scrollBar, maxValue, MAX_ROWS, ROW_HEIGHT); - local offset = FauxScrollFrame_GetOffset(scrollFrame.scrollBar); - for i = 1, MAX_ROWS do - local value = i + offset - scrollFrame.rows[i]:SetChecked(false); - scrollFrame.rows[i]:SetHighlightTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD"); - if value <= maxValue and AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE][value] and hide == nil then - local row = scrollFrame.rows[i] - row:SetText("|cffFFd200"..AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE][value][1]); - row.itemIndex = AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE][value][2]; - if row.itemIndex == ItemindexID then - row:SetChecked(true); + if AtlasLoot_Difficulty then + local maxValue = #AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE]; + FauxScrollFrame_Update(scrollFrame.scrollBar, maxValue, MAX_ROWS, ROW_HEIGHT); + local offset = FauxScrollFrame_GetOffset(scrollFrame.scrollBar); + for i = 1, MAX_ROWS do + local value = i + offset + scrollFrame.rows[i]:SetChecked(false); + scrollFrame.rows[i]:SetHighlightTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD"); + if value <= maxValue and AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE][value] and hide == nil then + local row = scrollFrame.rows[i] + row:SetText("|cffFFd200"..AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE][value][1]); + row.itemIndex = AtlasLoot_Difficulty[ATLASLOOT_CURRENTTYPE][value][2]; + if row.itemIndex == ItemindexID then + row:SetChecked(true); + end + row:Show() + else + scrollFrame.rows[i]:Hide() end - row:Show() - else - scrollFrame.rows[i]:Hide() end end end @@ -449,12 +433,25 @@ end }) subtableFrame.rows = rows2 -- Map Button -local mapbtn = CreateFrame("Button","AtlasLootDefaultFrame_MapButton", AtlasLootDefaultFrame,"UIPanelButtonTemplate2"); - mapbtn:SetSize(95,32); +local mapbtn = CreateFrame("Button","AtlasLootDefaultFrame_MapButton", AtlasLootDefaultFrame,"OptionsButtonTemplate"); + mapbtn:SetSize(90,24); mapbtn:SetPoint("BOTTOMLEFT",Atlasloot_SubTableFrame,0,-27.5); - mapbtn:SetScript("OnShow", function(self) - self:SetText("Map"); - self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ); - end) + mapbtn:SetText("Map"); + mapbtn:SetFrameLevel( (mapbtn:GetParent()):GetFrameLevel() + 1 ); mapbtn:SetScript("OnClick", function() AtlasLoot:MapOnShow(); end) - mapbtn:Hide(); \ No newline at end of file + mapbtn:Hide(); + + -- Map Select Button +local mapSelbtn = CreateFrame("Button","AtlasLootDefaultFrame_MapSelectButton", AtlasLootDefaultFrame,"OptionsButtonTemplate"); + mapSelbtn:SetSize(180,24); + mapSelbtn:SetPoint("BOTTOMRIGHT",Atlasloot_SubTableFrame,5,-27.5); + mapSelbtn:SetFrameLevel( (mapSelbtn:GetParent()):GetFrameLevel() + 1 ); + mapSelbtn:SetScript("OnClick", function(self) + if AtlasLoot_MapMenu:IsOpen() then + AtlasLoot_MapMenu:Close(); + else + AtlasLoot_MapMenu:Open(self); + end + end); + mapSelbtn:SetText("No Map"); + mapSelbtn:Hide(); \ No newline at end of file diff --git a/AtlasLoot_OriginalWoW/originalwow.lua b/AtlasLoot_OriginalWoW/originalwow.lua index 998e5f6..1f0af1c 100644 --- a/AtlasLoot_OriginalWoW/originalwow.lua +++ b/AtlasLoot_OriginalWoW/originalwow.lua @@ -112,6 +112,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["RuinsofAQ"] = { Name = BabbleZone["Ruins of Ahn'Qiraj"]; Type = "ClassicRaid"; + Map = "TheRuinsofAhnQiraj"; { Name = BabbleBoss["Kurinnaxx"]; { 1, 21499, "", "=q4=Vestments of the Shifting Sands", "=ds=#s5#, #a1#", "", "7.34%"}; @@ -298,6 +299,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["TempleofAQ"] = { Name = BabbleZone["Temple of Ahn'Qiraj"]; Type = "ClassicRaid"; + Map = "TheTempleofAhnQiraj"; { Name = BabbleBoss["The Prophet Skeram"]; { 1, 21701, "", "=q4=Cloak of Concentrated Hatred", "=ds=#s4#", "", "11.81%"}; @@ -581,7 +583,8 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") ------------------------- AtlasLoot_Data["BlackfathomDeeps"] = { - Name = BabbleZone["Blackfathom Deeps"]; + Name = BabbleZone["Blackfathom Deeps"]; + Map = "BlackfathomDeeps"; { Name = BabbleBoss["Ghamoo-ra"]; { 1, 6908, "", "=q3=Ghamoo-ra's Bind", "=ds=#s10#, #a1#", "", "45.81%"}; @@ -649,6 +652,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["BlackrockDepths"] = { Name = BabbleZone["Blackrock Depths"]; Type = "ClassicDungeonExt"; + Map = "BlackrockDepths"; { Name = AL["Overmaster Pyron"]; { 1, 14486, "", "=q3=Pattern: Cloak of Fire", "=ds=#p8# (275)", "", "17.95%"}; @@ -937,6 +941,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Name = BabbleZone["Lower Blackrock Spire"]; Type = "ClassicDungeonExt"; Loadfirst = 3; + Map = "BlackrockSpireLower"; { Name = AL["Scarshield Quartermaster"]; { 1, 18987, "", "=q1=Blackhand's Command", "=ds=#m2#", "", "100%"}; @@ -1111,6 +1116,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["UpperBlackrock"] = { Name = BabbleZone["Upper Blackrock Spire"]; Type = "ClassicDungeonExt"; + Map = "BlackrockSpireUpper"; { Name = BabbleBoss["Pyroguard Emberseer"]; { 1, 12905, "", "=q3=Wildfire Cape", "=ds=#s4#", "", "15.20%"}; @@ -1264,6 +1270,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["MoltenCore"] = { Name = BabbleZone["Molten Core"]; Type = "ClassicRaid"; + Map = "MoltenCore"; { Name = BabbleBoss["Lucifron"]; { 1, 18872, "", "=q4=Manastorm Leggings", "=ds=#s11#, #a1#", "", "1.93%"}; @@ -1486,6 +1493,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["BlackwingLair"] = { Name = BabbleZone["Blackwing Lair"]; Type = "ClassicRaid"; + Map = "BlackwingLair"; { Name = BabbleBoss["Razorgore the Untamed"]; { 1, 19337, "", "=q4=The Black Book", "=ds=#s14#, =q1=#m1# =ds=#c8#", "", "20%"}; @@ -1641,6 +1649,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["DireMaulEast"] = { Name = BabbleZone["Dire Maul"].." East"; Type = "ClassicDungeonExt"; + Map = "DireMaulEast"; { Name = BabbleBoss["Pusillin"]; { 1, 18267, "", "=q2=Recipe: Runn Tum Tuber Surprise", "=ds=#p3# (275)", "", "71.55%"}; @@ -1743,6 +1752,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["DireMaulNorth"] = { Name = BabbleZone["Dire Maul"].." North"; Type = "ClassicDungeonExt"; + Map = "DireMaulNorth"; { Name = BabbleBoss["Guard Mol'dar"]; { 1, 18496, "", "=q3=Heliotrope Cloak", "=ds=#s4#", "", "4.68%"}; @@ -1883,6 +1893,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["DireMaulWest"] = { Name = BabbleZone["Dire Maul"].." West"; Type = "ClassicDungeonExt"; + Map = "DireMaulWest"; { Name = BabbleBoss["Tendris Warpwood"]; { 1, 18390, "", "=q3=Tanglemoss Leggings", "=ds=#s11#, #a2#", "", "22.55%"}; @@ -1964,6 +1975,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["Gnomeregan"] = { Name = BabbleZone["Gnomeregan"]; + Map = "Gnomeregan"; { Name = AL["Namdo Bizzfizzle"]; { 1, 14639, "", "=q1=Schematic: Minor Recombobulator", "=ds=#p5# (140)"}; @@ -2036,6 +2048,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["Maraudon"] = { Name = BabbleZone["Maraudon"]; + Map = "Maraudon"; { Name = BabbleBoss["Noxxion"]; { 1, 17746, "", "=q3=Noxxion's Shackles", "=ds=#s8#, #a4#", "", "32.50%"}; @@ -2110,6 +2123,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") ---------------------- AtlasLoot_Data["RagefireChasm"] = { Name = BabbleZone["Ragefire Chasm"]; + Map = "RagefireChasm"; { Name = BabbleBoss["Taragaman the Hungerer"]; { 1, 14149, "", "=q3=Subterranean Cape", "=ds=#s4#", "", "31.59%"}; @@ -2135,6 +2149,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["RazorfenDowns"] = { Name = BabbleZone["Razorfen Downs"]; + Map = "RazorfenDowns"; { Name = BabbleBoss["Tuten'kash"]; { 1, 0, "INV_Box_01", "=q6="..BabbleBoss["Tuten'kash"], ""}; @@ -2200,6 +2215,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["RazorfenKraul"] = { Name = BabbleZone["Razorfen Kraul"]; + Map = "RazorfenKraul"; { Name = AL["Roogug"]; { 1, 6841, "", "=q1=Vial of Phlogiston", "=ds=#m3#"}; @@ -2268,6 +2284,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["Scarlet Monastery"] = { Name = BabbleZone["Scarlet Monastery"]; + Map = "SMArmory"; { Name = "Armory"; { 1, 7719, "", "=q3=Raging Berserker's Helm", "=ds=#s1#, #a3#", "", "30.62%"}; @@ -2369,6 +2386,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Name = BabbleZone["Scholomance"]; Type = "ClassicDungeonExt"; Loadfirst = 3; + Map = "Scholomance"; { Name = AL["Quest Item"]; { 1, 13873, "", "=q1=Viewing Room Key", "=ds=#e9#"}; @@ -2712,6 +2730,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["ShadowfangKeep"] = { Name = BabbleZone["Shadowfang Keep"]; + Map = "ShadowfangKeep"; { Name = BabbleBoss["Deathsworn Captain"]; { 1, 6642, "", "=q3=Phantom Armor", "=ds=#s5#, #a3#", "", "30.49%"}; @@ -2793,6 +2812,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["Stratholme"] = { Name = BabbleZone["Stratholme"]; Type = "ClassicDungeonExt"; + Map = "Stratholme"; { Name = BabbleBoss["Skul"]; { 1, 13395, "", "=q3=Skul's Fingerbone Claws", "=ds=#s9#, #a2#", "", "36.52%"}; @@ -3056,6 +3076,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["TheDeadmines"] = { Name = BabbleZone["The Deadmines"]; + Map = "TheDeadmines"; { Name = BabbleBoss["Marisa du'Paige"]; { 1, 3019, "", "=q2=Noble's Robe", "=ds=#s5#, #a1#", "", "22.4%"}; @@ -3130,6 +3151,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["TheStockade"] = { Name = BabbleZone["The Stockade"]; + Map = "TheStockade"; { Name = BabbleBoss["Targorr the Dread"]; { 1, 3630, "", "=q1=Head of Targorr", "=ds=#m3#", "", "100%"}; @@ -3165,6 +3187,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["SunkenTemple"] = { Name = "Sunken Temple"; + Map = "TheSunkenTemple"; { Name = "Spawn of Hakkar"; { 1, 10802, "", "=q3=Wingveil Cloak", "=ds=#s4#", "", "25.6%"}; @@ -3299,6 +3322,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["Uldaman"] = { Name = BabbleZone["Uldaman"]; + Map = "Uldaman"; { Name = AL["Magregan Deepshadow"]; { 1, 4635, "", "=q1=Hammertoe's Amulet", "=ds=#m3#", "", "100%"}; @@ -3428,6 +3452,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["WailingCaverns"] = { Name = BabbleZone["Wailing Caverns"]; + Map = "WailingCaverns"; { Name = AL["Kalldan Felmoon"]; { 1, 6475, "", "=q1=Pattern: Deviate Scale Gloves", "=ds=#p7# (105)"}; @@ -3507,6 +3532,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["ZulFarrak"] = { Name = BabbleZone["Zul'Farrak"]; + Map = "ZulFarrak"; { Name = BabbleBoss["Antu'sul"]; { 1, 9640, "", "=q3=Vice Grips", "=ds=#s9#, #a4#", "", "31.30%"}; @@ -3598,6 +3624,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["ZulGurub"] = { Name = BabbleZone["Zul'Gurub"]; Type = "ClassicRaid"; + Map = "ZulGurub"; { Name = BabbleBoss["High Priestess Jeklik"]; { 1, 19717, "", "=q4=Primal Hakkari Armsplint", "=ds=#m3#", "", "11.41%"}; @@ -3888,6 +3915,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["Naxxramas60"] = { Name = BabbleZone["Naxxramas"]; Type = "ClassicRaid"; + Map = "Naxxramas60"; { Name = BabbleBoss["Patchwerk"]; { 1, 22960, "", "=q4=Cloak of Suturing", "=ds=#s4#","", "20%" }, @@ -4112,6 +4140,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") AtlasLoot_Data["Onyxia60"] = { Name = BabbleZone["Onyxia's Lair"]; Type = "ClassicRaid"; + Map = "Onyxia60"; { Name = BabbleZone["Onyxia's Lair"]; { 1, 17078, "", "=q4=Sapphiron Drape", "=ds=#s4#","", "28.57%" },