diff --git a/ElvUI_EltreumUI/Modules/Skins/Actionbars.lua b/ElvUI_EltreumUI/Modules/Skins/Actionbars.lua index 211866d1b..71b88e39a 100644 --- a/ElvUI_EltreumUI/Modules/Skins/Actionbars.lua +++ b/ElvUI_EltreumUI/Modules/Skins/Actionbars.lua @@ -270,7 +270,7 @@ EltruismGlowPreview:SetFrameStrata("DIALOG") local EltruismGlowTexture = EltruismGlowPreview:CreateTexture() EltruismGlowPreview:Hide() function ElvUI_EltreumUI:PreviewGlow() - EltruismGlowTexture:SetTexture("Interface\\Addons\\ElvUI_EltreumUI\\Media\\Textures\\GlowPreview.tga") + EltruismGlowTexture:SetTexture("Interface\\Addons\\ElvUI_EltreumUI\\Media\\Textures\\GlowPreview") EltruismGlowTexture:SetAllPoints(EltruismGlowPreview) EltruismGlowPreview:SetMovable(true) EltruismGlowPreview:EnableMouse(true) @@ -283,10 +283,10 @@ function ElvUI_EltreumUI:PreviewGlow() local glowcustomcolor = E.db.ElvUI_EltreumUI.glowcustomcolor local r, g, b = glowcustomcolor.r, glowcustomcolor.g, glowcustomcolor.b skillglowcolor = {r, g, b, 1} - end - if E.db.ElvUI_EltreumUI.glow.colorclass then + elseif E.db.ElvUI_EltreumUI.glow.colorclass then skillglowcolor = {classcolor.r, classcolor.g, classcolor.b, 1} end + if EltruismGlowPreview:IsShown() then LCG.PixelGlow_Stop(EltruismGlowPreview) LCG.AutoCastGlow_Stop(EltruismGlowPreview) @@ -296,11 +296,9 @@ function ElvUI_EltreumUI:PreviewGlow() EltruismGlowPreview:Show() if E.db.ElvUI_EltreumUI.glow.pixel then LCG.PixelGlow_Start(EltruismGlowPreview, skillglowcolor, E.db.ElvUI_EltreumUI.glow.numberpixel, E.db.ElvUI_EltreumUI.glow.frequencypixel, E.db.ElvUI_EltreumUI.glow.lengthpixel, E.db.ElvUI_EltreumUI.glow.thicknesspixel, E.db.ElvUI_EltreumUI.glow.pixelxOffset, E.db.ElvUI_EltreumUI.glow.pixelyOffset, E.db.ElvUI_EltreumUI.glow.borderpixel, nil, high) - end - if E.db.ElvUI_EltreumUI.glow.autocast then + elseif E.db.ElvUI_EltreumUI.glow.autocast then LCG.AutoCastGlow_Start(EltruismGlowPreview, skillglowcolor, E.db.ElvUI_EltreumUI.glow.numberauto, E.db.ElvUI_EltreumUI.glow.frequencyauto, E.db.ElvUI_EltreumUI.glow.autoscale, E.db.ElvUI_EltreumUI.glow.autoxOffset, E.db.ElvUI_EltreumUI.glow.autoyOffset) - end - if E.db.ElvUI_EltreumUI.glow.blizzard then + elseif E.db.ElvUI_EltreumUI.glow.blizzard then LCG.ButtonGlow_Start(EltruismGlowPreview, skillglowcolor, E.db.ElvUI_EltreumUI.glow.frequencyblizz) end end diff --git a/ElvUI_EltreumUI/Options/OptionsClassic.lua b/ElvUI_EltreumUI/Options/OptionsClassic.lua index a6ddb99ca..43a2ccb15 100644 --- a/ElvUI_EltreumUI/Options/OptionsClassic.lua +++ b/ElvUI_EltreumUI/Options/OptionsClassic.lua @@ -2100,6 +2100,15 @@ if ElvUI_EltreumUI.Classic then width = 'full', image = function() return 'Interface\\AddOns\\ElvUI_EltreumUI\\Media\\Textures\\EltreumHeader', 3240, 1 end, }, + autocast = { + type = 'toggle', + name = L["Autocast"], + order = 10, + desc = 'Adds an autocast style glow using class color', + disabled = function() return not E.db.ElvUI_EltreumUI.glow.enable or E.db.ElvUI_EltreumUI.glow.pixel or E.db.ElvUI_EltreumUI.glow.blizzard end, + get = function(info) return E.db.ElvUI_EltreumUI.glow.autocast end, + set = function(info, value) E.db.ElvUI_EltreumUI.glow.autocast = value end, + }, pixel = { type = 'toggle', name = L["Pixel"], @@ -2464,6 +2473,108 @@ if ElvUI_EltreumUI.Classic then }, } }, + autocast = { + type = 'group', + name = L["Autocast Glow"], + order = 3, + args = { + headerline1 = { + order = 1, + type = "description", + name = "Autocast Glow", + width = 'full', + image = function() return 'Interface\\AddOns\\ElvUI_EltreumUI\\Media\\Textures\\EltreumHeader', 3240, 1 end, + }, + numberauto = { + type = 'range', + name = L["Autocast Particle Groups (Default is 8)"], + desc = L["'Set the number of groups for autocast, for each group you get 4 particles"], + order = 92, + min = 1, + max = 10, + step = 1, + width = "full", + get = function() return E.db.ElvUI_EltreumUI.glow.numberauto end, + set = function(_, value) E.db.ElvUI_EltreumUI.glow.numberauto = value end, + }, + headerline2 = { + order = 93, + type = "description", + name = "", + width = 'full', + image = function() return 'Interface\\AddOns\\ElvUI_EltreumUI\\Media\\Textures\\EltreumHeader', 3240, 1 end, + }, + frequencyauto = { + type = 'range', + name = L["Autocast Frequency (Default is 0.8)"], + desc = L["Speed for Autocast, set to negative to inverse direction of rotation"], + order = 93, + min = -3, + max = 3, + step = 0.1, + width = "full", + get = function() return E.db.ElvUI_EltreumUI.glow.frequencyauto end, + set = function(_, value) E.db.ElvUI_EltreumUI.glow.frequencyauto = value end, + }, + headerline3 = { + order = 94, + type = "description", + name = "", + width = 'full', + image = function() return 'Interface\\AddOns\\ElvUI_EltreumUI\\Media\\Textures\\EltreumHeader', 3240, 1 end, + }, + autoscale = { + type = 'range', + name = L["Autocast Scale (Default is 2)"], + desc = L["Change the size of Autocast"], + order = 94, + min = -3, + max = 3, + step = 0.1, + width = "full", + get = function() return E.db.ElvUI_EltreumUI.glow.autoscale end, + set = function(_, value) E.db.ElvUI_EltreumUI.glow.autoscale = value end, + }, + headerline4 = { + order = 95, + type = "description", + name = "", + width = 'full', + image = function() return 'Interface\\AddOns\\ElvUI_EltreumUI\\Media\\Textures\\EltreumHeader', 3240, 1 end, + }, + autoxOffset = { + type = 'range', + name = L["Autocast Horizontal Offset (Default is 5)"], + desc = L["Set the horizontal offset of autocast"], + order = 96, + min = 1, + max = 10, + step = 1, + width = "full", + get = function() return E.db.ElvUI_EltreumUI.glow.autoxOffset end, + set = function(_, value) E.db.ElvUI_EltreumUI.glow.autoxOffset = value end, + }, + headerline5 = { + order = 97, + type = "description", + name = "", + width = 'full', + image = function() return 'Interface\\AddOns\\ElvUI_EltreumUI\\Media\\Textures\\EltreumHeader', 3240, 1 end, + }, + autoyOffset = { + type = 'range', + name = L["Autocast Vertical Offset (Default is 5)"], + desc = L["Set the vertical offset of autocast"], + order = 97, + min = 1, + max = 10, + step = 1, + width = "full", + get = function() return E.db.ElvUI_EltreumUI.glow.autoyOffset end, + set = function(_, value) E.db.ElvUI_EltreumUI.glow.autoyOffset = value end, + }, + } + }, blizz = { type = 'group', name = L["Blizzard Glow"], diff --git a/ElvUI_EltreumUI/Options/OptionsTBC.lua b/ElvUI_EltreumUI/Options/OptionsTBC.lua index e271bf08f..1aa8691d3 100644 --- a/ElvUI_EltreumUI/Options/OptionsTBC.lua +++ b/ElvUI_EltreumUI/Options/OptionsTBC.lua @@ -2153,6 +2153,15 @@ if ElvUI_EltreumUI.TBC then width = 'full', image = function() return 'Interface\\AddOns\\ElvUI_EltreumUI\\Media\\Textures\\EltreumHeader', 3240, 1 end, }, + autocast = { + type = 'toggle', + name = L["Autocast"], + order = 10, + desc = 'Adds an autocast style glow using class color', + disabled = function() return not E.db.ElvUI_EltreumUI.glow.enable or E.db.ElvUI_EltreumUI.glow.pixel or E.db.ElvUI_EltreumUI.glow.blizzard end, + get = function(info) return E.db.ElvUI_EltreumUI.glow.autocast end, + set = function(info, value) E.db.ElvUI_EltreumUI.glow.autocast = value end, + }, pixel = { type = 'toggle', name = L["Pixel"], @@ -2517,6 +2526,108 @@ if ElvUI_EltreumUI.TBC then }, } }, + autocast = { + type = 'group', + name = L["Autocast Glow"], + order = 3, + args = { + headerline1 = { + order = 1, + type = "description", + name = "Autocast Glow", + width = 'full', + image = function() return 'Interface\\AddOns\\ElvUI_EltreumUI\\Media\\Textures\\EltreumHeader', 3240, 1 end, + }, + numberauto = { + type = 'range', + name = L["Autocast Particle Groups (Default is 8)"], + desc = L["'Set the number of groups for autocast, for each group you get 4 particles"], + order = 92, + min = 1, + max = 10, + step = 1, + width = "full", + get = function() return E.db.ElvUI_EltreumUI.glow.numberauto end, + set = function(_, value) E.db.ElvUI_EltreumUI.glow.numberauto = value end, + }, + headerline2 = { + order = 93, + type = "description", + name = "", + width = 'full', + image = function() return 'Interface\\AddOns\\ElvUI_EltreumUI\\Media\\Textures\\EltreumHeader', 3240, 1 end, + }, + frequencyauto = { + type = 'range', + name = L["Autocast Frequency (Default is 0.8)"], + desc = L["Speed for Autocast, set to negative to inverse direction of rotation"], + order = 93, + min = -3, + max = 3, + step = 0.1, + width = "full", + get = function() return E.db.ElvUI_EltreumUI.glow.frequencyauto end, + set = function(_, value) E.db.ElvUI_EltreumUI.glow.frequencyauto = value end, + }, + headerline3 = { + order = 94, + type = "description", + name = "", + width = 'full', + image = function() return 'Interface\\AddOns\\ElvUI_EltreumUI\\Media\\Textures\\EltreumHeader', 3240, 1 end, + }, + autoscale = { + type = 'range', + name = L["Autocast Scale (Default is 2)"], + desc = L["Change the size of Autocast"], + order = 94, + min = -3, + max = 3, + step = 0.1, + width = "full", + get = function() return E.db.ElvUI_EltreumUI.glow.autoscale end, + set = function(_, value) E.db.ElvUI_EltreumUI.glow.autoscale = value end, + }, + headerline4 = { + order = 95, + type = "description", + name = "", + width = 'full', + image = function() return 'Interface\\AddOns\\ElvUI_EltreumUI\\Media\\Textures\\EltreumHeader', 3240, 1 end, + }, + autoxOffset = { + type = 'range', + name = L["Autocast Horizontal Offset (Default is 5)"], + desc = L["Set the horizontal offset of autocast"], + order = 96, + min = 1, + max = 10, + step = 1, + width = "full", + get = function() return E.db.ElvUI_EltreumUI.glow.autoxOffset end, + set = function(_, value) E.db.ElvUI_EltreumUI.glow.autoxOffset = value end, + }, + headerline5 = { + order = 97, + type = "description", + name = "", + width = 'full', + image = function() return 'Interface\\AddOns\\ElvUI_EltreumUI\\Media\\Textures\\EltreumHeader', 3240, 1 end, + }, + autoyOffset = { + type = 'range', + name = L["Autocast Vertical Offset (Default is 5)"], + desc = L["Set the vertical offset of autocast"], + order = 97, + min = 1, + max = 10, + step = 1, + width = "full", + get = function() return E.db.ElvUI_EltreumUI.glow.autoyOffset end, + set = function(_, value) E.db.ElvUI_EltreumUI.glow.autoyOffset = value end, + }, + } + }, blizz = { type = 'group', name = L["Blizzard Glow"],