From 55939acfe0c8912cc63b172dabdd1e6b5767be77 Mon Sep 17 00:00:00 2001 From: NoM0Re <1629787+NoM0Re@users.noreply.github.com> Date: Sun, 30 Jun 2024 19:24:25 +0200 Subject: [PATCH] more changes to np --- WeakAuras/AuraEnvironment.lua | 4 ++-- WeakAuras/Modernize.lua | 11 +++++++++++ WeakAuras/RegionTypes/DynamicGroup.lua | 2 +- WeakAuras/WeakAuras.lua | 4 ++-- WeakAurasOptions/ActionOptions.lua | 5 +---- WeakAurasOptions/BuffTrigger2.lua | 2 +- WeakAurasOptions/ConditionOptions.lua | 6 +----- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/WeakAuras/AuraEnvironment.lua b/WeakAuras/AuraEnvironment.lua index 1fb295b..a31a5fd 100644 --- a/WeakAuras/AuraEnvironment.lua +++ b/WeakAuras/AuraEnvironment.lua @@ -115,8 +115,8 @@ WeakAuras.HideOverlayGlow = LCG.ButtonGlow_Stop local LGF = LibStub("LibGetFrame-1.0") WeakAuras.GetUnitFrame = LGF.GetUnitFrame -WeakAuras.GetUnitNameplate = function(unit) - if (Private.multiUnitUnits.nameplate[unit] and UnitName(unit) ~= WeakAuras.me) then +WeakAuras.GetNamePlateForUnit = function(unit) + if Private.multiUnitUnits.nameplate[unit] then return LGF.GetUnitNameplate(unit) end end diff --git a/WeakAuras/Modernize.lua b/WeakAuras/Modernize.lua index e1e26d3..ceb9249 100644 --- a/WeakAuras/Modernize.lua +++ b/WeakAuras/Modernize.lua @@ -287,6 +287,17 @@ function Private.Modernize(data) -- Version 18 was a migration for stance/form trigger, but deleted later because of migration issue + -- Version 19 were introduced in July 2019 in BfA + if data.internalVersion < 19 then + if data.triggers then + for triggerId, triggerData in ipairs(data.triggers) do + if triggerData.trigger.type == "status" and triggerData.trigger.event == "Cast" and triggerData.trigger.unit == "multi" then + triggerData.trigger.unit = "nameplate" + end + end + end + end + -- Version 20 was introduced July 2019 in BfA if data.internalVersion < 20 then if data.regionType == "icon" then diff --git a/WeakAuras/RegionTypes/DynamicGroup.lua b/WeakAuras/RegionTypes/DynamicGroup.lua index 452941e..699f2c4 100644 --- a/WeakAuras/RegionTypes/DynamicGroup.lua +++ b/WeakAuras/RegionTypes/DynamicGroup.lua @@ -366,7 +366,7 @@ local anchorers = { local unit = regionData.region.state and regionData.region.state.unit local found if unit then - local frame = WeakAuras.GetUnitNameplate(unit) + local frame = WeakAuras.GetNamePlateForUnit(unit) if frame then frames[frame] = frames[frame] or {} tinsert(frames[frame], regionData) diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua index d0256ea..0faa0a8 100644 --- a/WeakAuras/WeakAuras.lua +++ b/WeakAuras/WeakAuras.lua @@ -2860,7 +2860,7 @@ function Private.HandleGlowAction(actions, region) elseif actions.glow_frame_type == "UNITFRAME" and region.state.unit then glow_frame = WeakAuras.GetUnitFrame(region.state.unit) elseif actions.glow_frame_type == "NAMEPLATE" and region.state.unit then - glow_frame = WeakAuras.GetUnitNameplate(region.state.unit) + glow_frame = WeakAuras.GetNamePlateForUnit(region.state.unit) end if glow_frame then @@ -4402,7 +4402,7 @@ local function GetAnchorFrame(data, region, parent) if (anchorFrameType == "NAMEPLATE") then local unit = region.state and region.state.unit if unit then - local frame = unit and WeakAuras.GetUnitNameplate(unit) + local frame = unit and WeakAuras.GetNamePlateForUnit(unit) if frame then return frame end end --if WeakAuras.IsOptionsOpen() then diff --git a/WeakAurasOptions/ActionOptions.lua b/WeakAurasOptions/ActionOptions.lua index afd0cdd..895ad74 100644 --- a/WeakAurasOptions/ActionOptions.lua +++ b/WeakAurasOptions/ActionOptions.lua @@ -263,10 +263,7 @@ function OptionsPrivate.GetActionOptions(data) end, name = L["Glow Frame Type"], order = 10.3, - values = { - UNITFRAME = L["Unit Frame"], - FRAMESELECTOR = L["Frame Selector"] - }, + values = OptionsPrivate.Private.glow_frame_types, hidden = function() return not data.actions.start.do_glow or data.actions.start.glow_action == nil diff --git a/WeakAurasOptions/BuffTrigger2.lua b/WeakAurasOptions/BuffTrigger2.lua index 17450d3..e4104b0 100644 --- a/WeakAurasOptions/BuffTrigger2.lua +++ b/WeakAurasOptions/BuffTrigger2.lua @@ -812,7 +812,7 @@ local function GetBuffTriggerOptions(data, triggernum) name = L["Ignore Self"], order = 69.35, width = WeakAuras.doubleWidth, - hidden = function() return not (trigger.type == "aura2" and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party")) end + hidden = function() return not (trigger.type == "aura2" and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party" or trigger.unit == "nameplate")) end }, ignoreDead = { diff --git a/WeakAurasOptions/ConditionOptions.lua b/WeakAurasOptions/ConditionOptions.lua index d9169a9..19c26c3 100644 --- a/WeakAurasOptions/ConditionOptions.lua +++ b/WeakAurasOptions/ConditionOptions.lua @@ -1055,11 +1055,7 @@ local function addControlsForChange(args, order, data, conditionVariable, totalA values = OptionsPrivate.Private.glow_frame_types, width = WeakAuras.normalWidth, name = blueIfNoValue2(data, conditions[i].changes[j], "value", "glow_frame_type", L["Glow Frame Type"], L["Glow Frame Type"]), - desc = descIfNoValue2(data, conditions[i].changes[j], "value", "glow_frame_type", propertyType, { - UNITFRAME = L["Unit Frame"], - NAMEPLATE = L["Nameplate"], - FRAMESELECTOR = L["Frame Selector"] - }), + desc = descIfNoValue2(data, conditions[i].changes[j], "value", "glow_frame_type", propertyType, OptionsPrivate.Private.glow_frame_types), order = order, get = function() return type(conditions[i].changes[j].value) == "table" and conditions[i].changes[j].value.glow_frame_type;