Merge branch 'master' into new-wishlist-functions
This commit is contained in:
Anch
+1515
-1515
File diff suppressed because it is too large
Load Diff
@@ -45,6 +45,7 @@ function AtlasLootOptions_Init()
|
||||
AtlasLootOptionsFrameItemSyncTT:SetChecked(AtlasLoot.db.profile.ItemSyncTT);
|
||||
AtlasLootOptionsFrameEquipCompare:SetChecked(AtlasLoot.db.profile.EquipCompare);
|
||||
AtlasLootOptionsFrameOpaque:SetChecked(AtlasLoot.db.profile.Opaque);
|
||||
AtlasLootOptionsFrameAutoInstance:SetChecked(AtlasLoot.db.profile.AutoCurrentInstance);
|
||||
AtlasLootOptionsFrameItemID:SetChecked(AtlasLoot.db.profile.ItemIDs);
|
||||
AtlasLootOptionsFrameLoDStartup:SetChecked(AtlasLoot.db.profile.LoadAllLoDStartup);
|
||||
AtlasLootOptionsFrameLootBrowserScale:SetValue(AtlasLoot.db.profile.LootBrowserScale);
|
||||
@@ -106,6 +107,10 @@ function AtlasLootOptions_OpaqueToggle()
|
||||
AtlasLootOptions_Init();
|
||||
end
|
||||
|
||||
function AtlasLoot:Options_AutoInstanceToggle()
|
||||
AtlasLoot.db.profile.AutoCurrentInstance = AtlasLootOptionsFrameAutoInstance:GetChecked();
|
||||
end
|
||||
|
||||
function AtlasLootOptions_LoDStartup()
|
||||
if (AtlasLoot.db.profile.LoadAllLoDStartup) then
|
||||
AtlasLoot.db.profile.LoadAllLoDStartup = false;
|
||||
@@ -315,6 +320,11 @@ local opaque = CreateFrame("CheckButton", "AtlasLootOptionsFrameOpaque", AtlasLo
|
||||
AtlasLootOptionsFrameOpaqueText:SetText(AL["Make Loot Table Opaque"]);
|
||||
opaque:SetScript("OnClick", function() AtlasLootOptions_OpaqueToggle() end);
|
||||
|
||||
local autoInstance = CreateFrame("CheckButton", "AtlasLootOptionsFrameAutoInstance", AtlasLootOptionsFrame, "OptionsCheckButtonTemplate");
|
||||
autoInstance:SetPoint("TOPLEFT",5,-160);
|
||||
AtlasLootOptionsFrameAutoInstanceText:SetText(AL["Auto Load Instance Loot Pages"]);
|
||||
autoInstance:SetScript("OnClick", function() AtlasLoot:Options_AutoInstanceToggle() end);
|
||||
|
||||
local itemid = CreateFrame("CheckButton", "AtlasLootOptionsFrameItemID", AtlasLootOptionsFrame, "OptionsCheckButtonTemplate");
|
||||
itemid:SetPoint("TOP",5,-130);
|
||||
AtlasLootOptionsFrameItemIDText:SetText(AL["Show itemIDs at all times"]);
|
||||
|
||||
@@ -36,10 +36,27 @@ function AtlasLootDefaultFrame_OnShow()
|
||||
--Definition of where I want the loot table to be shown
|
||||
--Remove the selection of a loot table in Atlas
|
||||
AtlasLootItemsFrame.activeBoss = nil;
|
||||
-- checks to see if there is an instance to auto load its loottable
|
||||
local function findInstance()
|
||||
for i,v in pairs(AtlasLoot_SubMenus) do
|
||||
for n,t in ipairs(v) do
|
||||
if t[4] == BabbleZone[GetRealZoneText()] then
|
||||
ATLASLOOT_CURRENTTABLE = v.SubMenu;
|
||||
ATLASLOOT_LASTMODULE = v.Module;
|
||||
AtlasLoot:IsLootTableAvailable(ATLASLOOT_LASTMODULE);
|
||||
AtlasLoot:ShowItemsFrame(t[2], "AtlasLoot_Data", 1);
|
||||
AtlasLoot_DewdropSubMenu:Unregister(AtlasLootDefaultFrame_SubMenu);
|
||||
AtlasLoot:DewdropSubMenuRegister(AtlasLoot_SubMenus[ATLASLOOT_CURRENTTABLE]);
|
||||
AtlasLoot:WishListOptionsRegister();
|
||||
return true;
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
--Set the item table to the loot table
|
||||
--Show the last displayed loot table
|
||||
local lastboss = AtlasLoot.db.profile.LastBoss;
|
||||
if lastboss and lastboss[4] then
|
||||
if AtlasLoot.db.profile.AutoCurrentInstance and findInstance() then elseif lastboss and lastboss[4] then
|
||||
ATLASLOOT_CURRENTTABLE = lastboss[5];
|
||||
ATLASLOOT_LASTMODULE = lastboss[4];
|
||||
AtlasLoot:IsLootTableAvailable(lastboss[4]);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,73 +9,76 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0");
|
||||
|
||||
AtlasLoot_SubMenus["Dungeons and RaidsCLASSIC"] = {
|
||||
Module = "AtlasLootOriginalWoW";
|
||||
SubMenu = "Dungeons and RaidsCLASSIC";
|
||||
{"Raids:", "OldKeys", "Header"};
|
||||
{"", "MoltenCore"};
|
||||
{"", "ZulGurub"};
|
||||
{"", "Onyxia60"};
|
||||
{"", "BlackwingLair"};
|
||||
{"", "RuinsofAQ"};
|
||||
{"", "TempleofAQ"};
|
||||
{"", "Naxxramas60"};
|
||||
{"", "MoltenCore", "", "Molten Core"};
|
||||
{"", "ZulGurub", "", "Zul'Gurub"};
|
||||
{"", "Onyxia60", "", "Onyxias Hort"};
|
||||
{"", "BlackwingLair", "", "Blackwing Lair"};
|
||||
{"", "RuinsofAQ", "", "Ruinen von Ahn'Qiraj"};
|
||||
{"", "TempleofAQ", "", "Tempel von Ahn'Qiraj"};
|
||||
{"", "Naxxramas60", "", "Naxxramas"};
|
||||
{"Dungeons:", "OldKeys", "Header"};
|
||||
{"", "BlackfathomDeeps"};
|
||||
{"", "BlackrockDepths"};
|
||||
{"", "LowerBlackrock"};
|
||||
{"", "UpperBlackrock"};
|
||||
{"", "TheDeadmines"};
|
||||
{"", "DireMaulNorth"};
|
||||
{"", "DireMaulEast"};
|
||||
{"", "DireMaulWest"};
|
||||
{"", "Gnomeregan"};
|
||||
{"", "Maraudon"};
|
||||
{"", "RagefireChasm"};
|
||||
{"", "RazorfenDowns"};
|
||||
{"", "RazorfenKraul"};
|
||||
{"", "Scarlet Monastery"};
|
||||
{"", "Scholomance"};
|
||||
{"", "ShadowfangKeep"};
|
||||
{"", "TheStockade"};
|
||||
{"", "Stratholme"};
|
||||
{"", "SunkenTemple"};
|
||||
{"", "Uldaman"};
|
||||
{"", "WailingCaverns"};
|
||||
{"", "ZulFarrak"};
|
||||
{"", "BlackfathomDeeps", "", "Blackfathom Deeps"};
|
||||
{"", "BlackrockDepths", "", "Blackrock Depths"};
|
||||
{"", "LowerBlackrock", "", "Lower Blackrock Spire"};
|
||||
{"", "UpperBlackrock", "", "Upper Blackrock Spire"};
|
||||
{"", "TheDeadmines", "", "The Deadmines"};
|
||||
{"", "DireMaulNorth", "", "Dire Maul (North)"};
|
||||
{"", "DireMaulEast", "", "Dire Maul (East)"};
|
||||
{"", "DireMaulWest", "", "Dire Maul (West)"};
|
||||
{"", "Gnomeregan", "", "Gnomeregan"};
|
||||
{"", "Maraudon", "", "Maraudon"};
|
||||
{"", "RagefireChasm", "", "Ragefire Chasm"};
|
||||
{"", "RazorfenDowns", "", "Razorfen Downs"};
|
||||
{"", "RazorfenKraul", "", "Razorfen Kraul"};
|
||||
{"", "Scarlet Monastery", "", "Scarlet Monastery"};
|
||||
{"", "Scholomance", "", "Scholomance"};
|
||||
{"", "ShadowfangKeep", "", "Shadowfang Keep"};
|
||||
{"", "TheStockade", "", "The Stockade"};
|
||||
{"", "Stratholme", "", "Stratholme"};
|
||||
{"", "SunkenTemple", "", "Sunken Temple"};
|
||||
{"", "Uldaman", "", "Uldaman"};
|
||||
{"", "WailingCaverns", "", "Wailing Caverns"};
|
||||
{"", "ZulFarrak", "", "Zul'Farrak"};
|
||||
};
|
||||
|
||||
AtlasLoot_SubMenus["Dungeons and RaidsTBC"] = {
|
||||
Module = "AtlasLootBurningCrusade";
|
||||
SubMenu = "Dungeons and RaidsTBC";
|
||||
{"Raids:", "BCKeys", "Header"};
|
||||
{"", "Karazhan"};
|
||||
{"", "GruulsLair"};
|
||||
{"", "HCMagtheridon"};
|
||||
{"", "CFRSerpentshrine"};
|
||||
{"", "TKEye"};
|
||||
{"", "ZulAman"};
|
||||
{"", "CoTHyjal"};
|
||||
{"", "BlackTemple"};
|
||||
{"", "SunwellPlateau"};
|
||||
{"", "Karazhan", "", "Karazhan"};
|
||||
{"", "GruulsLair", "", "Gruul's Lair"};
|
||||
{"", "HCMagtheridon", "", "Magtheridon's Lair"};
|
||||
{"", "CFRSerpentshrine", "", "Serpentshrine Cavern"};
|
||||
{"", "TKEye", "", "The Eye"};
|
||||
{"", "ZulAman", "", "Zul'Aman"};
|
||||
{"", "CoTHyjal", "", "Mount Hyjal"};
|
||||
{"", "BlackTemple", "", "Black Temple"};
|
||||
{"", "SunwellPlateau", "", "Sunwell Plateau"};
|
||||
---- Dungeons -----
|
||||
{"Dungeons:", "BCKeys", "Header"};
|
||||
{"", "HCRamparts"};
|
||||
{"", "HCShatteredHalls"};
|
||||
{"", "HCFurnace"};
|
||||
{"", "TKBot"};
|
||||
{"", "TKArc"};
|
||||
{"", "TKMech"};
|
||||
{"", "AuchCrypts"};
|
||||
{"", "AuchManaTombs"};
|
||||
{"", "AuchSethekk"};
|
||||
{"", "AuchShadowLab"};
|
||||
{"", "CoTOldHillsbrad"};
|
||||
{"", "CoTBlackMorass"};
|
||||
{"", "CFRSlavePens"};
|
||||
{"", "CFRSteamvault"};
|
||||
{"", "CFRUnderbog"};
|
||||
{"", "MagistersTerrace"};
|
||||
{"", "HCRamparts", "", "Hellfire Ramparts"};
|
||||
{"", "HCShatteredHalls", "", "The Shattered Halls"};
|
||||
{"", "HCFurnace", "", "The Blood Furnace"};
|
||||
{"", "TKBot", "", "The Botanica"};
|
||||
{"", "TKArc", "", "The Arcatraz"};
|
||||
{"", "TKMech", "", "The Mechanar"};
|
||||
{"", "AuchCrypts", "", "Auchenai Crypts"};
|
||||
{"", "AuchManaTombs", "", "Mana-Tombs"};
|
||||
{"", "AuchSethekk", "", "Sethekk Halls"};
|
||||
{"", "AuchShadowLab", "", "Shadow Labyrinth"};
|
||||
{"", "CoTOldHillsbrad", "", "Old Hillsbrad Foothills"};
|
||||
{"", "CoTBlackMorass", "", "The Black Morass"};
|
||||
{"", "CFRSlavePens", "", "The Slave Pens"};
|
||||
{"", "CFRSteamvault", "", "The Steamvault"};
|
||||
{"", "CFRUnderbog", "", "The Underbog"};
|
||||
{"", "MagistersTerrace", "", "Magisters' Terrace"};
|
||||
};
|
||||
|
||||
AtlasLoot_SubMenus["Dungeons and RaidsWRATH"] = {
|
||||
Module = "AtlasLootWotLK";
|
||||
SubMenu = "Dungeons and RaidsWRATH";
|
||||
{"Raids:", "WrathKeys", "Header"};
|
||||
{"", "Naxxramas80"};
|
||||
{"", "Sartharion"};
|
||||
|
||||
Reference in New Issue
Block a user