From 858ba0ca5c66802978568f5583d3169bfdbf5b10 Mon Sep 17 00:00:00 2001 From: NoM0Re Date: Thu, 16 Jan 2025 18:53:43 +0100 Subject: [PATCH 1/4] fix registerevent logic --- WeakAurasOptions/GenericTrigger.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WeakAurasOptions/GenericTrigger.lua b/WeakAurasOptions/GenericTrigger.lua index 0731789..b2edeef 100644 --- a/WeakAurasOptions/GenericTrigger.lua +++ b/WeakAurasOptions/GenericTrigger.lua @@ -122,7 +122,7 @@ local function GetCustomTriggerOptions(data, triggernum) end elseif trueEvent:match("^UNIT_") then local unit = string.lower(i) - if not (OptionsPrivate.Private.baseUnitId[unit] and OptionsPrivate.Private.multiUnitId[unit]) and not unit:find("^nameplate%d+$") then + if not ((OptionsPrivate.Private.baseUnitId[unit] and OptionsPrivate.Private.multiUnitId[unit]) or unit ~= "nameplate") then return "|cFFFF0000"..L["Unit %s is not a valid unit for RegisterUnitEvent"]:format(unit) end elseif trueEvent == "TRIGGER" then @@ -170,7 +170,7 @@ local function GetCustomTriggerOptions(data, triggernum) end elseif trueEvent:match("^UNIT_") then local unit = string.lower(i) - if not (OptionsPrivate.Private.baseUnitId[unit] or unit:find("^nameplate%d+$")) then + if not (OptionsPrivate.Private.baseUnitId[unit] or unit ~= "nameplate") then return false end elseif trueEvent == "TRIGGER" then From a3d856372e1c098dd668bddfcabc2a5033f5704a Mon Sep 17 00:00:00 2001 From: NoM0Re Date: Fri, 17 Jan 2025 13:12:05 +0100 Subject: [PATCH 2/4] fix elvui np anchoring --- WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua b/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua index f37e550..ad9fb2f 100644 --- a/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua +++ b/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua @@ -308,9 +308,9 @@ function lib.GetUnitNameplate(unit) local nameplate = C_NamePlate.GetNamePlateForUnit(unit) if nameplate then -- credit to Exality for https://wago.io/explosiveorbs - if nameplate.unitFrame and nameplate.unitFrame.Health then + if nameplate.UnitFrame and nameplate.UnitFrame.Health then -- elvui - return nameplate.unitFrame.Health + return nameplate.UnitFrame.Health elseif nameplate.unitFramePlater and nameplate.unitFramePlater.healthBar then -- plater return nameplate.unitFramePlater.healthBar From 5d522900e29cd04ca26ecd29dd100dab7b207d61 Mon Sep 17 00:00:00 2001 From: NoM0Re Date: Fri, 17 Jan 2025 16:16:28 +0100 Subject: [PATCH 3/4] tweak non awesome wotlk imports some more --- WeakAuras/WeakAuras.lua | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua index 51522e5..f7234b8 100644 --- a/WeakAuras/WeakAuras.lua +++ b/WeakAuras/WeakAuras.lua @@ -2315,17 +2315,31 @@ local function removeSpellNames(data) end end -local function removeNameplateUnits(data) - for _, triggerData in ipairs(data.triggers) do - local trigger = triggerData.trigger - if trigger and trigger.type == "unit" then - if trigger.unit == "nameplate" then - trigger.unit = "target" - elseif trigger.threatUnit == "nameplate" then - trigger.threatUnit = "target" - end - end +local function removeNameplateUnitsAndAnchors(data) + -- Dynamic Group Anchor + if data.useAnchorPerUnit == true and data.anchorPerUnit == "NAMEPLATE" then + data.useAnchorPerUnit = false + data.anchorPerUnit = "CUSTOM" + end + -- Aura Anchor + if data.anchorFrameType == "NAMEPLATE" then + data.anchorFrameType = "SCREEN" + end + -- Action Glow Anchor + if data.actions and data.actions.start and data.actions.start.glow_frame_type == "NAMEPLATE" then + data.actions.start.glow_frame_type = "FRAMESELECTOR" + end + -- Trigger units + for _, triggerData in ipairs(data.triggers) do + local trigger = triggerData.trigger + if trigger and trigger.type == "unit" then + if trigger.unit == "nameplate" then + trigger.unit = "target" + elseif trigger.threatUnit == "nameplate" then + trigger.threatUnit = "target" + end end + end end local oldDataStub = { @@ -2525,7 +2539,7 @@ function WeakAuras.PreAdd(data) validateUserConfig(data, data.authorOptions, data.config) removeSpellNames(data) if not(WeakAuras.isAwesomeEnabled()) then - removeNameplateUnits(data) + removeNameplateUnitsAndAnchors(data) end data.init_started = nil data.init_completed = nil From a6beb4cc346b9a260213f0978150e5d13e84ef12 Mon Sep 17 00:00:00 2001 From: NoM0Re Date: Sat, 18 Jan 2025 13:03:32 +0100 Subject: [PATCH 4/4] remove CLEU console warnings on login --- WeakAuras/GenericTrigger.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua index dec3a4f..9e142a2 100644 --- a/WeakAuras/GenericTrigger.lua +++ b/WeakAuras/GenericTrigger.lua @@ -1610,9 +1610,8 @@ function GenericTrigger.Add(data, region) end if warnAboutCLEUEvents then - Private.AuraWarnings.UpdateWarning(data.uid, "spamy_event_warning", "warning", - L["COMBAT_LOG_EVENT_UNFILTERED with no filter can trigger frame drops in raid environment. Find more information:\nhttps://github.com/WeakAuras/WeakAuras2/wiki/Deprecated-CLEU"], - true) + Private.AuraWarnings.UpdateWarning(data.uid, "spammy_event_warning", "warning", + L["COMBAT_LOG_EVENT_UNFILTERED with no filter can trigger frame drops in raid environment. Find more information:\nhttps://github.com/WeakAuras/WeakAuras2/wiki/Deprecated-CLEU"]) else Private.AuraWarnings.UpdateWarning(data.uid, "spamy_event_warning") end