diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua
index 55d1ab2..83ff3dd 100644
--- a/AtlasLoot/Core/AtlasLoot.lua
+++ b/AtlasLoot/Core/AtlasLoot.lua
@@ -20,7 +20,6 @@ AtlasLoot_SetItemInfoFrame()
AtlasLootItemsFrame_OnCloseButton()
AtlasLootMenuItem_OnClick()
AtlasLoot_NavButton_OnClick()
-AtlasLoot_HeroicModeToggle()
AtlasLoot_IsLootTableAvailable(dataID)
AtlasLoot_GetLODModule(dataSource)
AtlasLoot_LoadAllModules()
@@ -108,13 +107,10 @@ local AtlasLootDBDefaults = {
FuBarIcon = true,
HidePanel = false,
LastBoss = "EmptyTable",
- HeroicMode = false,
- BigraidHeroic = false,
- Bigraid = false,
AtlasLootVersion = "1",
AtlasNaggedVersion = "",
FuBarPosition = 1,
- MythicPlussTier = 1,
+ SubtablePosition = false,
AutoQuery = false,
LoadAllLoDStartup = false,
PartialMatching = true,
@@ -392,10 +388,6 @@ function AtlasLoot_OnVariablesLoaded()
LibStub("LibAboutPanel").new(AL["AtlasLoot"], "AtlasLoot");
end
AtlasLoot_UpdateLootBrowserScale();
-
- AtlasLoot.db.profile.Bigraid = false
- AtlasLoot.db.profile.BigraidHeroic = false
- AtlasLoot.db.profile.HeroicMode = false
end
function AtlasLoot_Reset(data)
@@ -607,6 +599,11 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
if DewDrop2Enable or not dataID == nil or lastReference then
dataID = gsub(dataID, lastReference, ""); -- removes old table reference before adding a new 1 if needed
end
+
+ if dataID:match("MENU") and ATLASLOOT_FILTER_ENABLE then
+ AtlasLootFilterCheck:SetChecked(false);
+ ATLASLOOT_FILTER_ENABLE = 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()
@@ -643,7 +640,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
AtlasLoot_GenerateAtlasMenu(dataID, pFrame);
return;
end
-
+
-- Create the loottable
if (dataID == "SearchResult") or (dataID == "WishList") or (AtlasLoot_IsLootTableAvailable(dataID)) then
--Iterate through each item object and set its properties
@@ -690,25 +687,15 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
if(GetItemInfo(IDfound)) then
_, _, _, itemColor = GetItemQualityColor(itemQuality);
text = itemColor..itemName;
+ elseif dataSource[dataID][i][2] ~= IDfound and itemDefaultColour ~= nil and not dataSource[dataID][i][4]:match("=q5=") then
+ --If the item is not in cache, use the saved value and process it
+ text = (string.sub(dataSource[dataID][i][4], 5));
+ text = itemDefaultColour .. text;
+ text = AtlasLoot_FixText(text);
else
- if(GetItemInfo(IDfound)) or not dataSource[dataID][i][2] == IDfound then
- _, _, _, itemColor = GetItemQualityColor(itemQuality);
- text = itemColor..itemName;
- elseif dataSource[dataID][i][2] ~= IDfound then
- --If the item is not in cache, use the saved value and process it
- if tonumber(ItemindexID) and not dataSource[dataID][i][4]:match("=q5=") then
- text = (string.sub(dataSource[dataID][i][4], 5));
- text = "=q4=" .. text;
- text = AtlasLoot_FixText(text);
- else
- text = dataSource[dataID][i][4];
- text = AtlasLoot_FixText(text);
- end
- else
- --If the item is not in cache, use the saved value and process it
- text = dataSource[dataID][i][4];
- text = AtlasLoot_FixText(text);
- end
+ --If the item is not in cache, use the saved value and process it
+ text = dataSource[dataID][i][4];
+ text = AtlasLoot_FixText(text);
end
else
spellName, _, spellIcon, _, _, _, _, _, _ = GetSpellInfo(string.sub(IDfound, 2));
@@ -1377,14 +1364,4 @@ function AL_FindId(name, difficulty)
else
return nil;
end
-end
-
-
-
-function GetDifficultyTier()
- return AtlasLoot.db.profile.MythicPlussTier
-end
-
-function SetDifficultyTier(difficulty)
- AtlasLoot.db.profile.MythicPlussTier = difficulty;
-end
+end
\ No newline at end of file
diff --git a/AtlasLoot/Core/AtlasLoot.xml b/AtlasLoot/Core/AtlasLoot.xml
index 943e578..57b0c4b 100644
--- a/AtlasLoot/Core/AtlasLoot.xml
+++ b/AtlasLoot/Core/AtlasLoot.xml
@@ -875,6 +875,24 @@
+
+
+
+
+
+
+
+
+
+
+ local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+ getglobal(this:GetName().."Text"):SetText("Swap Subtable/Difficuilty Menus");
+
+
+ AtlasLootOptions_SubtablePositionToggle();
+
+
+
@@ -1026,7 +1044,7 @@
-
+
@@ -1048,7 +1066,7 @@
-
+
diff --git a/AtlasLoot/Core/Options.lua b/AtlasLoot/Core/Options.lua
index 8522694..4fd1cfc 100644
--- a/AtlasLoot/Core/Options.lua
+++ b/AtlasLoot/Core/Options.lua
@@ -49,6 +49,7 @@ function AtlasLootOptions_Init()
AtlasLootOptionsFrameItemAutoQuery:SetChecked(AtlasLoot.db.profile.ItemAutoQuery);
AtlasLootOptionsFrameOpaque:SetChecked(AtlasLoot.db.profile.Opaque);
AtlasLootOptionsFrameItemID:SetChecked(AtlasLoot.db.profile.ItemIDs);
+ AtlasLootOptionsFrameSubtablePosition:SetChecked(AtlasLoot.db.profile.SubtablePosition);
AtlasLootOptionsFrameItemSpam:SetChecked(AtlasLoot.db.profile.ItemSpam);
AtlasLootOptionsFrameLoDStartup:SetChecked(AtlasLoot.db.profile.LoadAllLoDStartup);
AtlasLootOptionsFrameHidePanel:SetChecked(AtlasLoot.db.profile.HidePanel);
@@ -66,6 +67,7 @@ function AtlasLootOptions_OnLoad()
AtlasLootOptionsFrameItemSyncTTText:SetText(AL["|cff9d9d9dItemSync Tooltips|r"]);
end
AtlasLootOptions_Init();
+ AtlasLootOptions_SubtablePositionToggle()
temp=AtlasLoot.db.profile.SafeLinks;
end
@@ -143,6 +145,19 @@ function AtlasLootOptions_ItemIDToggle()
AtlasLootOptions_Init();
end
+function AtlasLootOptions_SubtablePositionToggle()
+ if AtlasLootOptionsFrameSubtablePosition:GetChecked() then
+ AtlasLootDefaultFrame_SubMenu2:SetPoint("TOP", 160, -40);
+ AtlasLootDefaultFrame_SubMenu:SetPoint("TOP", 0, -40);
+ AtlasLoot.db.profile.SubtablePosition = AtlasLootOptionsFrameSubtablePosition:GetChecked();
+ else
+ AtlasLootDefaultFrame_SubMenu:SetPoint("TOP", 160, -40);
+ AtlasLootDefaultFrame_SubMenu2:SetPoint("TOP", 0, -40);
+ AtlasLoot.db.profile.SubtablePosition = AtlasLootOptionsFrameSubtablePosition:GetChecked();
+ end
+ AtlasLootOptions_Init();
+end
+
function AtlasLoot_SetupLootBrowserSlider(frame, mymin, mymax, step)
getglobal(frame:GetName().."Text"):SetText(AL["Loot Browser Scale: "].." ("..frame:GetValue()..")");
frame:SetMinMaxValues(mymin, mymax);
diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
index dd6d93f..f6b71ca 100644
--- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
+++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
@@ -133,13 +133,13 @@ function AtlasLootDefaultFrame_OnHide()
AtlasLoot_DewdropSubMenu:Close(1);
end
-function AtlasLoot_DewDropSubMenu2Click(raidtablename, itemID)
+function AtlasLoot_DewDropSubMenu2Click(raidtablename, itemID, itemColour)
if ATLASLOOT_FILTER_ENABLE == true then
AtlasLoot_FilterEnableButton()
ReEnableFilter = true
end
-- gets itemID reference
- AtlasLootDefaultFrame_GetRaidDifficulty(raidtablename, itemID)
+ 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
@@ -173,11 +173,13 @@ function AtlasLoot_DifficultyEnable(dataID, dataSource)
SelectedTable2TextSet = true
end
-function AtlasLootDefaultFrame_GetRaidDifficulty(raidtablename, itemID)
+function AtlasLootDefaultFrame_GetRaidDifficulty(raidtablename, itemID, itemColour)
+
if tonumber(itemID) then --used in itemID search feature for itemID database
ItemindexID = itemID;
isTablereference = false;
notPattern = false;
+ itemDefaultColour = itemColour;
elseif itemID:match("=s=") then -- =s= infront of a table reference will make it show a normal crafting item instead of a crafting pattern
newID = gsub(itemID, "=s=",""); -- removes =s= before passing the extra table addition
newID = gsub(newID, "Normal","");
@@ -209,6 +211,7 @@ function AtlasLoot_DewdropSubMenu2Register(loottable)
'func', AtlasLoot_DewDropSubMenu2Click,
'arg1', v[1],
'arg2', v[2],
+ 'arg3', v[3],
'notCheckable', true
)
end