diff --git a/.contrib/Parser/DATAS/06 - Expansion Features/08 Shadowlands/01 Covenants/Covenant - Night Fae.lua b/.contrib/Parser/DATAS/06 - Expansion Features/08 Shadowlands/01 Covenants/Covenant - Night Fae.lua index 9feb6b3751..16285a3972 100644 --- a/.contrib/Parser/DATAS/06 - Expansion Features/08 Shadowlands/01 Covenants/Covenant - Night Fae.lua +++ b/.contrib/Parser/DATAS/06 - Expansion Features/08 Shadowlands/01 Covenants/Covenant - Night Fae.lua @@ -1312,7 +1312,7 @@ _.ExpansionFeatures = -- Spirits/Transmog -- TODO: do these all need their own 'tier' of seed sub-header? they're already split by the minimum Spirit item required... n(-931, { -- Lesser Spirit - ["description"] = "Requires minimum |cFFFFD7001x|r Wildseed Root Grain. Its possible to receive rewards from higher quality spirits of the same type as well.", + ["description"] = "Requires minimum |cFFFFD7001x|r Wildseed Root Grain. It's possible to receive rewards from higher quality spirits of the same type as well.", ["g"] = { i(177698, { -- Untamed Spirit Ardenweald (Uncommon) i(179548), -- Elderwood Gavel diff --git a/AllTheThings.lua b/AllTheThings.lua index 2b3f4fd1bb..96f0179fa1 100644 --- a/AllTheThings.lua +++ b/AllTheThings.lua @@ -1,7 +1,7 @@ -------------------------------------------------------------------------------- -- A L L T H E T H I N G S -- -------------------------------------------------------------------------------- --- Copyright 2017-2019 Dylan Fortune (Crieve-Sargeras) -- +-- Copyright 2017-2021 Dylan Fortune (Crieve-Sargeras) -- -------------------------------------------------------------------------------- local app = select(2, ...); local L = app.L; @@ -1038,7 +1038,7 @@ local function VerifySourceID(item) if item.link and not item.retries then -- quality below UNCOMMON means no source if item.q and item.q < 2 then return true; end - + local linkInfoSourceID = app.GetSourceID(item.link, item.itemID); if linkInfoSourceID and linkInfoSourceID ~= item.s then print("Mismatched SourceID",item.link,item.s,"=>",linkInfoSourceID); @@ -2528,7 +2528,7 @@ local function BuildContainsInfo(groups, entries, paramA, paramB, indent, layer) and (not group.achievementID or paramA == "creatureID") -- not for things with a parent unless the parent has no difficultyID and (not group.parent or not group.parent.difficultyID) - -- not for group which contains an artifact + -- not for group which contains an artifact and not group.g[1].artifactID -- not for heirlooms and not (group.filterID == 109) @@ -3456,7 +3456,7 @@ local function GetCachedSearchResults(search, method, paramA, paramB, ...) else right = L["CUSTOM_COLLECTS_REASONS"][c][1] .. " " .. right; end - end + end end tinsert(info, { left = item.prefix .. left, right = right }); end @@ -3484,7 +3484,7 @@ local function GetCachedSearchResults(search, method, paramA, paramB, ...) else right = L["CUSTOM_COLLECTS_REASONS"][c][1] .. " " .. right; end - end + end end tinsert(info, { left = item.prefix .. left, right = right }); end @@ -3566,7 +3566,7 @@ app.BuildCrafted = function(item) if not itemID then return; end -- TODO: similar to 'customCollect' showing in the BuildContains, add a property to items in the crafted contains which shows the crafting Profession - + -- track the starting item tinsert(app.BuildCrafted_IncludedItems, itemID); local reagentCache = app.GetDataSubMember("Reagents", itemID); @@ -3660,7 +3660,7 @@ app.ExpandSubGroups_IncludedItems = {}; app.ExpandSubGroups = function(item) local itemID = item.modItemID or item.itemID; if not itemID or itemID < 1 or not item.g then return; end - + -- print("ExpandSubGroups",itemID); if not contains(app.ExpandSubGroups_IncludedItems, itemID) then -- track the starting item @@ -3674,7 +3674,7 @@ app.ExpandSubGroups = function(item) modItemID = GetGroupItemIDWithModID(sub); -- print("Search sub",modItemID) -- find a reference to the item in the DB and add it to the group - clone = GetCachedSearchResults("itemID:" .. tostring(modItemID), app.SearchForField, "itemID", modItemID) + clone = GetCachedSearchResults("itemID:" .. tostring(modItemID), app.SearchForField, "itemID", modItemID) if clone then if not clone.g then clone.total = nil; @@ -5046,7 +5046,7 @@ local function RefreshMountCollection(newMountID) -- Wait a frame before harvesting item collection status. coroutine.yield(); -- print("Refresh to check progress after collection...") - app:RefreshData(false, true); + app:RefreshData(false, true); -- Wait 2 frames before refreshing states. coroutine.yield(); @@ -5295,7 +5295,7 @@ local function AttachTooltip(self) end -- check what this tooltip is currently displaying, and keep that reference local link, target, spellID = select(2, self:GetItem()); - if link then + if link then if self.AllTheThingsProcessing and (self.AllTheThingsProcessing == link) then return true else @@ -5303,24 +5303,24 @@ local function AttachTooltip(self) end else target = select(2, self:GetUnit()); - if target then + if target then if self.AllTheThingsProcessing and (self.AllTheThingsProcessing == target) then return true else - self.AllTheThingsProcessing = target + self.AllTheThingsProcessing = target end else spellID = select(2, self:GetSpell()); - if spellID then + if spellID then if self.AllTheThingsProcessing and (self.AllTheThingsProcessing == spellID) then return true - else + else self.AllTheThingsProcessing = spellID end - end + end end end - + --[[-- -- Debug all of the available fields on the tooltip. for i,j in pairs(self) do @@ -9397,7 +9397,7 @@ end -- Verify no infinite parent recursion exists for a given group app.VerifyRecursion = function(group, checked) if type(group) ~= "table" then return; end - if not checked then + if not checked then checked = { }; -- print("test",group.key,group[group.key]); end @@ -10700,7 +10700,7 @@ local function AdjustRowIndent(row, indentAdjust) end if row.Texture then -- only ever LEFT point set - -- for i=1, row.Texture:GetNumPoints() do + -- for i=1, row.Texture:GetNumPoints() do -- print(row.Texture:GetPoint(i)); -- end -- print("---") @@ -15179,14 +15179,14 @@ app:GetWindow("WorldQuests", UIParent, function(self) self:Update(); end -- World Quests (Tasks) - self.MergeTasks = function(self, mapObject, includeAll, includePermanent, includeQuests) + self.MergeTasks = function(self, mapObject, includeAll, includePermanent, includeQuests) local mapID = mapObject.mapID; if not mapID then return; end local pois = C_TaskQuest.GetQuestsForPlayerByMapID(mapID); -- print(#pois,"WQ in",mapID); if pois then for i,poi in ipairs(pois) do - -- only include Tasks on this actual mapID since each Zone mapID is checked individually + -- only include Tasks on this actual mapID since each Zone mapID is checked individually if poi.mapID == mapID then local questObject = GetPopulatedQuestObject(poi.questId); if includeAll or @@ -15205,7 +15205,7 @@ app:GetWindow("WorldQuests", UIParent, function(self) end end end - end + end end -- Storylines/Map Quest Icons self.MergeStorylines = function(self, mapObject, includeAll, includePermanent, includeQuests) @@ -15308,7 +15308,7 @@ app:GetWindow("WorldQuests", UIParent, function(self) -- Merge Storylines for Zone self:MergeStorylines(subMapObject, includeAll, includePermanent, includeQuests); - + MergeObject(mapObject.g, subMapObject); end end @@ -17409,7 +17409,7 @@ app.events.QUEST_LOG_UPDATE = function() RefreshQuestCompletionState() end app.events.QUEST_ACCEPTED = function(questID) - if questID then + if questID then local logIndex = C_QuestLog.GetLogIndexForQuestID(questID); local freq; if logIndex then diff --git a/AllTheThings.toc b/AllTheThings.toc index 9b8ed43f91..b2905ab124 100644 --- a/AllTheThings.toc +++ b/AllTheThings.toc @@ -7,7 +7,7 @@ ## SavedVariables: AllTheThingsSettings, AllTheThingsAD, AllTheThingsAuctionConfig, AllTheThingsAuctionData, AllTheThingsDebugData, AllTheThingsHarvestItems ## SavedVariablesPerCharacter: AllTheThingsSettingsPerCharacter ## Notes: Addon for Tracking Collections & Account Completion -## Version: 1.1.1 +## Version: @project-version@ lib\LibStub\LibStub.lua lib\CallbackHandler-1.0\CallbackHandler-1.0.lua lib\LibDataBroker-1.1\LibDataBroker-1.1.lua diff --git a/Settings.lua b/Settings.lua index 3280063acd..1bb22eb7e5 100644 --- a/Settings.lua +++ b/Settings.lua @@ -1,7 +1,7 @@ -------------------------------------------------------------------------------- -- A L L T H E T H I N G S -- -------------------------------------------------------------------------------- --- Copyright 2017-2019 Dylan Fortune (Crieve-Sargeras) -- +-- Copyright 2017-2021 Dylan Fortune (Crieve-Sargeras) -- -------------------------------------------------------------------------------- local app = select(2, ...); local L = app.L; @@ -36,9 +36,9 @@ settings.MostRecentTab = nil; settings.Tabs = {}; settings.ModifierKeys = { "None", "Shift", "Ctrl", "Alt" }; settings:SetBackdrop({ - bgFile = "Interface/RAIDFRAME/UI-RaidFrame-GroupBg", - edgeFile = "Interface/Tooltips/UI-Tooltip-Border", - tile = false, edgeSize = 16, + bgFile = "Interface/RAIDFRAME/UI-RaidFrame-GroupBg", + edgeFile = "Interface/Tooltips/UI-Tooltip-Border", + tile = false, edgeSize = 16, insets = { left = 4, right = 4, top = 4, bottom = 4 } }); settings:SetBackdropColor(0, 0, 0, 1); @@ -121,7 +121,7 @@ local GeneralSettingsBase = { }; local FilterSettingsBase = { __index = { - + }, }; local TooltipSettingsBase = { @@ -196,13 +196,13 @@ settings.Initialize = function(self) if not AllTheThingsSettings.Tooltips then AllTheThingsSettings.Tooltips = {}; end setmetatable(AllTheThingsSettings.General, GeneralSettingsBase); setmetatable(AllTheThingsSettings.Tooltips, TooltipSettingsBase); - + -- Assign the preset filters for your character class as the default states if not AllTheThingsSettingsPerCharacter then AllTheThingsSettingsPerCharacter = {}; end if not AllTheThingsSettingsPerCharacter.Filters then AllTheThingsSettingsPerCharacter.Filters = {}; end setmetatable(AllTheThingsSettingsPerCharacter.Filters, FilterSettingsBase); FilterSettingsBase.__index = app.Presets[app.Class] or app.Presets.ALL; - + self.ContainsSlider:SetValue(self:GetTooltipSetting("ContainsCount") or 25); self.LocationsSlider:SetValue(self:GetTooltipSetting("Locations") or 5); self.MainListScaleSlider:SetValue(self:GetTooltipSetting("MainListScale")); @@ -218,7 +218,7 @@ settings.Initialize = function(self) OnClickForTab(self.Tabs[1]); self:Refresh(); self:UpdateMode(); - + if self:GetTooltipSetting("Auto:MainList") then app:GetWindow("Prime"):Show(); end @@ -252,7 +252,7 @@ settings.GetModeString = function(self) elseif self:Get("MainOnly") and not self:Get("Completionist") then mode = mode .. L["TITLE_MAIN_ONLY"]; -- L["TITLE_MAIN_ONLY"] = " (Main Only)"; end - + local things = {}; local thingCount = 0; local totalThingCount = 0; @@ -320,7 +320,7 @@ settings.GetShortModeString = function(self) else return style .. "U"; end - end + end end end settings.GetPersonal = function(self, setting) @@ -565,7 +565,7 @@ settings.UpdateMode = function(self, doRefresh) app.ClassRequirementFilter = app.NoFilter; app.RaceRequirementFilter = app.NoFilter; app.RequiredSkillFilter = app.NoFilter; - + app.AccountWideAchievements = true; app.AccountWideAzeriteEssences = true; app.AccountWideBattlePets = true; @@ -581,7 +581,7 @@ settings.UpdateMode = function(self, doRefresh) app.AccountWideTitles = true; app.AccountWideToys = true; app.AccountWideTransmog = true; - + app.CollectibleAchievements = true; app.CollectibleAzeriteEssences = true; app.CollectibleBattlePets = true; @@ -621,7 +621,7 @@ settings.UpdateMode = function(self, doRefresh) else app.ShowIncompleteThings = app.Filter; end - + app.AccountWideAchievements = self:Get("AccountWide:Achievements"); app.AccountWideAzeriteEssences = self:Get("AccountWide:AzeriteEssences"); app.AccountWideBattlePets = self:Get("AccountWide:BattlePets"); @@ -637,7 +637,7 @@ settings.UpdateMode = function(self, doRefresh) app.AccountWideTitles = self:Get("AccountWide:Titles"); app.AccountWideToys = self:Get("AccountWide:Toys"); app.AccountWideTransmog = self:Get("AccountWide:Transmog"); - + app.CollectibleAchievements = self:Get("Thing:Achievements"); app.CollectibleAzeriteEssences = self:Get("Thing:AzeriteEssences"); app.CollectibleBattlePets = self:Get("Thing:BattlePets"); @@ -694,7 +694,7 @@ settings.UpdateMode = function(self, doRefresh) app.RecipeChecker = app.GetDataSubMember; else app.RecipeChecker = app.GetTempDataSubMember; - end + end if self:Get("Filter:BoEs") then app.ItemBindFilter = app.FilterItemBind; else @@ -716,11 +716,11 @@ settings.UpdateMode = function(self, doRefresh) if self:Get("Thing:FlightPaths") or self:Get("DebugMode") then app:RegisterEvent("TAXIMAP_OPENED"); end - + -- if auto-refresh if doRefresh then app:RefreshData(nil,nil,true); - end + end end -- The ALL THE THINGS Epic Logo! @@ -1746,7 +1746,7 @@ end)(); ------------------------------------------ (function() local tab = settings:CreateTab(L["FILTERS_TAB"]); -tab.OnRefresh = function(self) +tab.OnRefresh = function(self) if settings:Get("DebugMode") then PanelTemplates_DisableTab(settings, self:GetID()); else @@ -1847,7 +1847,7 @@ f:SetScript("OnClick", function(self) app:RefreshData(nil,nil,true); end); f:SetATTTooltip(L["CLASS_DEFAULTS_BUTTON_TOOLTIP"]); -f.OnRefresh = function(self) +f.OnRefresh = function(self) if settings:Get("AccountMode") or settings:Get("DebugMode") then self:Disable(); else @@ -1902,7 +1902,7 @@ f:SetScript("OnClick", function(self) app:RefreshData(nil,nil,true); end); f:SetATTTooltip(L["ALL_BUTTON_TOOLTIP"]); -f.OnRefresh = function(self) +f.OnRefresh = function(self) if settings:Get("AccountMode") or settings:Get("DebugMode") then self:Disable(); else @@ -1927,7 +1927,7 @@ f:SetScript("OnClick", function(self) app:RefreshData(nil,nil,true); end); f:SetATTTooltip(L["UNCHECK_ALL_BUTTON_TOOLTIP"]); -f.OnRefresh = function(self) +f.OnRefresh = function(self) if settings:Get("AccountMode") or settings:Get("DebugMode") then self:Disable(); else @@ -1958,7 +1958,7 @@ end)(); --[[ (function() local tab = settings:CreateTab("Social"); -tab.OnRefresh = function(self) +tab.OnRefresh = function(self) -- We aren't ready yet. :( PanelTemplates_DisableTab(settings, self:GetID()); end; @@ -1970,7 +1970,7 @@ end)(); ------------------------------------------ (function() local tab = settings:CreateTab(L["UNOBTAINABLES_TAB"]); -tab.OnRefresh = function(self) +tab.OnRefresh = function(self) if settings:Get("DebugMode") then PanelTemplates_DisableTab(settings, self:GetID()); else @@ -2032,8 +2032,8 @@ seasonalFrame:SetPoint("RIGHT", child, -4, 0); seasonalFrame:SetHeight(250); -- seasonal enable -local seasonalEnable = child:CreateCheckBox(L["SEASONAL_ENABLE"], -function(self) +local seasonalEnable = child:CreateCheckBox(L["SEASONAL_ENABLE"], +function(self) self:SetChecked(app.GetDataMember("FilterSeasonal")); end, function(self) @@ -2091,8 +2091,8 @@ local y = 5; local count = 0; for k,v in ipairs(L["UNOBTAINABLE_ITEM_REASONS"]) do if v[1] > 4 then - local seasonalFilter = child:CreateCheckBox(v[3], - function(self) + local seasonalFilter = child:CreateCheckBox(v[3], + function(self) self:SetChecked(not app.GetDataMember("SeasonalFilters")[k]); if not app.GetDataMember("FilterSeasonal") then self:Disable(); @@ -2137,7 +2137,7 @@ unobtainableFrame:SetHeight(320); -- unobtainable enable local unobtainableEnable = child:CreateCheckBox(L["UNOBTAINABLE_ENABLE"], -function(self) +function(self) self:SetChecked(app.GetDataMember("FilterUnobtainableItems")); end, function(self) @@ -2234,7 +2234,7 @@ local count = 0; for k,v in ipairs(L["UNOBTAINABLE_ITEM_REASONS"]) do if v[1] == 1 then local filter = child:CreateCheckBox(v[3], - function(self) + function(self) self:SetChecked(not app.GetDataMember("UnobtainableItemFilters")[k]); if not app.GetDataMember("FilterUnobtainableItems") then self:Disable(); @@ -2315,7 +2315,7 @@ local count = 0; for k,v in ipairs(L["UNOBTAINABLE_ITEM_REASONS"]) do if v[1] == 3 then local filter = child:CreateCheckBox(v[3], - function(self) + function(self) self:SetChecked(not app.GetDataMember("UnobtainableItemFilters")[k]); if not app.GetDataMember("FilterUnobtainableItems") then self:Disable(); @@ -3251,7 +3251,7 @@ local ids = {["achievementID"] = "Achievement ID", local last = nil; for _,id in pairs({"achievementID","artifactID","azeriteEssenceID","bonusID","creatureID","creatures","currencyID","difficultyID","displayID","encounterID","factionID","filterID","flightPathID","followerID","iconPath"}) do local filter = settings:CreateCheckBox(ids[id], - function(self) + function(self) self:SetChecked(settings:GetTooltipSetting(id)); end, function(self) @@ -3268,7 +3268,7 @@ end last = nil; for _,id in pairs({"illusionID","instanceID","itemID","itemString", "mapID","modID","objectID","questID","QuestGivers","sourceID","speciesID","spellID","tierID","titleID","visualID"}) do local filter = settings:CreateCheckBox(ids[id], - function(self) + function(self) self:SetChecked(settings:GetTooltipSetting(id)); end, function(self) diff --git a/src/base.lua b/src/base.lua index 64ac90210e..b3c413099c 100644 --- a/src/base.lua +++ b/src/base.lua @@ -1,7 +1,7 @@ -------------------------------------------------------------------------------- -- A L L T H E T H I N G S -- -------------------------------------------------------------------------------- --- Copyright 2017-2019 Dylan Fortune (Crieve-Sargeras) -- +-- Copyright 2017-2021 Dylan Fortune (Crieve-Sargeras) -- -------------------------------------------------------------------------------- -- This is a hidden frame that intercepts all of the event notifications that we have registered for. local name, app = ...; @@ -125,4 +125,4 @@ function app:ShowPopupDialogWithEditBox(msg, text, callback) popup.callback = callback; StaticPopup_Hide ("ALL_THE_THINGS_EDITBOX"); StaticPopup_Show ("ALL_THE_THINGS_EDITBOX"); -end \ No newline at end of file +end