diff --git a/Interface/AddOns/SVUI/framework/movers/mover_dragger.lua b/Interface/AddOns/SVUI/framework/movers/mover_dragger.lua index f821c6e..dbd96a3 100644 --- a/Interface/AddOns/SVUI/framework/movers/mover_dragger.lua +++ b/Interface/AddOns/SVUI/framework/movers/mover_dragger.lua @@ -357,10 +357,10 @@ function Dragger:Initialize() if(not SV.db.SVQuest.enable) then UIPanels["ObjectiveTrackerFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; end - if(SV.db.SVMap.tinyWorldMap) then - UIPanels["WorldMapFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; - WorldMapTitleButton:EnableMouse(false) - end + -- if(SV.db.SVMap.tinyWorldMap) then + -- UIPanels["WorldMapFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; + -- WorldMapTitleButton:EnableMouse(false) + -- end self.EventsActive = true diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/runebar.lua b/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/runebar.lua index 45f02cb..a1077c5 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/runebar.lua +++ b/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/runebar.lua @@ -46,10 +46,10 @@ local oUF = ns.oUF local floor = math.floor oUF.colors.Runes = { - {1, 0, 0}, -- blood - {0, .5, 0}, -- unholy - {0, 1, 1}, -- frost - {.9, .1, 1}, -- death + {0.75, 0, 0}, -- blood + {0.1, 0.75, 0}, -- unholy + {0, 0.5, 0.75}, -- frost + {0.5, 0, 1}, -- death } local runemap = { 1, 2, 5, 6, 3, 4 } @@ -70,15 +70,13 @@ local UpdateType = function(self, event, rid, alt) local rune = self.Runes[runemap[rid]] local runeType = GetRuneType(rid) or alt if isUsable and runeType == 1 then runeType = 4; end + if(rune.bar.Change) then + rune.bar:Change(runeType) + end if not runeType then return; end local colors = oUF.colors.Runes[runeType] local r, g, b = colors[1], colors[2], colors[3] - rune:SetStatusBarColor(r, g, b) - - if(rune.bg) then - local mu = rune.bg.multiplier or 1 - rune.bg:SetVertexColor(r * mu, g * mu, b * mu) - end + rune.bar:SetStatusBarColor(r, g, b) end local UpdateRune = function(self, event, rid) @@ -86,15 +84,18 @@ local UpdateRune = function(self, event, rid) if(rune) then local start, duration, runeReady = GetRuneCooldown(rid) if(runeReady) then - rune:SetMinMaxValues(0, 1) - rune:SetValue(1) - rune:SetScript("OnUpdate", nil) + rune.bar:SetMinMaxValues(0, 1) + rune.bar:SetValue(1) + rune.bar:SetScript("OnUpdate", nil) else - rune.duration = GetTime() - start - rune.max = duration - rune:SetMinMaxValues(1, duration) - rune:SetScript("OnUpdate", OnUpdate) + rune.bar.duration = GetTime() - start + rune.bar.max = duration + rune.bar:SetMinMaxValues(1, duration) + rune.bar:SetScript("OnUpdate", OnUpdate) end + -- if(rune.bar.Change) then + -- rune.bar:Change(runeType) + -- end end end @@ -129,11 +130,6 @@ local Enable = function(self, unit) if not runes.UpdateAllRuneTypes then runes.UpdateAllRuneTypes = UpdateAllRuneTypes end for i=1, 6 do - local rune = runes[runemap[i]] - if(rune:IsObjectType'StatusBar' and not rune:GetStatusBarTexture()) then - rune:SetStatusBarTexture[[Interface\TargetingFrame\UI-StatusBar]] - end - -- From my minor testing this is a okey solution. A full login always remove -- the death runes, or at least the clients knowledge about them. UpdateType(self, nil, i, floor((runemap[i]+1)/2)) diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index 6433f8c..f14cb0b 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -378,11 +378,9 @@ end local function AdjustMapSize() if InCombatLockdown() then return end - -- if WORLDMAP_SETTINGS.size == WORLDMAP_FULLMAP_SIZE then - -- SetLargeWorldMap() - -- elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then - -- SetSmallWorldMap() - -- end + if WORLDMAP_SETTINGS.size == WORLDMAP_FULLMAP_SIZE then + WorldMapFrame:SetPoint("TOP", SV.Screen, "TOP", 0, 0) + end if SV.db.SVMap.tinyWorldMap == true then BlackoutWorld:SetTexture(0,0,0,0) diff --git a/Interface/AddOns/SVUI/packages/unit/resources/deathknight.lua b/Interface/AddOns/SVUI/packages/unit/resources/deathknight.lua index 8db2fe6..b0a68ba 100644 --- a/Interface/AddOns/SVUI/packages/unit/resources/deathknight.lua +++ b/Interface/AddOns/SVUI/packages/unit/resources/deathknight.lua @@ -50,14 +50,24 @@ if(not MOD) then return end LOCALS ########################################################## ]]-- -local runeTextures = { - [[Interface\Addons\SVUI\assets\artwork\Unitframe\Class\DEATHKNIGHT-BLOOD]], - [[Interface\Addons\SVUI\assets\artwork\Unitframe\Class\DEATHKNIGHT-BLOOD]], - [[Interface\Addons\SVUI\assets\artwork\Unitframe\Class\DEATHKNIGHT-FROST]], - [[Interface\Addons\SVUI\assets\artwork\Unitframe\Class\DEATHKNIGHT-FROST]], - [[Interface\Addons\SVUI\assets\artwork\Unitframe\Class\DEATHKNIGHT-UNHOLY]], - [[Interface\Addons\SVUI\assets\artwork\Unitframe\Class\DEATHKNIGHT-UNHOLY]] +SV.SpecialFX:Register("rune_blood", [[Spells\Monk_drunkenhaze_impact.m2]], 0, 0, 0, 0, 0.00001, 0, 0.3) +SV.SpecialFX:Register("rune_frost", [[Spells\Ice_cast_low_hand.m2]], 0, 0, 0, 0, 0.00001, -0.2, 0.4) +SV.SpecialFX:Register("rune_unholy", [[Spells\Poison_impactdot_med_chest.m2]], 0, 0, 0, 0, 0.13, -0.3, -0.2) +SV.SpecialFX:Register("rune_death", [[Spells\Shadow_strikes_state_hand.m2]], 0, 0, 0, 0, 0.001, 0, -0.35) +local specEffects = { + [1] = "rune_blood", + [2] = "rune_blood", + [3] = "rune_frost", + [4] = "rune_frost", + [5] = "rune_unholy", + [6] = "rune_unholy", }; +local colors = { + {0.75, 0, 0}, -- blood + {0.1, 0.75, 0}, -- unholy + {0, 0.5, 0.75}, -- frost + {0.5, 0, 1}, -- death +} --[[ ########################################################## POSITIONING @@ -83,17 +93,25 @@ local Reposition = function(self) bar:SetAllPoints(bar.Holder) for i = 1, max do bar[i]:ClearAllPoints() - bar[i]:SetHeight(size) + -- bar[i]:SetHeight(size*0.68) + -- bar[i]:SetWidth(size*2) + bar[i]:SetHeight(size+4) bar[i]:SetWidth(size) - bar[i]:GetStatusBarTexture():SetHorizTile(false) + bar[i].bar:GetStatusBarTexture():SetHorizTile(false) if i==1 then - bar[i]:SetPoint("TOPLEFT", bar, "TOPLEFT", 0, 0) - elseif i == 2 then - bar[i]:SetPointToScale("LEFT", bar[1], "RIGHT", -6, 0) + bar[i]:SetPoint("TOPLEFT", bar, "TOPLEFT", 0, 1) else - bar[i]:SetPointToScale("LEFT", bar[i - 1], "RIGHT", -2, 0) + bar[i]:SetPointToScale("LEFT", bar[i - 1], "RIGHT", -3, 0) end end + + -- bar[1]:SetPoint("TOPLEFT", bar, "TOPLEFT", 0, 2) + -- bar[2]:SetPoint("TOPLEFT", bar[1], "BOTTOMLEFT", 0, 4) + -- bar[3]:SetPoint("LEFT", bar[1], "RIGHT", -2, 0) + -- bar[4]:SetPoint("TOPLEFT", bar[3], "BOTTOMLEFT", 0, 4) + -- bar[5]:SetPoint("LEFT", bar[3], "RIGHT", -2, 0) + -- bar[6]:SetPoint("TOPLEFT", bar[5], "BOTTOMLEFT", 0, 4) + if bar.UpdateAllRuneTypes then bar.UpdateAllRuneTypes(self) end @@ -103,22 +121,81 @@ end DEATHKNIGHT ########################################################## ]]-- +local RuneUpdate = function(self, isReady) + if(isReady) then + if(not self.FX:IsShown()) then + self.FX:Show() + end + self.FX:UpdateEffect() + else + self.FX:Hide() + end +end + +local RuneChange = function(self, runeType) + if(runeType and runeType == 4) then + self.FX:SetEffect("rune_death") + else + self.FX:SetEffect(specEffects[self.effectIndex]) + end +end + function MOD:CreateClassBar(playerFrame) local max = 6 local bar = CreateFrame("Frame", nil, playerFrame) bar:SetFrameLevel(playerFrame.TextGrip:GetFrameLevel() + 30) - for i=1, max do - local graphic = runeTextures[i] - bar[i] = CreateFrame("StatusBar", nil, bar) - bar[i].noupdate = true; - bar[i]:SetStatusBarTexture(graphic) - bar[i]:GetStatusBarTexture():SetHorizTile(false) - bar[i]:SetOrientation("VERTICAL") - bar[i].bg = bar[i]:CreateTexture(nil,'BORDER') - bar[i].bg:SetAllPoints() - bar[i].bg:SetTexture(graphic) - bar[i].bg:SetAlpha(0.5) - bar[i].bg.multiplier = 0.1 + for i=1, max do + local color = colors[i] + local rune = CreateFrame("Frame", nil, bar) + rune:SetFrameStrata("BACKGROUND") + rune:SetFrameLevel(0) + + local bgFrame = CreateFrame("Frame", nil, rune) + bgFrame:SetAllPointsIn(rune) + + local bgTexture = bgFrame:CreateTexture(nil, "BORDER") + bgTexture:SetAllPoints(bgFrame) + bgTexture:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Bars\DEFAULT]]) + bgTexture:SetGradientAlpha("VERTICAL",colors[1],colors[2],colors[3],0.75,0,0,0,0.25) + + local borderB = bgFrame:CreateTexture(nil,"OVERLAY") + borderB:SetTexture(0,0,0) + borderB:SetPoint("BOTTOMLEFT") + borderB:SetPoint("BOTTOMRIGHT") + borderB:SetHeight(2) + + local borderT = bgFrame:CreateTexture(nil,"OVERLAY") + borderT:SetTexture(0,0,0) + borderT:SetPoint("TOPLEFT") + borderT:SetPoint("TOPRIGHT") + borderT:SetHeight(2) + + local borderL = bgFrame:CreateTexture(nil,"OVERLAY") + borderL:SetTexture(0,0,0) + borderL:SetPoint("TOPLEFT") + borderL:SetPoint("BOTTOMLEFT") + borderL:SetWidth(2) + + local borderR = bgFrame:CreateTexture(nil,"OVERLAY") + borderR:SetTexture(0,0,0) + borderR:SetPoint("TOPRIGHT") + borderR:SetPoint("BOTTOMRIGHT") + borderR:SetWidth(2) + + rune.bar = CreateFrame("StatusBar", nil, bgFrame) + rune.bar.noupdate = true; + rune.bar:SetAllPointsIn(bgFrame) + rune.bar:SetOrientation("HORIZONTAL") + rune.bar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Bars\DEFAULT]]) + + local effectName = specEffects[i] + SV.SpecialFX:SetFXFrame(rune.bar, effectName) + + bar[i] = rune + bar[i].bar.effectIndex = i; + bar[i].bar.Update = RuneUpdate + bar[i].bar.Change = RuneChange + bar[i].bar:SetOrientation("VERTICAL") end local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) diff --git a/Interface/AddOns/SVUI/packages/unit/resources/paladin.lua b/Interface/AddOns/SVUI/packages/unit/resources/paladin.lua index 8069713..2cb0485 100644 --- a/Interface/AddOns/SVUI/packages/unit/resources/paladin.lua +++ b/Interface/AddOns/SVUI/packages/unit/resources/paladin.lua @@ -145,8 +145,8 @@ function MOD:CreateClassBar(playerFrame) bar[i].bg:SetVertexColor(0,0,0) bar[i].holder = underlay - bar[i]:SetScript("OnShow", ShowLink) - bar[i]:SetScript("OnHide", HideLink) + --bar[i]:SetScript("OnShow", ShowLink) + --bar[i]:SetScript("OnHide", HideLink) end bar.Override = Update; diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua index a0d1fb8..8404034 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua @@ -51,6 +51,8 @@ end local function WorldMap_FullView() local WorldMapFrame = _G.WorldMapFrame; + --WorldMapFrame:ClearAllPoints() + -- WorldMapFrame:SetPoint("TOP", SV.Screen, "TOP", 0, 0) WorldMapFrame.Panel:ClearAllPoints() local w, h = WorldMapDetailFrame:GetSize() WorldMapFrame.Panel:SetSizeToScale(w + 24, h + 98)