Skip to content
This repository has been archived by the owner on Aug 3, 2023. It is now read-only.

Commit

Permalink
v2.25.0
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
onechiporenko committed Oct 26, 2022
1 parent c15ae4f commit 733ffe0
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 18 deletions.
8 changes: 7 additions & 1 deletion 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
Expand Down
8 changes: 3 additions & 5 deletions Libs/LibGraphMdb-2.0/LibGraphMdb-2.0/LibGraphMdb-2.0.lua
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Libs/ScrollingTableMdb-4.1/ScrollingTableMdb-4.1.lua
Expand Up @@ -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;
Expand Down
31 changes: 30 additions & 1 deletion Mechanics/Spells.lua
Expand Up @@ -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
Expand Down Expand Up @@ -126,6 +135,9 @@ local Spells = {
[241784] = true,
[227434] = true,
[227480] = true,
[227672] = true,
[227416] = true,
[227645] = true,

-- Karazhan Upper
[242894] = true,
Expand All @@ -146,6 +158,10 @@ local Spells = {
[229427] = true,
[230067] = true,
[229905] = true,
[229608] = true,
[229623] = true,
[229696] = true,
[227620] = true,

-------------
---- BfA ----
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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 = {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -658,6 +685,8 @@ local SpellsNoTank = {
[230050] = true,
[230161] = true,
[230002] = true,
[229692] = true,
[229693] = true,


-------------
Expand Down
4 changes: 2 additions & 2 deletions 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
Expand Down
3 changes: 0 additions & 3 deletions UI/Challenges.lua
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions Utils/Integrations/WA/Auras/CastOnMe.lua
Expand Up @@ -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]];
Expand Down

0 comments on commit 733ffe0

Please sign in to comment.