From 263b3f1330b2ff04bc94171b9897f3bcfd323dbf Mon Sep 17 00:00:00 2001 From: omicron Date: Fri, 12 May 2023 15:42:21 +0200 Subject: [PATCH] Update default configuration indicators/keybinds/layout --- src/frames.lua | 88 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 65 insertions(+), 23 deletions(-) diff --git a/src/frames.lua b/src/frames.lua index 750dbcd..bf828e6 100644 --- a/src/frames.lua +++ b/src/frames.lua @@ -21,6 +21,11 @@ local colors = { white = {1.0, 1.0, 1.0}, orange = {1.0, 0.5 , 0}, violet = {1.0, 0, 1.0}, + magic = {0.4, 0.4, 1.0}, + disease = {0.4, 0.2, 0.0}, + poison = {0.0, 0.7, 0.7}, + curse = {0.7, 0.0, 0.7}, + red = {1, 0, 0}, } local function RangeConfig() @@ -61,6 +66,7 @@ local function MouseConfig() -- Shift {button="mouse2", mods={shift=true}, kind="togglemenu"}, + {button="wheel-up", mods={shift=true}, kind="macro", data="/cast [@UNIT,help]Water Walking;\n/stopspelltarget"}, } elseif class == "PRIEST" then return { @@ -73,6 +79,7 @@ local function MouseConfig() {button="wheel-down", mods={}, kind="macro", data="/use [@UNIT,help]Renew"}, -- alt + {button="mouse1", mods={alt=true}, kind="spell", data="Power Word: Life"}, {button="mouse2", mods={alt=true}, kind="spell", data="Pain Suppression"}, {button="mouse3", mods={alt=true}, kind="spell", data="Power Infusion"}, {button="wheel-up", mods={alt=true}, kind="spell", data="Rapture"}, @@ -100,32 +107,43 @@ local function TriggerConfig() kind="AuraTrigger", spellId=383648, own=true, -- Second Earth Shield on yourself indicator={ kind="SquareIndicator", - size=14, + size=17, point="TOPLEFT", - x=2, y=-2, + x=3, y=-3, color=colors.white, + showStacks=true, } }, { kind="AuraTrigger", spellId=974, own=true, -- Second Earth Shield on yourself indicator={ kind="SquareIndicator", - size=14, + size=17, point="TOPLEFT", - x=2, y=-2, + x=3, y=-3, color=colors.white, + showStacks=true, } }, { kind="AuraTrigger", spellId=61295, own=true, -- Riptide indicator={ kind="SquareIndicator", - size=14, + size=17, point="BOTTOMLEFT", - x=2, y=2, + x=3, y=3, color=colors.cyan, } }, + { + kind="StatusTrigger", status="Burn", invert=false, + indicator={ + kind="BorderIndicator", + thickness=3.0, + color=colors.red, + level=0, + } + }, } elseif class == "PRIEST" then return { @@ -133,9 +151,9 @@ local function TriggerConfig() kind="AuraTrigger", spellId=17, own=true, -- Power Word: Shield indicator={ kind="SquareIndicator", - size=14, + size=17, point="TOPLEFT", - x=2, y=-2, + x=3, y=-3, color=colors.white, } }, @@ -143,9 +161,9 @@ local function TriggerConfig() kind="AuraTrigger", spellId=33206, own=true, -- Pain Suppression indicator={ kind="SquareIndicator", - size=14, + size=17, point="TOPLEFT", - x=18, y=-2, + x=22, y=-3, color=colors.orange, } }, @@ -153,32 +171,56 @@ local function TriggerConfig() kind="AuraTrigger", spellId=139, own=true, -- Renew indicator={ kind="SquareIndicator", - size=14, + size=17, point="BOTTOMLEFT", - x=2, y=2, + x=3, y=3, color=colors.cyan, } }, { - kind="AuraTrigger", spellId=194384, own=true, -- Renew + kind="AuraTrigger", spellId=194384, own=true, -- Atonement indicator={ kind="SquareIndicator", - size=14, + size=17, point="BOTTOMLEFT", - x=18, y=2, + x=22, y=3, color=colors.white, } }, { - kind="AuraTrigger", spellId=10060, own=true, -- Renew + kind="AuraTrigger", spellId=10060, own=true, -- Power Infusion indicator={ kind="SquareIndicator", - size=14, + size=17, point="BOTTOMLEFT", - x=34, y=2, + x=41, y=3, color=colors.violet, } }, + { + kind="StatusTrigger", status="Burn", invert=false, + indicator={ + kind="BorderIndicator", + thickness=3.0, + color=colors.red, + level=0, + } + }, + --[[{ + kind="MultiTrigger", invert=false, + children = { + {kind="StatusTrigger", status="Immune", defaultData={color=colors.violet}}, -- Renew + {kind="AuraTrigger", spellId=139, own=true, defaultData={color=colors.cyan}}, -- Renew + {kind="AuraTrigger", spellId=21562, own=true, defaultData={color=colors.white}}, -- pw:f + }, + indicator = { + kind="SquareIndicator", + size=17, + point="TOPRIGHT", + x=-3, y=-3, + color=colors.white, + } + }--]] } else return {} @@ -248,9 +290,9 @@ function CreateTargetFrames(left, top, config) end function CreateFrames() - config = { + local config = { size = { - width = 110, + width = 111, height = 45, }, range = RangeConfig(), @@ -259,10 +301,10 @@ function CreateFrames() triggers = TriggerConfig(), } - CreatePartyFrames(0, -290, config) + CreatePartyFrames(-0.05, -290.05, config) config.hideInRaid = false - CreateRaidFrames(0, -290, config) - CreateTargetFrames(110*3+50, -245, config) + CreateRaidFrames(-0.05, -290.05, config) + CreateTargetFrames(110*3+50 -0.05, -245.05, config) HideBlizzardFrames() end omif.SetEventHandler("OMICRON_LOADING", CreateFrames)