Skip to content

Commit e1a0e96

Browse files
NoM0ReInfusOnWoW
authored andcommitted
Classic/TBC/Wrath: add groupRole and fetchRole to BuffTrigger2
1 parent 3b98b5a commit e1a0e96

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

WeakAuras/BuffTrigger2.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3181,7 +3181,7 @@ function BuffTrigger.Add(data)
31813181

31823182
local groupTrigger = trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party"
31833183
local effectiveIgnoreSelf = (groupTrigger or trigger.unit == "nameplate") and trigger.ignoreSelf
3184-
local effectiveGroupRole = WeakAuras.IsWrathOrCataOrMistsOrRetail() and (groupTrigger and trigger.useGroupRole and trigger.group_role) or nil
3184+
local effectiveGroupRole = groupTrigger and trigger.useGroupRole and trigger.group_role or nil
31853185
local effectiveRaidRole = WeakAuras.IsClassicOrTBCOrWrathOrCataOrMists() and (groupTrigger and trigger.useRaidRole and trigger.raid_role) or nil
31863186
local effectiveClass = groupTrigger and trigger.useClass and trigger.class
31873187
local effectiveSpecId = WeakAuras.IsCataOrMistsOrRetail() and (groupTrigger and trigger.useActualSpec and trigger.actualSpec) or nil
@@ -3241,7 +3241,7 @@ function BuffTrigger.Add(data)
32413241
compareFunc = matchCombineFunctions[trigger.combineMode] or matchCombineFunctions["showLowest"],
32423242
unitExists = showIfInvalidUnit,
32433243
fetchTooltip = not IsSingleMissing(trigger) and trigger.unit ~= "multi" and trigger.fetchTooltip,
3244-
fetchRole = WeakAuras.IsCataOrMistsOrRetail() and trigger.unit ~= "multi" and trigger.fetchRole,
3244+
fetchRole = trigger.unit ~= "multi" and trigger.fetchRole,
32453245
fetchRaidMark = trigger.unit ~= "multi" and trigger.fetchRaidMark,
32463246
groupTrigger = IsGroupTrigger(trigger),
32473247
ignoreSelf = effectiveIgnoreSelf,
@@ -3424,7 +3424,7 @@ function BuffTrigger.GetAdditionalProperties(data, triggernum)
34243424
props["refreshTime"] = { display = L["Since Apply/Refresh"], formatter = "timed" }
34253425
end
34263426

3427-
if WeakAuras.IsCataOrMistsOrRetail() and trigger.unit ~= "multi" and trigger.fetchRole then
3427+
if trigger.unit ~= "multi" and trigger.fetchRole then
34283428
props["role"] = { display = L["Assigned Role"] }
34293429
props["roleIcon"] = { display = L["Assigned Role Icon"] }
34303430
end

WeakAurasOptions/BuffTrigger2.lua

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,6 @@ local function GetBuffTriggerOptions(data, triggernum)
833833
width = WeakAuras.doubleWidth,
834834
hidden = function()
835835
return not (trigger.type == "aura2" and trigger.unit ~= "multi")
836-
or WeakAuras.IsClassicOrTBCOrWrath()
837836
end
838837
},
839838
fetchRaidMark = {
@@ -919,7 +918,6 @@ local function GetBuffTriggerOptions(data, triggernum)
919918
order = 67.1,
920919
hidden = function() return
921920
not (trigger.type == "aura2" and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party"))
922-
or WeakAuras.IsClassicOrTBC()
923921
end
924922
},
925923
group_role = {
@@ -929,7 +927,6 @@ local function GetBuffTriggerOptions(data, triggernum)
929927
values = OptionsPrivate.Private.role_types,
930928
hidden = function() return
931929
not (trigger.type == "aura2" and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party") and trigger.useGroupRole)
932-
or WeakAuras.IsClassicOrTBC()
933930
end,
934931
order = 67.2
935932
},
@@ -940,7 +937,6 @@ local function GetBuffTriggerOptions(data, triggernum)
940937
width = WeakAuras.normalWidth,
941938
hidden = function() return
942939
not (trigger.type == "aura2" and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party") and not trigger.useGroupRole)
943-
or WeakAuras.IsClassicOrTBC()
944940
end
945941
},
946942
useRaidRole = {

0 commit comments

Comments
 (0)