Exiles/coa-atlasloot
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

new page filter

Browse Source
This commit is contained in:
Anch
2022-10-21 15:04:36 +13:00
parent 79840303b5
commit 877902fc22
7 changed files with 356 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AtlasLoot/AtlasLoot.toc
+2 -2
View File
@@ -24,8 +24,8 @@
## RealTitle-zhCN: [地图]副本掉落物品查询 ## RealTitle-zhCN: [地图]副本掉落物品查询
## RealTitle-zhTW: [地圖]AL 物品掉落[主程式] ## RealTitle-zhTW: [地圖]AL 物品掉落[主程式]
## Notes-ruRU: Отображает весю возможную добычу с боссов ## Notes-ruRU: Отображает весю возможную добычу с боссов
## SavedVariables: AtlasLootOptions, AtlasLootDB, AtlasLootWishList ## SavedVariables: AtlasLootOptions, AtlasLootDB, AtlasLootWishList, AtlasLootFilterDB
## SavedVariablesPerCharacter: AtlasLootCharDB, AtlasLootFilterDB ## SavedVariablesPerCharacter: AtlasLootCharDB
## OptionalDeps: LootLink, ItemSync, DewdropLib, FuBarPlugin-3.0, FuBar, Ace3, LibBabble-Boss-3.0, LibBabble-Faction-3.0, LibBabble-Inventory-3.0, LibBabble-Zone-3.0 ## OptionalDeps: LootLink, ItemSync, DewdropLib, FuBarPlugin-3.0, FuBar, Ace3, LibBabble-Boss-3.0, LibBabble-Faction-3.0, LibBabble-Inventory-3.0, LibBabble-Zone-3.0
embeds.xml embeds.xml
AtlasLoot/Core/AtlasLoot.lua
+14 -41
View File
@@ -133,6 +133,8 @@ function AtlasLoot:OnEnable()
if not AtlasLootCharDB then AtlasLootCharDB = {} end if not AtlasLootCharDB then AtlasLootCharDB = {} end
if not AtlasLootCharDB["QuickLooks"] then AtlasLootCharDB["QuickLooks"] = {} end if not AtlasLootCharDB["QuickLooks"] then AtlasLootCharDB["QuickLooks"] = {} end
if not AtlasLootCharDB["SearchResult"] then AtlasLootCharDB["SearchResult"] = {Name = "Search Result" , Type = "Search", Back = true}; end if not AtlasLootCharDB["SearchResult"] then AtlasLootCharDB["SearchResult"] = {Name = "Search Result" , Type = "Search", Back = true}; end
if not AtlasLootFilterDB then AtlasLootFilterDB = {["FilterLists"] = {}} end;
if AtlasLootFilterDB and not AtlasLootFilterDB["FilterLists"] then AtlasLootFilterDB = {["FilterLists"] = {}} end;
if AtlasLoot_Data then if AtlasLoot_Data then
AtlasLoot_Data["EmptyTable"] = { AtlasLoot_Data["EmptyTable"] = {
Name = AL["Select a Loot Table..."]; Name = AL["Select a Loot Table..."];
@@ -220,7 +222,6 @@ function AtlasLoot:OnEnable()
panel.name=AL["AtlasLoot"]; panel.name=AL["AtlasLoot"];
InterfaceOptions_AddCategory(panel); InterfaceOptions_AddCategory(panel);
--Filter and wishlist options menus creates as part of the next 2 commands --Filter and wishlist options menus creates as part of the next 2 commands
AtlasLoot_CreateFilterOptions();
AtlasLoot_CreateWishlistOptions(); AtlasLoot_CreateWishlistOptions();
panel = _G["AtlasLootHelpFrame"]; panel = _G["AtlasLootHelpFrame"];
panel.name=AL["Help"]; panel.name=AL["Help"];
@@ -231,11 +232,13 @@ function AtlasLoot:OnEnable()
end end
AtlasLoot_UpdateLootBrowserScale(); AtlasLoot_UpdateLootBrowserScale();
local playerName = UnitName("player"); local playerName = UnitName("player");
-- Is wishlist item disabled on load or not
if AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] then if AtlasLootWishList["Options"][playerName]["AutoSortWishlist"] then
AtlasLootItemsFrame_Wishlist_UnLock:Disable(); AtlasLootItemsFrame_Wishlist_UnLock:Disable();
else else
AtlasLootItemsFrame_Wishlist_UnLock:Enable(); AtlasLootItemsFrame_Wishlist_UnLock:Enable();
end end
AtlasLoot:LoadItemIDsDatabase();
end end
function AtlasLoot_Reset(data) function AtlasLoot_Reset(data)
@@ -372,6 +375,7 @@ function AtlasLoot:CreateToken(dataID)
}; };
end end
--Fills table with items --Fills table with items
local count = #AtlasLoot_Data[dataID][1] * #AtlasLoot_Data[dataID];
for n, t in ipairs(AtlasLoot_Data[dataID]) do for n, t in ipairs(AtlasLoot_Data[dataID]) do
for c, v in ipairs(t) do for c, v in ipairs(t) do
if type(v) == "table" then if type(v) == "table" then
@@ -380,21 +384,16 @@ function AtlasLoot:CreateToken(dataID)
if itemType == select(9, GetItemInfo(itemID)) or itemType2 == select(9, GetItemInfo(itemID)) then if itemType == select(9, GetItemInfo(itemID)) or itemType2 == select(9, GetItemInfo(itemID)) then
table.insert(AtlasLoot_TokenData[orgID][1], {#AtlasLoot_TokenData[orgID][1] + 1, v[2], v[3], v[4], t.Name}); table.insert(AtlasLoot_TokenData[orgID][1], {#AtlasLoot_TokenData[orgID][1] + 1, v[2], v[3], v[4], t.Name});
end end
if #t == n then if count == 1 then
AtlasLoot:CancelTimer(AtlasLoot.refreshTimer); AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]);
AtlasLoot.refreshTimer = AtlasLoot:ScheduleTimer("Refresh", 2);
end end
count = count - 1;
end) end)
end end
end end
end end
end end
-- Refresh loottable after token table creation.
function AtlasLoot:Refresh()
AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]);
end
--[[ --[[
AtlasLoot:ShowItemsFrame(dataID, dataSource, tablenum): AtlasLoot:ShowItemsFrame(dataID, dataSource, tablenum):
dataID - Name of the loot table dataID - Name of the loot table
@@ -424,6 +423,8 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
--Ditch the Quicklook selector --Ditch the Quicklook selector
AtlasLootQuickLooksButton:Hide(); AtlasLootQuickLooksButton:Hide();
AtlasLoot:HideFilterCreateButtons();
--Hide Map and reshow lootbackground --Hide Map and reshow lootbackground
AtlasLootDefaultFrame_Map:Hide(); AtlasLootDefaultFrame_Map:Hide();
AtlasLootDefaultFrame_LootBackground:Show(); AtlasLootDefaultFrame_LootBackground:Show();
@@ -773,7 +774,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
end end
-- Show the Filter Check-Box -- Show the Filter Check-Box
if dataID ~= "SearchResult" and filterCheck(dataID) ~= true and dataSource_backup ~= "AtlasLoot_TokenData" and dataSource_backup ~= "AtlasLoot_CurrentWishList" then if filterCheck(dataID) ~= true then
AtlasLootFilterCheck:Show(); AtlasLootFilterCheck:Show();
end end
@@ -805,7 +806,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
tablenum = AtlasLootItemsFrame.refreshOri[3]; tablenum = AtlasLootItemsFrame.refreshOri[3];
end end
if AtlasLootItemsFrame.refresh and tablenum ~= #_G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]] and dataSource_backup ~= "AtlasLoot_TokenData" then if AtlasLootItemsFrame.refresh and tablenum ~= #_G[AtlasLootItemsFrame.refreshOri[2]][AtlasLootItemsFrame.refreshOri[1]] and dataSource_backup ~= "AtlasLoot_TokenData" and dataID ~= "SearchResult" or tablenum ~= #_G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]] and dataID == "SearchResult" then
_G["AtlasLootItemsFrame_NEXT"]:Show(); _G["AtlasLootItemsFrame_NEXT"]:Show();
_G["AtlasLootItemsFrame_NEXT"].tablenum = tablenum + 1; _G["AtlasLootItemsFrame_NEXT"].tablenum = tablenum + 1;
_G["AtlasLootItemsFrame_NEXT"].tablebase = tablebase; _G["AtlasLootItemsFrame_NEXT"].tablebase = tablebase;
@@ -816,6 +817,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
_G["AtlasLootItemsFrame_PREV"].tablenum = tablenum - 1; _G["AtlasLootItemsFrame_PREV"].tablenum = tablenum - 1;
_G["AtlasLootItemsFrame_PREV"].tablebase = tablebase; _G["AtlasLootItemsFrame_PREV"].tablebase = tablebase;
end end
if dataSource[dataID].Back then if dataSource[dataID].Back then
_G["AtlasLootItemsFrame_BACK"]:Show(); _G["AtlasLootItemsFrame_BACK"]:Show();
end end
@@ -824,7 +826,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource_backup, tablenum)
--Anchor the item frame where it is supposed to be --Anchor the item frame where it is supposed to be
if ATLASLOOT_FILTER_ENABLE and dataID ~= "FilterList" then if ATLASLOOT_FILTER_ENABLE and dataID ~= "FilterList" then
AtlasLoot:HideNoUsableItems(); AtlasLoot:HideFilteredItems();
end end
if dataID ~= "SearchResult" then if dataID ~= "SearchResult" then
@@ -1055,35 +1057,6 @@ function AtlasLoot:QueryLootPage()
queryNextItem(START); queryNextItem(START);
end end
--[[
AtlasLoot:QueryLootPage()
Querys all valid items on the current loot page.
]]
function AtlasLoot:QueryLootPageOLD()
local lastitem
for t = 1, 30, 1 do
local xbutton = _G["AtlasLootItem_"..t];
local xqueryitem = xbutton.itemID;
if (xqueryitem) and (xqueryitem ~= nil) and (xqueryitem ~= "") and (xqueryitem ~= 0) and (string.sub(xqueryitem, 1, 1) ~= "s") then
lastitem = t;
end
end
for i = 1, 30, 1 do
local button = _G["AtlasLootItem_"..i];
local queryitem = button.itemID;
if (queryitem) and (queryitem ~= nil) and (queryitem ~= "") and (queryitem ~= 0) and (string.sub(queryitem, 1, 1) ~= "s") then
local item = Item:CreateFromID(queryitem);
if not (item:GetInfo()) then
item:ContinueOnLoad(function(itemId)
if i == lastitem then
AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]);
end
end)
end
end
end
end
--[[ --[[
AtlasLoot:AddTooltip(frameb, tooltiptext) AtlasLoot:AddTooltip(frameb, tooltiptext)
Adds explanatory tooltips to UI objects. Adds explanatory tooltips to UI objects.
AtlasLoot/Core/Filter.lua
+313 -323
View File
@@ -5,7 +5,7 @@ Loot browser associating loot with instance bosses
Can be integrated with Atlas (http://www.atlasmod.com) Can be integrated with Atlas (http://www.atlasmod.com)
Functions: Functions:
AtlasLoot:HideNoUsableItems() AtlasLoot:HideFilteredItems()
AtlasLoot_FilterEnableButton() AtlasLoot_FilterEnableButton()
<local> CreateCheckButton(parrent, text, num) <local> CreateCheckButton(parrent, text, num)
AtlasLoote_CreateFilterOptions() AtlasLoote_CreateFilterOptions()
@@ -16,359 +16,349 @@ local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
local OptionsLoadet = false local OptionsLoadet = false
AtlasLootFilterDB = {}; AtlasLoot_FilterMenu = AceLibrary("Dewdrop-2.0");
AtlasLoot_SetFiltersMenu = AceLibrary("Dewdrop-2.0");
local FilterTableNames = {
["Armor"] = AL["Armor:"],
["WeaponsMeele"] = AL["Melee weapons:"],
["WeaponsMeeleTwoHand"] = BabbleInventory["Two-Hand"]..":",--.." "..AL["Melee weapons:"],
["WeaponsRanged"] = AL["Ranged weapons:"],
["Relics"] = AL["Relics:"],
["Other"] = AL["Other:"],
}
local FilterSort = {"Armor","WeaponsMeele","WeaponsMeeleTwoHand","WeaponsRanged","Relics","Other"}
local FilterTable = { local FilterTable = {
["Armor"] = { {
"Cloth", --1 Name = AL["Primary Stats"],
"Leather", --2 Type = "Stat",
"Mail", --3 {"Strength", "ITEM_MOD_STRENGTH_SHORT"},
"Plate", --4 {"Agility", "ITEM_MOD_AGILITY_SHORT"},
}, {"Intellect", "ITEM_MOD_INTELLECT_SHORT"},
{"Spirit", "ITEM_MOD_SPIRIT_SHORT"}
["WeaponsMeele"] = { },
"Held in Off-Hand", --1 {
"Dagger", --2 Name = AL["Secondary Stats"],
"Mace", --3 Type = "Stat",
"Staff", --4 {"Attack Power", "ITEM_MOD_ATTACK_POWER_SHORT"},
"Axe", --5 {"Spell Power", "ITEM_MOD_SPELL_POWER_SHORT"},
"Polearm", --6 {"Crit", "ITEM_MOD_CRIT_RATING_SHORT"},
"Shield", --7 {"Hit", "ITEM_MOD_HIT_RATING_SHORT"},
"Sword", --8 {"Haste", "ITEM_MOD_HASTE_RATING_SHORT"},
"Fist Weapon", --9 {"Expertise", "ITEM_MOD_EXPERTISE_RATING_SHORT"},
}, {"Armor Pen", "ITEM_MOD_ARMOR_PENETRATION_RATING_SHORT"},
{"Spell Pen", "ITEM_MOD_SPELL_PENETRATION_SHORT"}
["WeaponsMeeleTwoHand"] = { },
"Mace", --1 {
"Axe", --2 Name = AL["Armor Type"],
"Sword", --3 Type = "ArmorType",
}, {"Cloth", "Cloth"},
{"Leather", "Leather"},
["WeaponsRanged"] = { {"Mail", "Mail"},
"Wand", --1 {"Plate", "Plate"},
"Bow", --2 },
"Crossbow", --3 {
"Gun", --4 Name = AL["Weapons"],
"Thrown", --5 Type = "InvType",
}, {"One-Hand", "INVTYPE_WEAPON"},
{"Two-Hand", "INVTYPE_2HWEAPON"},
["Relics"] = { {"Main Hand", "INVTYPE_WEAPONMAINHAND"},
"Idol", --1 {"Off Hand", "INVTYPE_WEAPONOFFHAND"},
"Totem", --2 {"Caster Off Hand", "INVTYPE_HOLDABLE"},
"Libram", --3 {"Ranged", "INVTYPE_RANGED"},
"Sigils", --4 {"Thrown", "INVTYPE_THROWN"},
}, {"Relic", "INVTYPE_RELIC"},
{"Shield", "INVTYPE_SHIELD"}
["Other"] = { },
"Ring", --1 {
"Trinket", --2 Name = AL["Accessories"],
"Neck", --3 Type = "InvType",
"Back", --4 {"Necklace", "INVTYPE_NECK"},
} {"Back", "INVTYPE_CLOAK"},
} {"Ring", "INVTYPE_FINGER"},
{"Trinket", "INVTYPE_TRINKET"}
local ClassHides = { },
["DRUID"] = {["Armor"] = {true,true,false,false},["WeaponsMeele"] = {true,true,true,true,false,true,false,false,false},["WeaponsMeeleTwoHand"] = {true,false,false},["WeaponsRanged"] = {false,false,false,false,false},["Relics"] = {true,false,false,false},["Other"] = {true,true,true,true}}, {
["MAGE"] = {["Armor"] = {true,false,false,false},["WeaponsMeele"] = {true,true,false,true,false,false,false,true,false},["WeaponsMeeleTwoHand"] = {false,false,false},["WeaponsRanged"] = {true,false,false,false,false},["Relics"] = {false,false,false,false},["Other"] = {true,true,true,true}}, Name = AL["Defensive Stats"],
["PALADIN"] = {["Armor"] = {true,true,true,true},["WeaponsMeele"] = {true,false,true,false,true,true,true,true,false},["WeaponsMeeleTwoHand"] = {true,false,true},["WeaponsRanged"] = {false,false,false,false,false},["Relics"] = {false,false,true,false},["Other"] = {true,true,true,true}}, Type = "Stat",
["PRIEST"] = {["Armor"] = {true,false,false,false},["WeaponsMeele"] = {true,true,true,true,false,false,false,false,false},["WeaponsMeeleTwoHand"] = {false,false,false},["WeaponsRanged"] = {true,false,false,false,false},["Relics"] = {false,false,false,false},["Other"] = {true,true,true,true}}, {"Defense", "ITEM_MOD_DEFENSE_SKILL_RATING_SHORT"},
["ROGUE"] = {["Armor"] = {true,true,false,false},["WeaponsMeele"] = {true,true,true,false,true,false,false,true,true},["WeaponsMeeleTwoHand"] = {false,false,false},["WeaponsRanged"] = {false,true,true,true,true},["Relics"] = {false,false,false,false},["Other"] = {true,true,true,true}}, {"Dodge", "ITEM_MOD_DODGE_RATING_SHORT"},
["HUNTER"] = {["Armor"] = {false,true,true,false},["WeaponsMeele"] = {false,true,false,true,true,true,false,true,true},["WeaponsMeeleTwoHand"] = {false,true,true},["WeaponsRanged"] = {false,true,true,true,false},["Relics"] = {false,false,false,false},["Other"] = {true,true,true,true}}, {"Parry", "ITEM_MOD_PARRY_RATING_SHORT"},
["SHAMAN"] = {["Armor"] = {true,true,true,false},["WeaponsMeele"] = {true,true,true,true,true,false,true,false,true},["WeaponsMeeleTwoHand"] = {true,true,false},["WeaponsRanged"] = {false,false,false,false,false},["Relics"] = {false,true,false,false},["Other"] = {true,true,true,true}}, {"Block", "ITEM_MOD_BLOCK_RATING_SHORT"},
["WARLOCK"] = {["Armor"] = {true,false,false,false},["WeaponsMeele"] = {true,true,false,true,false,false,false,true,false},["WeaponsMeeleTwoHand"] = {false,false,false},["WeaponsRanged"] = {true,false,false,false,false},["Relics"] = {false,false,false,false},["Other"] = {true,true,true,true}}, {"Block Value", "ITEM_MOD_BLOCK_VALUE_SHORT"},
["WARRIOR"] = {["Armor"] = {true,true,true,true},["WeaponsMeele"] = {true,true,true,true,true,true,true,true,true},["WeaponsMeeleTwoHand"] = {true,true,true},["WeaponsRanged"] = {false,true,true,true,true},["Relics"] = {false,false,false,false},["Other"] = {true,true,true,true}}, {"Resilience", "ITEM_MOD_RESILIENCE_RATING"}
["DEATHKNIGHT"] = {["Armor"] = {true,true,true,true},["WeaponsMeele"] = {true,false,true,false,true,true,false,true,false},["WeaponsMeeleTwoHand"] = {true,false,true},["WeaponsRanged"] = {false,false,false,false,false},["Relics"] = {false,false,false,true},["Other"] = {true,true,true,true}} },
} }
-- ********************************************************************** -- **********************************************************************
-- ItemFilter: -- ItemFilter:
-- AtlasLoot:HideNoUsableItems() -- AtlasLoot:HideFilteredItems()
-- AtlasLoot_FilterEnableButton() -- AtlasLoot_FilterEnableButton()
-- ********************************************************************** -- **********************************************************************
AtlasLootFilter = {};
AtlasLootFilter["FilterList"] = {};
AtlasLoot_Data["FilterList"] = { [1] = {}; }; function AtlasLoot:HideFilteredItems()
function AtlasLoot_Testabc()
print(BabbleInventory["Two-Hand"])
end
function AtlasLoot:HideNoUsableItems()
local dataID, dataSource, tablenum = AtlasLootItemsFrame.refreshFilter[1], _G[AtlasLootItemsFrame.refreshFilter[2]], AtlasLootItemsFrame.refreshFilter[3]; local dataID, dataSource, tablenum = AtlasLootItemsFrame.refreshFilter[1], _G[AtlasLootItemsFrame.refreshFilter[2]], AtlasLootItemsFrame.refreshFilter[3];
local tablebase = dataSource[dataID][tablenum] local tablebase = dataSource[dataID][tablenum]
if not tablebase or dataID == "WishList" or dataID == "SearchResult" then return end if not tablebase or dataID == "WishList" or dataID == "SearchResult" then return end
local itemCount = 0
local countAll = 1
local count = 0
local leatherworking = GetSpellInfo(2108)
AtlasLoot_Data["FilterList"] = { Type = dataSource[dataID].Type; Name = dataSource[dataID].Name; Back = dataSource[dataID].Back; Map = dataSource[dataID].Map; [tablenum] = {Name = dataSource[dataID][tablenum].Name}; }; AtlasLootFilter["FilterList"].Type = dataSource[dataID].Type;
AtlasLootFilter["FilterList"].Name = dataSource[dataID].Name;
AtlasLootFilter["FilterList"].Back = dataSource[dataID].Back;
AtlasLootFilter["FilterList"].Map = dataSource[dataID].Map;
AtlasLootFilter["FilterList"][tablenum] = {Name = dataSource[dataID][tablenum].Name};
for i=1,30 do local function getStats(itemID,sType)
local info = _G["AtlasLootItem_"..i.."_Extra"]:GetText() for i,v in pairs(AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter]) do
if _G["AtlasLootItem_"..i]:IsShown() then if type(v) == "table" then
local xgo = true if v[1] and v[3] == sType then
local countOld = count local ItemStats = {};
itemCount = itemCount + 1 GetItemStats(select(2,GetItemInfo(itemID)), ItemStats);
countAll = countAll + count if ItemStats[v[2]] then
count = 0 return true;
local xitemID = _G["AtlasLootItem_"..i].itemID
local xspellitemID = _G["AtlasLootItem_"..i].spellitemID
local xitemTexture = tablebase[itemCount][3]
local xitemExtraText = AtlasLoot_FixText(tablebase[itemCount][5])
local xitemExtraTextSave = xitemExtraText
-- remove the "-"
xitemExtraText = gsub(xitemExtraText, "-", "")
local xitemNameText = _G["AtlasLootItem_"..i.."_Name"]:GetText()
if xitemExtraText and xitemExtraText ~= "" then
for k = 1,#FilterSort do
k = FilterSort[k]
if type(FilterTable[k]) == "table" then
for i,j in pairs(FilterTable[k]) do
local Slotname = ""
-- Bugfix with Sigils
if j == "Sigils" then
Slotname = AL["Sigil"]
else
Slotname = BabbleInventory[j]
end
if (k ~= "WeaponsMeeleTwoHand" and not strfind(xitemExtraText, BabbleInventory["Two-Hand"]) and strfind(xitemExtraText, Slotname) and AtlasLootFilterDB[k][j] == false) then
xgo = false
-- German fix
if j == "Shield" and not strfind(xitemExtraText, BabbleInventory["Held in Off-Hand"]) and not strfind(xitemExtraText, BabbleInventory["Off Hand"]) then
xgo = false
elseif j == "Shield" and strfind(xitemExtraText, BabbleInventory["Held in Off-Hand"]) and AtlasLootFilterDB["WeaponsMeele"]["Held in Off-Hand"] == true then
xgo = true
end
elseif k == "WeaponsMeeleTwoHand" and strfind(xitemExtraText, BabbleInventory["Two-Hand"]) and strfind(xitemExtraText, Slotname) and AtlasLootFilterDB[k][j] == false then
xgo = false
-- Fix bug with Leatherworking Patterns
elseif strfind(xitemExtraText, leatherworking) then
xgo = true
end
end
end end
end end
end end
-- Sort the items
if xgo == true then
if i==16 and countOld > 0 then
AtlasLoot_Data["FilterList"][tablenum][16] = { 16, xitemID, xitemTexture, xitemNameText, xitemExtraTextSave}
countAll = 16
elseif i==16 and xitemExtraText and strfind(xitemExtraText, AL["Token"]) then
AtlasLoot_Data["FilterList"][tablenum][16] = { 16, xitemID, xitemTexture, xitemNameText, xitemExtraTextSave}
countAll = 16
elseif countAll < 16 and xitemNameText and strfind(xitemNameText, AL["Hard Mode"]) then
AtlasLoot_Data["FilterList"][tablenum][16] = { 16, xitemID, xitemTexture, xitemNameText, xitemExtraTextSave}
countAll = 16
elseif i==16 and xitemTexture == "INV_Box_01" then
AtlasLoot_Data["FilterList"][tablenum][16] = { 16, xitemID, xitemTexture, xitemNameText, xitemExtraTextSave}
countAll = 16
else
AtlasLoot_Data["FilterList"][tablenum][countAll] = { countAll, xitemID, xitemTexture, xitemNameText, xitemExtraTextSave}
end
if tablebase[itemCount][6] and countAll==16 then
AtlasLoot_Data["FilterList"][tablenum][16][6] = tablebase[itemCount][6]
elseif tablebase[itemCount][6] and countAll~=16 then
AtlasLoot_Data["FilterList"][tablenum][countAll][6] = tablebase[itemCount][6]
end
if tablebase[itemCount][7] and countAll==16 then
AtlasLoot_Data["FilterList"][tablenum][16][7] = tablebase[itemCount][7]
elseif tablebase[itemCount][7] and countAll~=16 then
AtlasLoot_Data["FilterList"][tablenum][countAll][7] = tablebase[itemCount][7]
end
if tablebase[itemCount][8] and countAll==16 then
AtlasLoot_Data["FilterList"][tablenum][16][8] = tablebase[itemCount][8]
elseif tablebase[itemCount][8] and countAll~=16 then
AtlasLoot_Data["FilterList"][tablenum][countAll][8] = tablebase[itemCount][8]
end
countAll = countAll + 1
count = 0
end
else
count = count + 1
end end
end end
AtlasLoot:ShowItemsFrame("FilterList", "AtlasLoot_Data", AtlasLootItemsFrame.refresh[3]) local count = 0
local function getFilterType(itemID)
local filterSelect3, filterSelect2,_ , filterSelect1 = select(6,GetItemInfo(itemID));
local filter1 = AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter][filterSelect1];
local filter2 = AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter][filterSelect2];
if filter1 and filter1[1] and filter1[3] == "InvType" and getStats(itemID,"Stat") or
filter2 and filter2[1] and filter2[3] == "ArmorType" and getStats(itemID,"Stat")
then
return true;
else
for _,v in pairs(FilterTable) do
for _,t in ipairs(v) do
if t[2] == filterSelect1 or t[2] == filterSelect2 or t[2] == filterSelect3 then
return false;
end
end
end
return true;
end
end
for i,v in ipairs(tablebase) do
if getFilterType(v[2]) or v[2] == 0 then
if v[1] == 16 then
count = 0;
end
table.insert(AtlasLootFilter["FilterList"][tablenum],{v[1] - count,v[2],v[3],v[4],v[5],v[6],v[7],v[8]});
elseif v[1] == 16 then
count = 1
else
count = count + 1;
end
end
AtlasLoot:ShowItemsFrame("FilterList", "AtlasLootFilter", AtlasLootItemsFrame.refresh[3])
end end
function AtlasLoot_FilterEnableButton() function AtlasLoot_FilterEnableButton(self, btnclick)
if ATLASLOOT_FILTER_ENABLE == true then if btnclick == "RightButton" then
ATLASLOOT_FILTER_ENABLE = false; if AtlasLoot_FilterMenu:IsOpen() then
AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refreshFilter[1], AtlasLootItemsFrame.refreshFilter[2], AtlasLootItemsFrame.refreshFilter[3]); AtlasLoot_FilterMenu:Close();
else
AtlasLoot_FilterMenu:Unregister(AtlasLootFilterCheck);
AtlasLoot:FilterMenuRegister();
AtlasLoot_FilterMenu:Open(self);
end
if AtlasLootFilterCheck:GetChecked() then
AtlasLootFilterCheck:SetChecked(false);
else
AtlasLootFilterCheck:SetChecked(true);
end
else else
ATLASLOOT_FILTER_ENABLE = true if ATLASLOOT_FILTER_ENABLE then
AtlasLoot:HideNoUsableItems(); ATLASLOOT_FILTER_ENABLE = false;
AtlasLoot:ShowItemsFrame(AtlasLootItemsFrame.refreshFilter[1], AtlasLootItemsFrame.refreshFilter[2], AtlasLootItemsFrame.refreshFilter[3]);
else
ATLASLOOT_FILTER_ENABLE = true
AtlasLoot:HideFilteredItems();
end
end end
end end
--[[
AtlasLoot:FilterMenuRegister:
Constructs the Filter menu.
]]
function AtlasLoot:FilterMenuRegister()
AtlasLoot_FilterMenu:Register(AtlasLootFilterCheck,
'point', function(parent)
return "TOP", "BOTTOM"
end,
'children', function(level, value)
for i,v in ipairs(AtlasLootFilterDB["FilterLists"]) do
local setFilter = false;
if AtlasLootFilterDB.SelectedFilter == i then setFilter = true end
AtlasLoot_FilterMenu:AddLine(
"text", v.Name,
"func", function() AtlasLootFilterDB.SelectedFilter = i end,
"checked", setFilter
);
end
AtlasLoot_FilterMenu:AddLine(
"text", AL["Add Filter Set"],
"func", function() AtlasLoot:OpenFilterCreate() end,
"notCheckable", true
);
--Close button
AtlasLoot_FilterMenu:AddLine(
'text', AL["Close Menu"],
'textR', 0,
'textG', 1,
'textB', 1,
'func', function() AtlasLoot_FilterMenu:Close() end,
'notCheckable', true
);
end,
'dontHook', true
)
end
--Sets all the filter check boxs for current filter
local function setFilterChecks()
local filterList = AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter];
local count = 1;
for i,v in ipairs(FilterTable) do
count = count + 1;
for n,t in ipairs(v) do
if filterList[t[2]] and filterList[t[2]][1] then
_G["AtlasLootFilterButton_"..count]:SetChecked(true);
else
_G["AtlasLootFilterButton_"..count]:SetChecked(false);
end
count = count + 1;
end
end
end
local function setFilter(arg1,type)
if AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter][arg1] and AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter][arg1][1] then
AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter][arg1] = {false,arg1,type};
else
AtlasLootFilterDB["FilterLists"][AtlasLootFilterDB.SelectedFilter][arg1] = {true,arg1,type};
end
end
function AtlasLoot:HideFilterCreateButtons()
if not ATLASLOOT_BUILD_FILTER_LIST then return end
for i=1, 41 do
_G["AtlasLootFilterButton_"..i]:Hide();
end
AtlasLootFilterSelect:Hide();
AtlasLootFilterCreate:Hide();
end
-- ********************************************************************** -- **********************************************************************
-- Options: -- Options:
-- AtlasLoot:HideNoUsableItems() -- AtlasLoot:HideFilteredItems()
-- <local> CreateCheckButton(parrent, text, num)
-- AtlasLoote_CreateFilterOptions()
-- ********************************************************************** -- **********************************************************************
local ypos = -40 ATLASLOOT_BUILD_FILTER_LIST = false;
local xpos = 0 -- Place to add new or edit existing filter lists
local linecount = 1 function AtlasLoot:OpenFilterCreate()
local lastframewidht,lastframeheight = 0,0 if not ATLASLOOT_BUILD_FILTER_LIST then
ATLASLOOT_BUILD_FILTER_LIST = true;
local function CreateCheckButton(parrent, text, num) local count = 1;
local framewidht = InterfaceOptionsFramePanelContainer:GetWidth() for i,v in ipairs(FilterTable) do
local Check = CreateFrame("CheckButton", "AtlasLootOptionsCheck"..text..num, parrent, "OptionsCheckButtonTemplate") local filterCatLable = AtlasLootItemsFrame:CreateFontString("AtlasLootFilterButton_"..count,"OVERLAY","GameFontNormal");
Check:SetPoint("LEFT", parrent, "TOPLEFT", xpos, ypos) filterCatLable:SetText(v.Name);
Check:SetWidth(25) filterCatLable:Show();
Check:SetHeight(25) if count == 1 then
Check:SetScript("OnShow", function() filterCatLable:SetPoint("TOP", "AtlasLootItemsFrame", "TOP",-150,-90);
_G[this:GetName().."Text"]:SetText(BabbleInventory[text]); elseif count == 15 then
if AtlasLootFilterDB[num][text] then filterCatLable:SetPoint("TOP", "AtlasLootItemsFrame", "TOP",0,-90);
this:SetChecked(1); elseif count == 30 then
filterCatLable:SetPoint("TOP", "AtlasLootItemsFrame", "TOP",150,-90);
else else
this:SetChecked(nil); filterCatLable:SetPoint("LEFT", "AtlasLootFilterButton_"..(count - 1), "LEFT",0,-25);
end end
end) count = count + 1;
Check:SetScript("OnClick", function() for n,t in ipairs(v) do
if AtlasLootFilterDB[num][text] then local button = CreateFrame("CheckButton", "AtlasLootFilterButton_"..count, AtlasLootItemsFrame, "OptionsCheckButtonTemplate");
AtlasLootFilterDB[num][text] = false; _G["AtlasLootFilterButton_"..count.."Text"]:SetText(t[1]);
else button:SetScript("OnClick", function() setFilter(t[2],v.Type) end)
AtlasLootFilterDB[num][text] = true; if n == 1 then
end button:SetPoint("LEFT", "AtlasLootFilterButton_"..(count - 1), "LEFT",0,-25);
end) else
button:SetPoint("LEFT", "AtlasLootFilterButton_"..(count - 1), "LEFT",0,-20);
if xpos == framewidht/2 then end
xpos = 0 count = count + 1;
ypos = ypos - 20 end
linecount = 1 end
elseif xpos == 0 then
xpos = framewidht/2 local filterSelectButton = CreateFrame("Button", "AtlasLootFilterSelect", AtlasLootItemsFrame, "UIDropDownMenuTemplate");
linecount = 2 filterSelectButton:SetSize(130,24);
filterSelectButton:SetPoint("Top", "AtlasLootItemsFrame", "TOP",-110,-35);
local createFilterButton = CreateFrame("Button", "AtlasLootFilterCreate", AtlasLootItemsFrame, "OptionsButtonTemplate");
createFilterButton:SetSize(130,20);
createFilterButton:SetPoint("LEFT", "AtlasLootItemsFrame_BACK", "LEFT",-150,0);
createFilterButton:SetText(AL["Add New Filter"]);
createFilterButton:SetScript("OnClick", function(self) StaticPopup_Show("ATLASLOOT_ADD_FILTER_LIST") end);
end
UIDropDownMenu_Initialize(AtlasLootFilterSelect, AtlasLoot.FilterSelectorMenuInitialize);
UIDropDownMenu_SetSelectedID(AtlasLootFilterSelect, AtlasLootFilterDB.SelectedFilter);
setFilterChecks();
for i=1,41 do
_G["AtlasLootFilterButton_"..i]:Show();
end
AtlasLootFilterSelect:Show();
AtlasLootFilterCreate:Show();
--Ditch the Quicklook selector
AtlasLootQuickLooksButton:Hide();
-- Hide the Filter Check-Box
AtlasLootFilterCheck:Hide();
--Hide navigation buttons by default, only show what we need
_G["AtlasLootItemsFrame_BACK"]:Show();
_G["AtlasLootItemsFrame_NEXT"]:Hide();
_G["AtlasLootItemsFrame_PREV"]:Hide();
--Hide UI objects so that only needed ones are shown
for i = 1, 30, 1 do
_G["AtlasLootItem_"..i.."_Unsafe"]:Hide();
_G["AtlasLootItem_"..i]:Hide();
_G["AtlasLootItem_"..i].itemID = 0;
_G["AtlasLootItem_"..i].spellitemID = 0;
end
--Set Page Title
AtlasLoot_BossName:SetText("Create Filter Set");
AtlasLoot_FilterMenu:Close();
end
local function FilterSelectOnClick()
AtlasLootFilterDB.SelectedFilter = this:GetID();
UIDropDownMenu_SetSelectedID(AtlasLootFilterSelect, AtlasLootFilterDB.SelectedFilter);
setFilterChecks();
end
function AtlasLoot:FilterSelectorMenuInitialize()
for i,v in ipairs(AtlasLootFilterDB["FilterLists"]) do
local info = {
text = v.Name;
func = FilterSelectOnClick;
};
UIDropDownMenu_AddButton(info);
end end
end end
local function CreateCat(parrent, text) --[[
if not AtlasLootFilterDB[text] then AtlasLootFilterDB[text] = {} end StaticPopupDialogs["ATLASLOOT_ADD_FILTER_LIST"]
if linecount == 2 then This is shown, if you want too add a CustomHeader to a wishlist
ypos = ypos - 10 ]]
else StaticPopupDialogs["ATLASLOOT_ADD_FILTER_LIST"] = {
ypos = ypos + 10 text = "Filter Name",
end button1 = "Add Filter",
local Text = parrent:CreateFontString("AtlasLoot"..text,"OVERLAY","GameFontNormal") button2 = AL["Cancel"],
Text:SetPoint("TOPLEFT", parrent, "TOPLEFT", xpos, ypos) OnShow = function(self)
Text:SetText(FilterTableNames[text]); self:SetFrameStrata("TOOLTIP");
Text:SetHeight(20) end,
Text:SetTextColor(1.0, 1.0, 1.0, 1.0); OnAccept = function()
local text = _G[this:GetParent():GetName().."EditBox"]:GetText();
ypos = ypos - 30 currentFilter.Name = text;
table.insert(AtlasLootFilterDB["FilterLists"],currentFilter);
for i,j in pairs(FilterTable[text]) do end,
if AtlasLootFilterDB[text][j] ~= true and AtlasLootFilterDB[text][j] ~= false then AtlasLootFilterDB[text][j] = true end hasEditBox = 1,
CreateCheckButton(parrent, j, text) timeout = 0,
end whileDead = 1,
hideOnEscape = 1
xpos = 0 };
ypos = ypos - 10
end
function AtlasLoot_CreateFilterOptions()
if OptionsLoadet then return end
local FilterOptionsFrame = CreateFrame("FRAME", nil)
FilterOptionsFrame.name = AL["Filter"];
FilterOptionsFrame.parent = AL["AtlasLoot"];
local framewidht = InterfaceOptionsFramePanelContainer:GetWidth()
local panel3 = CreateFrame("ScrollFrame", "AtlasLootFilterOptionsScrollFrame", FilterOptionsFrame, "UIPanelScrollFrameTemplate")
local scc = CreateFrame("Frame", "AtlasLootFilterOptionsScrollInhalt", panel3)
panel3:SetScrollChild(scc)
panel3:SetPoint("TOPLEFT", FilterOptionsFrame, "TOPLEFT", 10, -10)
scc:SetPoint("TOPLEFT", panel3, "TOPLEFT", 0, 0)
panel3:SetWidth(framewidht-45)
panel3:SetHeight(410)
scc:SetWidth(framewidht-45)
scc:SetHeight(410)
panel3:SetHorizontalScroll(-50)
panel3:SetVerticalScroll(50)
panel3:SetBackdrop({bgFile="Interface\\DialogFrame\\UI-DialogBox-Background", edgeFile="", tile = false, tileSize = 0, edgeSize = 0, insets = { left = 0, right = 0, top = 0, bottom = 0 }})
panel3:SetScript("OnVerticalScroll", function() end)
panel3:EnableMouse(true)
panel3:SetVerticalScroll(0)
panel3:SetHorizontalScroll(0)
panel3:SetScript("OnUpdate", function()
local xframewidht = InterfaceOptionsFramePanelContainer:GetWidth()
local xframeheight = InterfaceOptionsFramePanelContainer:GetHeight()
if xframewidht ~= lastframewidht or xframeheight ~= lastframeheight then
panel3:SetWidth(xframewidht-45)
scc:SetWidth(xframewidht-45)
panel3:SetHeight(xframeheight-20)
scc:SetHeight(xframeheight-20)
end
end)
local FilterDisableButton = CreateFrame("BUTTON", nil, scc, "UIPanelButtonTemplate")
FilterDisableButton:SetHeight(20)
FilterDisableButton:SetWidth(150)
FilterDisableButton:SetPoint("TOPLEFT", scc, "TOPLEFT",0,-5)
FilterDisableButton:SetText(AL["Select All Loot"])
FilterDisableButton:SetWidth(FilterDisableButton:GetTextWidth()+20)
FilterDisableButton:SetScript("OnClick", function()
for k,v in pairs(FilterTable) do
if type(v) == "table" then
for i,j in pairs(FilterTable[k]) do
AtlasLootFilterDB[k][j] = true
end
end
end
scc:Hide()
scc:Show()
end)
local locClass,playerClass = UnitClass("player");
local ClassFilterLoadButton = CreateFrame("BUTTON", nil, scc, "UIPanelButtonTemplate")
ClassFilterLoadButton:SetHeight(20)
ClassFilterLoadButton:SetWidth(150)
ClassFilterLoadButton:SetPoint("TOPRIGHT", scc, "TOPRIGHT",0,-5)
ClassFilterLoadButton:SetText(AL["Apply Filter:"].." "..locClass)
ClassFilterLoadButton:SetWidth(ClassFilterLoadButton:GetTextWidth()+20)
ClassFilterLoadButton:SetScript("OnClick", function()
for k,v in pairs(FilterTable) do
if type(v) == "table" then
for i,j in pairs(FilterTable[k]) do
if ClassHides[playerClass][k][i] == false then
AtlasLootFilterDB[k][j] = false
else
AtlasLootFilterDB[k][j] = true
end
end
end
end
scc:Hide()
scc:Show()
end)
CreateCat(scc, "Armor")
CreateCat(scc, "WeaponsMeele")
CreateCat(scc, "WeaponsMeeleTwoHand")
CreateCat(scc, "WeaponsRanged")
CreateCat(scc, "Relics")
CreateCat(scc, "Other")
InterfaceOptions_AddCategory(FilterOptionsFrame)
OptionsLoadet = true
end
AtlasLoot/Core/LootButtons.lua
+3 -3
View File
@@ -154,7 +154,7 @@ function AtlasLootItem_OnEnter(self)
if((AtlasLoot.db.profile.EquipCompare and ((not EquipCompare_RegisterTooltip) or (not EquipCompare_Enabled)))) or IsShiftKeyDown() then if((AtlasLoot.db.profile.EquipCompare and ((not EquipCompare_RegisterTooltip) or (not EquipCompare_Enabled)))) or IsShiftKeyDown() then
AtlasLootItem_ShowCompareItem(self); --- CALL MISSING METHOD TO SHOW 2 TOOLTIPS (Item Compare) AtlasLootItem_ShowCompareItem(self); --- CALL MISSING METHOD TO SHOW 2 TOOLTIPS (Item Compare)
end end
else --[[ else
AtlasLootTooltip:SetOwner(self, "ANCHOR_RIGHT", -(self:GetWidth() / 2), 24); AtlasLootTooltip:SetOwner(self, "ANCHOR_RIGHT", -(self:GetWidth() / 2), 24);
AtlasLootTooltip:ClearLines(); AtlasLootTooltip:ClearLines();
AtlasLootTooltip:AddLine(RED..AL["Item Unavailable"], nil, nil, nil, 1); AtlasLootTooltip:AddLine(RED..AL["Item Unavailable"], nil, nil, nil, 1);
@@ -162,7 +162,7 @@ function AtlasLootItem_OnEnter(self)
AtlasLootTooltip:AddLine(AL["self item is unsafe. To view self item without the risk of disconnection, you need to have first seen it in the game world. This is a restriction enforced by Blizzard since Patch 1.10."], nil, nil, nil, 1); AtlasLootTooltip:AddLine(AL["self item is unsafe. To view self item without the risk of disconnection, you need to have first seen it in the game world. This is a restriction enforced by Blizzard since Patch 1.10."], nil, nil, nil, 1);
AtlasLootTooltip:AddLine(" "); AtlasLootTooltip:AddLine(" ");
AtlasLootTooltip:AddLine(AL["You can right-click to attempt to query the server. You may be disconnected."], nil, nil, nil, 1); AtlasLootTooltip:AddLine(AL["You can right-click to attempt to query the server. You may be disconnected."], nil, nil, nil, 1);
AtlasLootTooltip:Show(); AtlasLootTooltip:Show(); ]]
end end
end end
end end
@@ -224,7 +224,7 @@ function AtlasLootItem_OnClick(self ,arg1)
if arg1=="RightButton" and ATLASLOOT_ITEM_UNLOCK then if arg1=="RightButton" and ATLASLOOT_ITEM_UNLOCK then
AtlasLoot:MoveWishlistItem("Down",self.number); AtlasLoot:MoveWishlistItem("Down",self.number);
elseif IsAltKeyDown() and arg1=="LeftButton" and ATLASLOOT_ITEM_UNLOCK then elseif IsAltKeyDown() and arg1=="LeftButton" and ATLASLOOT_ITEM_UNLOCK then
StaticPopup_Show ("ATLASLOOT_ADD_CUSTOMHEADER"); StaticPopup_Show("ATLASLOOT_ADD_CUSTOMHEADER");
StaticPopupDialogs.ATLASLOOT_ADD_CUSTOMHEADER.num = self.number; StaticPopupDialogs.ATLASLOOT_ADD_CUSTOMHEADER.num = self.number;
elseif (arg1=="LeftButton") and ATLASLOOT_ITEM_UNLOCK then elseif (arg1=="LeftButton") and ATLASLOOT_ITEM_UNLOCK then
AtlasLoot:MoveWishlistItem("Up",self.number); AtlasLoot:MoveWishlistItem("Up",self.number);
AtlasLoot/Core/Options.lua
+1 -29
View File
@@ -235,8 +235,6 @@ function AtlasLoot_OptionsOnShow()
UIDropDownMenu_SetWidth(AtlasLoot_SelectLootBrowserStyle, 150); UIDropDownMenu_SetWidth(AtlasLoot_SelectLootBrowserStyle, 150);
end end
function AtlasLoot_SelectLootBrowserStyle_OnClick() function AtlasLoot_SelectLootBrowserStyle_OnClick()
local thisID = this:GetID(); local thisID = this:GetID();
UIDropDownMenu_SetSelectedID(AtlasLoot_SelectLootBrowserStyle, thisID); UIDropDownMenu_SetSelectedID(AtlasLoot_SelectLootBrowserStyle, thisID);
@@ -249,32 +247,6 @@ function AtlasLoot_SelectLootBrowserStyle_OnClick()
AtlasLoot_OptionsOnShow(); AtlasLoot_OptionsOnShow();
end end
local Authors = {
["Calî"] = "Arthas",
["Lâg"] = "Arthas",
--["Daviesh"] = "Thaurissan",
["Hegarol"] = "Dun Morogh",
}
function AtlasLoot_UnitTarget()
local name = GameTooltip:GetUnit()
if UnitName("mouseover") == name then
local _, realm = UnitName("mouseover")
if not realm then
realm = GetRealmName()
end;
if name and Authors[name] then
if Authors[name] == realm then
GameTooltip:AddLine("AtlasLoot Author |TInterface\\AddOns\\AtlasLoot\\Images\\gold:0|t", 0, 1, 0 )
end
end
end
end
GameTooltip:HookScript("OnTooltipSetUnit", AtlasLoot_UnitTarget)
local helpframe = CreateFrame("Frame", "AtlasLootHelpFrame") local helpframe = CreateFrame("Frame", "AtlasLootHelpFrame")
helpframe:SetSize(425,450); helpframe:SetSize(425,450);
helpframe:Hide(); helpframe:Hide();
@@ -403,7 +375,7 @@ local fooshow = CreateFrame("Button", "AtlasLootOptionsFrame_FuBarShow", AtlasLo
end end
end); end);
local foohide = CreateFrame("Button", "AtlasLootOptionsFrame_FuBarShow", AtlasLootOptionsFrame, "OptionsButtonTemplate"); local foohide = CreateFrame("Button", "AtlasLootOptionsFrame_FuBarHide", AtlasLootOptionsFrame, "OptionsButtonTemplate");
foohide:SetSize(150,25); foohide:SetSize(150,25);
foohide:SetText(AL["Hide FuBar Plugin"]); foohide:SetText(AL["Hide FuBar Plugin"]);
foohide:SetPoint("TOP", "AtlasLootOptionsFrame", "TOP", 85, -390); foohide:SetPoint("TOP", "AtlasLootOptionsFrame", "TOP", 85, -390);
AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua
+8 -11
View File
@@ -52,7 +52,7 @@ local lootbground = CreateFrame("Frame", "AtlasLootDefaultFrame_LootBackground",
lootbground:SetBackdropColor(0,0,0.5,0.5); lootbground:SetBackdropColor(0,0,0.5,0.5);
lootbground:EnableMouse(); lootbground:EnableMouse();
lootbground:SetScript("OnMouseDown",function(self, button) lootbground:SetScript("OnMouseDown",function(self, button)
if _G[AtlasLootItemsFrame.refresh[2]][AtlasLootItemsFrame.refresh[1]].Back and button == "RightButton" then if _G["AtlasLootItemsFrame_BACK"]:IsVisible() and button == "RightButton" then
AtlasLoot:BackButton_OnClick(); AtlasLoot:BackButton_OnClick();
elseif AtlasLootDefaultFrame_AdvancedSearchPanel:IsVisible() and button == "RightButton" then elseif AtlasLootDefaultFrame_AdvancedSearchPanel:IsVisible() and button == "RightButton" then
AtlasLoot_AdvancedSearchClose(); AtlasLoot_AdvancedSearchClose();
@@ -88,7 +88,7 @@ local itemframe = CreateFrame("Frame", "AtlasLootItemsFrame", AtlasLootDefaultFr
end end
end); end);
local function createLootItemButtons(num) for num = 1, 30 do
local button = CreateFrame("Button","AtlasLootItem_"..num, AtlasLootItemsFrame); local button = CreateFrame("Button","AtlasLootItem_"..num, AtlasLootItemsFrame);
button:SetID(num); button:SetID(num);
button:SetSize(236,28); button:SetSize(236,28);
@@ -123,10 +123,6 @@ local function createLootItemButtons(num)
end end
end end
for i = 1, 30 do
createLootItemButtons(i);
end
-- LootInfo -- LootInfo
local lootinfo = CreateFrame("Frame", "AtlasLootInfo") local lootinfo = CreateFrame("Frame", "AtlasLootInfo")
lootinfo:SetSize(128,75); lootinfo:SetSize(128,75);
@@ -238,7 +234,8 @@ local filterbtn = CreateFrame("CheckButton","AtlasLootFilterCheck",AtlasLootItem
filterbtn.Label = filterbtn:CreateFontString("AtlasLootFilterCheckText","OVERLAY","GameFontNormal"); filterbtn.Label = filterbtn:CreateFontString("AtlasLootFilterCheckText","OVERLAY","GameFontNormal");
filterbtn.Label:SetText(AL["Filter"]); filterbtn.Label:SetText(AL["Filter"]);
filterbtn.Label:SetPoint("RIGHT", AtlasLootFilterCheck, 30, 2); filterbtn.Label:SetPoint("RIGHT", AtlasLootFilterCheck, 30, 2);
filterbtn:SetScript("OnClick", function() AtlasLoot_FilterEnableButton() end); filterbtn:RegisterForClicks("LeftButtonDown","RightButtonDown");
filterbtn:SetScript("OnClick", function(self, btnclick) AtlasLoot_FilterEnableButton(self, btnclick) end);
-- Quick Looks Button -- Quick Looks Button
local looksbtn = CreateFrame("Button", "AtlasLootQuickLooksButton", AtlasLootItemsFrame); local looksbtn = CreateFrame("Button", "AtlasLootQuickLooksButton", AtlasLootItemsFrame);
@@ -561,9 +558,9 @@ end)
scrollFrame.scrollBar = scrollSlider scrollFrame.scrollBar = scrollSlider
local rows = setmetatable({}, { __index = function(t, i) local rows = setmetatable({}, { __index = function(t, i)
local row = CreateFrame("CheckButton", "$parentRow"..i, scrollFrame) local row = CreateFrame("CheckButton", "$parentRow"..i, Atlasloot_Difficulty_ScrollFrame)
row:SetSize(230, ROW_HEIGHT); row:SetSize(230, ROW_HEIGHT);
row:SetFrameStrata("Dialog"); --row:SetFrameStrata("Dialog");
row:SetNormalFontObject(GameFontHighlightLeft); row:SetNormalFontObject(GameFontHighlightLeft);
row:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD"); row:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD");
row:SetScript("OnClick", function() row:SetScript("OnClick", function()
@@ -655,9 +652,9 @@ local scrollSlider2 = CreateFrame("ScrollFrame","AtlasLootDefaultFrameSubTableSc
subtableFrame.scrollBar = scrollSlider2 subtableFrame.scrollBar = scrollSlider2
local rows2 = setmetatable({}, { __index = function(t, i) local rows2 = setmetatable({}, { __index = function(t, i)
local row = CreateFrame("CheckButton", "$parentRow"..i, subtableFrame) local row = CreateFrame("CheckButton", "$parentRow"..i, Atlasloot_SubTableFrame)
row:SetSize(230, ROW_HEIGHT); row:SetSize(230, ROW_HEIGHT);
row:SetFrameStrata("Dialog"); --row:SetFrameStrata("Dialog");
row:SetNormalFontObject(GameFontHighlightLeft); row:SetNormalFontObject(GameFontHighlightLeft);
row:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD"); row:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD");
row.Text = row:CreateFontString("$parentRow"..i.."Text","OVERLAY","GameFontNormal"); row.Text = row:CreateFontString("$parentRow"..i.."Text","OVERLAY","GameFontNormal");
AtlasLoot/Locales/constants.en.lua
+15
View File
@@ -300,6 +300,7 @@ if AL then
AL["Add Wishlist"] = true; AL["Add Wishlist"] = true;
AL["Edit Wishlist"] = true; AL["Edit Wishlist"] = true;
AL["Sort Wishlist"] = true; AL["Sort Wishlist"] = true;
AL["Add Filter Set"] = true;
AL["Auto Sort WishLists"] = true; AL["Auto Sort WishLists"] = true;
AL["Copy Wishlist To Own"] = true; AL["Copy Wishlist To Own"] = true;
AL["Make Wishlist Default"] = true; AL["Make Wishlist Default"] = true;
@@ -326,6 +327,7 @@ if AL then
AL["Please set a default Wishlist."] = true; AL["Please set a default Wishlist."] = true;
AL["Set as default Wishlist"] = true; AL["Set as default Wishlist"] = true;
AL["Please Create a Wishlist First."] = true; AL["Please Create a Wishlist First."] = true;
AL["Add New Filter"] = true;
-- Misc Inventory related words -- Misc Inventory related words
AL["Enchant"] = true; AL["Enchant"] = true;
@@ -385,6 +387,19 @@ if AL then
AL["Quivers and Ammo Pouches"] = true; AL["Quivers and Ammo Pouches"] = true;
AL["Drums, Bags and Misc."] = true; AL["Drums, Bags and Misc."] = true;
--Stats etc
AL["Accessories"] = true;
AL["Weapons"] = true;
AL["Armor Type"] = true;
AL["Relics"] = true;
AL["Weapons One-Handers"] = true;
AL["Weapons Two-Handers"] = true;
AL["Ranged Weapons"] = true;
AL["Primary Stats"] = true;
AL["Secondary Stats"] = true;
AL["Defensive Stats"] = true;
AL["Resistances"] = true;
-- Tailoring -- Tailoring
AL["Cloth Armor"] = true; AL["Cloth Armor"] = true;
AL["Shirts"] = true; AL["Shirts"] = true;