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

fixed filter list not working

Browse Source
This commit is contained in:
Anch
2022-08-06 21:30:13 +12:00
parent 4dd0bab62b
commit 6f65167ab2
7 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AtlasLoot/Core/AtlasLoot.lua
+13 -12
View File
@@ -174,7 +174,7 @@ function AtlasLoot_OnVariablesLoaded()
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..."];
{Name = AL["Select a Loot Table..."]}; {Name = ""};
}; };
end end
@@ -506,10 +506,8 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum)
AtlasLoot:ScrollFrameUpdate(); AtlasLoot:ScrollFrameUpdate();
AtlasLoot_BossName:SetText(dataSource[dataID][tablenum].Name); AtlasLoot_BossName:SetText(dataSource[dataID][tablenum].Name);
--For stopping the subtable from changing if its a token table --For stopping the subtable from changing if its a token table
if dataSource[dataID].NoSubt == nil then if dataSource[dataID].NoSubt == nil and dataID ~= "FilterList" then
AtlasLootDefaultFrame_SubMenu:SetText(dataSource[dataID].Name); AtlasLootDefaultFrame_SubMenu:SetText(dataSource[dataID].Name);
AtlasLoot:SubTableScrollFrameUpdate(dataID, dataSource, pFrame, tablenum); AtlasLoot:SubTableScrollFrameUpdate(dataID, dataSource, pFrame, tablenum);
end end
@@ -749,18 +747,21 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum)
getglobal("AtlasLootItemsFrame_BACK"):Hide(); getglobal("AtlasLootItemsFrame_BACK"):Hide();
getglobal("AtlasLootItemsFrame_NEXT"):Hide(); getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide(); getglobal("AtlasLootItemsFrame_PREV"):Hide();
local tablebase = {dataID, dataSource};
if tablenum ~= #dataSource[dataID] then if dataID == "FilterList" then
tablebase = {AtlasLootItemsFrame.refreshOri[1],AtlasLootItemsFrame.refreshOri[2]};
tablenum = AtlasLootItemsFrame.refreshOri[5];
end
if tablenum ~= #tablebase[2][tablebase[1]] then
getglobal("AtlasLootItemsFrame_NEXT"):Show(); getglobal("AtlasLootItemsFrame_NEXT"):Show();
if dataID ~= "FilterList" then
getglobal("AtlasLootItemsFrame_NEXT").tablenum = tablenum + 1; getglobal("AtlasLootItemsFrame_NEXT").tablenum = tablenum + 1;
end getglobal("AtlasLootItemsFrame_NEXT").tablebase = tablebase;
end end
if tablenum ~= 1 then if tablenum ~= 1 then
getglobal("AtlasLootItemsFrame_PREV"):Show(); getglobal("AtlasLootItemsFrame_PREV"):Show();
if dataID ~= "FilterList" then
getglobal("AtlasLootItemsFrame_PREV").tablenum = tablenum - 1; getglobal("AtlasLootItemsFrame_PREV").tablenum = tablenum - 1;
end getglobal("AtlasLootItemsFrame_PREV").tablebase = tablebase;
end end
if dataSource[dataID].Back then if dataSource[dataID].Back then
getglobal("AtlasLootItemsFrame_BACK"):Show(); getglobal("AtlasLootItemsFrame_BACK"):Show();
@@ -804,8 +805,8 @@ AtlasLoot_NavButton_OnClick:
Called when <-, -> are pressed and calls up the appropriate loot page Called when <-, -> are pressed and calls up the appropriate loot page
]] ]]
function AtlasLoot_NavButton_OnClick(self) function AtlasLoot_NavButton_OnClick(self)
local tablenum = self.tablenum; local tablenum, dataID, dataSource = self.tablenum, self.tablebase[1], self.tablebase[2];
AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4], tablenum); AtlasLoot_ShowItemsFrame(dataID, dataSource, AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4], tablenum);
end end
--[[ --[[
AtlasLoot/Core/SearchAdvanced.lua
+1 -1
View File
@@ -236,7 +236,7 @@ function AtlasLoot_AdvancedSearchShow()
ATLASLOOT_CURRENTTYPE = "Search"; ATLASLOOT_CURRENTTYPE = "Search";
AtlasLoot:ScrollFrameUpdate(); AtlasLoot:ScrollFrameUpdate();
AtlasLoot:SubTableScrollFrameUpdate("", "", "", ""); AtlasLoot:SubTableScrollFrameUpdate("EmptyTable", AtlasLoot_Data, pFrame);
end end
function AtlasLoot_AdvancedSearchClose() function AtlasLoot_AdvancedSearchClose()
AtlasLoot/Core/TextParsing.lua
+1 -1
View File
@@ -699,7 +699,7 @@ function AtlasLoot_FixText(text)
text = gsub(text, "#aq40s8#", AL["Doomcaller's Attire"]); text = gsub(text, "#aq40s8#", AL["Doomcaller's Attire"]);
text = gsub(text, "#aq40s9#", AL["Conqueror's Battlegear"]); text = gsub(text, "#aq40s9#", AL["Conqueror's Battlegear"]);
-- Teir Tokens -- Tier Tokens
text = gsub(text, "#tt1#", AL["Tier 1 Set Token (Click)"]); text = gsub(text, "#tt1#", AL["Tier 1 Set Token (Click)"]);
text = gsub(text, "#tt2#", AL["Tier 2 Set Token (Click)"]); text = gsub(text, "#tt2#", AL["Tier 2 Set Token (Click)"]);
text = gsub(text, "#tt2.5#", AL["Tier 2.5 Set Token (Click)"]); text = gsub(text, "#tt2.5#", AL["Tier 2.5 Set Token (Click)"]);
AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua
+1 -9
View File
@@ -378,8 +378,6 @@ local subtableFrame = CreateFrame("Frame", "Atlasloot_SubTableFrame", AtlasLootD
}); });
function AtlasLoot:SubTableScrollFrameUpdate(tablename, dataSource, pFrame, currenttablenum) function AtlasLoot:SubTableScrollFrameUpdate(tablename, dataSource, pFrame, currenttablenum)
if dataSource ~= nil then
if(string.find(tablename, "SearchResult")) then tablename = "SearchResult"; end
local maxValue = #dataSource[tablename]; local maxValue = #dataSource[tablename];
subtableFrame.tablename = tablename; subtableFrame.tablename = tablename;
FauxScrollFrame_Update(subtableFrame.scrollBar, maxValue, MAX_ROWS2, ROW_HEIGHT); FauxScrollFrame_Update(subtableFrame.scrollBar, maxValue, MAX_ROWS2, ROW_HEIGHT);
@@ -402,13 +400,11 @@ function AtlasLoot:SubTableScrollFrameUpdate(tablename, dataSource, pFrame, curr
row:SetChecked(true); row:SetChecked(true);
end end
end end
row:Show(); row:Show();
else else
subtableFrame.rows[i]:Hide() subtableFrame.rows[i]:Hide()
end end
end end
end
end end
local scrollSlider2 = CreateFrame("ScrollFrame","AtlasLootDefaultFrameSubTableScroll",Atlasloot_SubTableFrame,"FauxScrollFrameTemplate"); local scrollSlider2 = CreateFrame("ScrollFrame","AtlasLootDefaultFrameSubTableScroll",Atlasloot_SubTableFrame,"FauxScrollFrameTemplate");
@@ -416,11 +412,7 @@ local scrollSlider2 = CreateFrame("ScrollFrame","AtlasLootDefaultFrameSubTableSc
scrollSlider2:SetPoint("BOTTOMRIGHT", -30, 8) scrollSlider2:SetPoint("BOTTOMRIGHT", -30, 8)
scrollSlider2:SetScript("OnVerticalScroll", function(self, offset) scrollSlider2:SetScript("OnVerticalScroll", function(self, offset)
self.offset = math.floor(offset / ROW_HEIGHT + 0.5) self.offset = math.floor(offset / ROW_HEIGHT + 0.5)
AtlasLoot:SubTableScrollFrameUpdate(); AtlasLoot:SubTableScrollFrameUpdate(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[4], AtlasLootItemsFrame.refresh[5]);
end)
scrollSlider2:SetScript("OnShow", function()
AtlasLoot:SubTableScrollFrameUpdate();
end) end)
subtableFrame.scrollBar = scrollSlider2 subtableFrame.scrollBar = scrollSlider2
AtlasLoot/Menus/SetMenus.lua
+1 -1
View File
@@ -30,7 +30,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
{ AL["Badge of Justice Rewards"], "BadgeShatt", "Header"}; { AL["Badge of Justice Rewards"], "BadgeShatt", "Header"};
{ "", "BadgeShatt"}; { "", "BadgeShatt"};
{ "", "BadgeSunwell"}; { "", "BadgeSunwell"};
{ "Teir Sets", "T4", "Header"}; { "Tier Sets", "T4", "Header"};
{ "", "T4"}; { "", "T4"};
{ "", "T5"}; { "", "T5"};
{ "", "T6"}; { "", "T6"};
AtlasLoot_BurningCrusade/burningcrusade.lua
+3 -3
View File
@@ -5177,7 +5177,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0");
-------------- --------------
AtlasLoot_Data["T4"] = { AtlasLoot_Data["T4"] = {
Name = "Teir 4"; Name = "Tier 4";
Type = "BCRaid"; Type = "BCRaid";
{ {
Name = "Druid".." - "..AL["Feral"]; Name = "Druid".." - "..AL["Feral"];
@@ -5330,7 +5330,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0");
-------------- --------------
AtlasLoot_Data["T5"] = { AtlasLoot_Data["T5"] = {
Name = "Teir 5"; Name = "Tier 5";
Type = "BCRaid"; Type = "BCRaid";
{ {
Name = "Druid".." - "..AL["Feral"]; Name = "Druid".." - "..AL["Feral"];
@@ -5508,7 +5508,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0");
-------------- --------------
AtlasLoot_Data["T6"] = { AtlasLoot_Data["T6"] = {
Name = "Teir 6"; Name = "Tier 6";
Type = "BCRaid"; Type = "BCRaid";
{ {
Name = "Druid".." - "..AL["Feral"]; Name = "Druid".." - "..AL["Feral"];
AtlasLoot_OriginalWoW/originalwow.lua
+6 -6
View File
@@ -4143,8 +4143,8 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
------------------------------------ ------------------------------------
AtlasLoot_Data["T0"] = { AtlasLoot_Data["T0"] = {
Name = "Teir 0"; Name = "Tier 0";
Type = "ClassicRaid"; Type = "ClassicDungeonExt";
{ {
Name = AL["Druid"]; Name = AL["Druid"];
{ 1, 0, "Spell_Nature_Regeneration", "=q6=#t0s1#", "=ec1=#j6#"}; { 1, 0, "Spell_Nature_Regeneration", "=q6=#t0s1#", "=ec1=#j6#"};
@@ -4341,7 +4341,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
----------------------------- -----------------------------
AtlasLoot_Data["T1"] = { AtlasLoot_Data["T1"] = {
Name = "Teir 1"; Name = "Tier 1";
Type = "ClassicRaid"; Type = "ClassicRaid";
{ {
Name = AL["Druid"]; Name = AL["Druid"];
@@ -4457,7 +4457,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
-- T2 Sets -- T2 Sets
AtlasLoot_Data["T2"] = { AtlasLoot_Data["T2"] = {
Name = "Teir 2"; Name = "Tier 2";
Type = "ClassicRaid"; Type = "ClassicRaid";
{ {
Name = AL["Druid"]; Name = AL["Druid"];
@@ -4576,7 +4576,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
------------------------ ------------------------
AtlasLoot_Data["T3"] = { AtlasLoot_Data["T3"] = {
Name = "Teir 3"; Name = "Tier 3";
Type = "ClassicRaid"; Type = "ClassicRaid";
{ {
Name = AL["Druid"]; Name = AL["Druid"];
@@ -4992,7 +4992,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
----------------- -----------------
AtlasLoot_Data["T2.5"] = { AtlasLoot_Data["T2.5"] = {
Name = AL["AQ40 Class Sets"].." (Teir 2.5)"; Name = AL["AQ40 Class Sets"].." (Tier 2.5)";
Type = "ClassicRaid"; Type = "ClassicRaid";
{ {
Name = AL["Druid"]; Name = AL["Druid"];