Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Bars.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2865,6 +2865,7 @@ local function DetectNewBuffs(unit, n, aura, isBuff, bp, vbp, bg)
local isMine = (tc == "player")
local isTabard = isMine and icon and (icon == tabardIcon) -- test if on player, same icon as equipped tabard, not cancellable
local isCastable = aura[17] and not isWeapon
local isStackable = aura[3] > 0
local isOther = not isStealable
and not isCastable
and not isNPC
Expand All @@ -2887,6 +2888,7 @@ local function DetectNewBuffs(unit, n, aura, isBuff, bp, vbp, bg)
local includeTypes = not bp.detectBuffTypes
or (bp.detectStealable and isStealable)
or (bp.detectCastable and isCastable)
or (bp.detectStackable and isStackable)
or (bp.detectNPCBuffs and isNPC)
or (bp.detectVehicleBuffs and isVehicle)
or (bp.detectBossBuffs and isBoss)
Expand All @@ -2905,6 +2907,7 @@ local function DetectNewBuffs(unit, n, aura, isBuff, bp, vbp, bg)
or not (
(bp.excludeStealable and isStealable)
or (bp.excludeCastable and isCastable)
or (bp.excludeStackable and isStackable)
or (bp.excludeNPCBuffs and isNPC)
or (bp.excludeVehicleBuffs and isVehicle)
or (bp.excludeBossBuffs and isBoss)
Expand Down Expand Up @@ -3054,13 +3057,15 @@ local function DetectNewDebuffs(unit, n, aura, isBuff, bp, vbp, bg)
local isEffect = (tt == "effect")
local isAlert = (tt == "alert")
local isPoison, isCurse, isMagic, isDisease = (aura[4] == "Poison"), (aura[4] == "Curse"), (aura[4] == "Magic"), (aura[4] == "Disease")
local isStackable = aura[3] > 0
local isOther = not isBoss and not isEffect and not isPoison and not isCurse and not isMagic and not isDisease and not isDispel and not isInflict and not isNPC and not isVehicle
local isMine = (tc == "player")
local id, gname = aura[20], aura[21]
local checkAll = (unit == "all")
local includeTypes = not bp.filterDebuffTypes
or (bp.detectDispellable and isDispel)
or (bp.detectInflictable and isInflict)
or (bp.detectMultiStack and isStackable)
or (bp.detectNPCDebuffs and isNPC)
or (bp.detectVehicleDebuffs and isVehicle)
or (bp.detectBossDebuffs and isBoss)
Expand All @@ -3075,6 +3080,7 @@ local function DetectNewDebuffs(unit, n, aura, isBuff, bp, vbp, bg)
or not (
(bp.excludeDispellable and isDispel)
or (bp.excludeInflictable and isInflict)
or (bp.excludeMultiStack and isStackable)
or (bp.excludeNPCDebuffs and isNPC)
or (bp.excludeVehicleDebuffs and isVehicle)
or (bp.excludeBossDebuffs and isBoss)
Expand Down
28 changes: 28 additions & 0 deletions Raven_Options/Options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12597,6 +12597,13 @@ MOD.OptionsTable = {
SetBarGroupField("detectCastable", value)
end,
},
Stackable = {
type = "toggle", order = 15, name = L["Stackable"],
disabled = function(info) return not GetBarGroupField("detectBuffTypes") or not GetBarGroupField("detectBuffs") end,
desc = L['Include buffs that able to stack.'],
get = function(info) return GetBarGroupField("detectStackable") end,
set = function(info, value) SetBarGroupField("detectStackable", value) end,
},
Stealable = {
type = "toggle",
order = 20,
Expand Down Expand Up @@ -12862,6 +12869,13 @@ MOD.OptionsTable = {
SetBarGroupField("excludeCastable", value)
end,
},
Stackable = {
type = "toggle", order = 15, name = L["Stackable"],
disabled = function(info) return not GetBarGroupField("excludeBuffTypes") or not GetBarGroupField("detectBuffs") end,
desc = L['Exclude buffs that able to stack.'],
get = function(info) return GetBarGroupField("excludeStackable") end,
set = function(info, value) SetBarGroupField("excludeStackable", value) end,
},
Stealable = {
type = "toggle",
order = 20,
Expand Down Expand Up @@ -14080,6 +14094,13 @@ MOD.OptionsTable = {
SetBarGroupField("detectInflictable", value)
end,
},
Stackable = {
type = "toggle", order = 15, name = L["Stackable"],
disabled = function(info) return not GetBarGroupField("filterDebuffTypes") end,
desc = L['Include debuffs that able to stack.'],
get = function(info) return GetBarGroupField("detectMultiStack") end,
set = function(info, value) SetBarGroupField("detectMultiStack", value) end,
},
Dispellable = {
type = "toggle",
order = 20,
Expand Down Expand Up @@ -14284,6 +14305,13 @@ MOD.OptionsTable = {
SetBarGroupField("excludeInflictable", value)
end,
},
Stackable = {
type = "toggle", order = 15, name = L["Stackable"],
disabled = function(info) return not GetBarGroupField("excludeDebuffTypes") end,
desc = L['Exclude debuffs that able to stack.'],
get = function(info) return GetBarGroupField("excludeMultiStack") end,
set = function(info, value) SetBarGroupField("excludeMultiStack", value) end,
},
Dispellable = {
type = "toggle",
order = 20,
Expand Down