From 733ffe0dc68d520f3d75fbc876aa2c3e9559151a Mon Sep 17 00:00:00 2001 From: Oleg Nechiporenko Date: Wed, 26 Oct 2022 21:47:48 +0300 Subject: [PATCH] v2.25.0 * Timewalking challenges should not be filtered out when "current week"-filter is used * Fix template for CastOnMe WA (improve caster's target checking) * Make compatible with 10.0.0 --- CHANGELOG.md | 8 ++++- .../LibGraphMdb-2.0/LibGraphMdb-2.0.lua | 8 ++--- .../ScrollingTableMdb-4.1.lua | 4 ++- Mechanics/Spells.lua | 31 ++++++++++++++++++- MyDungeonsBook.toc | 4 +-- UI/Challenges.lua | 3 -- Utils/Integrations/WA/Auras/CastOnMe.lua | 11 ++++--- 7 files changed, 51 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1492065..391dcf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -### v2.24.0 +### v2.25.0 + +* Timewalking challenges should not be filtered out when "current week"-filter is used +* Fix template for CastOnMe WA (improve caster's target checking) +* Make compatible with 10.0.0 + +### v2.24.0 * Fix template for GTFO-WA (remove hardcoded zone id) * Add some avoidable spells diff --git a/Libs/LibGraphMdb-2.0/LibGraphMdb-2.0/LibGraphMdb-2.0.lua b/Libs/LibGraphMdb-2.0/LibGraphMdb-2.0/LibGraphMdb-2.0.lua index 7a074a7..d0ef7aa 100644 --- a/Libs/LibGraphMdb-2.0/LibGraphMdb-2.0/LibGraphMdb-2.0.lua +++ b/Libs/LibGraphMdb-2.0/LibGraphMdb-2.0/LibGraphMdb-2.0.lua @@ -19,22 +19,20 @@ local minor = 90000 + tonumber(("$Revision: 58 $"):match("(%d+)")) --doesn't get modified with a newer revision (this one) local TextureDirectory do - local path = string.match(debugstack(1, 1, 0), "AddOns\\(.+)LibGraphMdb%-2%.0%.lua") + local path = string.match(debugstack(1, 1, 0), "Interface/AddOns/(.+)LibGraphMdb%-2%.0%.lua") if path then - TextureDirectory = "Interface\\AddOns\\"..path + TextureDirectory = "Interface/AddOns/"..path else error(major.." cannot determine the folder it is located in because the path is too long and got truncated in the debugstack(1, 1, 0) function call") end end - if not LibStub then error(major .. " requires LibStub") end local lib, oldLibMinor = LibStub:NewLibrary(major, minor) if not lib then return end local GraphFunctions = {} - local gsub = gsub local ipairs = ipairs local pairs = pairs @@ -1347,7 +1345,7 @@ function GraphFunctions:SetLineTexture(texture) --> full path if (texture:find ("\\") or texture:find ("//")) then self.CustomLine = texture - --> using an image inside lib-graph folder + --> using an image inside lib-graph folder else self.CustomLine = TextureDirectory..texture end diff --git a/Libs/ScrollingTableMdb-4.1/ScrollingTableMdb-4.1.lua b/Libs/ScrollingTableMdb-4.1/ScrollingTableMdb-4.1.lua index 6f01ea7..d7bc6fa 100644 --- a/Libs/ScrollingTableMdb-4.1/ScrollingTableMdb-4.1.lua +++ b/Libs/ScrollingTableMdb-4.1/ScrollingTableMdb-4.1.lua @@ -540,7 +540,9 @@ do cellFrame.text:SetText(cellvalue(data, cols, realrow, column, table)); end else - cellFrame.text:SetText(cellvalue); + if (type(cellvalue) ~= "table") then + cellFrame.text:SetText(cellvalue); + end end local color = nil; diff --git a/Mechanics/Spells.lua b/Mechanics/Spells.lua index fbb539a..c22eddd 100644 --- a/Mechanics/Spells.lua +++ b/Mechanics/Spells.lua @@ -59,6 +59,15 @@ local Spells = { [209630] = true, -- Piercing Gale [214688] = true, -- Carrion Swarm [219498] = true, -- Streetsweeper + [211457] = true, + [207887] = true, + [209628] = true, + [212791] = true, + [209512] = true, + [211464] = true, + [209410] = true, + [209378] = true, + [209413] = true, -- Darkheart Thicket [191326] = true, -- Breath of Corruption @@ -126,6 +135,9 @@ local Spells = { [241784] = true, [227434] = true, [227480] = true, + [227672] = true, + [227416] = true, + [227645] = true, -- Karazhan Upper [242894] = true, @@ -146,6 +158,10 @@ local Spells = { [229427] = true, [230067] = true, [229905] = true, + [229608] = true, + [229623] = true, + [229696] = true, + [227620] = true, ------------- ---- BfA ---- @@ -336,6 +352,11 @@ local Spells = { [299535] = true, --- Scrap Blast (Pistonhead Blaster) [298940] = true, --- Bolt Buster (Naeno Megacrash) [297283] = true, --- Cave In (King Gobbamak) + [298588] = true, + [300436] = true, + [301680] = true, + [296043] = true, + [300160] = true, --- Awakened Lieutenant [314309] = true, --- Dark Fury (Urg'roth, Breaker of Heroes) @@ -546,7 +567,8 @@ local Spells = { [358947] = true, -- Burning Tar (Hourglass Cannon) [357228] = true, -- Drifting Star (Adorned Starseer) [356260] = true, -- Tidal Burst (Hourglass Tidesage) - [346960] = true, -- Tidal Burst (Hourglass Tidesage) + [346960] = true, + [355423] = true, -- Tazavesh: Streets of Wonder [346028] = true, -- Interrogation [347481] = true, -- Shuri (So'azmi) @@ -562,6 +584,7 @@ local Spells = { [355903] = true, -- Disruption Grenade [356482] = true, -- Rotten Food [356404] = true, -- Lava Breath (Ancient Core Hound) + [348566] = true, }; local SpellsNoTank = { @@ -606,6 +629,10 @@ local SpellsNoTank = { -- Court of Stars [209036] = true, -- Throw Torch [211473] = true, -- Shadow Slash + [209036] = true, + [211473] = true, + [361313] = true, + [209495] = true, -- Darkheart Thicket [198376] = true, -- Primal Rampage @@ -658,6 +685,8 @@ local SpellsNoTank = { [230050] = true, [230161] = true, [230002] = true, + [229692] = true, + [229693] = true, ------------- diff --git a/MyDungeonsBook.toc b/MyDungeonsBook.toc index 6c3e5ed..35a5f14 100644 --- a/MyDungeonsBook.toc +++ b/MyDungeonsBook.toc @@ -1,8 +1,8 @@ ## Title: MyDungeonsBook ## Notes: Addon to collect and store specific information about your myth+ challenges. -## Version: 2.23.0 +## Version: 2.25.0 ## Author: GelioS -## Interface: 90207 +## Interface: 100000 ## OptionalDeps: LibStub, CallbackHandler-1.0, Ace3, LibCompress, LibGroupInSpecT-1.1 ## SavedVariables: MyDungeonsBookDB ## SavedVariablesPerCharacter: MyDungeonsBookData diff --git a/UI/Challenges.lua b/UI/Challenges.lua index 2118d8a..e38edae 100644 --- a/UI/Challenges.lua +++ b/UI/Challenges.lua @@ -162,9 +162,6 @@ function MyDungeonsBook:ChallengesFrame_Table_Create(parentFrame) local startTime = row.cols[2].value; local currentWeekaffixes = C_MythicPlus.GetCurrentAffixes(); if (affixes[1] ~= currentWeekaffixes[1].id or - affixes[2] ~= currentWeekaffixes[2].id or - affixes[3] ~= currentWeekaffixes[3].id or - affixes[4] ~= currentWeekaffixes[4].id or time() - startTime > 7 * 24 * 60 * 60) then return false; end diff --git a/Utils/Integrations/WA/Auras/CastOnMe.lua b/Utils/Integrations/WA/Auras/CastOnMe.lua index 224b9ef..05004c0 100644 --- a/Utils/Integrations/WA/Auras/CastOnMe.lua +++ b/Utils/Integrations/WA/Auras/CastOnMe.lua @@ -7,11 +7,12 @@ Utils @section Utils ]] -local customTrigger = [[function(_, sourceUnit, castGUID, spellId) - if (not UnitExists(sourceUnit)) then - return false; - end - if (UnitIsUnit(sourceUnit.."target", "player") and spellId == "SPELL_ID") then +local customTrigger = [[function (event, ...) + local _, subevent = ...; + local targetGUID = select(11, ...); + local spellId = select(12, ...); + + if (subevent == "SPELL_CAST_START" and UnitGUID("player") == targetGUID and spellId == SPELL_ID) then return true; end end]];