diff --git a/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/ORB.blp b/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/ORB.blp index 546db24..27d34fd 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/ORB.blp and b/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/ORB.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/PALADIN-HAMMER.blp b/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/PALADIN-HAMMER.blp index dfca28e..350fbc1 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/PALADIN-HAMMER.blp and b/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/PALADIN-HAMMER.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/SWIRL.blp b/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/SWIRL.blp index 4785032..4f30ab8 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/SWIRL.blp and b/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/SWIRL.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/VORTEX.blp b/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/VORTEX.blp index c8941d6..88e582e 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/VORTEX.blp and b/Interface/AddOns/SVUI/assets/artwork/Unitframe/Class/VORTEX.blp differ diff --git a/Interface/AddOns/SVUI/packages/dock/SVDock.lua b/Interface/AddOns/SVUI/packages/dock/SVDock.lua index 3b5ce69..b1aaa73 100644 --- a/Interface/AddOns/SVUI/packages/dock/SVDock.lua +++ b/Interface/AddOns/SVUI/packages/dock/SVDock.lua @@ -728,7 +728,7 @@ do function MOD:LoadToolBarProfessions() if(MOD.ToolBarLoaded) then return end - if(InCombatLockdown()) then self:RegisterEvent("PLAYER_REGEN_ENABLED"); return end + if(InCombatLockdown()) then MOD:RegisterEvent("PLAYER_REGEN_ENABLED"); return end local size = SuperDockMacroBar.currentSize local hearth = CreateFrame("Button", "RightSuperDockHearthButton", SuperDockMacroBar, "SecureActionButtonTemplate") hearth:Size(size, size) diff --git a/Interface/AddOns/SVUI/packages/plates/SVPlate.lua b/Interface/AddOns/SVUI/packages/plates/SVPlate.lua index fd646b4..4619bfc 100644 --- a/Interface/AddOns/SVUI/packages/plates/SVPlate.lua +++ b/Interface/AddOns/SVUI/packages/plates/SVPlate.lua @@ -729,17 +729,14 @@ do local function GetPlateReaction(plate) local oldR,oldG,oldB = plate.health:GetStatusBarColor() - local r = floor(oldR * 100 + .5) / 100; - local g = floor(oldG * 100 + .5) / 100; - local b = floor(oldB * 100 + .5) / 100; + local r = floor(oldR * 100 + .5) * 0.01; + local g = floor(oldG * 100 + .5) * 0.01; + local b = floor(oldB * 100 + .5) * 0.01; for class, _ in pairs(RAID_CLASS_COLORS) do local bb = b if class == 'MONK' then bb = bb - 0.01 end - if SVUI_CLASS_COLORS[class].r == r and SVUI_CLASS_COLORS[class].g == g and SVUI_CLASS_COLORS[class].b == bb then - return class - end if RAID_CLASS_COLORS[class].r == r and RAID_CLASS_COLORS[class].g == g and RAID_CLASS_COLORS[class].b == bb then return class end diff --git a/Interface/AddOns/SVUI/packages/unit/resources/monk.lua b/Interface/AddOns/SVUI/packages/unit/resources/monk.lua index ec8b10a..e1fcb08 100644 --- a/Interface/AddOns/SVUI/packages/unit/resources/monk.lua +++ b/Interface/AddOns/SVUI/packages/unit/resources/monk.lua @@ -72,7 +72,7 @@ local Reposition = function(self) bar[i]:ClearAllPoints() bar[i]:SetHeight(size) bar[i]:SetWidth(size) - bar[i]:SetStatusBarColor(chi,0.87,0.35) + bar[i]:SetStatusBarColor(chi, 0.87, 0.35) if i==1 then bar[i]:SetPoint("TOPLEFT", bar, "TOPLEFT", 0, 0) else @@ -139,6 +139,7 @@ function MOD:CreateClassBar(playerFrame) bar[i].glow:SetAllPoints(bar[i]) bar[i].glow:SetTexture(CHI_FILE) bar[i].glow:SetTexCoord(coords[1],coords[2],coords[3],coords[4]) + bar[i].overlay = bar[i]:CreateTexture(nil, "OVERLAY", nil, 1) bar[i].overlay:SetAllPoints(bar[i]) bar[i].overlay:SetTexture(CHI_FILE) diff --git a/Interface/AddOns/SVUI/packages/unit/resources/paladin.lua b/Interface/AddOns/SVUI/packages/unit/resources/paladin.lua index a66cc15..644363c 100644 --- a/Interface/AddOns/SVUI/packages/unit/resources/paladin.lua +++ b/Interface/AddOns/SVUI/packages/unit/resources/paladin.lua @@ -100,12 +100,16 @@ local Update = function(self, event, unit, powerType) bar[i]:Hide() else bar[i]:Show() + if(not bar[i].swirl[3].anim:IsPlaying()) then + bar[i].swirl[3].anim:Play() + end end end self.MaxClassPower = maxCount end; local AlphaHook = function(self,value) + self.swirl[3].anim:Finish() if value < 1 then self.swirl[1].anim:Finish() self.swirl[2].anim:Finish() @@ -115,7 +119,8 @@ local AlphaHook = function(self,value) end; if(not self.swirl[2].anim:IsPlaying()) then self.swirl[2].anim:Play() - end + end + self.swirl[3].anim:Play() end end --[[ @@ -161,6 +166,13 @@ function MOD:CreateClassBar(playerFrame) barAnimation[2]:SetVertexColor(0.5,0.5,0.15) SuperVillain.Animate:Orbit(barAnimation[2],10,true) + barAnimation[3] = barAnimation:CreateTexture(nil, "OVERLAY") + barAnimation[3]:WrapOuter(barAnimation, 3, 3) + barAnimation[3]:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Unitframe\\Class\\MAGE-FG-ANIMATION") + barAnimation[3]:SetBlendMode("ADD") + barAnimation[3]:SetVertexColor(1, 1, 0) + SuperVillain.Animate:Sprite(barAnimation[3], 0.08, 2, true) + bar[i].swirl = barAnimation; hooksecurefunc(bar[i], "SetAlpha", AlphaHook) end; diff --git a/Interface/AddOns/SVUI/packages/unit/resources/priest.lua b/Interface/AddOns/SVUI/packages/unit/resources/priest.lua index da1d8e7..9451add 100644 --- a/Interface/AddOns/SVUI/packages/unit/resources/priest.lua +++ b/Interface/AddOns/SVUI/packages/unit/resources/priest.lua @@ -86,15 +86,16 @@ PRIEST ########################################################## ]]-- local innerOrbs = { - [1] = {1, 0.7, 0}, - [2] = {1, 1, 0.3}, - [3] = {0.7, 0.5, 1} + [1] = {1, 0.7, 0, 0.2, 0.08, 0.01}, + [2] = {0, 0.5, 0.9, 0.02, 0.1, 0.1}, + [3] = {0.7, 0.5, 1, 0.1, 0.02, 0.4} }; local PreUpdate = function(self, spec) - local color = innerOrbs[spec] or {0.7, 0.5, 1}; + local color = innerOrbs[spec] or {0.7, 0.5, 1, 1, 1, 0.5}; for i = 1, 5 do - self[i].swirl[1]:SetVertexColor(unpack(color)) + self[i].swirl[1]:SetVertexColor(color[1], color[2], color[3]) + self[i].swirl[2]:SetVertexColor(color[4], color[5], color[6]) end end; @@ -129,7 +130,7 @@ function MOD:CreateClassBar(playerFrame) swirl[2]:SetTexture(ICON_FILE) swirl[2]:SetTexCoord(0.5,1,0.5,1) swirl[2]:SetBlendMode("BLEND") - swirl[2]:SetVertexColor(0, 0, 0) + swirl[2]:SetVertexColor(0.2, 0.08, 0.01) SuperVillain.Animate:Orbit(swirl[2], 10, true) bar[i].swirl = swirl; bar[i]:SetScript("OnShow", function(self) diff --git a/Interface/AddOns/SVUI/system/system.lua b/Interface/AddOns/SVUI/system/system.lua index acd9077..8407ee6 100644 --- a/Interface/AddOns/SVUI/system/system.lua +++ b/Interface/AddOns/SVUI/system/system.lua @@ -338,7 +338,11 @@ end local Anim_OnFinished = function(self) local parent = self.parent + local looped = self:GetLooping() self:Stop() + if(looped and looped == "REPEAT" and parent:IsShown()) then + self:Play() + end end local Sprite_OnUpdate = function(self) @@ -430,7 +434,7 @@ function Animate:SetTemplate(frame, animType, hideOnFinished, speed, special, sc frame.anim = frame:CreateAnimationGroup(animType) frame.anim.parent = frame; frame.anim.hideOnFinished = hideOnFinished - if animType ~= 'Flash'then + if animType ~= 'Flash' then frame.anim:SetScript("OnPlay", Anim_OnPlay) frame.anim:SetScript("OnFinished", Anim_OnFinished) frame.anim:SetScript("OnStop", Anim_OnStop) @@ -473,8 +477,8 @@ function Animate:SetTemplate(frame, animType, hideOnFinished, speed, special, sc frame.anim[1]:SetDegrees(360) end frame.anim[1]:SetDuration(speed) - frame.anim:Play() frame.anim:SetLooping("REPEAT") + frame.anim:Play() elseif animType == 'Sprite' then frame.anim[1] = SetNewAnimation(frame.anim, "Translation") frame.anim[1]:SetOrder(1)