Skip to content
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

Jump to bottom

Nameplates will now be shown on all units player has mouseover-ed fir… #75

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Nameplates will now be shown on all units player has mouseover-ed fir… #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60253d5
Nameplates will now be shown on all units player has mouseover-ed fir…
brajevicm Dec 9, 2021
261ff01
Fixed Aura application.
brajevicm Dec 9, 2021
8900d03
Fixed typo.
brajevicm Dec 9, 2021
68d398f
Merged.
brajevicm Dec 10, 2021
3edf5a1
Indent fix.
brajevicm Dec 10, 2021
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
7 changes: 7 additions & 0 deletions ElvUI/Modules/Nameplates/Elements/CastBar.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ end

function NP:Update_CastBarOnUpdate(elapsed)
if self.casting or self.channeling then
if self.value == nil then
resetAttributes(self)
self:Hide()
NP:StyleFilterUpdate(self:GetParent(), "FAKE_Casting")
return
end

if self.casting then
self.value = self.value + elapsed
if self.value >= self.max then
Expand Down
94 changes: 90 additions & 4 deletions ElvUI/Modules/Nameplates/Nameplates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ local LAI = E.Libs.LAI

local _G = _G
local pcall = pcall
local select, unpack, pairs, next, tonumber = select, unpack, pairs, next, tonumber
local select, unpack, pairs, next, tonumber, bit = select, unpack, pairs, next, tonumber, bit
local floor = math.floor
local format, find, gsub, match, split = string.format, string.find, string.gsub, string.match, string.split
local twipe = table.wipe
Expand All @@ -30,18 +30,39 @@ local WorldFrame = WorldFrame
local WorldGetChildren = WorldFrame.GetChildren
local WorldGetNumChildren = WorldFrame.GetNumChildren
local RAID_CLASS_COLORS = RAID_CLASS_COLORS
local COMBATLOG_OBJECT_REACTION_HOSTILE = COMBATLOG_OBJECT_REACTION_HOSTILE
local COMBATLOG_OBJECT_CONTROL_PLAYER = COMBATLOG_OBJECT_CONTROL_PLAYER
local COMBATLOG_OBJECT_CONTROL_NPC = COMBATLOG_OBJECT_CONTROL_NPC

local lastChildern, numChildren, hasTarget = 0, 0
local OVERLAY = [=[Interface\TargetingFrame\UI-TargetingFrame-Flash]=]
local FSPAT = "%s*"..(gsub(gsub(_G.FOREIGN_SERVER_LABEL, "^%s", ""), "[%*()]", "%%%1")).."$"

local playerGUID = UnitGUID("player")

local castEvents = {
["SPELL_CAST_START"] = true,
["SPELL_AURA_APPLIED"] = true,
}

local RaidIconCoordinate = {
[0] = {[0] = "STAR", [0.25] = "MOON"},
[0.25] = {[0] = "CIRCLE", [0.25] = "SQUARE"},
[0.5] = {[0] = "DIAMOND", [0.25] = "CROSS"},
[0.75] = {[0] = "TRIANGLE", [0.25] = "SKULL"}
}

local RaidTargetReference = {
["STAR"] = 0x00000001,
["CIRCLE"] = 0x00000002,
["DIAMOND"] = 0x00000004,
["TRIANGLE"] = 0x00000008,
["MOON"] = 0x00000010,
["SQUARE"] = 0x00000020,
["CROSS"] = 0x00000040,
["SKULL"] = 0x00000080,
}

NP.CreatedPlates = {}
NP.VisiblePlates = {}
NP.GUIDList = {}
Expand Down Expand Up @@ -849,8 +870,6 @@ function NP:SetMouseoverFrame(frame)

if not frame.isGroupUnit then
frame.unit = nil

self:Update_CastBar(frame)
end
end

Expand Down Expand Up @@ -943,9 +962,37 @@ function NP:SearchForFrame(guid, raidIcon, name)
return frame
end

function NP:SearchForFrameByFlags(flags, guid, raidFlags, name)
local frame

if bit.band(flags, COMBATLOG_OBJECT_REACTION_HOSTILE) > 0 then
if bit.band(flags, COMBATLOG_OBJECT_CONTROL_PLAYER) > 0 then
frame = self:SearchNameplateByName(name)
elseif bit.band(flags, COMBATLOG_OBJECT_CONTROL_NPC) > 0 then
frame = self:SearchNameplateByGUID(guid)
if not frame then
local UnitIcon;
for iconname, bitmask in pairs(RaidTargetReference) do
if bit.band(raidFlags, bitmask) > 0 then
UnitIcon = iconname
break
end
end
frame = self:SearchNameplateByIconName(UnitIcon)
end
else
return
end
else
return
end

return frame
end

function NP:UpdateCVars()
SetCVar("ShowClassColorInNameplate", "1")
SetCVar("showVKeyCastbar", "0")
SetCVar("showVKeyCastbar", "1")

if self.db.motionType == "OVERLAP" then
SetCVar("nameplateMotion", "0")
Expand Down Expand Up @@ -1018,6 +1065,45 @@ function NP:UPDATE_MOUSEOVER_UNIT()
end
end

function NP:COMBAT_LOG_EVENT_UNFILTERED(
_,
_,
subevent,
_,
sourceGUID,
sourceName,
sourceFlags,
sourceRaidFlags,
destGUID,
destName,
destFlags,
destRaidFlags,
...)
if sourceGUID == playerGUID and destGUID ~= playerGUID then
if subevent == "SPELL_AURA_APPLIED" or subevent == "SPELL_AURA_REFRESH" then
local frame = self:SearchForFrameByFlags(destFlags, destGUID, destRaidFlags, destName)

if frame then
frame.guid = destGUID
frame.unit = destGUID
self:Update_Auras(frame)
end
end
end

if sourceGUID ~= playerGUID then
if castEvents[subevent] then
local frame = self:SearchForFrameByFlags(sourceFlags, sourceGUID, sourceRaidFlags, sourceName)

if frame then
frame.unit = sourceGUID
frame.guid = sourceGUID
self:Update_CastBar(frame, nil, frame.unit)
end
end
end
end

function NP:PLAYER_FOCUS_CHANGED()
local unitName

Expand Down