From abd8ff6399ef5c61329266281f39f8505e61fd4e Mon Sep 17 00:00:00 2001 From: Flamanis Date: Mon, 20 May 2024 01:33:03 -0500 Subject: [PATCH 1/3] Update parser.lua --- core/parser.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/parser.lua b/core/parser.lua index b5f8ea57..995fc9f0 100755 --- a/core/parser.lua +++ b/core/parser.lua @@ -7251,13 +7251,13 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1 for i = 1, players do local name, killingBlows, honorableKills, deaths, honorGained, faction, race, rank, class, classToken, damageDone, healingDone, bgRating, ratingChange, preMatchMMR, mmrChange, talentSpec - if (isWOTLK or isERA) then + if (isCATA or isWOTLK or isERA) then name, killingBlows, honorableKills, deaths, honorGained, faction, rank, race, class, classToken, damageDone, healingDone, bgRating, ratingChange, preMatchMMR, mmrChange, talentSpec = GetBattlefieldScore(i) else name, killingBlows, honorableKills, deaths, honorGained, faction, race, class, classToken, damageDone, healingDone, bgRating, ratingChange, preMatchMMR, mmrChange, talentSpec = GetBattlefieldScore(i) end - if (not isWOTLK and not isERA) then --Must be dragonflight + if (not isWOTLK and not isERA and not isCATA) then --Must be dragonflight if (not name:match("%-")) then name = name .. "-" .. realmName end From 90632b5ab03e26a92543f21b9bd48bd81b9f4f7a Mon Sep 17 00:00:00 2001 From: Flamanis Date: Mon, 20 May 2024 06:46:08 -0500 Subject: [PATCH 2/3] Update container_actors.lua --- classes/container_actors.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/container_actors.lua b/classes/container_actors.lua index 093bbecb..6ce0da4d 100644 --- a/classes/container_actors.lua +++ b/classes/container_actors.lua @@ -517,7 +517,7 @@ end return playerName end - if (not UnitIsInMyGuild(playerName)) then + if (not UnitIsInMyGuild(playerName) and playerName ~= Details.playername) then return playerName end else @@ -538,10 +538,10 @@ end if (bitBand(actorFlags, OBJECT_TYPE_PLAYER) ~= 0) then if (not Details.ignore_nicktag) then local actorNameAmbiguated = Ambiguate(actorName, "none") - actorObject.displayName = checkValidNickname(Details:GetNickname(actorNameAmbiguated, false, true), actorName) --defaults to player name - if (Details.remove_realm_from_name) then - actorObject.displayName = actorObject.displayName:gsub(("%-.*"), "") - end + local nickname = Details:GetNickname(actorNameAmbiguated, false, true) + if nickname then + actorObject.displayName = checkValidNickname(nickname, actorName) --defaults to player name + end end if (not actorObject.displayName) then From 44c97087eb6ac1919a5ca592afe657087282704d Mon Sep 17 00:00:00 2001 From: Tercio Jose Date: Sat, 25 May 2024 13:58:31 -0300 Subject: [PATCH 3/3] Fix for Cataclysm attempting to run augmentation evoker code --- Libs/DF/definitions.lua | 2 ++ Libs/DF/fw.lua | 7 +++++++ functions/spec_augmentation.lua | 8 ++++++++ 3 files changed, 17 insertions(+) diff --git a/Libs/DF/definitions.lua b/Libs/DF/definitions.lua index b9760f65..fb172eef 100644 --- a/Libs/DF/definitions.lua +++ b/Libs/DF/definitions.lua @@ -177,6 +177,8 @@ ---@field IsShadowlandsWow fun():boolean ---@field IsDragonflightWow fun():boolean ---@field IsWarWow fun():boolean +---@field IsTWWWow fun():boolean +---@field ExpansionHasAugEvoker fun():boolean ---@field LoadSpellCache fun(self:table, hashMap:table, indexTable:table, allSpellsSameName:table) : hashMap:table, indexTable:table, allSpellsSameName:table load all spells in the game and add them into the passed tables ---@field UnloadSpellCache fun(self:table) wipe the table contents filled with LoadSpellCache() ---@field GetCurrentClassName fun(self:table) : string return the name of the class the player is playing diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index 874ec625..93c9a7d3 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -187,6 +187,9 @@ function DF.IsWarWow() return false end +function DF.IsTWWWow() + return DF.IsWarWow() +end ---return true if the player is playing in the WotLK version of wow with the retail api ---@return boolean @@ -199,6 +202,10 @@ function DF.IsNonRetailWowWithRetailAPI() end DF.IsWotLKWowWithRetailAPI = DF.IsNonRetailWowWithRetailAPI -- this is still in use +function DF.ExpansionHasAugEvoker() + return DF.IsDragonflightWow() or DF.IsWarWow() +end + ---for classic wow, get the role using the texture from the talents frame local roleBySpecTextureName = { DruidBalance = "DAMAGER", diff --git a/functions/spec_augmentation.lua b/functions/spec_augmentation.lua index 91a38395..9e231bc3 100644 --- a/functions/spec_augmentation.lua +++ b/functions/spec_augmentation.lua @@ -3,6 +3,9 @@ local addonName, Details222 = ... local Details = Details local _ +---@type detailsframework +local detailsFramework = DetailsFramework + local CONST_SPELLID_EBONMIGHT = 395152 local CONST_SPELLID_SS = 413984 local CONST_SPELLID_PRESCIENCE = 410089 @@ -44,6 +47,11 @@ end local eventListener = Details:CreateEventListener() --eventListener:RegisterEvent("COMBAT_PLAYER_ENTER") eventListener:RegisterEvent("COMBAT_PLAYER_LEAVING", function(eventName, combatObject) + --check if the expansion the player is playing has the augmentation evokers + if (not detailsFramework.ExpansionHasAugEvoker()) then + return + end + --close the time on the current amount of prescience stacks the evoker have ---@type combat local combat = Details:GetCurrentCombat()