diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index 4e300b1..d893faf 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -174,7 +174,7 @@ function AtlasLoot_OnVariablesLoaded() if AtlasLoot_Data then AtlasLoot_Data["EmptyTable"] = { Name = AL["Select a Loot Table..."]; - {Name = AL["Select a Loot Table..."]}; + {Name = ""}; }; end @@ -506,10 +506,8 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum) AtlasLoot:ScrollFrameUpdate(); AtlasLoot_BossName:SetText(dataSource[dataID][tablenum].Name); - - --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); AtlasLoot:SubTableScrollFrameUpdate(dataID, dataSource, pFrame, tablenum); end @@ -749,18 +747,21 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum) getglobal("AtlasLootItemsFrame_BACK"):Hide(); getglobal("AtlasLootItemsFrame_NEXT"):Hide(); getglobal("AtlasLootItemsFrame_PREV"):Hide(); - - if tablenum ~= #dataSource[dataID] then + local tablebase = {dataID, dataSource}; + 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(); - if dataID ~= "FilterList" then getglobal("AtlasLootItemsFrame_NEXT").tablenum = tablenum + 1; - end + getglobal("AtlasLootItemsFrame_NEXT").tablebase = tablebase; + end if tablenum ~= 1 then getglobal("AtlasLootItemsFrame_PREV"):Show(); - if dataID ~= "FilterList" then getglobal("AtlasLootItemsFrame_PREV").tablenum = tablenum - 1; - end + getglobal("AtlasLootItemsFrame_PREV").tablebase = tablebase; end if dataSource[dataID].Back then getglobal("AtlasLootItemsFrame_BACK"):Show(); @@ -804,8 +805,8 @@ AtlasLoot_NavButton_OnClick: Called when <-, -> are pressed and calls up the appropriate loot page ]] function AtlasLoot_NavButton_OnClick(self) - local tablenum = self.tablenum; - AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4], tablenum); + local tablenum, dataID, dataSource = self.tablenum, self.tablebase[1], self.tablebase[2]; + AtlasLoot_ShowItemsFrame(dataID, dataSource, AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4], tablenum); end --[[ diff --git a/AtlasLoot/Core/SearchAdvanced.lua b/AtlasLoot/Core/SearchAdvanced.lua index 44d4df4..71d1122 100644 --- a/AtlasLoot/Core/SearchAdvanced.lua +++ b/AtlasLoot/Core/SearchAdvanced.lua @@ -236,7 +236,7 @@ function AtlasLoot_AdvancedSearchShow() ATLASLOOT_CURRENTTYPE = "Search"; AtlasLoot:ScrollFrameUpdate(); - AtlasLoot:SubTableScrollFrameUpdate("", "", "", ""); + AtlasLoot:SubTableScrollFrameUpdate("EmptyTable", AtlasLoot_Data, pFrame); end function AtlasLoot_AdvancedSearchClose() diff --git a/AtlasLoot/Core/TextParsing.lua b/AtlasLoot/Core/TextParsing.lua index dddafe4..2302184 100644 --- a/AtlasLoot/Core/TextParsing.lua +++ b/AtlasLoot/Core/TextParsing.lua @@ -699,7 +699,7 @@ function AtlasLoot_FixText(text) text = gsub(text, "#aq40s8#", AL["Doomcaller's Attire"]); 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, "#tt2#", AL["Tier 2 Set Token (Click)"]); text = gsub(text, "#tt2.5#", AL["Tier 2.5 Set Token (Click)"]); diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua index eb6698e..95f9b17 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua @@ -378,8 +378,6 @@ local subtableFrame = CreateFrame("Frame", "Atlasloot_SubTableFrame", AtlasLootD }); function AtlasLoot:SubTableScrollFrameUpdate(tablename, dataSource, pFrame, currenttablenum) - if dataSource ~= nil then - if(string.find(tablename, "SearchResult")) then tablename = "SearchResult"; end local maxValue = #dataSource[tablename]; subtableFrame.tablename = tablename; FauxScrollFrame_Update(subtableFrame.scrollBar, maxValue, MAX_ROWS2, ROW_HEIGHT); @@ -402,13 +400,11 @@ function AtlasLoot:SubTableScrollFrameUpdate(tablename, dataSource, pFrame, curr row:SetChecked(true); end end - row:Show(); else subtableFrame.rows[i]:Hide() end end - end end local scrollSlider2 = CreateFrame("ScrollFrame","AtlasLootDefaultFrameSubTableScroll",Atlasloot_SubTableFrame,"FauxScrollFrameTemplate"); @@ -416,11 +412,7 @@ local scrollSlider2 = CreateFrame("ScrollFrame","AtlasLootDefaultFrameSubTableSc scrollSlider2:SetPoint("BOTTOMRIGHT", -30, 8) scrollSlider2:SetScript("OnVerticalScroll", function(self, offset) self.offset = math.floor(offset / ROW_HEIGHT + 0.5) - AtlasLoot:SubTableScrollFrameUpdate(); - end) - - scrollSlider2:SetScript("OnShow", function() - AtlasLoot:SubTableScrollFrameUpdate(); + AtlasLoot:SubTableScrollFrameUpdate(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[4], AtlasLootItemsFrame.refresh[5]); end) subtableFrame.scrollBar = scrollSlider2 diff --git a/AtlasLoot/Menus/SetMenus.lua b/AtlasLoot/Menus/SetMenus.lua index 5e5e044..fb60070 100644 --- a/AtlasLoot/Menus/SetMenus.lua +++ b/AtlasLoot/Menus/SetMenus.lua @@ -30,7 +30,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { AL["Badge of Justice Rewards"], "BadgeShatt", "Header"}; { "", "BadgeShatt"}; { "", "BadgeSunwell"}; - { "Teir Sets", "T4", "Header"}; + { "Tier Sets", "T4", "Header"}; { "", "T4"}; { "", "T5"}; { "", "T6"}; diff --git a/AtlasLoot_BurningCrusade/burningcrusade.lua b/AtlasLoot_BurningCrusade/burningcrusade.lua index 08f70d5..4fadac9 100644 --- a/AtlasLoot_BurningCrusade/burningcrusade.lua +++ b/AtlasLoot_BurningCrusade/burningcrusade.lua @@ -5177,7 +5177,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); -------------- AtlasLoot_Data["T4"] = { - Name = "Teir 4"; + Name = "Tier 4"; Type = "BCRaid"; { Name = "Druid".." - "..AL["Feral"]; @@ -5330,7 +5330,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); -------------- AtlasLoot_Data["T5"] = { - Name = "Teir 5"; + Name = "Tier 5"; Type = "BCRaid"; { Name = "Druid".." - "..AL["Feral"]; @@ -5508,7 +5508,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0"); -------------- AtlasLoot_Data["T6"] = { - Name = "Teir 6"; + Name = "Tier 6"; Type = "BCRaid"; { Name = "Druid".." - "..AL["Feral"]; diff --git a/AtlasLoot_OriginalWoW/originalwow.lua b/AtlasLoot_OriginalWoW/originalwow.lua index 72cc435..998e5f6 100644 --- a/AtlasLoot_OriginalWoW/originalwow.lua +++ b/AtlasLoot_OriginalWoW/originalwow.lua @@ -4143,8 +4143,8 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") ------------------------------------ AtlasLoot_Data["T0"] = { - Name = "Teir 0"; - Type = "ClassicRaid"; + Name = "Tier 0"; + Type = "ClassicDungeonExt"; { Name = AL["Druid"]; { 1, 0, "Spell_Nature_Regeneration", "=q6=#t0s1#", "=ec1=#j6#"}; @@ -4341,7 +4341,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") ----------------------------- AtlasLoot_Data["T1"] = { - Name = "Teir 1"; + Name = "Tier 1"; Type = "ClassicRaid"; { Name = AL["Druid"]; @@ -4457,7 +4457,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") -- T2 Sets AtlasLoot_Data["T2"] = { - Name = "Teir 2"; + Name = "Tier 2"; Type = "ClassicRaid"; { Name = AL["Druid"]; @@ -4576,7 +4576,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") ------------------------ AtlasLoot_Data["T3"] = { - Name = "Teir 3"; + Name = "Tier 3"; Type = "ClassicRaid"; { Name = AL["Druid"]; @@ -4992,7 +4992,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") ----------------- AtlasLoot_Data["T2.5"] = { - Name = AL["AQ40 Class Sets"].." (Teir 2.5)"; + Name = AL["AQ40 Class Sets"].." (Tier 2.5)"; Type = "ClassicRaid"; { Name = AL["Druid"];