diff --git a/AtlasLoot/AtlasLoot.toc b/AtlasLoot/AtlasLoot.toc
index 01d57c2..6a8eb1e 100644
--- a/AtlasLoot/AtlasLoot.toc
+++ b/AtlasLoot/AtlasLoot.toc
@@ -2,7 +2,7 @@
## Title: AtlasLoot Ascension Edition
## Notes: Shows the possible loot from the bosses
## Author: Original: Hegarol, Ascension: Skray/Szyler/Anch/Rvng
-## Version: v6.1.2
+## Version: v6.2.0
## X-eMail: manager@atlasloot.net
## X-Credits: Daviesh, Lag, Cellelach, Asurn, Pernicus and many others.
## X-Category: Map
diff --git a/AtlasLoot/Core/AtlasDifficulty.lua b/AtlasLoot/Core/AtlasDifficulty.lua
index 794b991..2a9a78d 100644
--- a/AtlasLoot/Core/AtlasDifficulty.lua
+++ b/AtlasLoot/Core/AtlasDifficulty.lua
@@ -1,171 +1,183 @@
+local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+
AtlasLoot_Difficulty = {
-- table of difficulties and there itemID references
- ["ClassicDungeon"] = {
+ ["ClassicDungeon"] = {
[1] = {
- {"Normal", "", [4] = "Submenu"},
- },
+ {"Normal", "", [4] = "Submenu"},
+ },
[2] = {
- {"Bloodforged", 1, [4] = "Submenu"},
- },
+ {"Bloodforged", 1, [4] = "Submenu"},
+ },
};
-
- ["ClassicDungeonExt"] = {
+
+ ["ClassicDungeonExt"] = {
[1] = {
- {"Normal", "", [4] = "Submenu"},
- },
+ {"Normal", "", [4] = "Submenu"},
+ },
[2] = {
- {"Heroic", 3, "=q4=", [4] = "Submenu"},
- },
+ {"Heroic", 3, "=q4=", [4] = "Submenu"},
+ },
[3] = {
- {"Mythic", 4, "=q4=", [4] = "Submenu"},
- },
- [4] = {
+ {"Mythic", 4, "=q4=", [4] = "Submenu"},
+ },
+ [4] = {
["Mythic+ 1-10"] = {
- {"Mythic 1", 5, "=q4=", [4] = "Submenu" }, {"Mythic 2", 6, "=q4=", [4] = "Submenu" }, {"Mythic 3", 7, "=q4=", [4] = "Submenu" }, {"Mythic 4", 8, "=q4=", [4] = "Submenu" }, {"Mythic 5", 9, "=q4=", [4] = "Submenu" },
+ {"Mythic 1", 5, "=q4=", [4] = "Submenu" }, {"Mythic 2", 6, "=q4=", [4] = "Submenu" }, {"Mythic 3", 7, "=q4=", [4] = "Submenu" }, {"Mythic 4", 8, "=q4=", [4] = "Submenu" }, {"Mythic 5", 9, "=q4=", [4] = "Submenu" },
{"Mythic 6", 10, "=q4=", [4] = "Submenu" }, {"Mythic 7", 11, "=q4=", [4] = "Submenu" }, {"Mythic 8", 12, "=q4=", [4] = "Submenu" }, {"Mythic 9", 13, "=q4=", [4] = "Submenu" }, {"Mythic 10", 14, "=q4=", [4] = "Submenu" },
- },
+ },
},
[5] = {
["Mythic+ 11-20"] = {
- {"Mythic 11", 15, "=q4=", [4] = "Submenu" }, {"Mythic 12", 16, "=q4=", [4] = "Submenu" }, {"Mythic 13", 17, "=q4=", [4] = "Submenu" }, {"Mythic 14", 18, "=q4=", [4] = "Submenu" }, {"Mythic 15", 19, "=q4=", [4] = "Submenu" },
+ {"Mythic 11", 15, "=q4=", [4] = "Submenu" }, {"Mythic 12", 16, "=q4=", [4] = "Submenu" }, {"Mythic 13", 17, "=q4=", [4] = "Submenu" }, {"Mythic 14", 18, "=q4=", [4] = "Submenu" }, {"Mythic 15", 19, "=q4=", [4] = "Submenu" },
{"Mythic 16", 20, "=q4=", [4] = "Submenu" }, {"Mythic 17", 21, "=q4=", [4] = "Submenu" }, {"Mythic 18", 22, "=q4=", [4] = "Submenu" }, {"Mythic 19", 23, "=q4=", [4] = "Submenu" }, {"Mythic 20", 24, "=q4=", [4] = "Submenu" },
},
- },
+ },
[6] = {
+ ["Mythic+ 21-30"] = {
+ {"Mythic 21", 25, "=q4=", [4] = "Submenu" }, {"Mythic 22", 26, "=q4=", [4] = "Submenu" }, {"Mythic 23", 27, "=q4=", [4] = "Submenu" }, {"Mythic 24", 28, "=q4=", [4] = "Submenu" }, {"Mythic 25", 29, "=q4=", [4] = "Submenu" },
+ {"Mythic 26", 30, "=q4=", [4] = "Submenu" }, {"Mythic 27", 31, "=q4=", [4] = "Submenu" }, {"Mythic 28", 32, "=q4=", [4] = "Submenu" }, {"Mythic 29", 33, "=q4=", [4] = "Submenu" }, {"Mythic 30", 34, "=q4=", [4] = "Submenu" },
+ },
+ },
+ [7] = {
{"Bloodforged", 1, [4] = "Submenu"},
- },
+ },
};
-
- ["ClassicRaid"] = {
+
+ ["ClassicRaid"] = {
[1] = {
- {"Normal Flex", "", [4] = "Submenu"},
- },
+ {"Normal Flex", "", [4] = "Submenu"},
+ },
[2] = {
- {"Heroic Flex", 3, [4] = "Submenu"},
- },
+ {"Heroic Flex", 3, [4] = "Submenu"},
+ },
[3] = {
- {"Ascended", 4, [4] = "Submenu"},
+ {"Ascended", 4, [4] = "Submenu"},
},
[4] = {
{"Bloodforged", 1, [4] = "Submenu"},
- },
+ },
};
-
- ["BCDungeon"] = {
+
+ ["BCDungeon"] = {
[1] = {
- {"Normal/Heroic", "", [4] = "Submenu"},
- },
+ {"Normal/Heroic", "", [4] = "Submenu"},
+ },
[2] = {
- {"Mythic", 4, "=q4=", [4] = "Submenu"},
+ {"Mythic", 4, "=q4=", [4] = "Submenu"},
},
[3] = {
{"Bloodforged", 1, [4] = "Submenu"},
- },
+ },
--[[
- [3] = {
+ [3] = {
["Mythic+ 1-10"] = {
- {"Mythic 1", 5, "=q4=", [4] = "Submenu" }, {"Mythic 2", 6, "=q4=", [4] = "Submenu" }, {"Mythic 3", 7, "=q4=", [4] = "Submenu" }, {"Mythic 4", 8, "=q4=", [4] = "Submenu" }, {"Mythic 5", 9, "=q4=", [4] = "Submenu" },
+ {"Mythic 1", 5, "=q4=", [4] = "Submenu" }, {"Mythic 2", 6, "=q4=", [4] = "Submenu" }, {"Mythic 3", 7, "=q4=", [4] = "Submenu" }, {"Mythic 4", 8, "=q4=", [4] = "Submenu" }, {"Mythic 5", 9, "=q4=", [4] = "Submenu" },
{"Mythic 6", 10, "=q4=", [4] = "Submenu" }, {"Mythic 7", 11, "=q4=", [4] = "Submenu" }, {"Mythic 8", 12, "=q4=", [4] = "Submenu" }, {"Mythic 9", 13, "=q4=", [4] = "Submenu" }, {"Mythic 10", 14, "=q4=", [4] = "Submenu" },
- },
+ },
},
[4] = {
["Mythic+ 11-20"] = {
- {"Mythic 11", 15, "=q4=", [4] = "Submenu" }, {"Mythic 12", 16, "=q4=", [4] = "Submenu" }, {"Mythic 13", 17, "=q4=", [4] = "Submenu" }, {"Mythic 14", 18, "=q4=", [4] = "Submenu" }, {"Mythic 15", 19, "=q4=", [4] = "Submenu" },
+ {"Mythic 11", 15, "=q4=", [4] = "Submenu" }, {"Mythic 12", 16, "=q4=", [4] = "Submenu" }, {"Mythic 13", 17, "=q4=", [4] = "Submenu" }, {"Mythic 14", 18, "=q4=", [4] = "Submenu" }, {"Mythic 15", 19, "=q4=", [4] = "Submenu" },
{"Mythic 16", 20, "=q4=", [4] = "Submenu" }, {"Mythic 17", 21, "=q4=", [4] = "Submenu" }, {"Mythic 18", 22, "=q4=", [4] = "Submenu" }, {"Mythic 19", 23, "=q4=", [4] = "Submenu" }, {"Mythic 20", 24, "=q4=", [4] = "Submenu" },
},
- },
+ },
]]
};
-
- ["BCRaid"] = {
+
+ ["BCRaid"] = {
[1] = {
- {"Normal Flex", "", [4] = "Submenu"},
- },
+ {"Normal Flex", "", [4] = "Submenu"},
+ },
[2] = {
- {"Heroic Flex", 3, [4] = "Submenu"},
- },
+ {"Heroic Flex", 3, [4] = "Submenu"},
+ },
[3] = {
- {"Ascended", 4, [4] = "Submenu"},
+ {"Ascended", 4, [4] = "Submenu"},
},
[4] = {
{"Bloodforged", 1, [4] = "Submenu"},
},
};
-
- ["WrathDungeon"] = {
+
+ ["WrathDungeon"] = {
[1] = {
- {"Normal/Heroic", "", [4] = "Submenu"},
- },
+ {"Normal/Heroic", "", [4] = "Submenu"},
+ },
[2] = {
- {"Mythic", 4, "=q4=", [4] = "Submenu"},
+ {"Mythic", 4, "=q4=", [4] = "Submenu"},
},
[3] = {
{"Bloodforged", 1, [4] = "Submenu"},
- },
+ },
--[[
- [3] = {
+ [3] = {
["Mythic+ 1-10"] = {
- {"Mythic 1", 5, "=q4=", [4] = "Submenu" }, {"Mythic 2", 6, "=q4=", [4] = "Submenu" }, {"Mythic 3", 7, "=q4=", [4] = "Submenu" }, {"Mythic 4", 8, "=q4=", [4] = "Submenu" }, {"Mythic 5", 9, "=q4=", [4] = "Submenu" },
+ {"Mythic 1", 5, "=q4=", [4] = "Submenu" }, {"Mythic 2", 6, "=q4=", [4] = "Submenu" }, {"Mythic 3", 7, "=q4=", [4] = "Submenu" }, {"Mythic 4", 8, "=q4=", [4] = "Submenu" }, {"Mythic 5", 9, "=q4=", [4] = "Submenu" },
{"Mythic 6", 10, "=q4=", [4] = "Submenu" }, {"Mythic 7", 11, "=q4=", [4] = "Submenu" }, {"Mythic 8", 12, "=q4=", [4] = "Submenu" }, {"Mythic 9", 13, "=q4=", [4] = "Submenu" }, {"Mythic 10", 14, "=q4=", [4] = "Submenu" },
- },
+ },
},
[4] = {
["Mythic+ 11-20"] = {
- {"Mythic 11", 15, "=q4=", [4] = "Submenu" }, {"Mythic 12", 16, "=q4=", [4] = "Submenu" }, {"Mythic 13", 17, "=q4=", [4] = "Submenu" }, {"Mythic 14", 18, "=q4=", [4] = "Submenu" }, {"Mythic 15", 19, "=q4=", [4] = "Submenu" },
+ {"Mythic 11", 15, "=q4=", [4] = "Submenu" }, {"Mythic 12", 16, "=q4=", [4] = "Submenu" }, {"Mythic 13", 17, "=q4=", [4] = "Submenu" }, {"Mythic 14", 18, "=q4=", [4] = "Submenu" }, {"Mythic 15", 19, "=q4=", [4] = "Submenu" },
{"Mythic 16", 20, "=q4=", [4] = "Submenu" }, {"Mythic 17", 21, "=q4=", [4] = "Submenu" }, {"Mythic 18", 22, "=q4=", [4] = "Submenu" }, {"Mythic 19", 23, "=q4=", [4] = "Submenu" }, {"Mythic 20", 24, "=q4=", [4] = "Submenu" },
},
- },
+ },
]]
};
-
- ["WrathRaid"] = {
+
+ ["WrathRaid"] = {
[1] = {
- {"Normal Flex", "", [4] = "Submenu"},
- },
+ {"Normal Flex", "", [4] = "Submenu"},
+ },
[2] = {
- {"Heroic Flex", 3, [4] = "Submenu"},
- },
+ {"Heroic Flex", 3, [4] = "Submenu"},
+ },
[3] = {
- {"Ascended", 4, [4] = "Submenu"},
+ {"Ascended", 4, [4] = "Submenu"},
},
[4] = {
{"Bloodforged", 1, [4] = "Submenu"},
},
};
-
- ["Crafting"] = {
+
+ ["Crafting"] = {
[1] = {
{"Crafting Patterns", "", [4] = "Submenu" },
},
- [2] = {
+ [2] = {
{"Item Normal", "=s=Normal", [4] = "Submenu" },
},
- [3] = {
+ [3] = {
{"Bloodforged", 1, [4] = "Submenu" },
- },
+ },
};
-
- ["CraftingExt"] = {
+
+ ["CraftingExt"] = {
[1] = {
{"Crafting Pattern Uncommon", "", [4] = "Submenu" },
},
- [2] = {
+ [2] = {
{"Crafting Patterns Rare", "Rare", [4] = "Submenu" },
},
- [3] = {
+ [3] = {
{"Crafting Patterns Epic", "Epic", [4] = "Submenu" },
},
- [4] = {
+ [4] = {
{"Item Uncommon", "=s=", [4] = "Submenu" },
},
- [5] = {
+ [5] = {
{"Item Rare", "=s=Rare", [4] = "Submenu" },
},
- [6] = {
+ [6] = {
{"Item Epic", "=s=Epic", [4] = "Submenu" }
- },
+ },
};
-
+
+
+ ["Search"] = {"Bloodforged", "Normal", "Heroic", "Mythic", "Mythic 1", "Mythic 2","Mythic 3","Mythic 4","Mythic 5", "Mythic 6","Mythic 7",
+ "Mythic 8","Mythic 9", "Mythic 10", "Mythic 11", "Mythic 12","Mythic 13","Mythic 14","Mythic 15", "Mythic 16","Mythic 17","Mythic 18",
+ "Mythic 19", "Mythic 20", [99] = "Ascended"};
--Enums for comparisons in code
Bloodforged = 1;
@@ -173,9 +185,10 @@ AtlasLoot_Difficulty = {
Heroic = 3;
Mythic = 4; --Use for Ascended as well
- MythicPlus = {5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24}; --Usage AtlasLoot_Difficulty.MythicPlus[1-20];
+ MythicPlus = {5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34}; --Usage AtlasLoot_Difficulty.MythicPlus[1-30];
+ DIF_SEARCH = 16;
DUPLICATE = 17;
MIN_DIF = 18;
MAX_DIF = 19;
-}
\ No newline at end of file
+}
diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua
index 260c1dd..dce334b 100644
--- a/AtlasLoot/Core/AtlasLoot.lua
+++ b/AtlasLoot/Core/AtlasLoot.lua
@@ -86,6 +86,9 @@ SelectedTable2TextSet = true
isTablereference = false
notPattern = false
+--Search panel open and close save variables
+--dataID, dataSource, boss, pFrame
+SearchPrevData = {"", "", "", ""};
AtlasLootCharDB={};
@@ -506,6 +509,8 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
local isItem;
local spellName, spellIcon;
+ SearchPrevData = {dataID, dataSource, boss, pFrame};
+
--If the loot table name has not been passed, throw up a debugging statement
if dataID==nil then
DEFAULT_CHAT_FRAME:AddMessage("No dataID!");
@@ -516,6 +521,10 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
HideUIPanel(AtlasQuestInsideFrame);
end
+ --Hide Advanced search if it is up and reshow Querybutton
+ AtlasLootAdvancedSearch:Hide();
+ AtlasLootServerQueryButton:Show();
+
--Ditch the Quicklook selector
AtlasLoot_QuickLooks:Hide();
AtlasLootQuickLooksButton:Hide();
@@ -544,6 +553,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
else
dataSource = AtlasLoot_Data;
end
+
if dataID == "FilterList" then
Type = lastType;
else
@@ -621,6 +631,9 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
if(toShow) then
IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), ItemindexID) or dataSource[dataID][i][2];
+ if ((dataID == "SearchResult") or (dataID == "WishList")) then
+ IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]) or dataSource[dataID][i][2];
+ end
if string.sub(IDfound, 1, 1) == "s" then
isItem = false;
@@ -640,9 +653,16 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
if dataSource[dataID][i][AtlasLoot_Difficulty.DUPLICATE] then
--Used if an item has more then 1 version with the same name eg Atiesh
IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5) .. " " .. dataSource[dataID][i][AtlasLoot_Difficulty.DUPLICATE], ItemindexID) or dataSource[dataID][i][2];
+ if ((dataID == "SearchResult") or (dataID == "WishList")) then
+ IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]) or dataSource[dataID][i][2];
+ end
else
--If something was found in itemID database show that if not show default table item
IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), ItemindexID) or dataSource[dataID][i][2];
+ if ((dataID == "SearchResult") or (dataID == "WishList")) then
+ IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]) or dataSource[dataID][i][2];
+ end
+
end
itemName, itemLink, itemQuality, itemLevel, itemMinLevel, itemType, itemSubType, itemCount, itemEquipLoc, itemTexture = GetItemInfo(IDfound);
@@ -777,6 +797,17 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
if (dataID == "SearchResult" or dataID == "WishList") and dataSource[dataID][i][8] then
itemButton.sourcePage = dataSource[dataID][i][8];
end
+ if dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH] then
+ itemButton.difficulty = dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH];
+ else
+ itemButton.difficulty = ItemindexID;
+ if dataSource[dataID].Type then
+ if string.find(dataSource[dataID].Type, "Raid") and ItemindexID == 4 then
+ itemButton.difficulty = 99;
+ end
+ end
+ end
+
itemButton.i = 1;
itemButton:Show();
@@ -786,7 +817,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
end
if dataID ~= "FilterList" then
- lastType = dataSource[dataID].Type
+ lastType = dataSource[dataID].Type
end
if SelectedTableTextSet then
diff --git a/AtlasLoot/Core/AtlasLoot.xml b/AtlasLoot/Core/AtlasLoot.xml
index 7183b76..955be38 100644
--- a/AtlasLoot/Core/AtlasLoot.xml
+++ b/AtlasLoot/Core/AtlasLoot.xml
@@ -16,6 +16,7 @@
+
@@ -1627,7 +1628,7 @@
-
+
@@ -1650,14 +1651,14 @@
-