Bundle of fixes #10

Merged
omicron merged 11 commits from Andreas/OmicronFrames:bundle-of-fixes into main 2026-10-29 09:10:53 +00:00
Showing only changes of commit 2a24e64554 - Show all commits
+48 -20
View File
@@ -21,6 +21,7 @@ local colors = {
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 },
yellow = { 1.0, 1.0, 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 },
@@ -61,25 +62,41 @@ local function MouseConfig()
button = "mouse2", button = "mouse2",
mods = {}, mods = {},
kind = "macro", kind = "macro",
data = "/use [@UNIT,dead,help]Ancestral Vision; [@UNIT,help]Chain Heal", data = "/use [@UNIT,dead,help]Ancestral Spirit; [@UNIT,help]Chain Heal",
}, },
{ {
button = "mouse3", button = "mouse3",
mods = {}, mods = {},
kind = "macro", kind = "macro",
data = "/use [@UNIT,dead,help]Ancestral Spirit; [@UNIT,help]Purify Spirit", data = "/use [@UNIT,help]Cure Poison",
}, },
{ {
button = "wheel-up", button = "wheel-up",
mods = {}, mods = {},
kind = "macro", kind = "macro",
data = "/use [@UNIT,help]Healing Surge", data = "/use [@UNIT,help]Lesser Healing Wave",
},
{
button = "wheel-down",
mods = {},
kind = "macro",
data = "/use [@UNIT,help]Healing Wave",
}, },
{ 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-down", mods = { alt = true }, kind = "spell", data = "Earth Shield" }, { button = "wheel-down", mods = { alt = true }, kind = "spell", data = "Earth Shield" },
{
button = "wheel-up",
mods = { alt = true },
kind = "macro",
data = "/use [@UNIT,help,nodead]Nature's Swiftness\n/use [@UNIT,help]Healing Wave",
},
{
button = "mouse3",
mods = { alt = true },
kind = "macro",
data = "/use [@UNIT,help]Cure Disease",
},
-- Shift -- Shift
{ button = "mouse2", mods = { shift = true }, kind = "togglemenu" }, { button = "mouse2", mods = { shift = true }, kind = "togglemenu" },
@@ -89,6 +106,12 @@ local function MouseConfig()
kind = "macro", kind = "macro",
data = "/cast [@UNIT,help]Water Walking;\n/stopspelltarget", data = "/cast [@UNIT,help]Water Walking;\n/stopspelltarget",
}, },
{
button = "wheel-down",
mods = { shift = true },
kind = "macro",
data = "/use [@UNIT,help]Healing Wave(rank 1)",
},
} }
elseif class == "PRIEST" then elseif class == "PRIEST" then
return { return {
@@ -259,7 +282,7 @@ local function TriggerClassConfig()
return { return {
{ {
kind = "AuraTrigger", kind = "AuraTrigger",
spellId = 383648, spellId = 32594,
own = true, -- Second Earth Shield on yourself own = true, -- Second Earth Shield on yourself
indicator = { indicator = {
kind = "SquareIndicator", kind = "SquareIndicator",
@@ -273,29 +296,30 @@ local function TriggerClassConfig()
}, },
{ {
kind = "AuraTrigger", kind = "AuraTrigger",
spellId = 974, spellId = 29203,
own = true, -- Second Earth Shield on yourself own = true, -- Healing Way
indicator = { indicator = {
kind = "SquareIndicator", kind = "SquareIndicator",
size = 17, size = 17,
point = "TOPLEFT", point = "TOPLEFT",
x = 3, x = 20,
y = -3, y = -3,
color = colors.white, color = colors.yellow,
showStacks = true, showStacks = true,
}, },
}, },
{ {
kind = "AuraTrigger", kind = "AuraTrigger",
spellId = 61295, spellId = 16237,
own = true, -- Riptide own = true, -- Ancestral Fortitude
indicator = { indicator = {
kind = "IconIndicator", kind = "SquareIndicator",
size = 17, size = 17,
point = "BOTTOMLEFT", point = "TOPLEFT",
x = 3, x = 40,
y = 3, y = -3,
fadeTime = 10.0, color = colors.orange,
showStacks = false,
}, },
}, },
{ {
@@ -710,9 +734,13 @@ 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)
local pet = UnitFrame:new("pet", config)
group:AddUnitFrame(pet)
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)
local partypet = UnitFrame:new("partypet" .. i, config)
group:AddUnitFrame(partypet)
end end
group:Sort() group:Sort()
end end
@@ -742,10 +770,10 @@ function CreateFrames()
triggers = TriggerConfig(), triggers = TriggerConfig(),
} }
CreatePartyFrames(-0.05, -290.05, config) CreatePartyFrames(-0.05, -240.05, config)
config.hideInRaid = false config.hideInRaid = false
CreateRaidFrames(-0.05, -290.05, config) CreateRaidFrames(-0.05, -240.05, config)
CreateTargetFrames(110 * 3 + 50 - 0.05, -245.05, config) CreateTargetFrames(110 * 3 + 50 - 0.05, -240.05, config)
HideBlizzardFrames() HideBlizzardFrames()
end end