Skip to content

Personal Targeted Spells: honor raid vs party settings #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Krathe82 wants to merge 2 commits into
base: main
Choose a base branch
from
+27 −18
Open

Personal Targeted Spells: honor raid vs party settings #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c707bd9
Personal Targeted Spells: honor the active mode's settings (raid vs p…
Krathe82 Jun 16, 2026
cb98359
Changelog: Personal Targeted Spells mode-aware fix
Krathe82 Jun 16, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
* (Aura Designer) Text-only icons no longer draw a leftover border (static or expiring). (by Krathe)
* (Aura Designer) Aura icon and square borders from older profiles keep their original look after the border rework, instead of appearing thinner or floating in a gap. (by Krathe)
* (Buff/Debuff) Icon borders from older profiles no longer float in a gap after the border rework — they hug the icon as before. (by Krathe)
* (Personal Targeted Spells) The personal targeted-spell display now honours your **raid** and **party** settings separately — disabling it on the raid tab no longer leaves it showing in raid (the whole feature was reading the party settings, ignoring raid's enable / size / position / border). (by Krathe)

## [4.4.1]

Expand Down
44 changes: 26 additions & 18 deletions Features/TargetedSpells.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,14 @@ local function ShouldShowPersonalTargetedSpells(db)
return true -- Default to showing
end

-- Personal Targeted Spells is a player-screen overlay with per-mode settings, so
-- resolve the ACTIVE mode's DB (raid while in a raid, else party). Without this the
-- whole personal path read DF:GetDB() (party) and ignored the raid toggle/size/pos.
-- The group-frame and Targeted List paths stay party-resolved by design.
local function GetPersonalDB()
return IsInRaid() and DF:GetRaidDB() or DF:GetDB()
end

-- Check if a unit is valid for targeted spell tracking
-- We ONLY track nameplate units - boss/arena/target/focus all have nameplates too
-- so tracking them separately would cause duplicates
Expand Down Expand Up @@ -1754,7 +1762,7 @@ local function ProcessCastInternal(casterUnit, isChannel)
end

-- Create personal display icon (always, for every cast - use SetAlphaFromBoolean for visibility)
if ShouldShowPersonalTargetedSpells(db) then
if ShouldShowPersonalTargetedSpells(GetPersonalDB()) then
-- Always show icon, let SetAlphaFromBoolean control visibility based on targeting
DF:ShowPersonalTargetedSpellIcon(casterUnit, casterUnit, spellID, texture, durationObject, isChannel, startTime)
end
Expand Down Expand Up @@ -1860,7 +1868,7 @@ local function HandleTargetChange(casterUnit)
-- Check if this caster has an active cast we're tracking (by unit token)
if not activeCasters[casterUnit] then return end

local db = DF:GetDB()
local db = GetPersonalDB()

-- Group-frame visibility update removed: see ProcessCastInternal note.
-- We only update the personal display now (which uses "player" comparisons,
Expand Down Expand Up @@ -1935,8 +1943,8 @@ local function HandleCastStop(casterUnit, wasInterrupted)
end)

-- Also hide personal targeted spell icon for this caster
if db.personalTargetedSpellEnabled then
if wasInterrupted and db.personalTargetedSpellShowInterrupted then
if GetPersonalDB().personalTargetedSpellEnabled then
if wasInterrupted and GetPersonalDB().personalTargetedSpellShowInterrupted then
-- Will show interrupted animation then hide
DF:HidePersonalTargetedSpellIcon(casterUnit, false)
else
Expand Down Expand Up @@ -2320,7 +2328,7 @@ end

-- Calculate mover size based on settings
local function GetPersonalMoverSize()
local db = DF:GetDB()
local db = GetPersonalDB()
local iconSize = db.personalTargetedSpellSize or 40
local scale = db.personalTargetedSpellScale or 1.0
local maxIcons = db.personalTargetedSpellMaxIcons or 5
Expand Down Expand Up @@ -2348,7 +2356,7 @@ end
-- anchors to the container's CENTER) ends up in the right place, with the full
-- block symmetrically centred on the saved (x, y).
local function GetPersonalContainerPoint(x, y)
local db = DF:GetDB()
local db = GetPersonalDB()
local iconSize = db.personalTargetedSpellSize or 40
local scale = db.personalTargetedSpellScale or 1.0
local maxIcons = db.personalTargetedSpellMaxIcons or 5
Expand Down Expand Up @@ -2377,7 +2385,7 @@ end
local function CreatePersonalContainer()
if personalContainer then return personalContainer end

local db = DF:GetDB()
local db = GetPersonalDB()
local x = db.personalTargetedSpellX or 0
local y = db.personalTargetedSpellY or -150

Expand Down Expand Up @@ -2522,7 +2530,7 @@ local function CreatePersonalIcon(index)
-- Handle interrupted animation (needs to run every frame for smooth animation)
if self.isInterrupted then
self.interruptTimer = (self.interruptTimer or 0) + elapsed
local db = DF:GetDB()
local db = GetPersonalDB()
local duration = db.personalTargetedSpellInterruptedDuration or 0.5

if self.interruptTimer >= duration then
Expand Down Expand Up @@ -2738,7 +2746,7 @@ end

-- Position personal icons
local function PositionPersonalIcons()
local db = DF:GetDB()
local db = GetPersonalDB()
if not personalContainer then return end

local iconSize = db.personalTargetedSpellSize or 40
Expand Down Expand Up @@ -2816,7 +2824,7 @@ end

-- Show a personal targeted spell icon
function DF:ShowPersonalTargetedSpellIcon(casterUnit, casterKey, spellID, texture, durationObject, isChannel, startTime)
local db = DF:GetDB()
local db = GetPersonalDB()
if not db.personalTargetedSpellEnabled then return end

CreatePersonalContainer()
Expand Down Expand Up @@ -2894,7 +2902,7 @@ function DF:HidePersonalTargetedSpellIcon(casterKey, immediate, fromTimer)
local icon = personalIcons[iconIndex]
if not icon then return end

local db = DF:GetDB()
local db = GetPersonalDB()

-- If already showing interrupt animation, only hide if timer completed (fromTimer=true)
-- This prevents UNIT_SPELLCAST_STOP from hiding the icon during interrupt animation
Expand Down Expand Up @@ -2983,7 +2991,7 @@ end

-- Update personal display position from settings
function DF:UpdatePersonalTargetedSpellsPosition()
local db = DF:GetDB()
local db = GetPersonalDB()
local x = db.personalTargetedSpellX or 0
local y = db.personalTargetedSpellY or -150
local iconAlpha = db.personalTargetedSpellAlpha or 1.0
Expand Down Expand Up @@ -3060,7 +3068,7 @@ function DF:CreatePersonalTargetedSpellsMover()
end
self:StartMoving()

local db = DF:GetDB()
local db = GetPersonalDB()
self:SetScript("OnUpdate", function()
-- Update icons to follow mover during drag
local screenWidth, screenHeight = GetScreenWidth(), GetScreenHeight()
Expand Down Expand Up @@ -3092,7 +3100,7 @@ function DF:CreatePersonalTargetedSpellsMover()
local x = centerX - screenWidth / 2
local y = centerY - screenHeight / 2

local db = DF:GetDB()
local db = GetPersonalDB()
if db.snapToGrid and DF.gridFrame and DF.gridFrame:IsShown() then
x, y = DF:SnapToGrid(x, y)
end
Expand Down Expand Up @@ -3123,7 +3131,7 @@ function DF:ShowPersonalTargetedSpellsMover()
DF:CreatePersonalTargetedSpellsMover()
end

local db = DF:GetDB()
local db = GetPersonalDB()
local x = db.personalTargetedSpellX or 0
local y = db.personalTargetedSpellY or -150

Expand All @@ -3146,7 +3154,7 @@ end

-- Test mode support for personal targeted spells
function DF:ShowTestPersonalTargetedSpells()
local db = DF:GetDB()
local db = GetPersonalDB()
if not db.personalTargetedSpellEnabled then return end

CreatePersonalContainer()
Expand Down Expand Up @@ -3256,7 +3264,7 @@ end
-- Update test personal targeted spells (called when settings change)
function DF:UpdateTestPersonalTargetedSpells()
-- Update if mover is shown OR if in test mode with personal enabled
local db = DF:GetDB()
local db = GetPersonalDB()
local moverShown = DF.personalTargetedSpellsMover and DF.personalTargetedSpellsMover:IsShown()
-- Show personal targeted spells in test mode if personal is enabled (don't require testShowTargetedSpell)
local inTestMode = (DF.testMode or DF.raidTestMode) and db.personalTargetedSpellEnabled
Expand Down Expand Up @@ -6263,7 +6271,7 @@ function DF:InitTargetedSpells()
-- only manages the container/icons; the events that drive cast tracking
-- are registered separately so personal display can run even when the
-- group-frame feature is off or API-blocked.
if db.personalTargetedSpellEnabled then
if GetPersonalDB().personalTargetedSpellEnabled then
DF:TogglePersonalTargetedSpells(true)
end

Expand Down