wow/OmicronFrames
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Implement fade and flash behavior for square indicators

Browse Source
This commit is contained in:
omicron
2023-07-28 14:15:50 +02:00
parent 877560cb58
commit e20887d46b
4 changed files with 298 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

359
src/frames.lua
View File

@@ -17,15 +17,16 @@
local omif = select(2, ...) local omif = select(2, ...)
local colors = { local colors = {
cyan = {0.0, 0.8, 0.8}, cyan = { 0.0, 0.8, 0.8 },
white = {1.0, 1.0, 1.0}, white = { 1.0, 1.0, 1.0 },
orange = {1.0, 0.5 , 0}, orange = { 1.0, 0.5, 0 },
violet = {1.0, 0, 1.0}, violet = { 1.0, 0, 1.0 },
magic = {0.4, 0.4, 1.0}, magic = { 0.4, 0.4, 1.0 },
disease = {0.4, 0.2, 0.0}, disease = { 0.4, 0.2, 0.0 },
poison = {0.0, 0.7, 0.7}, poison = { 0.0, 0.7, 0.7 },
curse = {0.7, 0.0, 0.7}, curse = { 0.7, 0.0, 0.7 },
red = {1, 0, 0}, red = { 1, 0, 0 },
blue = { .4, 0.4, 1 },
} }
local function RangeConfig() local function RangeConfig()
@@ -54,156 +55,230 @@ local function MouseConfig()
if class == "SHAMAN" then if class == "SHAMAN" then
return { return {
-- No modifier -- No modifier
{button="mouse1", mods={}, kind="target"}, { button = "mouse1", mods = {}, kind = "target" },
{button="mouse2", mods={}, kind="macro", data="/use [@UNIT,dead,help]Ancestral Vision; [@UNIT,help]Chain Heal"}, {
{button="mouse3", mods={}, kind="macro", data="/use [@UNIT,dead,help]Ancestral Spirit; [@UNIT,help]Purify Spirit"}, button = "mouse2",
{button="wheel-up", mods={}, kind="macro", data="/use [@UNIT,help]Healing Surge"}, mods = {},
{button="wheel-down", mods={}, kind="macro", data="/use [@UNIT,help]Riptide"}, kind = "macro",
data =
"/use [@UNIT,dead,help]Ancestral Vision; [@UNIT,help]Chain Heal"
},
{
button = "mouse3",
mods = {},
kind = "macro",
data =
"/use [@UNIT,dead,help]Ancestral Spirit; [@UNIT,help]Purify Spirit"
},
{ button = "wheel-up", mods = {}, kind = "macro", data = "/use [@UNIT,help]Healing Surge" },
{ button = "wheel-down", mods = {}, kind = "macro", data = "/use [@UNIT,help]Riptide" },
-- alt -- alt
{button="wheel-up", mods={alt=true}, kind="spell", data="Healing Wave"}, { button = "wheel-up", mods = { alt = true }, kind = "spell", data = "Healing Wave" },
{button="wheel-down", mods={alt=true}, kind="spell", data="Earth Shield"}, { button = "wheel-down", mods = { alt = true }, kind = "spell", data = "Earth Shield" },
-- Shift -- Shift
{button="mouse2", mods={shift=true}, kind="togglemenu"}, { button = "mouse2", mods = { shift = true }, kind = "togglemenu" },
{button="wheel-up", mods={shift=true}, kind="macro", data="/cast [@UNIT,help]Water Walking;\n/stopspelltarget"}, {
button = "wheel-up",
mods = { shift = true },
kind = "macro",
data =
"/cast [@UNIT,help]Water Walking;\n/stopspelltarget"
},
} }
elseif class == "PRIEST" then elseif class == "PRIEST" then
return { return {
-- No modifier -- No modifier
{button="mouse1", mods={}, kind="target"}, { button = "mouse1", mods = {}, kind = "target" },
{button="mouse2", mods={}, kind="macro", data="/use [@UNIT,dead,help]Mass Resurrection; [@UNIT,help]Power Word: Radiance"}, {
{button="mouse3", mods={}, kind="macro", data="/use [@UNIT,dead,help]Resurrection; [@UNIT,help]Purify"}, button = "mouse2",
{button="mouse4", mods={}, kind="spell", data="Shadow Covenant"}, mods = {},
{button="wheel-up", mods={}, kind="macro", data="/use [@UNIT,help]Flash Heal"}, kind = "macro",
{button="wheel-down", mods={}, kind="macro", data="/use [@UNIT,help]Renew"}, data = "/use [@UNIT,dead,help]Mass Resurrection; [@UNIT,help]Power Word: Radiance"
},
{
button = "mouse3",
mods = {},
kind = "macro",
data = "/use [@UNIT,dead,help]Resurrection; [@UNIT,help]Purify"
},
{ button = "mouse4", mods = {}, kind = "spell", data = "Shadow Covenant" },
{ button = "wheel-up", mods = {}, kind = "macro", data = "/use [@UNIT,help]Flash Heal" },
{ button = "wheel-down", mods = {}, kind = "macro", data = "/use [@UNIT,help]Renew" },
-- alt -- alt
{button="mouse1", mods={alt=true}, kind="spell", data="Power Word: Life"}, { button = "mouse1", mods = { alt = true }, kind = "spell", data = "Power Word: Life" },
{button="mouse2", mods={alt=true}, kind="spell", data="Pain Suppression"}, { button = "mouse2", mods = { alt = true }, kind = "spell", data = "Pain Suppression" },
{button="mouse3", mods={alt=true}, kind="spell", data="Power Infusion"}, { button = "mouse3", mods = { alt = true }, kind = "spell", data = "Power Infusion" },
{button="wheel-up", mods={alt=true}, kind="spell", data="Rapture"}, { button = "wheel-up", mods = { alt = true }, kind = "spell", data = "Rapture" },
{button="wheel-down", mods={alt=true}, kind="spell", data="Power Word: Shield"}, { button = "wheel-down", mods = { alt = true }, kind = "spell", data = "Power Word: Shield" },
-- Shift -- Shift
{button="mouse2", mods={shift=true}, kind="togglemenu"}, { button = "mouse2", mods = { shift = true }, kind = "togglemenu" },
{button="wheel-up", mods={shift=true}, kind="macro", data="/cast [@UNIT,help]Levitate;\n/stopspelltarget"}, {
{button="wheel-down", mods={shift=true}, kind="macro", data="/cast [@UNIT,help]Leap of Faith;\n/stopspelltarget"}, button = "wheel-up",
mods = { shift = true },
kind = "macro",
data = "/cast [@UNIT,help]Levitate;\n/stopspelltarget"
},
{
button = "wheel-down",
mods = { shift = true },
kind = "macro",
data = "/cast [@UNIT,help]Leap of Faith;\n/stopspelltarget"
},
} }
else else
return { return {
-- Super basic defaults -- Super basic defaults
{button="mouse1", mods={}, kind="target"}, { button = "mouse1", mods = {}, kind = "target" },
{button="mouse2", mods={shift=true}, kind="togglemenu"}, { button = "mouse2", mods = { shift = true }, kind = "togglemenu" },
} }
end end
end end
local function TriggerConfig() local function TriggerClassConfig()
local _, class = UnitClass("player") local _, class = UnitClass("player")
if class == "SHAMAN" then if class == "SHAMAN" then
return { return {
{ {
kind="AuraTrigger", spellId=383648, own=true, -- Second Earth Shield on yourself kind = "AuraTrigger",
indicator={ spellId = 383648,
kind="SquareIndicator", own = true, -- Second Earth Shield on yourself
size=17, indicator = {
point="TOPLEFT", kind = "SquareIndicator",
x=3, y=-3, size = 17,
color=colors.white, point = "TOPLEFT",
showStacks=true, x = 3,
y = -3,
color = colors.white,
showStacks = true,
} }
}, },
{ {
kind="AuraTrigger", spellId=974, own=true, -- Second Earth Shield on yourself kind = "AuraTrigger",
indicator={ spellId = 974,
kind="SquareIndicator", own = true, -- Second Earth Shield on yourself
size=17, indicator = {
point="TOPLEFT", kind = "SquareIndicator",
x=3, y=-3, size = 17,
color=colors.white, point = "TOPLEFT",
showStacks=true, x = 3,
y = -3,
color = colors.white,
showStacks = true,
} }
}, },
{ {
kind="AuraTrigger", spellId=61295, own=true, -- Riptide kind = "AuraTrigger",
indicator={ spellId = 61295,
kind="SquareIndicator", own = true, -- Riptide
size=17, indicator = {
point="BOTTOMLEFT", kind = "SquareIndicator",
x=3, y=3, size = 17,
color=colors.cyan, point = "BOTTOMLEFT",
x = 3,
y = 3,
color = colors.cyan,
fadeTime = 10.0,
} }
}, },
{ {
kind="StatusTrigger", status="Burn", invert=false, kind = "StatusTrigger",
indicator={ status = "Burn",
kind="BorderIndicator", invert = false,
thickness=3.0, indicator = {
color=colors.red, kind = "BorderIndicator",
level=0, thickness = 3.0,
color = colors.red,
level = 0,
} }
}, },
} }
elseif class == "PRIEST" then elseif class == "PRIEST" then
return { return {
{ {
kind="AuraTrigger", spellId=17, own=true, -- Power Word: Shield kind = "AuraTrigger",
indicator={ spellId = 17,
kind="SquareIndicator", own = true, -- Power Word: Shield
size=17, indicator = {
point="TOPLEFT", kind = "SquareIndicator",
x=3, y=-3, size = 17,
color=colors.white, point = "TOPLEFT",
x = 3,
y = -3,
color = colors.white,
fadeTime = 10.0,
} }
}, },
{ {
kind="AuraTrigger", spellId=33206, own=true, -- Pain Suppression kind = "AuraTrigger",
indicator={ spellId = 33206,
kind="SquareIndicator", own = true, -- Pain Suppression
size=17, indicator = {
point="TOPLEFT", kind = "SquareIndicator",
x=22, y=-3, size = 17,
color=colors.orange, point = "TOPLEFT",
x = 22,
y = -3,
color = colors.orange,
fadeTime = 10.0,
flashTime = 1.3,
} }
}, },
{ {
kind="AuraTrigger", spellId=139, own=true, -- Renew kind = "AuraTrigger",
indicator={ spellId = 139,
kind="SquareIndicator", own = true, -- Renew
size=17, indicator = {
point="BOTTOMLEFT", kind = "SquareIndicator",
x=3, y=3, size = 17,
color=colors.cyan, point = "BOTTOMLEFT",
x = 3,
y = 3,
color = colors.cyan,
fadeTime = 10.0,
} }
}, },
{ {
kind="AuraTrigger", spellId=194384, own=true, -- Atonement kind = "AuraTrigger",
indicator={ spellId = 194384,
kind="SquareIndicator", own = true, -- Atonement
size=17, indicator = {
point="BOTTOMLEFT", kind = "SquareIndicator",
x=22, y=3, size = 17,
color=colors.white, point = "BOTTOMLEFT",
x = 22,
y = 3,
color = colors.white,
fadeTime = 10.0,
flashTime = 1.3,
} }
}, },
{ {
kind="AuraTrigger", spellId=10060, own=true, -- Power Infusion kind = "AuraTrigger",
indicator={ spellId = 10060,
kind="SquareIndicator", own = true, -- Power Infusion
size=17, indicator = {
point="BOTTOMLEFT", kind = "SquareIndicator",
x=41, y=3, size = 17,
color=colors.violet, point = "BOTTOMLEFT",
x = 41,
y = 3,
color = colors.violet,
fadeTime = 10.0,
} }
}, },
{ {
kind="StatusTrigger", status="Burn", invert=false, kind = "StatusTrigger",
indicator={ status = "Burn",
kind="BorderIndicator", invert = false,
thickness=3.0, indicator = {
color=colors.red, kind = "BorderIndicator",
level=0, thickness = 3.0,
color = colors.red,
level = 0,
} }
}, },
--[[{ --[[{
@@ -227,6 +302,65 @@ local function TriggerConfig()
end end
end end
-- Quick helper function to create a config for debuff triggers
local function MakeDebuffTrigger(slot, spellid, color, stacks)
if stacks == nil then
stacks = false
end
return {
kind = "AuraTrigger",
spellId = spellid,
indicator = {
kind = "SquareIndicator",
size = 15,
point = "TOPRIGHT",
x = -17 * slot,
y = -3,
color = color,
showStacks = stacks,
}
}
end
local function TriggerConfig()
local triggers = TriggerClassConfig()
-- slot, spellid, color, stacks
local debuffs = {
-- Kezzara, Aberrus
{ 1, 406525, colors.orange }, -- Dread Rift
{ 2, 402253, colors.red }, -- Ray of Anguish
{ 3, 404743, colors.violet, true }, -- Terror Claws
-- Forgotten Experiment, Aberrus
{ 1, 406365, colors.red, true }, -- Rending Charge (p1)
{ 1, 407327, colors.cyan, true }, -- Unstable Essence (p2/p3)
{ 3, 407313, colors.violet, true }, -- Infused Strikes
-- Uldaman: Legacy of Tyr
{ 1, 377510, colors.cyan, true }, -- Stolen Time
-- Brackenhide Hollow
{ 1, 367521, colors.cyan, true }, -- Bone Bolt
-- The Underrot
--{1, 273226, colors.green, true}, -- Decaying Spores
-- Sarkareth, Aberrus
{ 3, 401330, colors.violet }, -- Burning Claws (P1 tank)
{ 3, 411241, colors.violet }, -- Void Claws (P2 tank)
{ 3, 408429, colors.violet }, -- Void Slash (P3 tank)
{ 2, 404218, colors.blue }, -- Void Fracture (carry bomb)
{ 1, 401951, colors.cyan, true }, -- Oblivion
}
for _, debuff in ipairs(debuffs) do
table.insert(triggers, MakeDebuffTrigger(debuff[1], debuff[2], debuff[3], debuff[4]))
end
return triggers
end
local types = omif.GetModule("types") local types = omif.GetModule("types")
local UnitFrame = types.UnitFrame local UnitFrame = types.UnitFrame
local UnitGroup = types.UnitGroup local UnitGroup = types.UnitGroup
@@ -254,9 +388,9 @@ function CreateRaidFrames(left, top, config)
local width = config.size.width local width = config.size.width
local height = config.size.height local height = config.size.height
local group = UnitGroup:new(left, top, width, height) local group = UnitGroup:new(left, top, width, height)
for i=0,5 do for i = 0, 5 do
for j=0,4 do for j = 0, 4 do
local num = i*5 + j + 1 local num = i * 5 + j + 1
local frame = UnitFrame:new("raid" .. num, config) local frame = UnitFrame:new("raid" .. num, config)
group:AddUnitFrame(frame) group:AddUnitFrame(frame)
end end
@@ -269,7 +403,7 @@ function CreatePartyFrames(left, top, config)
local group = UnitGroup:new(left, top, width, height) local group = UnitGroup:new(left, top, width, height)
local player = UnitFrame:new("player", config) local player = UnitFrame:new("player", config)
group:AddUnitFrame(player) group:AddUnitFrame(player)
for i=1,4 do for i = 1, 4 do
local frame = UnitFrame:new("party" .. i, config) local frame = UnitFrame:new("party" .. i, config)
group:AddUnitFrame(frame) group:AddUnitFrame(frame)
end end
@@ -283,9 +417,9 @@ function CreateTargetFrames(left, top, config)
focus:SetPosition(left, top) focus:SetPosition(left, top)
local target = UnitFrame:new("target", config) local target = UnitFrame:new("target", config)
target:SetPosition(left, top - height) target:SetPosition(left, top - height)
for i=1,4 do for i = 1, 4 do
local boss = UnitFrame:new("boss" .. i, config) local boss = UnitFrame:new("boss" .. i, config)
boss:SetPosition(left, top-(i+1)*height) boss:SetPosition(left, top - (i + 1) * height)
end end
end end
@@ -304,7 +438,8 @@ function CreateFrames()
CreatePartyFrames(-0.05, -290.05, config) CreatePartyFrames(-0.05, -290.05, config)
config.hideInRaid = false config.hideInRaid = false
CreateRaidFrames(-0.05, -290.05, config) CreateRaidFrames(-0.05, -290.05, config)
CreateTargetFrames(110*3+50 -0.05, -245.05, config) CreateTargetFrames(110 * 3 + 50 - 0.05, -245.05, config)
HideBlizzardFrames() HideBlizzardFrames()
end end
omif.SetEventHandler("OMICRON_LOADING", CreateFrames) omif.SetEventHandler("OMICRON_LOADING", CreateFrames)

41
src/types/indicators/squareindicator.lua
View File

@@ -45,7 +45,9 @@ end
---@param y number ---@param y number
---@param color number[] ---@param color number[]
---@param showStacks boolean ---@param showStacks boolean
function SquareIndicator:Init(unitframe, size, point, x, y, color, showStacks) ---@param doFade nil|number
---@param doFlash nil|number
function SquareIndicator:Init(unitframe, size, point, x, y, color, showStacks, fadeTime, flashTime)
self.unitframe = unitframe self.unitframe = unitframe
self.frameParent = unitframe.overlays self.frameParent = unitframe.overlays
self.size = size self.size = size
@@ -54,6 +56,8 @@ function SquareIndicator:Init(unitframe, size, point, x, y, color, showStacks)
self.y = y self.y = y
self.color = color self.color = color
self.showStacks = showStacks self.showStacks = showStacks
self.fadeTime = fadeTime
self.flashTime = flashTime
end end
--- Set the color of the Square Indicator --- Set the color of the Square Indicator
@@ -77,6 +81,13 @@ function SquareIndicator:Show(data)
stacks:SetText(numStacks) stacks:SetText(numStacks)
stacks:Show() stacks:Show()
end end
if self.flashTime or self.fadeTime then
self.frame:SetScript("OnUpdate", function(frame, dt)
self:OnUpdate(dt)
end)
self.expirationTime = data.expirationTime
self.updateThrottle = 0
end
if data.color then if data.color then
self:SetColor(data.color) self:SetColor(data.color)
else else
@@ -93,7 +104,7 @@ function SquareIndicator:GetFrame()
bgFile = "Interface\\Addons\\OmicronFrames\\media\\textures\\square_white", bgFile = "Interface\\Addons\\OmicronFrames\\media\\textures\\square_white",
edgeFile = "Interface\\Addons\\OmicronFrames\\media\\textures\\pixel_edge", edgeFile = "Interface\\Addons\\OmicronFrames\\media\\textures\\pixel_edge",
edgeSize = 2, edgeSize = 2,
insets = {left=0, right=0, top=0, bottom=0}, insets = { left = 0, right = 0, top = 0, bottom = 0 },
} }
frame:ApplyBackdrop() frame:ApplyBackdrop()
@@ -108,6 +119,7 @@ function SquareIndicator:GetFrame()
frame:SetParent(self.frameParent) frame:SetParent(self.frameParent)
frame:SetPoint(self.point, self.x, self.y) frame:SetPoint(self.point, self.x, self.y)
frame:SetBackdropBorderColor(0, 0, 0, 1) frame:SetBackdropBorderColor(0, 0, 0, 1)
frame:SetAlpha(1)
stacks = frame.stacks stacks = frame.stacks
return frame, stacks return frame, stacks
end end
@@ -122,6 +134,30 @@ function SquareIndicator:Update(data)
self.stacks:SetText(numStacks) self.stacks:SetText(numStacks)
self.stacks:Show() self.stacks:Show()
end end
self.expirationTime = data.expirationTime
self.frame:SetAlpha(1)
end
function SquareIndicator:OnUpdate(dt)
dt = self.updateThrottle + dt
if dt < 0.04 then
self.updateThrottle = dt
return
else
self.updateThrottle = 0
end
local timeLeft = self.expirationTime - GetTime()
local fadeTime = self.fadeTime or 0
local flashTime = self.flashTime or 0
if timeLeft < flashTime then
local alpha = ((timeLeft * 4) % 1)
self.frame:SetAlpha(alpha)
elseif timeLeft < fadeTime then
local alpha = timeLeft / fadeTime
self.frame:SetAlpha(alpha)
end
end end
--- Hide the square indicator. --- Hide the square indicator.
@@ -130,5 +166,6 @@ function SquareIndicator:Hide()
self.stacks:Hide() self.stacks:Hide()
self.frame = nil self.frame = nil
self.stacks = nil self.stacks = nil
frame:SetScript("OnUpdate", nil)
squarePool:Release(frame) squarePool:Release(frame)
end end

4
src/types/triggers/auratrigger.lua
View File

@@ -92,7 +92,7 @@ function AuraTrigger:AddAura(aura)
return return
end end
self.count = self.count + 1 self.count = self.count + 1
self:SetData({stacks=aura.applications}) self:SetData({ stacks = aura.applications, duration = aura.duration, expirationTime = aura.expirationTime })
self:SetState(self.count >= self.requiredCount, false) self:SetState(self.count >= self.requiredCount, false)
end end
@@ -100,7 +100,7 @@ end
---@param before UnitAuraInfo ---@param before UnitAuraInfo
---@param after UnitAuraInfo ---@param after UnitAuraInfo
function AuraTrigger:UpdateAura(before, after) function AuraTrigger:UpdateAura(before, after)
self:SetData({stacks=after.applications}) self:SetData({ stacks = after.applications, duration = after.duration, expirationTime = after.expirationTime })
if self.active then if self.active then
self.indicator:Update(self.data) self.indicator:Update(self.data)
end end

4
src/types/unitframe.lua
View File

@@ -125,7 +125,9 @@ function UnitFrame:CreateIndicator(indicator)
indicator.x, indicator.x,
indicator.y, indicator.y,
indicator.color, indicator.color,
indicator.showStacks indicator.showStacks,
indicator.fadeTime,
indicator.flashTime
) )
elseif kind == "BorderIndicator" then elseif kind == "BorderIndicator" then
return BorderIndicator:new( return BorderIndicator:new(