diff --git a/SVUITheme_Simple/SVUITheme_Simple.toc b/SVUITheme_Simple/SVUITheme_Simple.toc index 1a8e122..df3095a 100644 --- a/SVUITheme_Simple/SVUITheme_Simple.toc +++ b/SVUITheme_Simple/SVUITheme_Simple.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.0.0 ## Title: |cffFF9900SVUI Theme: |r|cff00EFFFSimple|r diff --git a/SVUI_!Core/SVUI_!Core.toc b/SVUI_!Core/SVUI_!Core.toc index cb2ff49..34a50c4 100644 --- a/SVUI_!Core/SVUI_!Core.toc +++ b/SVUI_!Core/SVUI_!Core.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.2.7 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Core|r diff --git a/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua b/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua index a56e7cd..a1c6a57 100644 --- a/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua +++ b/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua @@ -176,7 +176,7 @@ local function Constructor() local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND") scrollbg:SetAllPoints(scrollbar) - scrollbg:SetTexture(0, 0, 0, 0.4) + scrollbg:SetColorTexture(0, 0, 0, 0.4) --Container Support local content = CreateFrame("Frame", nil, scrollframe) diff --git a/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua b/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua index 085449b..bddeee7 100644 --- a/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua +++ b/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua @@ -669,7 +669,7 @@ local function Constructor() local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND") scrollbg:SetAllPoints(scrollbar) - scrollbg:SetTexture(0,0,0,0.4) + scrollbg:SetColorTexture(0,0,0,0.4) local border = CreateFrame("Frame",nil,frame) border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT") diff --git a/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua b/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua index f25d46c..59f8d60 100644 --- a/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua +++ b/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua @@ -146,7 +146,7 @@ local function Constructor() local texture = frame:CreateTexture(nil, "BACKGROUND") texture:SetWidth(16) texture:SetHeight(16) - texture:SetTexture(1, 1, 1) + texture:SetColorTexture(1, 1, 1) texture:SetPoint("CENTER", colorSwatch) texture:Show() diff --git a/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua b/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua index 1f28cb5..1d80f11 100644 --- a/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua +++ b/SVUI_!Core/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua @@ -455,7 +455,7 @@ do local line = self.frame:CreateTexture(nil, "OVERLAY") line:SetHeight(1) - line:SetTexture(.5, .5, .5) + line:SetColorTexture(.5, .5, .5) line:SetPoint("LEFT", self.frame, "LEFT", 10, 0) line:SetPoint("RIGHT", self.frame, "RIGHT", -10, 0) diff --git a/SVUI_!Core/libs/AceVillain-1.0/AceVillain-1.0.toc b/SVUI_!Core/libs/AceVillain-1.0/AceVillain-1.0.toc index 5077dba..4ab6ed5 100644 --- a/SVUI_!Core/libs/AceVillain-1.0/AceVillain-1.0.toc +++ b/SVUI_!Core/libs/AceVillain-1.0/AceVillain-1.0.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## LoadOnDemand: 1 ## Title: Lib: AceVillain-1.0 diff --git a/SVUI_!Core/libs/AceVillain-1.0/widgets/AceGUIContainer-Frame.lua b/SVUI_!Core/libs/AceVillain-1.0/widgets/AceGUIContainer-Frame.lua index e4b7d1e..650dddc 100644 --- a/SVUI_!Core/libs/AceVillain-1.0/widgets/AceGUIContainer-Frame.lua +++ b/SVUI_!Core/libs/AceVillain-1.0/widgets/AceGUIContainer-Frame.lua @@ -168,28 +168,28 @@ local function SetHeadingStyle(frame) local bg = backdrop:CreateTexture(nil, "BORDER") bg:SetAllPoints(backdrop) - bg:SetTexture(0, 0, 0, 0.5) + bg:SetColorTexture(0, 0, 0, 0.5) local left = backdrop:CreateTexture(nil, "OVERLAY") - left:SetTexture(0, 0, 0, 1) + left:SetColorTexture(0, 0, 0, 1) left:SetPoint("TOPLEFT", 1, -1) left:SetPoint("BOTTOMLEFT", -1, -1) left:SetWidth(2) local right = backdrop:CreateTexture(nil, "OVERLAY") - right:SetTexture(0, 0, 0, 1) + right:SetColorTexture(0, 0, 0, 1) right:SetPoint("TOPRIGHT", -1, -1) right:SetPoint("BOTTOMRIGHT", -1, -1) right:SetWidth(2) local bottom = backdrop:CreateTexture(nil, "OVERLAY") - bottom:SetTexture(0, 0, 0, 1) + bottom:SetColorTexture(0, 0, 0, 1) bottom:SetPoint("BOTTOMLEFT", 1, -1) bottom:SetPoint("BOTTOMRIGHT", -1, -1) bottom:SetHeight(2) local top = backdrop:CreateTexture(nil, "OVERLAY") - top:SetTexture(0, 0, 0, 1) + top:SetColorTexture(0, 0, 0, 1) top:SetPoint("TOPLEFT", 1, -1) top:SetPoint("TOPRIGHT", -1, 1) top:SetHeight(2) diff --git a/SVUI_!Core/libs/AceVillain-1.0/widgets/AceGUIContainer-TreeGroup.lua b/SVUI_!Core/libs/AceVillain-1.0/widgets/AceGUIContainer-TreeGroup.lua index 9bdf2b8..4690437 100644 --- a/SVUI_!Core/libs/AceVillain-1.0/widgets/AceGUIContainer-TreeGroup.lua +++ b/SVUI_!Core/libs/AceVillain-1.0/widgets/AceGUIContainer-TreeGroup.lua @@ -667,7 +667,7 @@ local function Constructor() local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND") scrollbg:SetAllPoints(scrollbar) - scrollbg:SetTexture(0,0,0,0.4) + scrollbg:SetColorTexture(0,0,0,0.4) local border = CreateFrame("Frame",nil,frame) border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT") diff --git a/SVUI_!Core/libs/LibSharedMedia-3.0/LibSharedMedia-3.0.toc b/SVUI_!Core/libs/LibSharedMedia-3.0/LibSharedMedia-3.0.toc index bae72fd..a1fe837 100644 --- a/SVUI_!Core/libs/LibSharedMedia-3.0/LibSharedMedia-3.0.toc +++ b/SVUI_!Core/libs/LibSharedMedia-3.0/LibSharedMedia-3.0.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## LoadOnDemand: 1 ## X-Curse-Packaged-Version: 6.1.0 - r92 ## X-Curse-Project-Name: LibSharedMedia-3.0 diff --git a/SVUI_!Core/libs/_SVUI_Lib/Animate.lua b/SVUI_!Core/libs/_SVUI_Lib/Animate.lua index 8b2e14f..41895d5 100644 --- a/SVUI_!Core/libs/_SVUI_Lib/Animate.lua +++ b/SVUI_!Core/libs/_SVUI_Lib/Animate.lua @@ -233,12 +233,14 @@ local function AnimationTemplate(frame, animType, hideOnFinished, speed, special if not speed then speed = 0.33 end frame.anim[1] = SetNewAnimation(frame.anim, "Alpha") - frame.anim[1]:SetChange(1) + frame.anim[1]:SetFromAlpha(0) + frame.anim[1]:SetToAlpha(1) frame.anim[1]:SetOrder(2) frame.anim[1]:SetDuration(speed) frame.anim[2] = SetNewAnimation(frame.anim, "Alpha") - frame.anim[2]:SetChange(-1) + frame.anim[2]:SetFromAlpha(1) + frame.anim[2]:SetToAlpha(0) frame.anim[2]:SetOrder(1) frame.anim[2]:SetDuration(speed) diff --git a/SVUI_!Core/libs/_SVUI_Lib/Registry.lua b/SVUI_!Core/libs/_SVUI_Lib/Registry.lua index bfc59c6..939b58b 100644 --- a/SVUI_!Core/libs/_SVUI_Lib/Registry.lua +++ b/SVUI_!Core/libs/_SVUI_Lib/Registry.lua @@ -70,7 +70,7 @@ local ThemeFromMeta = "X-SVUITheme"; local CoreGlobalName = GetAddOnMetadata(..., HeaderFromMeta); local AddonVersion = GetAddOnMetadata(..., "Version"); local InterfaceVersion = select(4, GetBuildInfo()); - +--print(InterfaceVersion) --[[ COMMON LOCAL VARS ]]-- local GLOBAL_FILENAME = CoreGlobalName.."_Global"; diff --git a/SVUI_!Core/setup/presets.lua b/SVUI_!Core/setup/presets.lua index fa37f46..2af5a45 100644 --- a/SVUI_!Core/setup/presets.lua +++ b/SVUI_!Core/setup/presets.lua @@ -884,7 +884,7 @@ local function LoadPageData() { ["SubTitle"] = RESOLUTION, - ["Desc1"] = (L["Your current resolution is %s, this is considered a %s resolution."]):format(GetCVar("gxResolution"), (SV.LowRez and LOW or HIGH)), + ["Desc1"] = (L["Your current resolution is %s, this is considered a %s resolution."]):format(GetCVar("gxFullscreenResolution"), (SV.LowRez and LOW or HIGH)), ["Desc2"] = isLowRez, ["Desc3"] = L["CHOOSE_OR_DIE"], diff --git a/SVUI_!Core/system/_reports/friends.lua b/SVUI_!Core/system/_reports/friends.lua index 7bfd670..64b3ef7 100644 --- a/SVUI_!Core/system/_reports/friends.lua +++ b/SVUI_!Core/system/_reports/friends.lua @@ -154,9 +154,9 @@ do local presenceID, presenceName, battleTag, isBattleTagPresence, toonName, toonID, client, isOnline, lastOnline, isAFK, isDND, messageText, noteText, isRIDFriend, messageTime, canSoR = BNGetFriendInfo(i) local _, hasFocus, realmName, realmID, faction, race, class, guild, zoneName, level, gameText, broadcastText, broadcastTime; if(toonID) then - hasFocus, toonName, client, realmName, realmID, faction, race, class, guild, zoneName, level, gameText, broadcastText, broadcastTime = BNGetToonInfo(toonID); + hasFocus, toonName, client, realmName, realmID, faction, race, class, guild, zoneName, level, gameText, broadcastText, broadcastTime = BNGetGameAccountInfo(toonID); else - hasFocus, toonName, client, realmName, realmID, faction, race, class, guild, zoneName, level, gameText, broadcastText, broadcastTime = BNGetToonInfo(presenceID); + hasFocus, toonName, client, realmName, realmID, faction, race, class, guild, zoneName, level, gameText, broadcastText, broadcastTime = BNGetGameAccountInfo(presenceID); end if(not client or (client == BNET_CLIENT_APP)) then diff --git a/SVUI_!Core/system/alerts.lua b/SVUI_!Core/system/alerts.lua index 00a954c..d303c25 100644 --- a/SVUI_!Core/system/alerts.lua +++ b/SVUI_!Core/system/alerts.lua @@ -739,7 +739,7 @@ end ########################################################## ALERT HOOKS ########################################################## -]]-- + local _hook_AlertFrame_SetLootAnchors = function(self) if MissingLootFrame:IsShown() then MissingLootFrame:ClearAllPoints() @@ -884,11 +884,11 @@ local _hook_AlertFrame_SetGarrisonShipFollowerAlertFrameAnchors = function(self) frame:SetPoint(POSITION, self, ANCHOR_POINT, 0, YOFFSET) end end - +]]-- local AlertFramePostMove_Hook = function(forced) local b, c = SVUI_AlertFrame_MOVE:GetCenter() local d = SV.Screen:GetTop() - if(c > (d / 2)) then + if(c > (d * 0.6)) then POSITION = "TOP" ANCHOR_POINT = "BOTTOM" YOFFSET = -10; @@ -899,6 +899,7 @@ local AlertFramePostMove_Hook = function(forced) YOFFSET = 10; SVUI_AlertFrame_MOVE:SetText(SVUI_AlertFrame_MOVE.textString.." (Grow Up)") end + if(SV.RollFrames and SV.RollFrames[1]) then local lastFrame = SVUI_AlertFrame; local newAnchor; @@ -918,16 +919,11 @@ local AlertFramePostMove_Hook = function(forced) if(newAnchor) then AlertFrame:SetAllPoints(newAnchor) else - AlertFrame:SetAllPoints(SVUI_AlertFrame) + AlertFrame:SetPoint(POSITION, SVUI_AlertFrame, POSITION, 0, 0) end else AlertFrame:ClearAllPoints() - AlertFrame:SetAllPoints(SVUI_AlertFrame) - end - if(forced) then - FORCE_POSITION = true; - AlertFrame_FixAnchors() - FORCE_POSITION = false + AlertFrame:SetPoint(POSITION, SVUI_AlertFrame, POSITION, 0, 0) end end --[[ @@ -1051,7 +1047,9 @@ local function LoadSystemAlerts() SVUI_AlertFrame:SetSize(180, 20); SVUI_AlertFrame.callbackOnEnter = true; SV:NewAnchor(SVUI_AlertFrame, L["Loot / Alert Frames"], AlertFramePostMove_Hook) - + NewHook(AlertFrame, "UpdateAnchors", AlertFramePostMove_Hook) + --AlertFrame:HookScript("UpdateAnchors", AlertFramePostMove_Hook) + --[[ NewHook('AlertFrame_FixAnchors', AlertFramePostMove_Hook) NewHook('AlertFrame_SetLootAnchors', _hook_AlertFrame_SetLootAnchors) NewHook('AlertFrame_SetLootWonAnchors', _hook_AlertFrame_SetLootWonAnchors) @@ -1070,6 +1068,7 @@ local function LoadSystemAlerts() NewHook('AlertFrame_SetGarrisonShipMissionAlertFrameAnchors', _hook_AlertFrame_SetGarrisonShipMissionAlertFrameAnchors) NewHook('AlertFrame_SetGarrisonFollowerAlertFrameAnchors', _hook_AlertFrame_SetGarrisonFollowerAlertFrameAnchors) NewHook('AlertFrame_SetGarrisonShipFollowerAlertFrameAnchors', _hook_AlertFrame_SetGarrisonShipFollowerAlertFrameAnchors) + ]]-- end SV.Events:On("LOAD_ALL_ESSENTIALS", LoadSystemAlerts); diff --git a/SVUI_!Core/system/api.lua b/SVUI_!Core/system/api.lua index a50fcaf..d61656d 100644 --- a/SVUI_!Core/system/api.lua +++ b/SVUI_!Core/system/api.lua @@ -104,7 +104,7 @@ UI SCALING ########################################################## ]]-- local function ScreenUpdate() - local rez = GetCVar("gxResolution") + local rez = GetCVar("gxFullscreenResolution") local height = rez:match("%d+x(%d+)") local width = rez:match("(%d+)x%d+") local gxHeight = tonumber(height) @@ -986,7 +986,7 @@ local function CommonButtonSettings(frame, addChecked, noSwipe) hover:InsetPoints(frame.Panel) frame.hover = hover; end - frame.hover:SetTexture(0.1, 0.8, 0.8, 0.5) + frame.hover:SetColorTexture(0.1, 0.8, 0.8, 0.5) frame:SetHighlightTexture(frame.hover) end @@ -996,7 +996,7 @@ local function CommonButtonSettings(frame, addChecked, noSwipe) pushed:InsetPoints(frame.Panel) frame.pushed = pushed; end - frame.pushed:SetTexture(0.1, 0.8, 0.1, 0.3) + frame.pushed:SetColorTexture(0.1, 0.8, 0.1, 0.3) frame:SetPushedTexture(frame.pushed) end @@ -1006,7 +1006,7 @@ local function CommonButtonSettings(frame, addChecked, noSwipe) checked:InsetPoints(frame.Panel) frame.checked = checked end - frame.checked:SetTexture(0, 0.5, 0, 0.2) + frame.checked:SetColorTexture(0, 0.5, 0, 0.2) frame:SetCheckedTexture(frame.checked) end @@ -1186,7 +1186,7 @@ MOD.Methods["DockButton"] = function(self, frame, inverse, template) hover:InsetPoints(frame.Panel) frame.hover = hover; end - frame.hover:SetTexture(0.1, 0.8, 0.8, 0.5) + frame.hover:SetColorTexture(0.1, 0.8, 0.8, 0.5) frame:SetHighlightTexture(frame.hover) end diff --git a/SVUI_!Core/system/core.lua b/SVUI_!Core/system/core.lua index 9686ec2..4efd37c 100644 --- a/SVUI_!Core/system/core.lua +++ b/SVUI_!Core/system/core.lua @@ -85,7 +85,7 @@ _G.SVUI_ICON_COORDS = {0.1, 0.9, 0.1, 0.9}; ---- LOCALS ---- -local rez = GetCVar("gxResolution"); +local rez = GetCVar("gxFullscreenResolution"); local baseHeight = tonumber(rez:match("%d+x(%d+)")) local baseWidth = tonumber(rez:match("(%d+)x%d+")) local defaultDockWidth = baseWidth * 0.66; @@ -156,6 +156,7 @@ if(not CUSTOM_CLASS_COLORS) then ["WARRIOR"] = { r = 0.698, g = 0.36, b = 0.152 }, ["DEATHKNIGHT"] = { r = 0.847, g = 0.117, b = 0.074 }, ["MONK"] = { r = 0.015, g = 0.886, b = 0.38 }, + ["DEMONHUNTER"] = { r = 0.286, g = 0, b = 0.788 }, }; ---- IF WE NEED TO FORCE DEFAULT COLORS, USE THIS INSTEAD ---- diff --git a/SVUI_!Core/system/dock.lua b/SVUI_!Core/system/dock.lua index ab8a1fa..5d98929 100644 --- a/SVUI_!Core/system/dock.lua +++ b/SVUI_!Core/system/dock.lua @@ -291,28 +291,28 @@ local function SetBasicBackdrop(frame) local underlay = backdrop:CreateTexture(nil, "BORDER") underlay:InsetPoints(backdrop) - underlay:SetTexture(0, 0, 0, 0.5) + underlay:SetColorTexture(0, 0, 0, 0.5) local left = backdrop:CreateTexture(nil, "OVERLAY") - left:SetTexture(0, 0, 0, 1) + left:SetColorTexture(0, 0, 0, 1) left:SetPoint("TOPLEFT", 1, -1) left:SetPoint("BOTTOMLEFT", -1, -1) left:SetWidth(2) local right = backdrop:CreateTexture(nil, "OVERLAY") - right:SetTexture(0, 0, 0, 1) + right:SetColorTexture(0, 0, 0, 1) right:SetPoint("TOPRIGHT", -1, -1) right:SetPoint("BOTTOMRIGHT", -1, -1) right:SetWidth(2) local bottom = backdrop:CreateTexture(nil, "OVERLAY") - bottom:SetTexture(0, 0, 0, 1) + bottom:SetColorTexture(0, 0, 0, 1) bottom:SetPoint("BOTTOMLEFT", 1, -1) bottom:SetPoint("BOTTOMRIGHT", -1, -1) bottom:SetHeight(2) local top = backdrop:CreateTexture(nil, "OVERLAY") - top:SetTexture(0, 0, 0, 1) + top:SetColorTexture(0, 0, 0, 1) top:SetPoint("TOPLEFT", 1, -1) top:SetPoint("TOPRIGHT", -1, 1) top:SetHeight(2) @@ -331,20 +331,20 @@ local UpdateBackdrop = function(self) self.backdrop.underlay:SetGradientAlpha("VERTICAL", 0, 0, 0, 0, 0, 0, 0, 0.8) self.backdrop.left:SetGradientAlpha("VERTICAL", 0, 0, 0, 0, 0, 0, 0, 1) self.backdrop.right:SetGradientAlpha("VERTICAL", 0, 0, 0, 0, 0, 0, 0, 1) - self.backdrop.bottom:SetTexture(0, 0, 0, 0) + --self.backdrop.bottom:SetColorTexture(0, 0, 0, 0) self.backdrop.bottom:SetAlpha(0) self.backdrop.bottom:SetHeight(1) - self.backdrop.top:SetTexture(0, 0, 0, 1) + --self.backdrop.top:SetColorTexture(0, 0, 0, 1) self.backdrop.top:SetAlpha(1) self.backdrop.top:SetHeight(2) else self.backdrop.underlay:SetGradientAlpha("VERTICAL", 0, 0, 0, 0.8, 0, 0, 0, 0) self.backdrop.left:SetGradientAlpha("VERTICAL", 0, 0, 0, 1, 0, 0, 0, 0) self.backdrop.right:SetGradientAlpha("VERTICAL", 0, 0, 0, 1, 0, 0, 0, 0) - self.backdrop.bottom:SetTexture(0, 0, 0, 1) + --self.backdrop.bottom:SetColorTexture(0, 0, 0, 1) self.backdrop.bottom:SetAlpha(1) self.backdrop.bottom:SetHeight(2) - self.backdrop.top:SetTexture(0, 0, 0, 0) + --self.backdrop.top:SetColorTexture(0, 0, 0, 0) self.backdrop.top:SetAlpha(0) self.backdrop.top:SetHeight(1) end @@ -367,12 +367,12 @@ function MOD.SetThemedBackdrop(frame, forceTop) local underlay = backdrop:CreateTexture(nil, "BACKGROUND") underlay:InsetPoints(backdrop) - underlay:SetTexture(1, 1, 1, 1) + underlay:SetColorTexture(1, 1, 1, 1) backdrop.underlay = underlay; local left = backdrop:CreateTexture(nil, "BORDER") - left:SetTexture(1, 1, 1, 1) + left:SetColorTexture(1, 1, 1, 1) left:SetPoint("TOPLEFT", -1, 1) left:SetPoint("BOTTOMLEFT", -1, -1) left:SetWidth(2) @@ -380,7 +380,7 @@ function MOD.SetThemedBackdrop(frame, forceTop) backdrop.left = left; local right = backdrop:CreateTexture(nil, "BORDER") - right:SetTexture(1, 1, 1, 1) + right:SetColorTexture(1, 1, 1, 1) right:SetPoint("TOPRIGHT", 1, 1) right:SetPoint("BOTTOMRIGHT", 1, -1) right:SetWidth(2) @@ -388,6 +388,7 @@ function MOD.SetThemedBackdrop(frame, forceTop) backdrop.right = right; local bottom = backdrop:CreateTexture(nil, "BORDER") + bottom:SetColorTexture(0, 0, 0, 1) bottom:SetPoint("BOTTOMLEFT", -1, -1) bottom:SetPoint("BOTTOMRIGHT", 1, -1) bottom:SetHeight(2) @@ -395,6 +396,7 @@ function MOD.SetThemedBackdrop(frame, forceTop) backdrop.bottom = bottom; local top = backdrop:CreateTexture(nil, "BORDER") + top:SetColorTexture(0, 0, 0, 1) top:SetPoint("TOPLEFT", -1, 1) top:SetPoint("TOPRIGHT", 1, 1) top:SetHeight(2) diff --git a/SVUI_!Core/system/errors.lua b/SVUI_!Core/system/errors.lua index 7171191..f47c2da 100644 --- a/SVUI_!Core/system/errors.lua +++ b/SVUI_!Core/system/errors.lua @@ -31,7 +31,7 @@ local ERR_FILTERS = {}; EVENTS ########################################################## ]]-- -local ErrorFrameHandler = function(self, event, msg) +local ErrorFrameHandler = function(self, event, msgType, msg) if(event == 'PLAYER_REGEN_DISABLED') then self:UnregisterEvent('UI_ERROR_MESSAGE') elseif(event == 'PLAYER_REGEN_ENABLED') then diff --git a/SVUI_!Core/system/layout.lua b/SVUI_!Core/system/layout.lua index 4e72390..8ded4f4 100644 --- a/SVUI_!Core/system/layout.lua +++ b/SVUI_!Core/system/layout.lua @@ -72,7 +72,7 @@ UIPanels["CharacterFrame"] = { moving = false, snapped = false, canupdate = UIPanels["ClassTrainerFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; UIPanels["CollectionsJournal"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; UIPanels["DressUpFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; -UIPanels["DraenorZoneAbilityFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; +--UIPanels["DraenorZoneAbilityFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; UIPanels["EncounterJournal"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; UIPanels["FriendsFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; UIPanels["GMSurveyFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true }; @@ -886,14 +886,14 @@ function Graph:UpdateAllReports() local xGrid = self.Grid:CreateTexture(nil, 'BACKGROUND') local yGrid = self.Grid:CreateTexture(nil, 'BACKGROUND') if(i == halfWidth) then - xGrid:SetTexture(0, 1, 0, 0.8) + xGrid:SetColorTexture(0, 1, 0, 0.8) else - xGrid:SetTexture(0.1, 0.1, 0.1, 0.8) + xGrid:SetColorTexture(0.1, 0.1, 0.1, 0.8) end if(i == halfHeight) then - yGrid:SetTexture(0, 1, 0, 0.8) + yGrid:SetColorTexture(0, 1, 0, 0.8) else - yGrid:SetTexture(0.1, 0.1, 0.1, 0.8) + yGrid:SetColorTexture(0.1, 0.1, 0.1, 0.8) end xGrid:SetPoint("TOPLEFT", self.Grid, "TOPLEFT", (mod - 0.5), 0) diff --git a/SVUI_!Core/system/letsride.lua b/SVUI_!Core/system/letsride.lua index e16119f..cdb899b 100644 --- a/SVUI_!Core/system/letsride.lua +++ b/SVUI_!Core/system/letsride.lua @@ -56,12 +56,8 @@ MountListener.favorites = false LOCAL FUNCTIONS ########################################################## ]]-- -local function CountMounts() - return C_MountJournal.GetNumMounts() -end - -local function MountInfo(index) - return true, C_MountJournal.GetMountInfo(index) +local function CacheMounts() + return C_MountJournal.GetMountIDs() end local function RandomMount() @@ -72,15 +68,20 @@ local function RandomMount() return random(1, maxMounts) end -local function MountUp(index) +local function MountInfo(index) index = index or RandomMount() - return C_MountJournal.Summon(index) + return C_MountJournal.GetDisplayedMountInfo(index) +end + +local function MountUp(index) + local _, _, _, _, _, _, _, _, _, _, _, id = MountInfo(index); + return C_MountJournal.SummonByID(id) end local UnMount = C_MountJournal.Dismiss local function UpdateMountCheckboxes(button, index) - local _, creatureName = MountInfo(index); + local creatureName = MountInfo(index); local n = button.MountBar local bar = _G[n] @@ -135,11 +136,12 @@ end local function UpdateMountsCache() if(not MountJournal) then return end - local num = CountMounts() + local myMounts = CacheMounts(); MountListener.favorites = false - for index = 1, num, 1 do - local _, info, id, _, _, _, _, _, favorite = MountInfo(index) + for index, id in pairs(myMounts) do + --creatureName, spellID, icon, active, isUsable, sourceType, isFavorite, isFactionSpecific, faction, hideOnChar, isCollected, mountID + local info, spellId, _, _, _, _, favorite, _, _, _, _, mId = MountInfo(index); if(favorite == true) then MountListener.favorites = true end @@ -167,18 +169,16 @@ local function UpdateMountsCache() end local function Update_MountCheckButtons() - if(not MountJournal or (MountJournal and not MountJournal.cachedMounts)) then return end - local count = #MountJournal.cachedMounts - if(type(count) ~= "number") then return end + if(not MountJournal) then return end + local count = C_MountJournal.GetNumMounts(); local scrollFrame = MountJournal.ListScrollFrame; local offset = HybridScrollFrame_GetOffset(scrollFrame); - local buttons = scrollFrame.buttons; + local buttons = scrollFrame.buttons; for i=1, #buttons do local button = buttons[i]; local displayIndex = i + offset; if ( displayIndex <= count ) then - local index = MountJournal.cachedMounts[displayIndex]; - UpdateMountCheckboxes(button, index) + UpdateMountCheckboxes(button, displayIndex) end end end @@ -302,7 +302,7 @@ local function CreateMountCheckBox(name, parent) hover:InsetPoints(frame.Panel) frame.hover = hover; end - frame.hover:SetTexture(0.1, 0.8, 0.8, 0.5) + frame.hover:SetColorTexture(0.1, 0.8, 0.8, 0.5) frame:SetHighlightTexture(frame.hover) end if(frame.SetPushedTexture) then @@ -311,7 +311,7 @@ local function CreateMountCheckBox(name, parent) pushed:InsetPoints(frame.Panel) frame.pushed = pushed; end - frame.pushed:SetTexture(0.1, 0.8, 0.1, 0.3) + frame.pushed:SetColorTexture(0.1, 0.8, 0.1, 0.3) frame:SetPushedTexture(frame.pushed) end if(frame.SetCheckedTexture) then @@ -452,9 +452,9 @@ KEYBIND FUNCTION ########################################################## ]]-- _G.SVUILetsRide = function() - local maxMounts = CountMounts() + local myMounts = CacheMounts() - if(not maxMounts or IsMounted()) then + if(not myMounts or IsMounted()) then UnMount() return end diff --git a/SVUI_!Core/system/media.lua b/SVUI_!Core/system/media.lua index 239279c..ec6b6ac 100644 --- a/SVUI_!Core/system/media.lua +++ b/SVUI_!Core/system/media.lua @@ -707,7 +707,7 @@ local function ChangeSystemFonts() _alterFont("GameFontBlack", "default", 0, 'NONE', 0, 0, 0) _alterFont("GameFontBlackSmall", "default", -1, 'NONE', 0, 0, 0) _alterFont("GameFontNormalMed2", "default", 2) - ---- _alterFont("GameFontNormalMed1", "default", 0) ---- + _alterFont("Game15Font_o1", "number", 1, "OUTLINE") _alterFont("GameFontNormalLarge", "default") _alterFont("GameFontNormalLargeOutline", "default") _alterFont("GameFontHighlightSmall", "default") @@ -725,6 +725,7 @@ local function ChangeSystemFonts() _alterFont("FriendsFont_UserText", "default", -1) _alterFont("SystemFont_Small", "default", -1) _alterFont("GameFontNormalSmall", "default", -1) + _alterFont("GameFontNormalSmall2", "default") _alterFont("NumberFont_Shadow_Med", "default", -1, "OUTLINE") _alterFont("NumberFont_Shadow_Small", "default", -1, "OUTLINE") _alterFont("SystemFont_Tiny", "default", -1) diff --git a/SVUI_!Core/system/misc.lua b/SVUI_!Core/system/misc.lua index e58ec7b..295752d 100644 --- a/SVUI_!Core/system/misc.lua +++ b/SVUI_!Core/system/misc.lua @@ -358,6 +358,7 @@ do LockItem(CloakToggle,false) end + --[[ HShowing = ShowingHelm() CShowing = ShowingCloak() HChecked = HelmetToggle:GetChecked() @@ -385,6 +386,7 @@ do HelmetToggle:SetChecked(HShowing); CloakToggle:SetChecked(CShowing); + ]]-- DressUpdateTimer = 0; end end @@ -460,6 +462,7 @@ do end end) + --[[ HelmetToggle = CreateFrame('CheckButton', nil, CharacterModelFrame, "OptionsCheckButtonTemplate") HelmetToggle:SetSize(16, 16) HelmetToggle:SetStyle("Checkbox") @@ -488,7 +491,9 @@ do HelmetToggle:SetScript('OnMouseDown', MouseEventHandler) CloakToggle:SetScript('OnMouseDown', MouseEventHandler) + CharacterModelFrame:HookScript("OnShow", SetVanityPlacement) + ]]-- end end --[[ diff --git a/SVUI_!Core/system/overrides.lua b/SVUI_!Core/system/overrides.lua index a3713a4..6bc2d70 100644 --- a/SVUI_!Core/system/overrides.lua +++ b/SVUI_!Core/system/overrides.lua @@ -714,11 +714,8 @@ EventFunc["LOOT_READY"] = function(autoLoot) if drops > 0 then for i = 1, drops do local slot = SVUI_LootFrame.slots[i] or MakeSlots(i) - local texture, item, quantity, quality, locked, isQuestItem, questId, isActive = GetLootSlotInfo(i) + local textureID, item, quantity, quality, locked, isQuestItem, questId, isActive = GetLootSlotInfo(i) local color = ITEM_QUALITY_COLORS[quality] - if texture and texture:find("INV_Misc_Coin") then - item = item:gsub("\n", ", ") - end if quantity and quantity > 1 then slot.count:SetText(quantity) slot.count:Show() @@ -736,7 +733,7 @@ EventFunc["LOOT_READY"] = function(autoLoot) if color then slot.name:SetTextColor(color.r, color.g, color.b) end - slot.icon:SetTexture(texture) + slot.icon:SetTexture(textureID) if quality then iQuality = max(iQuality, quality) end diff --git a/SVUI_!Options/SVUI_!Options.toc b/SVUI_!Options/SVUI_!Options.toc index 3963851..eb402bb 100644 --- a/SVUI_!Options/SVUI_!Options.toc +++ b/SVUI_!Options/SVUI_!Options.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.2.7 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Options|r diff --git a/SVUI_ActionBars/Loader.lua b/SVUI_ActionBars/Loader.lua index 5b5435d..b558beb 100644 --- a/SVUI_ActionBars/Loader.lua +++ b/SVUI_ActionBars/Loader.lua @@ -316,7 +316,8 @@ SV.defaults[Schema] = { ["SHAMAN"] = "", ["WARRIOR"] = "", ["DEATHKNIGHT"] = "", - ["MONK"] = "", + ["MONK"] = "", + ["DEMONHUNTER"] = "", }, ["alpha"] = 1 }, diff --git a/SVUI_ActionBars/SVUI_ActionBars.lua b/SVUI_ActionBars/SVUI_ActionBars.lua index 00c9b84..327edde 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.lua +++ b/SVUI_ActionBars/SVUI_ActionBars.lua @@ -278,13 +278,13 @@ local function ModifyActionButton(button, noStyle) if(not noStyle) then if highlight then - highlight:SetTexture(1,1,1,.2) + highlight:SetColorTexture(1,1,1,.2) end if pushed then - pushed:SetTexture(0,0,0,.4) + pushed:SetColorTexture(0,0,0,.4) end if checked then - checked:SetTexture(1,1,1,.2) + checked:SetColorTexture(1,1,1,.2) end if flash then flash:SetTexture("") @@ -922,7 +922,7 @@ local function SetStanceBarButtons() StanceBarFrame.lastSelected = button:GetID() if maxForms > 1 then - if button.checked then button.checked:SetTexture(0, 0.5, 0, 0.2) end + if button.checked then button.checked:SetColorTexture(0, 0.5, 0, 0.2) end button:SetBackdropBorderColor(0.4, 0.8, 0) end icon:SetVertexColor(1, 1, 1) @@ -1174,7 +1174,7 @@ do if i <= maxForms then local cooldown = _G["SVUI_StanceBarButton"..i.."Cooldown"] local start, duration, enable = GetShapeshiftFormCooldown(i) - CooldownFrame_SetTimer(cooldown, start, duration, enable) + CooldownFrame_Set(cooldown, start, duration, enable) end end end @@ -1348,7 +1348,7 @@ local CreateExtraBar = function(self) _G[icon]:SetDrawLayer("ARTWORK") _G[cool]:InsetPoints() local checkedTexture = button:CreateTexture(nil, "OVERLAY") - checkedTexture:SetTexture(0.9, 0.8, 0.1, 0.3) + checkedTexture:SetColorTexture(0.9, 0.8, 0.1, 0.3) checkedTexture:InsetPoints() button:SetCheckedTexture(checkedTexture) end @@ -1458,8 +1458,8 @@ local function RemoveDefaults() -- IconIntroTracker:Hide() -- IconIntroTracker:SetParent(removalManager) - InterfaceOptionsCombatPanelActionButtonUseKeyDown:SetScale(0.0001) - InterfaceOptionsCombatPanelActionButtonUseKeyDown:SetAlpha(0) + --InterfaceOptionsCombatPanelActionButtonUseKeyDown:SetScale(0.0001) + --InterfaceOptionsCombatPanelActionButtonUseKeyDown:SetAlpha(0) InterfaceOptionsActionBarsPanelAlwaysShowActionBars:EnableMouse(false) InterfaceOptionsActionBarsPanelPickupActionKeyDropDownButton:SetScale(0.0001) InterfaceOptionsActionBarsPanelLockActionBars:SetScale(0.0001) @@ -1468,8 +1468,8 @@ local function RemoveDefaults() InterfaceOptionsActionBarsPanelLockActionBars:SetAlpha(0) InterfaceOptionsActionBarsPanelPickupActionKeyDropDown:SetAlpha(0) InterfaceOptionsActionBarsPanelPickupActionKeyDropDown:SetScale(0.00001) - InterfaceOptionsStatusTextPanelXP:SetAlpha(0) - InterfaceOptionsStatusTextPanelXP:SetScale(0.00001) + --InterfaceOptionsStatusTextPanelXP:SetAlpha(0) + --InterfaceOptionsStatusTextPanelXP:SetScale(0.00001) if PlayerTalentFrame then PlayerTalentFrame:UnregisterEvent("ACTIVE_TALENT_GROUP_CHANGED") diff --git a/SVUI_ActionBars/SVUI_ActionBars.toc b/SVUI_ActionBars/SVUI_ActionBars.toc index 02de7a4..8213bb8 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.toc +++ b/SVUI_ActionBars/SVUI_ActionBars.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.2.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Action Bars|r diff --git a/SVUI_ActionBars/components/keybind.lua b/SVUI_ActionBars/components/keybind.lua index cca88b3..6e5f5d2 100644 --- a/SVUI_ActionBars/components/keybind.lua +++ b/SVUI_ActionBars/components/keybind.lua @@ -402,7 +402,7 @@ function MOD:LoadKeyBinder() Binder:EnableMouseWheel(true) Binder.texture = Binder:CreateTexture() Binder.texture:SetAllPoints(Binder) - Binder.texture:SetTexture(0, 0, 0, .25) + Binder.texture:SetColorTexture(0, 0, 0, .25) Binder:Hide() GameTooltip:HookScript("OnUpdate", GameTooltip_OnUpdate) diff --git a/SVUI_ActionBars/components/totem.lua b/SVUI_ActionBars/components/totem.lua index 0204ecb..fb0f109 100644 --- a/SVUI_ActionBars/components/totem.lua +++ b/SVUI_ActionBars/components/totem.lua @@ -53,7 +53,7 @@ function Totems:Refresh() if(haveTotem) then svuitotem:Show() svuitotem.Icon:SetTexture(icon) - CooldownFrame_SetTimer(svuitotem.CD, start, duration, 1) + CooldownFrame_Set(svuitotem.CD, start, duration, 1) local blizztotem = _G["TotemFrameTotem"..slot] local tslot = blizztotem.slot if(tslot and tslot > 0) then diff --git a/SVUI_ActionBars/components/zone.lua b/SVUI_ActionBars/components/zone.lua index 30b4866..dfc3a76 100644 --- a/SVUI_ActionBars/components/zone.lua +++ b/SVUI_ActionBars/components/zone.lua @@ -36,7 +36,7 @@ local IsControlKeyDown = _G.IsControlKeyDown; local IsModifiedClick = _G.IsModifiedClick; local RegisterStateDriver = _G.RegisterStateDriver; local RANGE_INDICATOR = _G.RANGE_INDICATOR; -local CooldownFrame_SetTimer = _G.CooldownFrame_SetTimer; +local CooldownFrame_Set = _G.CooldownFrame_Set; --[[ ########################################################## GET ADDON DATA @@ -128,9 +128,9 @@ local DraenorButtonUpdate = function(self) local start, duration, enable = GetSpellCooldown(name); if(usesCharges and charges < maxCharges) then - CooldownFrame_SetTimer(self.Cooldown, chargeStart, chargeDuration, enable, charges, maxCharges); + CooldownFrame_Set(self.Cooldown, chargeStart, chargeDuration, enable, charges, maxCharges); elseif(start) then - CooldownFrame_SetTimer(self.Cooldown, start, duration, enable); + CooldownFrame_Set(self.Cooldown, start, duration, enable); end self.spellName = name; @@ -224,6 +224,7 @@ PACKAGE CALL ########################################################## ]]-- function MOD:InitializeZoneButton() +if(not DraenorZoneAbilityFrame) then return end; local size = SVUI_DraenorButtonHolder:GetHeight() local draenor = CreateFrame('Button', "SVUI_DraenorZoneAbility", UIParent, 'SecureActionButtonTemplate, SecureHandlerStateTemplate, SecureHandlerAttributeTemplate'); draenor:SetSize(size,size); diff --git a/SVUI_ActionBars/libs/LibActionButton-1.0/LibActionButton-1.0.lua b/SVUI_ActionBars/libs/LibActionButton-1.0/LibActionButton-1.0.lua index 23712e8..6a1d6eb 100644 --- a/SVUI_ActionBars/libs/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/SVUI_ActionBars/libs/LibActionButton-1.0/LibActionButton-1.0.lua @@ -47,7 +47,7 @@ local str_match, format, tinsert, tremove = string.match, format, tinsert, tremo -- GLOBALS: LibStub, CreateFrame, InCombatLockdown, ClearCursor, GetCursorInfo, GameTooltip, GameTooltip_SetDefaultAnchor -- GLOBALS: GetBindingKey, GetBindingText, SetBinding, SetBindingClick, GetCVar, GetMacroInfo -- GLOBALS: PickupAction, PickupItem, PickupMacro, PickupPetAction, PickupSpell, PickupCompanion, PickupEquipmentSet --- GLOBALS: CooldownFrame_SetTimer, UIParent, IsSpellOverlayed, SpellFlyout, GetMouseFocus, SetClampedTextureRotation +-- GLOBALS: CooldownFrame_Set, UIParent, IsSpellOverlayed, SpellFlyout, GetMouseFocus, SetClampedTextureRotation -- GLOBALS: GetActionInfo, GetActionTexture, HasAction, GetActionText, GetActionCount, GetActionCooldown, IsAttackAction -- GLOBALS: IsAutoRepeatAction, IsEquippedAction, IsCurrentAction, IsConsumableAction, IsUsableAction, IsStackableAction, IsActionInRange -- GLOBALS: GetSpellLink, GetMacroSpell, GetSpellTexture, GetSpellCount, GetSpellCooldown, IsAttackSpell, IsCurrentSpell @@ -1248,7 +1248,7 @@ function UpdateCooldown(self) self.cooldown.currentCooldownType = COOLDOWN_TYPE_LOSS_OF_CONTROL self.cooldown:SetSwipeColor(0.17, 0, 0, 0.8) end - CooldownFrame_SetTimer(self.cooldown, locStart, locDuration, 1, nil, nil, true) + CooldownFrame_Set(self.cooldown, locStart, locDuration, 1, nil, nil, true) else if self.cooldown.currentCooldownType ~= COOLDOWN_TYPE_NORMAL then self.cooldown:SetEdgeTexture("Interface\\Cooldown\\edge") @@ -1264,7 +1264,7 @@ function UpdateCooldown(self) elseif self.chargeCooldown then EndChargeCooldown(self.chargeCooldown) end - CooldownFrame_SetTimer(self.cooldown, start, duration, enable, charges, maxCharges) + CooldownFrame_Set(self.cooldown, start, duration, enable, charges, maxCharges) end end diff --git a/SVUI_Auras/SVUI_Auras.lua b/SVUI_Auras/SVUI_Auras.lua index a3925d2..eb5de57 100644 --- a/SVUI_Auras/SVUI_Auras.lua +++ b/SVUI_Auras/SVUI_Auras.lua @@ -38,7 +38,7 @@ local UnitBuff = _G.UnitBuff; local UnitStat = _G.UnitStat; local UnitLevel = _G.UnitLevel; local UnitClass = _G.UnitClass; -local NUM_LE_RAID_BUFF_TYPES = _G.NUM_LE_RAID_BUFF_TYPES; +--local NUM_LE_RAID_BUFF_TYPES = _G.NUM_LE_RAID_BUFF_TYPES; local RAID_CLASS_COLORS = _G.RAID_CLASS_COLORS; local CUSTOM_CLASS_COLORS = _G.CUSTOM_CLASS_COLORS; local GetItemQualityColor = _G.GetItemQualityColor; @@ -529,9 +529,11 @@ function MOD:UpdateAuraHolder(newHeight, referenceHolder) self.Holder.Grip:SetPoint("TOPRIGHT", referenceHolder, "TOPLEFT", HOLDER_OFFSET, 0) end end + --[[ if(self.HyperBuffFrame) then self:Update_ConsolidatedBuffsSettings() end + ]]-- end --[[ ########################################################## @@ -565,6 +567,7 @@ function MOD:Load() self.Holder:SetSize(CB_WIDTH, CB_HEIGHT) self.Holder:SetPoint("TOPRIGHT", Minimap, "TOPLEFT", HOLDER_OFFSET, 0) + --[[ if(SV.db.Auras.hyperBuffsEnabled) then ConsolidatedBuffs:Die() @@ -602,7 +605,7 @@ function MOD:Load() SV.Events:On("PLAYER_ROLE_CHANGED", PlayerRoleChanged) self:Update_ConsolidatedBuffsSettings() end - + ]]-- if(SV.db.Auras.aurasEnabled) then BuffFrame:Die() TemporaryEnchantFrame:Die() diff --git a/SVUI_Auras/SVUI_Auras.toc b/SVUI_Auras/SVUI_Auras.toc index 4e2c223..50f471f 100644 --- a/SVUI_Auras/SVUI_Auras.toc +++ b/SVUI_Auras/SVUI_Auras.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.2.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Auras|r diff --git a/SVUI_Auras/components/procs.lua b/SVUI_Auras/components/procs.lua index 9e5f239..3010ce4 100644 --- a/SVUI_Auras/components/procs.lua +++ b/SVUI_Auras/components/procs.lua @@ -77,7 +77,7 @@ local function CreateProcIcon() local bg = proc:CreateTexture(nil, "BACKGROUND") bg:SetAllPoints() - bg:SetTexture(0,0,0,0.5) + bg:SetColorTexture(0,0,0,0.5) proc.icon = proc:CreateTexture(nil, "BORDER") proc.icon:InsetPoints(proc, 2, 2) diff --git a/SVUI_Chat/SVUI_Chat.toc b/SVUI_Chat/SVUI_Chat.toc index 55b698c..7d17bfa 100644 --- a/SVUI_Chat/SVUI_Chat.toc +++ b/SVUI_Chat/SVUI_Chat.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.2.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Chat|r diff --git a/SVUI_CraftOMatic/SVUI_CraftOMatic.lua b/SVUI_CraftOMatic/SVUI_CraftOMatic.lua index bfa9e13..0588fa9 100644 --- a/SVUI_CraftOMatic/SVUI_CraftOMatic.lua +++ b/SVUI_CraftOMatic/SVUI_CraftOMatic.lua @@ -674,13 +674,13 @@ function PLUGIN:Load() title:SetInsertMode('TOP') title.divider = title:CreateTexture(nil,"OVERLAY") - title.divider:SetTexture(0,0,0,0.5) + title.divider:SetColorTexture(0,0,0,0.5) title.divider:SetPoint("BOTTOMLEFT") title.divider:SetPoint("BOTTOMRIGHT") title.divider:SetHeight(1) local topleftline = title:CreateTexture(nil,"OVERLAY") - topleftline:SetTexture(0,0,0,0.5) + topleftline:SetColorTexture(0,0,0,0.5) topleftline:SetPoint("TOPLEFT") topleftline:SetPoint("BOTTOMLEFT") topleftline:SetWidth(1) @@ -702,7 +702,7 @@ function PLUGIN:Load() log:SetInsertMode('TOP') local bottomleftline = log:CreateTexture(nil,"OVERLAY") - bottomleftline:SetTexture(0,0,0,0.5) + bottomleftline:SetColorTexture(0,0,0,0.5) bottomleftline:SetPoint("TOPLEFT") bottomleftline:SetPoint("BOTTOMLEFT") bottomleftline:SetWidth(1) diff --git a/SVUI_CraftOMatic/SVUI_CraftOMatic.toc b/SVUI_CraftOMatic/SVUI_CraftOMatic.toc index 54cd294..b5b1a69 100644 --- a/SVUI_CraftOMatic/SVUI_CraftOMatic.toc +++ b/SVUI_CraftOMatic/SVUI_CraftOMatic.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.0.09 ## Title: |cffFF9900SVUI Plugin: |r|cffFF69B4Craft-O-Matic|r diff --git a/SVUI_FightOMatic/SVUI_FightOMatic.lua b/SVUI_FightOMatic/SVUI_FightOMatic.lua index 1c464db..df51313 100644 --- a/SVUI_FightOMatic/SVUI_FightOMatic.lua +++ b/SVUI_FightOMatic/SVUI_FightOMatic.lua @@ -1053,7 +1053,7 @@ function PLUGIN:Load() toolBar:SetPoint("BOTTOMLEFT", self.Docklet, "BOTTOMLEFT", 0, 0); local tbDivider = toolBar:CreateTexture(nil,"OVERLAY") - tbDivider:SetTexture(0,0,0,0.5) + tbDivider:SetColorTexture(0,0,0,0.5) tbDivider:SetPoint("TOPRIGHT") tbDivider:SetPoint("BOTTOMRIGHT") tbDivider:SetWidth(1) @@ -1071,7 +1071,7 @@ function PLUGIN:Load() title:SetInsertMode('TOP') local divider1 = title:CreateTexture(nil,"OVERLAY") - divider1:SetTexture(0,0,0,0.5) + divider1:SetColorTexture(0,0,0,0.5) divider1:SetPoint("BOTTOMLEFT") divider1:SetPoint("BOTTOMRIGHT") divider1:SetHeight(1) @@ -1104,7 +1104,7 @@ function PLUGIN:Load() self.Summary = summary local divider2 = summary:CreateTexture(nil,"OVERLAY") - divider2:SetTexture(0,0,0,0.5) + divider2:SetColorTexture(0,0,0,0.5) divider2:SetPoint("BOTTOMLEFT") divider2:SetPoint("BOTTOMRIGHT") divider2:SetHeight(1) diff --git a/SVUI_Inventory/SVUI_Inventory.lua b/SVUI_Inventory/SVUI_Inventory.lua index b1ccaaf..6185a02 100644 --- a/SVUI_Inventory/SVUI_Inventory.lua +++ b/SVUI_Inventory/SVUI_Inventory.lua @@ -250,7 +250,7 @@ local SlotUpdate = function(self, slotID) slot:SetBackdropColor(r,g,b,0.6) slot:SetBackdropBorderColor(r,g,b,1) - CooldownFrame_SetTimer(slot.cooldown, start, duration, enable); + CooldownFrame_Set(slot.cooldown, start, duration, enable); if((duration > 0) and (enable == 0)) then SetItemButtonTextureVertexColor(slot, 0.4, 0.4, 0.4) @@ -289,7 +289,7 @@ local ContainerFrame_UpdateCooldowns = function(self) for slotID = 1, GetContainerNumSlots(bagID)do local start, duration, enable = GetContainerItemCooldown(bagID, slotID) if(self.Bags[bagID][slotID]) then - CooldownFrame_SetTimer(self.Bags[bagID][slotID].cooldown, start, duration, enable) + CooldownFrame_Set(self.Bags[bagID][slotID].cooldown, start, duration, enable) if duration > 0 and enable == 0 then SetItemButtonTextureVertexColor(self.Bags[bagID][slotID], 0.4, 0.4, 0.4) else diff --git a/SVUI_Inventory/SVUI_Inventory.toc b/SVUI_Inventory/SVUI_Inventory.toc index 186da93..bad2f7c 100644 --- a/SVUI_Inventory/SVUI_Inventory.toc +++ b/SVUI_Inventory/SVUI_Inventory.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.2.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Inventory|r diff --git a/SVUI_Maps/SVUI_Maps.lua b/SVUI_Maps/SVUI_Maps.lua index a7e4ff1..0c8c3e6 100644 --- a/SVUI_Maps/SVUI_Maps.lua +++ b/SVUI_Maps/SVUI_Maps.lua @@ -417,7 +417,7 @@ local function AdjustMapSize() if SV.db.Maps.tinyWorldMap == true then BlackoutWorld:SetTexture("") else - BlackoutWorld:SetTexture(0, 0, 0, 1) + BlackoutWorld:SetColorTexture(0, 0, 0, 1) end end @@ -784,10 +784,10 @@ end local _hook_BlipTextures = function(self, texture) if(SV.db.Maps.customIcons and (texture ~= MOD.media.customBlips)) then - self:SetBlipTexture(MOD.media.customBlips) + --self:SetBlipTexture(MOD.media.customBlips) else if((not SV.db.Maps.customIcons) and texture ~= MOD.media.defaultBlips) then - self:SetBlipTexture(MOD.media.defaultBlips) + --self:SetBlipTexture(MOD.media.defaultBlips) end end end @@ -795,22 +795,32 @@ end function MOD:Load() self:UpdateLocals() - Minimap:SetPlayerTexture(MOD.media.playerArrow) - Minimap:SetCorpsePOIArrowTexture(MOD.media.corpseArrow) - Minimap:SetPOIArrowTexture(MOD.media.guideArrow) + --Minimap:SetPlayerTexture(MOD.media.playerArrow) + --Minimap:SetCorpsePOIArrowTexture(MOD.media.corpseArrow) + --Minimap:SetPOIArrowTexture(MOD.media.guideArrow) if(SV.db.Maps.customIcons) then - Minimap:SetBlipTexture(MOD.media.customBlips) + --Minimap:SetBlipTexture(MOD.media.customBlips) else - Minimap:SetBlipTexture(MOD.media.defaultBlips) + --Minimap:SetBlipTexture(MOD.media.defaultBlips) end Minimap:SetClampedToScreen(false) + if TimeManagerClockButton then + TimeManagerClockButton:Die() + end - self.Holder:SetFrameStrata(Minimap:GetFrameStrata()) + Minimap:SetQuestBlobRingAlpha(0) + Minimap:SetArchBlobRingAlpha(0) + Minimap:SetParent(self.Holder) + Minimap:SetFrameStrata("LOW") + Minimap:SetFrameLevel(Minimap:GetFrameLevel() + 2) + + self.Holder:SetFrameLevel(Minimap:GetFrameLevel() - 2) + self.Holder:SetFrameStrata("LOW") self.Holder:SetPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", -15, -20) self.Holder:SetSize(MM_WIDTH, MM_HEIGHT) - self.Holder.Square = CreateFrame("Frame", nil, Minimap) + self.Holder.Square = CreateFrame("Frame", nil, self.Holder) self.Holder.Square:WrapPoints(self.Holder, 2) self.Holder.Square:SetStyle("Frame", "Minimap") self.Holder.Square:SetPanelColor(MM_COLOR) @@ -821,16 +831,6 @@ function MOD:Load() self.Holder.Circle:SetVertexColor(0,0,0) self.Holder.Circle:Hide() - if TimeManagerClockButton then - TimeManagerClockButton:Die() - end - - Minimap:SetQuestBlobRingAlpha(0) - Minimap:SetArchBlobRingAlpha(0) - Minimap:SetParent(self.Holder) - Minimap:SetFrameStrata("LOW") - Minimap:SetFrameLevel(Minimap:GetFrameLevel() + 2) - self.Holder:SetFrameLevel(Minimap:GetFrameLevel() - 2) ShowUIPanel(SpellBookFrame) HideUIPanel(SpellBookFrame) MinimapBorder:Hide() diff --git a/SVUI_Maps/SVUI_Maps.toc b/SVUI_Maps/SVUI_Maps.toc index 34f78fa..b78c7f2 100644 --- a/SVUI_Maps/SVUI_Maps.toc +++ b/SVUI_Maps/SVUI_Maps.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.2.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Maps|r diff --git a/SVUI_NamePlates/SVUI_NamePlates.lua b/SVUI_NamePlates/SVUI_NamePlates.lua index dcf0fd9..8ff67da 100644 --- a/SVUI_NamePlates/SVUI_NamePlates.lua +++ b/SVUI_NamePlates/SVUI_NamePlates.lua @@ -290,28 +290,28 @@ local function CreatePlateBorder(plate) plate.bordertop:SetPoint("TOPLEFT", plate, "TOPLEFT", -2, 2) plate.bordertop:SetPoint("TOPRIGHT", plate, "TOPRIGHT", 2, 2) plate.bordertop:SetHeight(2) - plate.bordertop:SetTexture(0,0,0) + plate.bordertop:SetColorTexture(0,0,0) plate.bordertop:SetDrawLayer("BORDER", 1) plate.borderbottom = plate:CreateTexture(nil, "BORDER") plate.borderbottom:SetPoint("BOTTOMLEFT", plate, "BOTTOMLEFT", -2, -2) plate.borderbottom:SetPoint("BOTTOMRIGHT", plate, "BOTTOMRIGHT", 2, -2) plate.borderbottom:SetHeight(2) - plate.borderbottom:SetTexture(0,0,0) + plate.borderbottom:SetColorTexture(0,0,0) plate.borderbottom:SetDrawLayer("BORDER", 1) plate.borderleft = plate:CreateTexture(nil, "BORDER") plate.borderleft:SetPoint("TOPLEFT", plate, "TOPLEFT", -2, 2) plate.borderleft:SetPoint("BOTTOMLEFT", plate, "BOTTOMLEFT", 2, -2) plate.borderleft:SetWidth(2) - plate.borderleft:SetTexture(0,0,0) + plate.borderleft:SetColorTexture(0,0,0) plate.borderleft:SetDrawLayer("BORDER", 1) plate.borderright = plate:CreateTexture(nil, "BORDER") plate.borderright:SetPoint("TOPRIGHT", plate, "TOPRIGHT", 2, 2) plate.borderright:SetPoint("BOTTOMRIGHT", plate, "BOTTOMRIGHT", -2, -2) plate.borderright:SetWidth(2) - plate.borderright:SetTexture(0,0,0) + plate.borderright:SetColorTexture(0,0,0) plate.borderright:SetDrawLayer("BORDER", 1) end @@ -600,7 +600,7 @@ local function CreateAuraIcon(auras, plate) button.bord = button:CreateTexture(nil, "BACKGROUND") button.bord:SetDrawLayer('BACKGROUND', 2) - button.bord:SetTexture(0,0,0,1) + button.bord:SetColorTexture(0,0,0,1) button.bord:SetPoint("TOPLEFT", button, "TOPLEFT", -2, 2) button.bord:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", 2, -2) @@ -1265,7 +1265,7 @@ do frame.highlight = frame:CreateTexture(nil, 'OVERLAY') frame.highlight:SetAllPoints(frame.health) - frame.highlight:SetTexture(1, 1, 1, 0.3) + frame.highlight:SetColorTexture(1, 1, 1, 0.3) frame.highlight:Hide() local alert = CreateFrame("Frame", nil, frame) diff --git a/SVUI_NamePlates/SVUI_NamePlates.toc b/SVUI_NamePlates/SVUI_NamePlates.toc index ac31af9..14817ea 100644 --- a/SVUI_NamePlates/SVUI_NamePlates.toc +++ b/SVUI_NamePlates/SVUI_NamePlates.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.2.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00NamePlates|r diff --git a/SVUI_QuestTracker/SVUI_QuestTracker.lua b/SVUI_QuestTracker/SVUI_QuestTracker.lua index 66a6acc..880e777 100644 --- a/SVUI_QuestTracker/SVUI_QuestTracker.lua +++ b/SVUI_QuestTracker/SVUI_QuestTracker.lua @@ -166,25 +166,25 @@ local OBJECTIVE_GetStatus = function(self) bgFrame.bg:SetVertexColor(0,0,0,0.5) local borderB = bgFrame:CreateTexture(nil,"OVERLAY") - borderB:SetTexture(0,0,0) + borderB:SetColorTexture(0,0,0) borderB:SetPoint("BOTTOMLEFT") borderB:SetPoint("BOTTOMRIGHT") borderB:SetHeight(2) local borderT = bgFrame:CreateTexture(nil,"OVERLAY") - borderT:SetTexture(0,0,0) + borderT:SetColorTexture(0,0,0) borderT:SetPoint("TOPLEFT") borderT:SetPoint("TOPRIGHT") borderT:SetHeight(2) local borderL = bgFrame:CreateTexture(nil,"OVERLAY") - borderL:SetTexture(0,0,0) + borderL:SetColorTexture(0,0,0) borderL:SetPoint("TOPLEFT") borderL:SetPoint("BOTTOMLEFT") borderL:SetWidth(2) local borderR = bgFrame:CreateTexture(nil,"OVERLAY") - borderR:SetTexture(0,0,0) + borderR:SetColorTexture(0,0,0) borderR:SetPoint("TOPRIGHT") borderR:SetPoint("BOTTOMRIGHT") borderR:SetWidth(2) diff --git a/SVUI_QuestTracker/SVUI_QuestTracker.toc b/SVUI_QuestTracker/SVUI_QuestTracker.toc index 19b074b..d86904e 100644 --- a/SVUI_QuestTracker/SVUI_QuestTracker.toc +++ b/SVUI_QuestTracker/SVUI_QuestTracker.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.2.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00QuestTracker|r diff --git a/SVUI_QuestTracker/components/quests.lua b/SVUI_QuestTracker/components/quests.lua index dd1e86f..f393475 100644 --- a/SVUI_QuestTracker/components/quests.lua +++ b/SVUI_QuestTracker/components/quests.lua @@ -823,25 +823,25 @@ local GetQuestRow = function(self, index) bgFrame.bg:SetVertexColor(0,0,0,0.5) local borderB = bgFrame:CreateTexture(nil,"OVERLAY") - borderB:SetTexture(0,0,0) + borderB:SetColorTexture(0,0,0) borderB:SetPoint("BOTTOMLEFT") borderB:SetPoint("BOTTOMRIGHT") borderB:SetHeight(2) local borderT = bgFrame:CreateTexture(nil,"OVERLAY") - borderT:SetTexture(0,0,0) + borderT:SetColorTexture(0,0,0) borderT:SetPoint("TOPLEFT") borderT:SetPoint("TOPRIGHT") borderT:SetHeight(2) local borderL = bgFrame:CreateTexture(nil,"OVERLAY") - borderL:SetTexture(0,0,0) + borderL:SetColorTexture(0,0,0) borderL:SetPoint("TOPLEFT") borderL:SetPoint("BOTTOMLEFT") borderL:SetWidth(2) local borderR = bgFrame:CreateTexture(nil,"OVERLAY") - borderR:SetTexture(0,0,0) + borderR:SetColorTexture(0,0,0) borderR:SetPoint("TOPRIGHT") borderR:SetPoint("BOTTOMRIGHT") borderR:SetWidth(2) diff --git a/SVUI_Skins/SVUI_Skins.lua b/SVUI_Skins/SVUI_Skins.lua index 5ebb1fe..a06c5b8 100644 --- a/SVUI_Skins/SVUI_Skins.lua +++ b/SVUI_Skins/SVUI_Skins.lua @@ -173,12 +173,15 @@ end function MOD:PLAYER_ENTERING_WORLD(event, ...) for addonName,fn in pairs(self.OnLoadAddons) do if(IsAddOnLoaded(addonName)) then + --print(addonName) + --self.Debugging = true self:Style(addonName, fn, event, ...) self.OnLoadAddons[addonName] = nil end end for _,fn in pairs(self.CustomQueue)do + --print(_) fn(event, ...) end @@ -202,6 +205,7 @@ function MOD:ADDON_LOADED(event, addon) local needsUpdate = false for name, fn in pairs(self.OnLoadAddons) do if(addon:find(name)) then + --self.Debugging = true self:Style(name, fn, event, addon) self.OnLoadAddons[name] = nil needsUpdate = true diff --git a/SVUI_Skins/SVUI_Skins.toc b/SVUI_Skins/SVUI_Skins.toc index ef099c9..7685784 100644 --- a/SVUI_Skins/SVUI_Skins.toc +++ b/SVUI_Skins/SVUI_Skins.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch, Azilroka, Sortokk ## Version: 1.2.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Skins|r diff --git a/SVUI_Skins/components/addons/Zygor.lua b/SVUI_Skins/components/addons/Zygor.lua index 7d94a90..4c7f925 100644 --- a/SVUI_Skins/components/addons/Zygor.lua +++ b/SVUI_Skins/components/addons/Zygor.lua @@ -29,10 +29,10 @@ ZYGOR ]]-- local function StyleZygorTabs() if(not ZGVCharacterGearFinderButton) then return end - ZGVCharacterGearFinderButton.Highlight:SetTexture(1, 1, 1, 0.3) + ZGVCharacterGearFinderButton.Highlight:SetColorTexture(1, 1, 1, 0.3) ZGVCharacterGearFinderButton.Highlight:SetPoint("TOPLEFT", 3, -4) ZGVCharacterGearFinderButton.Highlight:SetPoint("BOTTOMRIGHT", -1, 0) - ZGVCharacterGearFinderButton.Hider:SetTexture(0.4, 0.4, 0.4, 0.4) + ZGVCharacterGearFinderButton.Hider:SetColorTexture(0.4, 0.4, 0.4, 0.4) ZGVCharacterGearFinderButton.Hider:SetPoint("TOPLEFT", 3, -4) ZGVCharacterGearFinderButton.Hider:SetPoint("BOTTOMRIGHT", -1, 0) ZGVCharacterGearFinderButton.TabBg:Die() @@ -66,11 +66,11 @@ local function StyleZygor() ZygorGuidesViewerFrame_Border:HookScript('OnShow', function(self) self:RemoveTextures(true) end) if(SV.Maps and SV.db.Maps) then if(SV.db.Maps.customIcons) then - Minimap:SetBlipTexture(SV.Maps.media.customBlips) - Minimap.SetBlipTexture = function() return end + --Minimap:SetBlipTexture(SV.Maps.media.customBlips) + --Minimap.SetBlipTexture = function() return end else - Minimap:SetBlipTexture(SV.Maps.media.defaultBlips) - Minimap.SetBlipTexture = function() return end + --Minimap:SetBlipTexture(SV.Maps.media.defaultBlips) + --Minimap.SetBlipTexture = function() return end end end end diff --git a/SVUI_Skins/components/blizzard/achievement.lua b/SVUI_Skins/components/blizzard/achievement.lua index 7be0754..b01ec90 100644 --- a/SVUI_Skins/components/blizzard/achievement.lua +++ b/SVUI_Skins/components/blizzard/achievement.lua @@ -211,7 +211,7 @@ local function AchievementStyle() local highlight = _G[hlName] if(highlight) then highlight:RemoveTextures() - _G[hlName.."Middle"]:SetTexture(1, 1, 1, 0.3) + _G[hlName.."Middle"]:SetColorTexture(1, 1, 1, 0.3) _G[hlName.."Middle"]:SetAllPoints(categoryName) end BarStyleHelper(_G[categoryName]) @@ -317,17 +317,17 @@ local function AchievementStyle() _G[d].bg1:SetPoint("BOTTOMRIGHT", -4, 4) _G[d].bg2 = _G[d]:CreateTexture(nil, "BACKGROUND") _G[d].bg2:SetDrawLayer("BACKGROUND", 3) - _G[d].bg2:SetTexture(0, 0, 0) + _G[d].bg2:SetColorTexture(0, 0, 0) _G[d].bg2:SetPoint("TOPLEFT", 3, -3) _G[d].bg2:SetPoint("BOTTOMRIGHT", -3, 3) _G[d].bg3 = _G[d]:CreateTexture(nil, "BACKGROUND") _G[d].bg3:SetDrawLayer("BACKGROUND", 2) - _G[d].bg3:SetTexture(0,0,0,1) + _G[d].bg3:SetColorTexture(0,0,0,1) _G[d].bg3:SetPoint("TOPLEFT", 2, -2) _G[d].bg3:SetPoint("BOTTOMRIGHT", -2, 2) _G[d].bg4 = _G[d]:CreateTexture(nil, "BACKGROUND") _G[d].bg4:SetDrawLayer("BACKGROUND", 1) - _G[d].bg4:SetTexture(0, 0, 0) + _G[d].bg4:SetColorTexture(0, 0, 0) _G[d].bg4:SetPoint("TOPLEFT", 1, -1) _G[d].bg4:SetPoint("BOTTOMRIGHT", -1, 1) @@ -358,26 +358,26 @@ local function AchievementStyle() if w.accountWide then w.bg3:SetTexture(ACHIEVEMENTUI_BLUEBORDER_R, ACHIEVEMENTUI_BLUEBORDER_G, ACHIEVEMENTUI_BLUEBORDER_B) else - w.bg3:SetTexture(0,0,0,1) + w.bg3:SetColorTexture(0,0,0,1) end if x.accountWide then x.bg3:SetTexture(ACHIEVEMENTUI_BLUEBORDER_R, ACHIEVEMENTUI_BLUEBORDER_G, ACHIEVEMENTUI_BLUEBORDER_B) else - x.bg3:SetTexture(0,0,0,1) + x.bg3:SetColorTexture(0,0,0,1) end end) for f = 1, 20 do local d = _G["AchievementFrameStatsContainerButton"..f] - _G["AchievementFrameStatsContainerButton"..f.."BG"]:SetTexture(1, 1, 1, 0.2) + _G["AchievementFrameStatsContainerButton"..f.."BG"]:SetColorTexture(1, 1, 1, 0.2) _G["AchievementFrameStatsContainerButton"..f.."HeaderLeft"]:Die() _G["AchievementFrameStatsContainerButton"..f.."HeaderRight"]:Die() _G["AchievementFrameStatsContainerButton"..f.."HeaderMiddle"]:Die() local d = "AchievementFrameComparisonStatsContainerButton"..f; _G[d]:RemoveTextures() _G[d]:SetStyle("Frame", "Default") - _G[d.."BG"]:SetTexture(1, 1, 1, 0.2) + _G[d.."BG"]:SetColorTexture(1, 1, 1, 0.2) _G[d.."HeaderLeft"]:Die() _G[d.."HeaderRight"]:Die() _G[d.."HeaderMiddle"]:Die() @@ -399,7 +399,7 @@ local function AchievementStyle() d.bg1:SetAllPoints() d.bg3 = d:CreateTexture(nil, "BACKGROUND") d.bg3:SetDrawLayer("BACKGROUND", 2) - d.bg3:SetTexture(0,0,0,1) + d.bg3:SetColorTexture(0,0,0,1) d.bg3:SetPoint("TOPLEFT", -1, 1) d.bg3:SetPoint("BOTTOMRIGHT", 1, -1); d.text:ClearAllPoints() diff --git a/SVUI_Skins/components/blizzard/alert.lua b/SVUI_Skins/components/blizzard/alert.lua index 0bdaf2f..78a530d 100644 --- a/SVUI_Skins/components/blizzard/alert.lua +++ b/SVUI_Skins/components/blizzard/alert.lua @@ -117,7 +117,7 @@ local function StyleUpgradeFrame(frame) StyleAlertIcon(frame, frame.Icon) end end - +--[[ local function AchievementStyle() for i = 1, MAX_ACHIEVEMENT_ALERTS do local frameName = "AchievementAlertFrame"..i @@ -146,6 +146,30 @@ local function AchievementStyle() end end +local function CriteriaStyle() + for i = 1, MAX_ACHIEVEMENT_ALERTS do + local frameName = "CriteriaAlertFrame"..i + local frame = _G[frameName] + if(frame and (not frame.Panel)) then + + SV.API:Set("!_Alert", frame) + + local icon = _G[frameName .. 'IconTexture']; + if(icon) then + icon:ClearAllPoints() + icon:SetPoint("CENTER", frame.AlertPanel.icon, "CENTER", 0, 0) + StyleAlertIcon(frame, icon) + end + + if(_G[frameName .. 'Glow']) then _G[frameName .. 'Glow']:Die() end + if(_G[frameName .. 'Shine']) then _G[frameName .. 'Shine']:Die() end + if(_G[frameName .. 'Background']) then _G[frameName .. 'Background']:SetTexture("") end + if(_G[frameName .. 'IconOverlay']) then _G[frameName .. 'IconOverlay']:Die() end + if(_G[frameName .. 'IconBling']) then _G[frameName .. 'IconBling']:Die() end + end + end +end +]]-- local function DungeonCompletionStyle() local frameName = "DungeonCompletionAlertFrame1" local frame = _G[frameName] @@ -247,30 +271,6 @@ local function ScenarioStyle() end end -local function CriteriaStyle() - for i = 1, MAX_ACHIEVEMENT_ALERTS do - local frameName = "CriteriaAlertFrame"..i - local frame = _G[frameName] - if(frame and (not frame.Panel)) then - - SV.API:Set("!_Alert", frame) - - local icon = _G[frameName .. 'IconTexture']; - if(icon) then - icon:ClearAllPoints() - icon:SetPoint("CENTER", frame.AlertPanel.icon, "CENTER", 0, 0) - StyleAlertIcon(frame, icon) - end - - if(_G[frameName .. 'Glow']) then _G[frameName .. 'Glow']:Die() end - if(_G[frameName .. 'Shine']) then _G[frameName .. 'Shine']:Die() end - if(_G[frameName .. 'Background']) then _G[frameName .. 'Background']:SetTexture("") end - if(_G[frameName .. 'IconOverlay']) then _G[frameName .. 'IconOverlay']:Die() end - if(_G[frameName .. 'IconBling']) then _G[frameName .. 'IconBling']:Die() end - end - end -end - -- [[ GarrisonFollowerAlertFrame ]] -- local function GarrisonFollowerAlertStyle(followerID, name, displayID, level, quality, isUpgraded) local color = BAG_ITEM_QUALITY_COLORS[quality]; @@ -288,6 +288,7 @@ ALERTFRAME STYLES ########################################################## ]]-- local function AlertStyle() + --print('test AlertStyle') if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.alertframes ~= true then return end --[[ SVUI ]]-- @@ -312,7 +313,7 @@ local function AlertStyle() end end - --[[ LOOT WON ]]-- + --[[ do for i = 1, #LOOT_WON_ALERT_FRAMES do StyleLootFrame(LOOT_WON_ALERT_FRAMES[i]) @@ -341,7 +342,6 @@ local function AlertStyle() end) end - --[[ MONEY WON ]]-- do for i = 1, #MONEY_WON_ALERT_FRAMES do StyleLootFrame(MONEY_WON_ALERT_FRAMES[i]) @@ -355,7 +355,6 @@ local function AlertStyle() end) end - --[[ LOOT UPGRADE ]]-- do for i = 1, #LOOT_UPGRADE_ALERT_FRAMES do StyleUpgradeFrame(LOOT_UPGRADE_ALERT_FRAMES[i]) @@ -377,29 +376,25 @@ local function AlertStyle() end) end - --[[ ACHIEVEMENT ]]-- AchievementStyle() hooksecurefunc("AlertFrame_SetAchievementAnchors", AchievementStyle) - --[[ DUNGEON ]]-- + CriteriaStyle() + hooksecurefunc("AlertFrame_SetCriteriaAnchors", CriteriaStyle) + DungeonCompletionStyle() hooksecurefunc("AlertFrame_SetDungeonCompletionAnchors", DungeonCompletionStyle) - --[[ GUILD CHALLENGE ]]-- GuildChallengeStyle() hooksecurefunc("AlertFrame_SetGuildChallengeAnchors", GuildChallengeStyle) - --[[ CHALLENGE MODE ]]-- ChallengeModeStyle() hooksecurefunc("AlertFrame_SetChallengeModeAnchors", ChallengeModeStyle) - - --[[ SCENARIO ]]-- + ScenarioStyle() hooksecurefunc("AlertFrame_SetScenarioAnchors", ScenarioStyle) + ]]-- - --[[ CRITERIA ]]-- - CriteriaStyle() - hooksecurefunc("AlertFrame_SetCriteriaAnchors", CriteriaStyle) --[[ GARRISON ]]-- do @@ -495,7 +490,7 @@ local function AlertStyle() end end end - hooksecurefunc("GarrisonFollowerAlertFrame_ShowAlert", GarrisonFollowerAlertStyle) + hooksecurefunc("GarrisonFollowerAlertFrame_SetUp", GarrisonFollowerAlertStyle) end --[[ ########################################################## diff --git a/SVUI_Skins/components/blizzard/character.lua b/SVUI_Skins/components/blizzard/character.lua index 5bc4c76..f5e6935 100644 --- a/SVUI_Skins/components/blizzard/character.lua +++ b/SVUI_Skins/components/blizzard/character.lua @@ -53,6 +53,12 @@ local CharFrameList = { "PaperDollEquipmentManagerPane" }; +local CharacterStatsSubFrames = { + "ItemLevelCategory", + "AttributesCategory", + "EnhancementsCategory" +}; + local function SetItemFrame(frame, point) point = point or frame local noscalemult = 2 * UIParent:GetScale() @@ -66,25 +72,25 @@ local function SetItemFrame(frame, point) point.bordertop:SetPoint("TOPLEFT", point, "TOPLEFT", -noscalemult, noscalemult) point.bordertop:SetPoint("TOPRIGHT", point, "TOPRIGHT", noscalemult, noscalemult) point.bordertop:SetHeight(noscalemult) - point.bordertop:SetTexture(0,0,0) + point.bordertop:SetColorTexture(0,0,0) point.bordertop:SetDrawLayer("BORDER", 1) point.borderbottom = frame:CreateTexture(nil, "BORDER") point.borderbottom:SetPoint("BOTTOMLEFT", point, "BOTTOMLEFT", -noscalemult, -noscalemult) point.borderbottom:SetPoint("BOTTOMRIGHT", point, "BOTTOMRIGHT", noscalemult, -noscalemult) point.borderbottom:SetHeight(noscalemult) - point.borderbottom:SetTexture(0,0,0) + point.borderbottom:SetColorTexture(0,0,0) point.borderbottom:SetDrawLayer("BORDER", 1) point.borderleft = frame:CreateTexture(nil, "BORDER") point.borderleft:SetPoint("TOPLEFT", point, "TOPLEFT", -noscalemult, noscalemult) point.borderleft:SetPoint("BOTTOMLEFT", point, "BOTTOMLEFT", noscalemult, -noscalemult) point.borderleft:SetWidth(noscalemult) - point.borderleft:SetTexture(0,0,0) + point.borderleft:SetColorTexture(0,0,0) point.borderleft:SetDrawLayer("BORDER", 1) point.borderright = frame:CreateTexture(nil, "BORDER") point.borderright:SetPoint("TOPRIGHT", point, "TOPRIGHT", noscalemult, noscalemult) point.borderright:SetPoint("BOTTOMRIGHT", point, "BOTTOMRIGHT", -noscalemult, -noscalemult) point.borderright:SetWidth(noscalemult) - point.borderright:SetTexture(0,0,0) + point.borderright:SetColorTexture(0,0,0) point.borderright:SetDrawLayer("BORDER", 1) end @@ -126,10 +132,10 @@ local function StyleCharacterSlots() local tab = _G["PaperDollSidebarTab"..i] if(tab) then if(not tab.Panel) then - tab.Highlight:SetTexture(1, 1, 1, 0.3) + tab.Highlight:SetColorTexture(1, 1, 1, 0.3) tab.Highlight:SetPoint("TOPLEFT", 3, -4) tab.Highlight:SetPoint("BOTTOMRIGHT", -1, 0) - tab.Hider:SetTexture(0.4, 0.4, 0.4, 0.4) + tab.Hider:SetColorTexture(0.4, 0.4, 0.4, 0.4) tab.Hider:SetPoint("TOPLEFT", 3, -4) tab.Hider:SetPoint("BOTTOMRIGHT", -1, 0) tab.TabBg:Die() @@ -154,21 +160,30 @@ local function StyleCharacterSlots() end end +local function StyleFlyoutButton(button, texture) + button:SetStyle("Button") + texture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) + button:GetNormalTexture():SetTexture("") + texture:InsetPoints() + button:SetFrameLevel(button:GetFrameLevel() + 2) + if not button.Panel then + button:SetStyle("Frame", "Default") + button.Panel:SetAllPoints() + end +end + local function EquipmentFlyout_OnShow() EquipmentFlyoutFrameButtons:RemoveTextures() + EquipmentFlyoutFrame.NavigationFrame:RemoveTextures() + SV.API:Set("!_PageButton", EquipmentFlyoutFrame.NavigationFrame.PrevButton) + SquareButton_SetIcon(EquipmentFlyoutFrame.NavigationFrame.PrevButton, 'LEFT') + SV.API:Set("!_PageButton", EquipmentFlyoutFrame.NavigationFrame.NextButton) + SquareButton_SetIcon(EquipmentFlyoutFrame.NavigationFrame.NextButton, 'RIGHT') local counter = 1; local button = _G["EquipmentFlyoutFrameButton"..counter] while button do local texture = _G["EquipmentFlyoutFrameButton"..counter.."IconTexture"] - button:SetStyle("Button") - texture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - button:GetNormalTexture():SetTexture("") - texture:InsetPoints() - button:SetFrameLevel(button:GetFrameLevel() + 2) - if not button.Panel then - button:SetStyle("Frame", "Default") - button.Panel:SetAllPoints() - end + StyleFlyoutButton(button, texture) counter = counter + 1; button = _G["EquipmentFlyoutFrameButton"..counter] end @@ -250,6 +265,7 @@ CHARACTERFRAME MODR ########################################################## ]]-- local function CharacterFrameStyle() + --print('test CharacterFrameStyle') if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.character ~= true then return end @@ -268,11 +284,7 @@ local function CharacterFrameStyle() SlotListener:SetScript("OnEvent", StyleCharacterSlots) CharacterFrame:HookScript("OnShow", StyleCharacterSlots) - -- if GetCVar("characterFrameCollapsed") ~= "0" then - -- SquareButton_SetIcon(CharacterFrameExpandButton, 'RIGHT') - -- else - -- SquareButton_SetIcon(CharacterFrameExpandButton, 'LEFT') - -- end + --[[ CharacterFrameExpandButton:RemoveTextures(true) SV.API:Set("!_PageButton", CharacterFrameExpandButton) @@ -285,7 +297,8 @@ local function CharacterFrameStyle() SV.API:Set("!_PageButton", CharacterFrameExpandButton) SquareButton_SetIcon(CharacterFrameExpandButton, 'LEFT') end) - + CharacterFrameExpandButton:SetFrameLevel(CharacterModelFrame:GetFrameLevel() + 5) + ]]-- SV.API:Set("CloseButton", ReputationDetailCloseButton) SV.API:Set("CloseButton", TokenFramePopupCloseButton) ReputationDetailAtWarCheckBox:SetStyle("CheckButton") @@ -297,6 +310,7 @@ local function CharacterFrameStyle() EquipmentFlyoutFrameHighlight:Die() EquipmentFlyoutFrame:HookScript("OnShow", EquipmentFlyout_OnShow) hooksecurefunc("EquipmentFlyout_Show", EquipmentFlyout_OnShow) + CharacterFramePortrait:Die() SV.API:Set("ScrollBar", _G["PaperDollTitlesPaneScrollBar"], 5) SV.API:Set("ScrollBar", _G["PaperDollEquipmentManagerPaneScrollBar"], 5) @@ -305,6 +319,13 @@ local function CharacterFrameStyle() if(_G[gName]) then _G[gName]:RemoveTextures(true) end end + for _,gName in pairs(CharacterStatsSubFrames) do + if(CharacterStatsPane[gName]) then + CharacterStatsPane[gName]:RemoveTextures(true) + CharacterStatsPane[gName]:SetStyle("Frame", 'Inset') + end + end + CharacterFrameInsetRight:SetStyle("Frame", 'Inset') for i=1, 6 do @@ -320,7 +341,6 @@ local function CharacterFrameStyle() CharacterModelFrameBackgroundBotRight:SetTexture("") CharacterModelFrame:SetStyle("!_Frame", "Model") - CharacterFrameExpandButton:SetFrameLevel(CharacterModelFrame:GetFrameLevel() + 5) PaperDollTitlesPane:RemoveTextures() PaperDollTitlesPaneScrollChild:RemoveTextures() @@ -342,7 +362,6 @@ local function CharacterFrameStyle() SV.API:Set("Tab", _G["CharacterFrameTab"..i]) end - ReputationFrame:RemoveTextures(true) ReputationListScrollFrame:RemoveTextures() ReputationListScrollFrame:SetStyle("Frame", "Inset") @@ -372,12 +391,14 @@ local function CharacterFrameStyle() TokenFramePopup:SetPoint("TOPLEFT", TokenFrame, "TOPRIGHT", 4, -28) end) + --[[ PetModelFrame:SetStyle("Frame", "Model", false, 1, -7, -7) PetPaperDollPetInfo:GetRegions():SetTexCoord(.12, .63, .15, .55) PetPaperDollPetInfo:SetFrameLevel(PetPaperDollPetInfo:GetFrameLevel() + 10) PetPaperDollPetInfo:SetStyle("Frame", "Icon") PetPaperDollPetInfo.Panel:SetFrameLevel(0) PetPaperDollPetInfo:SetSize(24, 24) + ]]-- end --[[ ########################################################## diff --git a/SVUI_Skins/components/blizzard/chat.lua b/SVUI_Skins/components/blizzard/chat.lua index a2be769..99d1865 100644 --- a/SVUI_Skins/components/blizzard/chat.lua +++ b/SVUI_Skins/components/blizzard/chat.lua @@ -181,6 +181,7 @@ CHAT MODR ########################################################## ]]-- local function ChatStyle() + --print('test ChatStyle') if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.chat ~= true then return end diff --git a/SVUI_Skins/components/blizzard/encounterjournal.lua b/SVUI_Skins/components/blizzard/encounterjournal.lua index 76ce244..d5c62bb 100644 --- a/SVUI_Skins/components/blizzard/encounterjournal.lua +++ b/SVUI_Skins/components/blizzard/encounterjournal.lua @@ -62,32 +62,32 @@ local function Outline(frame, noHighlight) --[[ UNDERLAY BORDER ]]-- local borderLeft = panel:CreateTexture(nil, "BORDER") - borderLeft:SetTexture(0, 0, 0) + borderLeft:SetColorTexture(0, 0, 0) borderLeft:SetPoint("TOPLEFT") borderLeft:SetPoint("BOTTOMLEFT") borderLeft:SetWidth(offset) local borderRight = panel:CreateTexture(nil, "BORDER") - borderRight:SetTexture(0, 0, 0) + borderRight:SetColorTexture(0, 0, 0) borderRight:SetPoint("TOPRIGHT") borderRight:SetPoint("BOTTOMRIGHT") borderRight:SetWidth(offset) local borderTop = panel:CreateTexture(nil, "BORDER") - borderTop:SetTexture(0, 0, 0) + borderTop:SetColorTexture(0, 0, 0) borderTop:SetPoint("TOPLEFT") borderTop:SetPoint("TOPRIGHT") borderTop:SetHeight(mod) local borderBottom = panel:CreateTexture(nil, "BORDER") - borderBottom:SetTexture(0, 0, 0) + borderBottom:SetColorTexture(0, 0, 0) borderBottom:SetPoint("BOTTOMLEFT") borderBottom:SetPoint("BOTTOMRIGHT") borderBottom:SetHeight(mod) if(not noHighlight) then local highlight = frame:CreateTexture(nil, "HIGHLIGHT") - highlight:SetTexture(0, 1, 1, 0.35) + highlight:SetColorTexture(0, 1, 1, 0.35) highlight:SetAllPoints(panel) end diff --git a/SVUI_Skins/components/blizzard/friends.lua b/SVUI_Skins/components/blizzard/friends.lua index 241720e..47934e1 100644 --- a/SVUI_Skins/components/blizzard/friends.lua +++ b/SVUI_Skins/components/blizzard/friends.lua @@ -114,6 +114,7 @@ FRIENDSFRAME MODR ########################################################## ]]--FriendsFrameBattlenetFrameScrollFrame local function FriendsFrameStyle() + --print('test FriendsFrameStyle') if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.friends ~= true then return end diff --git a/SVUI_Skins/components/blizzard/garrison.lua b/SVUI_Skins/components/blizzard/garrison.lua index 86ccffd..9240489 100644 --- a/SVUI_Skins/components/blizzard/garrison.lua +++ b/SVUI_Skins/components/blizzard/garrison.lua @@ -31,7 +31,7 @@ local function AddFadeBanner(frame) local bg = frame:CreateTexture(nil, "OVERLAY") bg:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, 0) bg:SetPoint("BOTTOMRIGHT", frame, "RIGHT", 0, 0) - bg:SetTexture(1, 1, 1, 1) + bg:SetColorTexture(1, 1, 1, 1) bg:SetGradientAlpha("VERTICAL", 0, 0, 0, 0, 0, 0, 0, 0.9) end @@ -316,7 +316,7 @@ local function StyleMissionComplete(parentFrame) completedBG:SetAllPoints(parentFrame.Panel) local completedBGTex = completedBG:CreateTexture(nil, "BACKGROUND") completedBGTex:SetAllPoints(completedBG) - completedBGTex:SetTexture(0,0,0,0.8) + completedBGTex:SetColorTexture(0,0,0,0.8) parentFrame.MissionCompleteBackground:DisableDrawLayer("BACKGROUND") end @@ -440,7 +440,7 @@ local function LoadGarrisonStyle() ############################################################################## --]] SV.API:Set("Window", GarrisonMissionFrame, true, false, 1, 0, 4) - + GarrisonMissionFrame.GarrCorners:RemoveTextures() GarrisonMissionFrameMissions:RemoveTextures() GarrisonMissionFrameMissions:SetStyle("!_Frame", "Inset") @@ -448,7 +448,7 @@ local function LoadGarrisonStyle() readyBG:SetAllPoints(GarrisonMissionFrame.Panel) local readyBGTex = readyBG:CreateTexture(nil, "BACKGROUND") readyBGTex:SetAllPoints(readyBG) - readyBGTex:SetTexture(0,0,0,0.8) + readyBGTex:SetColorTexture(0,0,0,0.8) GarrisonMissionFrameMissions.CompleteDialog:DisableDrawLayer("BACKGROUND") GarrisonMissionFrameMissions.CompleteDialog.BorderFrame:RemoveTextures() @@ -509,15 +509,13 @@ local function LoadGarrisonStyle() --SV.API:Set("Button", GarrisonMissionFrame.MissionTab.MissionPage.MinimizeButton) _hook_GarrisonMissionList_Update() - - hooksecurefunc("GarrisonMissionList_Update", _hook_GarrisonMissionList_Update) + --hooksecurefunc("GarrisonMissionList_Update", _hook_GarrisonMissionList_Update) hooksecurefunc("GarrisonMissionFrame_SetItemRewardDetails", _hook_GarrisonMissionFrame_SetItemRewardDetails) - hooksecurefunc("GarrisonMissionFrame_SetFollowerPortrait", _hook_GarrisonMissionFrame_SetFollowerPortrait) + --hooksecurefunc("GarrisonMissionFrame_SetFollowerPortrait", _hook_GarrisonMissionFrame_SetFollowerPortrait) hooksecurefunc(GarrisonFollowerMissionComplete, "SetFollowerLevel", _hook_GarrisonMissionComplete_SetFollowerLevel) - --hooksecurefunc(GarrisonMission, "UpdateMissionParty", _hook_GarrisonFollowerPage_UpdateMissionForParty) hooksecurefunc("GarrisonMissionButton_SetRewards", _hook_GarrisonMissionButton_SetRewards) - hooksecurefunc("GarrisonMissionFrame_CheckRewardButtons", _hook_GarrisonMissionFrame_CheckRewardButtons) + --hooksecurefunc("GarrisonMissionFrame_CheckRewardButtons", _hook_GarrisonMissionFrame_CheckRewardButtons) --[[ ############################################################################## CAPACITIVE DISPLAY @@ -607,6 +605,7 @@ local function LoadGarrisonStyle() --]] SV.API:Set("Window", GarrisonShipyardFrame, true) GarrisonShipyardFrame.BorderFrame:RemoveTextures() + GarrisonShipyardFrame.BorderFrame.GarrCorners:RemoveTextures() SV.API:Set("CloseButton", GarrisonShipyardFrame.BorderFrame.CloseButton2) GarrisonShipyardFrame.FollowerList:RemoveTextures() GarrisonShipyardFrame.FollowerList:SetStyle("Frame", 'Inset', false, 4, 0, 0) diff --git a/SVUI_Skins/components/blizzard/guild.lua b/SVUI_Skins/components/blizzard/guild.lua index d859573..3e32c95 100644 --- a/SVUI_Skins/components/blizzard/guild.lua +++ b/SVUI_Skins/components/blizzard/guild.lua @@ -103,7 +103,7 @@ local function GCTabHelper(tab) tab.bg1:InsetPoints(tab.Panel,1) tab.bg3 = tab:CreateTexture(nil,"BACKGROUND") tab.bg3:SetDrawLayer("BACKGROUND",2) - tab.bg3:SetTexture(0,0,0,1) + tab.bg3:SetColorTexture(0,0,0,1) tab.bg3:SetAllPoints(tab.Panel) end diff --git a/SVUI_Skins/components/blizzard/help.lua b/SVUI_Skins/components/blizzard/help.lua index d5dc39d..e2cea59 100644 --- a/SVUI_Skins/components/blizzard/help.lua +++ b/SVUI_Skins/components/blizzard/help.lua @@ -60,6 +60,7 @@ HELPFRAME MODR ########################################################## ]]-- local function HelpFrameStyle() + --print('test HelpFrameStyle') if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.help ~= true then return end diff --git a/SVUI_Skins/components/blizzard/misc.lua b/SVUI_Skins/components/blizzard/misc.lua index f2bb2d4..49a17a3 100644 --- a/SVUI_Skins/components/blizzard/misc.lua +++ b/SVUI_Skins/components/blizzard/misc.lua @@ -28,7 +28,7 @@ local _hook_NavBar_AddButton = function(self, buttonData) end hooksecurefunc("NavBar_AddButton", _hook_NavBar_AddButton) - +--[[ local MissingLootFrame_OnShow = function(self) local numMissing = GetNumMissingLootItems() for i = 1, numMissing do @@ -46,7 +46,7 @@ local MissingLootFrame_OnShow = function(self) local calc = (ceil(numMissing * 0.5) * 43) + 38 _G.MissingLootFrame:SetHeight(calc + _G.MissingLootFrameLabel:GetHeight()) end - +]]-- local LootHistoryFrame_OnUpdate = function(self) local numItems = _G.C_LootHistory.GetNumItems() for i = 1, numItems do @@ -185,6 +185,7 @@ local TABARD_REGIONS = { ########################################################## ]]-- local function MiscStyles() + --print('test MiscStyles') if SV.db.Skins.blizzard.enable ~= true then return end @@ -301,18 +302,18 @@ local function MiscStyles() if(SV.db.Skins.blizzard.loot) then local MasterLooterFrame = _G.MasterLooterFrame; - local MissingLootFrame = _G.MissingLootFrame; + --local MissingLootFrame = _G.MissingLootFrame; local LootHistoryFrame = _G.LootHistoryFrame; local BonusRollFrame = _G.BonusRollFrame; - local MissingLootFramePassButton = _G.MissingLootFramePassButton; + --local MissingLootFramePassButton = _G.MissingLootFramePassButton; LootHistoryFrame:SetFrameStrata('HIGH') - MissingLootFrame:RemoveTextures() - MissingLootFrame:SetStyle("Frame", "Pattern") + --MissingLootFrame:RemoveTextures() + --MissingLootFrame:SetStyle("Frame", "Pattern") - SV.API:Set("CloseButton", MissingLootFramePassButton) - hooksecurefunc("MissingLootFrame_Show", MissingLootFrame_OnShow) + --SV.API:Set("CloseButton", MissingLootFramePassButton) + --hooksecurefunc("MissingLootFrame_Show", MissingLootFrame_OnShow) LootHistoryFrame:RemoveTextures() SV.API:Set("CloseButton", LootHistoryFrame.CloseButton) LootHistoryFrame:RemoveTextures() @@ -673,7 +674,7 @@ local function MiscStyles() SV.API:Set("Window", TaxiFrame) SV.API:Set("CloseButton", TaxiFrame.CloseButton) end - + if (SV.db.Skins.blizzard.trade) then TradeFrameInset:Die() TradeRecipientItemsInset:Die() @@ -709,21 +710,21 @@ local function MiscStyles() StyleTradeSlots("TradeRecipientItem"..i) end - TradeHighlightPlayerTop:SetTexture(0.28, 0.75, 1, 0.2) - TradeHighlightPlayerBottom:SetTexture(0.28, 0.75, 1, 0.2) - TradeHighlightPlayerMiddle:SetTexture(0.28, 0.75, 1, 0.2) + TradeHighlightPlayerTop:SetColorTexture(0.28, 0.75, 1, 0.2) + TradeHighlightPlayerBottom:SetColorTexture(0.28, 0.75, 1, 0.2) + TradeHighlightPlayerMiddle:SetColorTexture(0.28, 0.75, 1, 0.2) TradeHighlightPlayer:SetFrameStrata("HIGH") - TradeHighlightPlayerEnchantTop:SetTexture(0.28, 0.75, 1, 0.2) - TradeHighlightPlayerEnchantBottom:SetTexture(0.28, 0.75, 1, 0.2) - TradeHighlightPlayerEnchantMiddle:SetTexture(0.28, 0.75, 1, 0.2) + TradeHighlightPlayerEnchantTop:SetColorTexture(0.28, 0.75, 1, 0.2) + TradeHighlightPlayerEnchantBottom:SetColorTexture(0.28, 0.75, 1, 0.2) + TradeHighlightPlayerEnchantMiddle:SetColorTexture(0.28, 0.75, 1, 0.2) TradeHighlightPlayerEnchant:SetFrameStrata("HIGH") - TradeHighlightRecipientTop:SetTexture(0.28, 0.75, 1, 0.2) - TradeHighlightRecipientBottom:SetTexture(0.28, 0.75, 1, 0.2) - TradeHighlightRecipientMiddle:SetTexture(0.28, 0.75, 1, 0.2) + TradeHighlightRecipientTop:SetColorTexture(0.28, 0.75, 1, 0.2) + TradeHighlightRecipientBottom:SetColorTexture(0.28, 0.75, 1, 0.2) + TradeHighlightRecipientMiddle:SetColorTexture(0.28, 0.75, 1, 0.2) TradeHighlightRecipient:SetFrameStrata("HIGH") - TradeHighlightRecipientEnchantTop:SetTexture(0.28, 0.75, 1, 0.2) - TradeHighlightRecipientEnchantBottom:SetTexture(0.28, 0.75, 1, 0.2) - TradeHighlightRecipientEnchantMiddle:SetTexture(0.28, 0.75, 1, 0.2) + TradeHighlightRecipientEnchantTop:SetColorTexture(0.28, 0.75, 1, 0.2) + TradeHighlightRecipientEnchantBottom:SetColorTexture(0.28, 0.75, 1, 0.2) + TradeHighlightRecipientEnchantMiddle:SetColorTexture(0.28, 0.75, 1, 0.2) TradeHighlightRecipientEnchant:SetFrameStrata("HIGH") end diff --git a/SVUI_Skins/components/blizzard/petjournal.lua b/SVUI_Skins/components/blizzard/petjournal.lua index 0916b0a..1f347ce 100644 --- a/SVUI_Skins/components/blizzard/petjournal.lua +++ b/SVUI_Skins/components/blizzard/petjournal.lua @@ -310,6 +310,20 @@ local function CollectionsJournalStyle() button:SetStyle("Button") end end + + SV.API:Set("Tab", CollectionsJournalTab5) + WardrobeCollectionFrame:RemoveTextures() + WardrobeCollectionFrameSearchBox:SetStyle("Editbox") + WardrobeCollectionFrame.FilterButton:RemoveTextures(true) + WardrobeCollectionFrame.FilterButton:SetStyle("Button") + WardrobeCollectionFrame.ModelsFrame:RemoveTextures() + WardrobeCollectionFrame.ModelsFrame:SetStyle("!_Frame", 'Model') + + WardrobeCollectionFrame.progressBar:RemoveTextures() + WardrobeCollectionFrame.progressBar:SetStatusBarTexture([[Interface\BUTTONS\WHITE8X8]]) + WardrobeCollectionFrame.progressBar:SetStyle("Frame", "Bar", true, 2, 2, 2) + SV.API:Set("PageButton", WardrobeCollectionFrame.NavigationFrame.PrevPageButton, false, true) + SV.API:Set("PageButton", WardrobeCollectionFrame.NavigationFrame.NextPageButton) end --[[ ########################################################## diff --git a/SVUI_Skins/components/blizzard/pvp.lua b/SVUI_Skins/components/blizzard/pvp.lua index db34a0a..f80bec5 100644 --- a/SVUI_Skins/components/blizzard/pvp.lua +++ b/SVUI_Skins/components/blizzard/pvp.lua @@ -53,17 +53,15 @@ local function PVPFrameStyle() HonorFrame.Inset:RemoveTextures() HonorFrame.Inset:SetStyle("!_Frame", "Inset") SV.API:Set("ScrollBar", HonorFrameSpecificFrameScrollBar) - HonorFrameSoloQueueButton:RemoveTextures() - HonorFrameGroupQueueButton:RemoveTextures() - HonorFrameSoloQueueButton:SetStyle("Button") - HonorFrameGroupQueueButton:SetStyle("Button") + HonorFrame.QueueButton:RemoveTextures() + HonorFrame.QueueButton:SetStyle("Button") HonorFrame.BonusFrame:RemoveTextures() HonorFrame.BonusFrame.ShadowOverlay:RemoveTextures() HonorFrame.BonusFrame.RandomBGButton:RemoveTextures() HonorFrame.BonusFrame.RandomBGButton:SetStyle("!_Frame", "Button") HonorFrame.BonusFrame.RandomBGButton:SetStyle("Button") HonorFrame.BonusFrame.RandomBGButton.SelectedTexture:InsetPoints() - HonorFrame.BonusFrame.RandomBGButton.SelectedTexture:SetTexture(1, 1, 0, 0.1) + HonorFrame.BonusFrame.RandomBGButton.SelectedTexture:SetColorTexture(1, 1, 0, 0.1) HonorFrame.BonusFrame.DiceButton:DisableDrawLayer("ARTWORK") HonorFrame.BonusFrame.DiceButton:SetHighlightTexture("") @@ -92,6 +90,10 @@ local function PVPFrameStyle() local ConquestPointsBar = _G.ConquestPointsBar; ConquestFrame.Inset:RemoveTextures() + ConquestPoints.XPBar:RemoveTextures() + ConquestPoints.XPBar:SetStyle("!_Frame", 'Inset') + ConquestPoints.XPBar.Panel:WrapPoints(ConquestPointsBar, nil, -2) + --[[ ConquestPointsBarLeft:Die() ConquestPointsBarRight:Die() ConquestPointsBarMiddle:Die() @@ -100,6 +102,7 @@ local function PVPFrameStyle() ConquestPointsBar.progress:SetTexture(SV.media.statusbar.default) ConquestPointsBar:SetStyle("!_Frame", 'Inset') ConquestPointsBar.Panel:WrapPoints(ConquestPointsBar, nil, -2) + ]]-- ConquestFrame:RemoveTextures() ConquestFrame.ShadowOverlay:RemoveTextures() ConquestJoinButton:RemoveTextures() @@ -108,7 +111,7 @@ local function PVPFrameStyle() ConquestFrame.RatedBG:SetStyle("!_Frame", "Inset") ConquestFrame.RatedBG:SetStyle("Button") ConquestFrame.RatedBG.SelectedTexture:InsetPoints() - ConquestFrame.RatedBG.SelectedTexture:SetTexture(1, 1, 0, 0.1) + ConquestFrame.RatedBG.SelectedTexture:SetColorTexture(1, 1, 0, 0.1) WarGamesFrame:RemoveTextures() WarGamesFrame.RightInset:RemoveTextures() WarGamesFrameInfoScrollFrame:RemoveTextures() diff --git a/SVUI_Skins/components/blizzard/quest.lua b/SVUI_Skins/components/blizzard/quest.lua index a98d270..bff73f5 100644 --- a/SVUI_Skins/components/blizzard/quest.lua +++ b/SVUI_Skins/components/blizzard/quest.lua @@ -114,6 +114,7 @@ QUEST MODRS ########################################################## ]]-- local function QuestFrameStyle() + --print('test QuestFrameStyle') if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.quest ~= true then return end SV.API:Set("Window", QuestLogPopupDetailFrame, true, true) @@ -128,7 +129,7 @@ local function QuestFrameStyle() local choiceBG = QuestInfoItemHighlight:CreateTexture(nil, "BACKGROUND") choiceBG:SetAllPoints(QuestInfoItemHighlight) - choiceBG:SetTexture(0.35, 1, 0, 0.35) + choiceBG:SetColorTexture(0.35, 1, 0, 0.35) local width = QuestLogPopupDetailFrameScrollFrame:GetWidth() QuestLogPopupDetailFrame.ShowMapButton:SetWidth(width) diff --git a/SVUI_Skins/components/blizzard/raid.lua b/SVUI_Skins/components/blizzard/raid.lua index 87a4800..509a6ab 100644 --- a/SVUI_Skins/components/blizzard/raid.lua +++ b/SVUI_Skins/components/blizzard/raid.lua @@ -61,6 +61,7 @@ local function RaidUIStyle() end local function RaidInfoStyle() + --print('test RaidInfoStyle') if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.nonraid ~= true then return end diff --git a/SVUI_Skins/components/blizzard/spellbook.lua b/SVUI_Skins/components/blizzard/spellbook.lua index 0779371..e6636c3 100644 --- a/SVUI_Skins/components/blizzard/spellbook.lua +++ b/SVUI_Skins/components/blizzard/spellbook.lua @@ -186,6 +186,7 @@ SPELLBOOK MODR ########################################################## ]]-- local function SpellBookStyle() + --print('test SpellBookStyle') if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.spellbook ~= true then return end SV:FontManager(_G["SubSpellFont"], "caps", "SYSTEM", 1, "OUTLINE", 0.8, 0.8, 0.8); @@ -215,7 +216,7 @@ local function SpellBookStyle() SV.API:Set("PageButton", SpellBookNextPageButton) hooksecurefunc("SpellButton_UpdateButton", ButtonUpdateHelper) - hooksecurefunc("SpellBook_GetCoreAbilityButton", AbilityButtonHelper) + --hooksecurefunc("SpellBook_GetCoreAbilityButton", AbilityButtonHelper) for i = 1, MAX_SKILLLINE_TABS do local tabName = "SpellBookSkillLineTab" .. i @@ -226,7 +227,7 @@ local function SpellBookStyle() end end - hooksecurefunc('SpellBook_GetCoreAbilitySpecTab', GetSpecTabHelper) + --hooksecurefunc('SpellBook_GetCoreAbilitySpecTab', GetSpecTabHelper) for _, gName in pairs(proFrames)do local frame = _G[gName] @@ -293,11 +294,11 @@ local function SpellBookStyle() end end +--[[ if(SpellBookCoreAbilitiesFrame.SpecName) then - --SpellBookCoreAbilitiesFrame.SpecName:SetFontObject(NumberFont_Outline_Large) SpellBookCoreAbilitiesFrame.SpecName:SetTextColor(1,1,0) end - +]]-- if(SpellBookFrameTabButton1) then SV.API:Set("Tab", SpellBookFrameTabButton1) SpellBookFrameTabButton1:ClearAllPoints() diff --git a/SVUI_Skins/components/blizzard/system.lua b/SVUI_Skins/components/blizzard/system.lua index 2f84cbe..ea646f0 100644 --- a/SVUI_Skins/components/blizzard/system.lua +++ b/SVUI_Skins/components/blizzard/system.lua @@ -165,10 +165,18 @@ local SystemFrameList15 = { "NamesPanelFriendlyPets", "NamesPanelFriendlyGuardians", "NamesPanelFriendlyTotems", + "NamesPanelUnitFriendlyMinions", + "NamesPanelUnitEnemyMinions", + "NamesPanelUnitNameplatesPersonalResource", + "NamesPanelUnitNameplatesPersonalResourceOnEnemy", + "NamesPanelUnitNameplatesMakeLarger", + "NamesPanelUnitNameplatesShowAll", + "NamesPanelUnitNameplatesAggroFlash", "NamesPanelUnitNameplatesFriends", "NamesPanelUnitNameplatesFriendlyGuardians", "NamesPanelUnitNameplatesFriendlyPets", "NamesPanelUnitNameplatesFriendlyTotems", + "NamesPanelUnitNameplatesFriendlyMinions", "NamesPanelGuilds", "NamesPanelGuildTitles", "NamesPanelTitles", @@ -183,6 +191,7 @@ local SystemFrameList15 = { "NamesPanelUnitNameplatesEnemyGuardians", "NamesPanelUnitNameplatesEnemyTotems", "NamesPanelUnitNameplatesEnemyMinus", + "NamesPanelUnitNameplatesEnemyMinions", "CombatTextPanelTargetDamage", "CombatTextPanelPeriodicDamage", "CombatTextPanelPetDamage", @@ -419,6 +428,7 @@ SYSTEM WIDGET MODRS ########################################################## ]]-- local function SystemPanelQue() + --print('test SystemPanelQue') if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.misc ~= true then return end local GhostFrame = _G.GhostFrame; @@ -653,39 +663,42 @@ local function SystemPanelQue() VideoOptionsFrameDefaults:SetPoint("TOPLEFT",VideoOptionsFrameCategoryFrame,"BOTTOMLEFT",-1,-5) InterfaceOptionsFrameDefaults:SetPoint("TOPLEFT",InterfaceOptionsFrameCategories,"BOTTOMLEFT",-1,-5) InterfaceOptionsFrameCancel:SetPoint("TOPRIGHT",InterfaceOptionsFramePanelContainer,"BOTTOMRIGHT",0,-6) - InterfaceOptionsCombatPanelLossOfControl:SetPoint("TOPLEFT",InterfaceOptionsCombatPanelActionButtonUseKeyDown,"BOTTOMLEFT",0,-16) - InterfaceOptionsCombatPanelLossOfControlFullDropDown:SetPoint("TOPLEFT",InterfaceOptionsCombatPanelLossOfControl,"BOTTOMLEFT",16,-16) + for i = 1, #SystemFrameList15 do local this = _G["InterfaceOptions"..SystemFrameList15[i]] if(this) then this:SetStyle("CheckButton") end end + for i = 1, #SystemFrameList16 do local this = _G["InterfaceOptions"..SystemFrameList16[i]] if(this) then SV.API:Set("DropDown", this) end end - InterfaceOptionsHelpPanelResetTutorials:SetStyle("Button") + for i = 1, #SystemFrameList17 do local this = _G[SystemFrameList17[i]] if(this) then this:SetStyle("CheckButton") end end + for i = 1, #SystemFrameList18 do local this = _G[SystemFrameList18[i]] if(this) then SV.API:Set("DropDown", this, 165) end end + for i = 1, #SystemFrameList19 do local this = _G[SystemFrameList19[i]] if(this) then this:SetStyle("Button") end end + AudioOptionsVoicePanelChatMode1KeyBindingButton:ClearAllPoints() AudioOptionsVoicePanelChatMode1KeyBindingButton:SetPoint("CENTER", AudioOptionsVoicePanelBinding, "CENTER", 0, -10) if(CompactUnitFrameProfilesRaidStylePartyFrames) then CompactUnitFrameProfilesRaidStylePartyFrames:SetStyle("CheckButton") end @@ -705,9 +718,8 @@ local function SystemPanelQue() SV.API:Set("ScrollBar", this) end end - Graphics_RightQuality:SetBackdrop(nil) - Graphics_RightQuality:Die() - + + --print('test SystemPanelQue 2') if(MacOptionsFrame) then MacOptionsFrame:RemoveTextures() MacOptionsFrame:SetStyle("!_Frame") @@ -719,6 +731,7 @@ local function SystemPanelQue() MacOptionsFrameMovieRecording:RemoveTextures() MacOptionsITunesRemote:RemoveTextures() MacOptionsFrameMisc:RemoveTextures() + --print('test SystemPanelQue m1') SV.API:Set("DropDown", MacOptionsFrameResolutionDropDown) SV.API:Set("DropDown", MacOptionsFrameFramerateDropDown) SV.API:Set("DropDown", MacOptionsFrameCodecDropDown) @@ -729,6 +742,7 @@ local function SystemPanelQue() this:SetStyle("CheckButton") end end + --print('test SystemPanelQue m2') MacOptionsButtonKeybindings:ClearAllPoints() MacOptionsButtonKeybindings:SetPoint("LEFT", MacOptionsFrameDefaults, "RIGHT", 2, 0) MacOptionsFrameOkay:ClearAllPoints() @@ -738,6 +752,7 @@ local function SystemPanelQue() MacOptionsFrameCancel:SetWidth(MacOptionsFrameCancel:GetWidth() - 6) end + --print('test SystemPanelQue 3') ReportCheatingDialog:RemoveTextures() ReportCheatingDialogCommentFrame:RemoveTextures() ReportCheatingDialogReportButton:SetStyle("Button") @@ -751,7 +766,7 @@ local function SystemPanelQue() ReportPlayerNameDialogReportButton:SetStyle("Button") ReportPlayerNameDialogCancelButton:SetStyle("Button") - + --print('test SystemPanelQue 4') SideDressUpFrame:RemoveTextures(true) SideDressUpFrame:SetSize(300, 400) SideDressUpModel:RemoveTextures(true) diff --git a/SVUI_Skins/components/blizzard/talents.lua b/SVUI_Skins/components/blizzard/talents.lua index 0c8977e..1de01ed 100644 --- a/SVUI_Skins/components/blizzard/talents.lua +++ b/SVUI_Skins/components/blizzard/talents.lua @@ -106,61 +106,61 @@ local function TalentFrameStyle() PlayerTalentFrameTalentsClearInfoFrame:RemoveTextures() PlayerTalentFrame.Panel:SetPoint("BOTTOMRIGHT", PlayerTalentFrame, "BOTTOMRIGHT", 0, -5) - PlayerTalentFrameSpecializationTutorialButton:Die() - PlayerTalentFrameTalentsTutorialButton:Die() - PlayerTalentFramePetSpecializationTutorialButton:Die() - SV.API:Set("CloseButton", PlayerTalentFrameCloseButton) - PlayerTalentFrameActivateButton:SetStyle("Button") - - for _,name in pairs(SpecButtonList)do - local button = _G[name]; - if(button) then - button:RemoveTextures() - button:SetStyle("Button") - local initialAnchor, anchorParent, relativeAnchor, xPosition, yPosition = button:GetPoint() - button:SetPoint(initialAnchor, anchorParent, relativeAnchor, xPosition, -28) - end - end + -- PlayerTalentFrameSpecializationTutorialButton:Die() + -- PlayerTalentFrameTalentsTutorialButton:Die() + -- PlayerTalentFramePetSpecializationTutorialButton:Die() + -- SV.API:Set("CloseButton", PlayerTalentFrameCloseButton) + -- PlayerTalentFrameActivateButton:SetStyle("Button") + + -- for _,name in pairs(SpecButtonList)do + -- local button = _G[name]; + -- if(button) then + -- button:RemoveTextures() + -- button:SetStyle("Button") + -- local initialAnchor, anchorParent, relativeAnchor, xPosition, yPosition = button:GetPoint() + -- button:SetPoint(initialAnchor, anchorParent, relativeAnchor, xPosition, -28) + -- end + -- end PlayerTalentFrameTalents:SetStyle("!_Frame", "Inset") - PlayerTalentFrameTalentsClearInfoFrame.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - PlayerTalentFrameTalentsClearInfoFrame:SetWidth(PlayerTalentFrameTalentsClearInfoFrame:GetWidth()-2) - PlayerTalentFrameTalentsClearInfoFrame:SetHeight(PlayerTalentFrameTalentsClearInfoFrame:GetHeight()-2) - PlayerTalentFrameTalentsClearInfoFrame.icon:SetSize(PlayerTalentFrameTalentsClearInfoFrame:GetSize()) - PlayerTalentFrameTalentsClearInfoFrame:SetPoint('TOPLEFT', PlayerTalentFrameTalents, 'BOTTOMLEFT', 8, -8) - - for i = 1, 4 do - SV.API:Set("Tab", _G["PlayerTalentFrameTab"..i]) - if i == 1 then - local d, e, k, g = _G["PlayerTalentFrameTab"..i]:GetPoint() - _G["PlayerTalentFrameTab"..i]:SetPoint(d, e, k, g, -4) - end - end - - hooksecurefunc("PlayerTalentFrame_UpdateTabs", function() - for i = 1, 4 do - local d, e, k, g = _G["PlayerTalentFrameTab"..i]:GetPoint() - _G["PlayerTalentFrameTab"..i]:SetPoint(d, e, k, g, -4) - end - end) - - PlayerTalentFrameSpecializationSpellScrollFrameScrollChild.Seperator:SetTexture(1, 1, 1) - PlayerTalentFrameSpecializationSpellScrollFrameScrollChild.Seperator:SetAlpha(0.2) - - for i = 1, 2 do - local v = _G["PlayerSpecTab"..i] - _G["PlayerSpecTab"..i.."Background"]:Die() - ChangeTabHelper(v) - end - - hooksecurefunc("PlayerTalentFrame_UpdateSpecs", function() - local d, x, f, g, h = PlayerSpecTab1:GetPoint() - PlayerSpecTab1:SetPoint(d, x, f, -1, h) - end) - - local maxTiers = MAX_TALENT_TIERS - - for i = 1, maxTiers do + -- PlayerTalentFrameTalentsClearInfoFrame.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) + -- PlayerTalentFrameTalentsClearInfoFrame:SetWidth(PlayerTalentFrameTalentsClearInfoFrame:GetWidth()-2) + -- PlayerTalentFrameTalentsClearInfoFrame:SetHeight(PlayerTalentFrameTalentsClearInfoFrame:GetHeight()-2) + -- PlayerTalentFrameTalentsClearInfoFrame.icon:SetSize(PlayerTalentFrameTalentsClearInfoFrame:GetSize()) + -- PlayerTalentFrameTalentsClearInfoFrame:SetPoint('TOPLEFT', PlayerTalentFrameTalents, 'BOTTOMLEFT', 8, -8) + + -- for i = 1, 4 do + -- SV.API:Set("Tab", _G["PlayerTalentFrameTab"..i]) + -- if i == 1 then + -- local d, e, k, g = _G["PlayerTalentFrameTab"..i]:GetPoint() + -- _G["PlayerTalentFrameTab"..i]:SetPoint(d, e, k, g, -4) + -- end + -- end + + -- hooksecurefunc("PlayerTalentFrame_UpdateTabs", function() + -- for i = 1, 4 do + -- local d, e, k, g = _G["PlayerTalentFrameTab"..i]:GetPoint() + -- _G["PlayerTalentFrameTab"..i]:SetPoint(d, e, k, g, -4) + -- end + -- end) + + -- PlayerTalentFrameSpecializationSpellScrollFrameScrollChild.Seperator:SetColorTexture(1, 1, 1) + -- PlayerTalentFrameSpecializationSpellScrollFrameScrollChild.Seperator:SetAlpha(0.2) + + -- for i = 1, 2 do + -- local v = _G["PlayerSpecTab"..i] + -- _G["PlayerSpecTab"..i.."Background"]:Die() + -- ChangeTabHelper(v) + -- end + + -- hooksecurefunc("PlayerTalentFrame_UpdateSpecs", function() + -- local d, x, f, g, h = PlayerSpecTab1:GetPoint() + -- PlayerSpecTab1:SetPoint(d, x, f, -1, h) + -- end) + + local maxTiers = 7 + + for i = 1, 7 do local gName = ("PlayerTalentFrameTalentsTalentRow%d"):format(i) local rowFrame = _G[gName] if(rowFrame) then @@ -172,7 +172,7 @@ local function TalentFrameStyle() rowFrame.TopLine:SetPoint("TOP", 0, 4) rowFrame.BottomLine:SetPoint("BOTTOM", 0, -4) - for z = 1, NUM_TALENT_COLUMNS do + for z = 1, 3 do local talentItem = _G[("%sTalent%d"):format(gName, z)] if(talentItem) then SV.API:Set("ItemButton", talentItem) @@ -182,10 +182,10 @@ local function TalentFrameStyle() end hooksecurefunc("TalentFrame_Update", function() - for i = 1, maxTiers do + for i = 1, 7 do local gName = ("PlayerTalentFrameTalentsTalentRow%d"):format(i) - for z = 1, NUM_TALENT_COLUMNS do + for z = 1, 3 do local talentItem = _G[("%sTalent%d"):format(gName, z)] if(talentItem) then if talentItem.knownSelection:IsShown() then @@ -201,139 +201,140 @@ local function TalentFrameStyle() end end) - for b = 1, 5 do - select(b, PlayerTalentFrameSpecializationSpellScrollFrameScrollChild:GetRegions()):Hide() - end - - local C = _G["PlayerTalentFrameSpecializationSpellScrollFrameScrollChild"] - C.ring:Hide() - C:SetStyle("!_Frame", "Inset") - C.Panel:WrapPoints(C.specIcon) - C.specIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - - local D = _G["PlayerTalentFramePetSpecializationSpellScrollFrameScrollChild"] - D.ring:Hide() - D:SetStyle("!_Frame", "Inset") - D.Panel:WrapPoints(D.specIcon) - D.specIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - - hooksecurefunc("PlayerTalentFrame_UpdateSpecFrame", function(self, arg1) - local arg2 = GetSpecialization(nil, self.isPet, PlayerSpecTab2:GetChecked() and 2 or 1) - local spec = arg1 or arg2 or 1; - local arg3, _, _, icon = GetSpecializationInfo(spec, nil, self.isPet) - local scrollChild = self.spellsScroll.child; - scrollChild.specIcon:SetTexture(icon) - - local cache; - if self.isPet then - cache = { GetSpecializationSpells(spec, nil, self.isPet) } - else - cache = SPEC_SPELLS_DISPLAY[arg3] - end - - local indexOffset = 1; - for i = 1, #cache, 2 do - local button = scrollChild["abilityButton" .. indexOffset] - if(button) then - local _, icon = GetSpellTexture(cache[i]) - button.icon:SetTexture(icon) - if not button.restyled then - button.restyled = true; - button:SetSize(30, 30) - button.ring:Hide() - button:SetStyle("!_Frame", "Inset") - button.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - button.icon:InsetPoints() - end - end - indexOffset = indexOffset + 1 - end - - for i = 1, GetNumSpecializations(nil, self.isPet)do - local specButton = self["specButton"..i] - if(specButton) then - specButton.SelectedTexture:InsetPoints(specButton.Panel) - if specButton.selected then - specButton.SelectedTexture:Show() - else - specButton.SelectedTexture:Hide() - end - end - end - end) - - for b = 1, GetNumSpecializations(false, nil)do - local button = PlayerTalentFrameSpecialization["specButton"..b] - if(button) then - local _, _, _, icon = GetSpecializationInfo(b, false, nil) - button.ring:Hide() - button.specIcon:SetTexture(icon) - button.specIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - button.specIcon:SetSize(50, 50) - button.specIcon:SetPoint("LEFT", button, "LEFT", 15, 0) - button.SelectedTexture = button:CreateTexture(nil, 'ARTWORK') - button.SelectedTexture:SetTexture(1, 1, 0, 0.1) - end - end - - local btnList = { - "PlayerTalentFrameSpecializationSpecButton", "PlayerTalentFramePetSpecializationSpecButton" - } - - for _, gName in pairs(btnList)do - for b = 1, 4 do - local button = _G[gName..b] - if(button) then - if(_G[gName..b.."Glow"]) then _G[gName..b.."Glow"]:Die() end - local bTex = button:CreateTexture(nil, 'ARTWORK') - bTex:SetTexture(1, 1, 1, 0.1) - button:SetHighlightTexture(bTex) - button.bg:SetAlpha(0) - button.learnedTex:SetAlpha(0) - button.selectedTex:SetAlpha(0) - button:SetStyle("!_Frame", "Button") - button:GetHighlightTexture():InsetPoints(button.Panel) - end - end - end - - if SV.class == "HUNTER" then - for b = 1, 6 do - select(b, PlayerTalentFramePetSpecialization:GetRegions()):Hide() - end - for b = 1, PlayerTalentFramePetSpecialization:GetNumChildren()do - local O = select(b, PlayerTalentFramePetSpecialization:GetChildren()) - if O and not O:GetName() then - O:DisableDrawLayer("OVERLAY") - end - end - for b = 1, 5 do - select(b, PlayerTalentFramePetSpecializationSpellScrollFrameScrollChild:GetRegions()):Hide() - end - for b = 1, GetNumSpecializations(false, true)do - local A = PlayerTalentFramePetSpecialization["specButton"..b] - local p, p, p, icon = GetSpecializationInfo(b, false, true) - A.ring:Hide() - A.specIcon:SetTexture(icon) - A.specIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - A.specIcon:SetSize(50, 50) - A.specIcon:SetPoint("LEFT", A, "LEFT", 15, 0) - A.SelectedTexture = A:CreateTexture(nil, 'ARTWORK') - A.SelectedTexture:SetTexture(1, 1, 0, 0.1) - end - PlayerTalentFramePetSpecializationSpellScrollFrameScrollChild.Seperator:SetTexture(1, 1, 1) - PlayerTalentFramePetSpecializationSpellScrollFrameScrollChild.Seperator:SetAlpha(0.2) - end - - PlayerTalentFrameSpecialization:DisableDrawLayer('ARTWORK') - PlayerTalentFrameSpecialization:DisableDrawLayer('BORDER') + -- for b = 1, 5 do + -- select(b, PlayerTalentFrameSpecializationSpellScrollFrameScrollChild:GetRegions()):Hide() + -- end + + -- local C = _G["PlayerTalentFrameSpecializationSpellScrollFrameScrollChild"] + -- C.ring:Hide() + -- C:SetStyle("!_Frame", "Inset") + -- C.Panel:WrapPoints(C.specIcon) + -- C.specIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) + + -- local D = _G["PlayerTalentFramePetSpecializationSpellScrollFrameScrollChild"] + -- D.ring:Hide() + -- D:SetStyle("!_Frame", "Inset") + -- D.Panel:WrapPoints(D.specIcon) + -- D.specIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) + + -- hooksecurefunc("PlayerTalentFrame_UpdateSpecFrame", function(self, arg1) + -- local arg2 = GetSpecialization(nil, self.isPet, PlayerSpecTab2:GetChecked() and 2 or 1) + -- local spec = arg1 or arg2 or 1; + -- local arg3, _, _, icon = GetSpecializationInfo(spec, nil, self.isPet) + -- local scrollChild = self.spellsScroll.child; + -- scrollChild.specIcon:SetTexture(icon) + + -- local cache; + -- if self.isPet then + -- cache = { GetSpecializationSpells(spec, nil, self.isPet) } + -- else + -- cache = SPEC_SPELLS_DISPLAY[arg3] + -- end + + -- local indexOffset = 1; + -- for i = 1, #cache, 2 do + -- local button = scrollChild["abilityButton" .. indexOffset] + -- if(button) then + -- local _, icon = GetSpellTexture(cache[i]) + -- button.icon:SetTexture(icon) + -- if not button.restyled then + -- button.restyled = true; + -- button:SetSize(30, 30) + -- button.ring:Hide() + -- button:SetStyle("!_Frame", "Inset") + -- button.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) + -- button.icon:InsetPoints() + -- end + -- end + -- indexOffset = indexOffset + 1 + -- end + + -- for i = 1, GetNumSpecializations(nil, self.isPet)do + -- local specButton = self["specButton"..i] + -- if(specButton) then + -- specButton.SelectedTexture:InsetPoints(specButton.Panel) + -- if specButton.selected then + -- specButton.SelectedTexture:Show() + -- else + -- specButton.SelectedTexture:Hide() + -- end + -- end + -- end + -- end) + + -- for b = 1, GetNumSpecializations(false, nil)do + -- local button = PlayerTalentFrameSpecialization["specButton"..b] + -- if(button) then + -- local _, _, _, icon = GetSpecializationInfo(b, false, nil) + -- button.ring:Hide() + -- button.specIcon:SetTexture(icon) + -- button.specIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) + -- button.specIcon:SetSize(50, 50) + -- button.specIcon:SetPoint("LEFT", button, "LEFT", 15, 0) + -- button.SelectedTexture = button:CreateTexture(nil, 'ARTWORK') + -- button.SelectedTexture:SetColorTexture(1, 1, 0, 0.1) + -- end + -- end + + -- local btnList = { + -- "PlayerTalentFrameSpecializationSpecButton", "PlayerTalentFramePetSpecializationSpecButton" + -- } + + -- for _, gName in pairs(btnList)do + -- for b = 1, 4 do + -- local button = _G[gName..b] + -- if(button) then + -- if(_G[gName..b.."Glow"]) then _G[gName..b.."Glow"]:Die() end + -- local bTex = button:CreateTexture(nil, 'ARTWORK') + -- bTex:SetColorTexture(1, 1, 1, 0.1) + -- button:SetHighlightTexture(bTex) + -- button.bg:SetAlpha(0) + -- button.learnedTex:SetAlpha(0) + -- button.selectedTex:SetAlpha(0) + -- button:SetStyle("!_Frame", "Button") + -- button:GetHighlightTexture():InsetPoints(button.Panel) + -- end + -- end + -- end + + -- if SV.class == "HUNTER" then + -- for b = 1, 6 do + -- select(b, PlayerTalentFramePetSpecialization:GetRegions()):Hide() + -- end + -- for b = 1, PlayerTalentFramePetSpecialization:GetNumChildren()do + -- local O = select(b, PlayerTalentFramePetSpecialization:GetChildren()) + -- if O and not O:GetName() then + -- O:DisableDrawLayer("OVERLAY") + -- end + -- end + -- for b = 1, 5 do + -- select(b, PlayerTalentFramePetSpecializationSpellScrollFrameScrollChild:GetRegions()):Hide() + -- end + -- for b = 1, GetNumSpecializations(false, true)do + -- local A = PlayerTalentFramePetSpecialization["specButton"..b] + -- local p, p, p, icon = GetSpecializationInfo(b, false, true) + -- A.ring:Hide() + -- A.specIcon:SetTexture(icon) + -- A.specIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) + -- A.specIcon:SetSize(50, 50) + -- A.specIcon:SetPoint("LEFT", A, "LEFT", 15, 0) + -- A.SelectedTexture = A:CreateTexture(nil, 'ARTWORK') + -- A.SelectedTexture:SetColorTexture(1, 1, 0, 0.1) + -- end + -- PlayerTalentFramePetSpecializationSpellScrollFrameScrollChild.Seperator:SetColorTexture(1, 1, 1) + -- PlayerTalentFramePetSpecializationSpellScrollFrameScrollChild.Seperator:SetAlpha(0.2) + -- end + + -- PlayerTalentFrameSpecialization:DisableDrawLayer('ARTWORK') + -- PlayerTalentFrameSpecialization:DisableDrawLayer('BORDER') + + -- for b = 1, PlayerTalentFrameSpecialization:GetNumChildren()do + -- local O = select(b, PlayerTalentFrameSpecialization:GetChildren()) + -- if O and not O:GetName() then + -- O:DisableDrawLayer("OVERLAY") + -- end + -- end - for b = 1, PlayerTalentFrameSpecialization:GetNumChildren()do - local O = select(b, PlayerTalentFrameSpecialization:GetChildren()) - if O and not O:GetName() then - O:DisableDrawLayer("OVERLAY") - end - end end --[[ ########################################################## diff --git a/SVUI_Skins/components/blizzard/timemanager.lua b/SVUI_Skins/components/blizzard/timemanager.lua index 58c3b20..6313d51 100644 --- a/SVUI_Skins/components/blizzard/timemanager.lua +++ b/SVUI_Skins/components/blizzard/timemanager.lua @@ -38,7 +38,7 @@ local function TimeManagerStyle() TimeManagerStopwatchCheck:GetNormalTexture():SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) TimeManagerStopwatchCheck:GetNormalTexture():InsetPoints() local sWatch = TimeManagerStopwatchCheck:CreateTexture(nil, "OVERLAY") - sWatch:SetTexture(1, 1, 1, 0.3) + sWatch:SetColorTexture(1, 1, 1, 0.3) sWatch:SetPoint("TOPLEFT", TimeManagerStopwatchCheck, 2, -2) sWatch:SetPoint("BOTTOMRIGHT", TimeManagerStopwatchCheck, -2, 2) TimeManagerStopwatchCheck:SetHighlightTexture(sWatch) diff --git a/SVUI_Skins/components/blizzard/trainer.lua b/SVUI_Skins/components/blizzard/trainer.lua index 105e8ff..197d810 100644 --- a/SVUI_Skins/components/blizzard/trainer.lua +++ b/SVUI_Skins/components/blizzard/trainer.lua @@ -50,7 +50,7 @@ local function TrainerStyle() if item then SV.API:Set("ItemButton", item, nil, true) _G["ClassTrainerScrollFrameButton"..i.."Icon"]:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - item.selectedTex:SetTexture(1, 1, 1, 0.3) + item.selectedTex:SetColorTexture(1, 1, 1, 0.3) item.selectedTex:InsetPoints() end end @@ -74,8 +74,8 @@ local function TrainerStyle() ClassTrainerFrameSkillStepButton:SetStyle("!_Frame", "Button", true) --ClassTrainerFrameSkillStepButton.Panel:WrapPoints(ClassTrainerFrameSkillStepButton.icon) --ClassTrainerFrameSkillStepButton.icon:SetParent(ClassTrainerFrameSkillStepButton.Panel) - ClassTrainerFrameSkillStepButtonHighlight:SetTexture(1, 1, 1, 0.3) - ClassTrainerFrameSkillStepButton.selectedTex:SetTexture(1, 1, 1, 0.3) + ClassTrainerFrameSkillStepButtonHighlight:SetColorTexture(1, 1, 1, 0.3) + ClassTrainerFrameSkillStepButton.selectedTex:SetColorTexture(1, 1, 1, 0.3) ClassTrainerStatusBar:RemoveTextures() ClassTrainerStatusBar:SetStatusBarTexture(SV.media.statusbar.gradient) ClassTrainerStatusBar:SetStyle("Frame", "Inset", true, 1, 2, 2) diff --git a/SVUI_Skins/components/blizzard/worldmap.lua b/SVUI_Skins/components/blizzard/worldmap.lua index 65ee78b..05cf680 100644 --- a/SVUI_Skins/components/blizzard/worldmap.lua +++ b/SVUI_Skins/components/blizzard/worldmap.lua @@ -60,14 +60,16 @@ local function StripQuestMapFrame() WorldMapFrame.BorderFrame.ButtonFrameEdge:SetTexture("") WorldMapFrame.BorderFrame.InsetBorderTop:SetTexture("") WorldMapFrame.BorderFrame.Inset:RemoveTextures(true) + --print('test StripQuestMapFrame 1') WorldMapTitleButton:RemoveTextures(true) WorldMapFrameNavBar:RemoveTextures(true) WorldMapFrameNavBarOverlay:RemoveTextures(true) + --print('test StripQuestMapFrame 2') QuestMapFrame:RemoveTextures(true) QuestMapFrame.DetailsFrame:RemoveTextures(true) QuestScrollFrame:RemoveTextures(true) - QuestScrollFrame.ViewAll:RemoveTextures(true) - + --QuestScrollFrame.ViewAll:RemoveTextures(true) + --print('test StripQuestMapFrame 3') QuestMapFrame.DetailsFrame.CompleteQuestFrame:RemoveTextures(true) QuestMapFrame.DetailsFrame.CompleteQuestFrame.CompleteButton:RemoveTextures(true) QuestMapFrame.DetailsFrame.BackButton:RemoveTextures(true) @@ -75,7 +77,7 @@ local function StripQuestMapFrame() QuestMapFrame.DetailsFrame.ShareButton:RemoveTextures(true) QuestMapFrame.DetailsFrame.TrackButton:RemoveTextures(true) QuestMapFrame.DetailsFrame.RewardsFrame:RemoveTextures(true) - + --print('test StripQuestMapFrame 4') QuestMapFrame.DetailsFrame:SetStyle("Frame", "Paper") QuestMapFrame.DetailsFrame.CompleteQuestFrame.CompleteButton:SetStyle("Button") QuestMapFrame.DetailsFrame.BackButton:SetStyle("Button") @@ -87,9 +89,8 @@ local function StripQuestMapFrame() SV.API:Set("Skin", QuestMapFrame.DetailsFrame.RewardsFrame, 0, -10, 0, 0) QuestScrollFrame:SetStyle("Frame", "Paper") - - QuestScrollFrame.ViewAll:SetStyle("Button") - + --QuestScrollFrame.ViewAll:SetStyle("Button") + --print('test StripQuestMapFrame 5') local detailWidth = QuestMapFrame.DetailsFrame.RewardsFrame:GetWidth() QuestMapFrame.DetailsFrame:ClearAllPoints() QuestMapFrame.DetailsFrame:SetPoint("BOTTOMRIGHT", QuestMapFrame, "BOTTOMRIGHT", 2, 0) @@ -111,7 +112,7 @@ local function WorldMap_OnShow() end -- WorldMap_SmallView() if not SV.db.Maps.tinyWorldMap then - BlackoutWorld:SetTexture(0,0,0,1) + BlackoutWorld:SetColorTexture(0,0,0,1) else BlackoutWorld:SetTexture("") end @@ -130,40 +131,40 @@ WORLDMAP MODR ########################################################## ]]-- local function WorldMapStyle() + --print('test WorldMapStyle') if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.worldmap ~= true then return end SV.API:Set("Window", WorldMapFrame, true, true) - --WorldMapFrame.Panel:SetStyle("Frame", "Transparent") - SV.API:Set("ScrollBar", QuestScrollFrameScrollBar) SV.API:Set("ScrollBar", WorldMapQuestScrollFrameScrollBar) SV.API:Set("ScrollBar", WorldMapQuestDetailScrollFrameScrollBar, 4) SV.API:Set("ScrollBar", WorldMapQuestRewardScrollFrameScrollBar, 4) + --print('test WorldMapStyle 1') WorldMapDetailFrame:SetStyle("Frame", "Blackout") WorldMapFrameSizeDownButton:SetFrameLevel(999) WorldMapFrameSizeUpButton:SetFrameLevel(999) WorldMapFrameCloseButton:SetFrameLevel(999) + --print('test WorldMapStyle 2') SV.API:Set("CloseButton", WorldMapFrameCloseButton) SV.API:Set("ArrowButton", WorldMapFrameSizeDownButton, "down") SV.API:Set("ArrowButton", WorldMapFrameSizeUpButton, "up") - SV.API:Set("DropDown", WorldMapLevelDropDown) SV.API:Set("DropDown", WorldMapZoneMinimapDropDown) SV.API:Set("DropDown", WorldMapContinentDropDown) SV.API:Set("DropDown", WorldMapZoneDropDown) SV.API:Set("DropDown", WorldMapShowDropDown) - + --print('test WorldMapStyle 3') StripQuestMapFrame() --WorldMapFrame.UIElementsFrame:SetStyle("Frame", "Blackout") - + WorldMapFrame:HookScript("OnShow", WorldMap_OnShow) hooksecurefunc("WorldMap_ToggleSizeUp", WorldMap_OnShow) BlackoutWorld:SetParent(WorldMapFrame.Panel) - + --print('test WorldMapStyle 4') WorldMapFrameNavBar:ClearAllPoints() WorldMapFrameNavBar:SetPoint("TOPLEFT", WorldMapFrame.Panel, "TOPLEFT", 12, -26) WorldMapFrameNavBar:SetStyle("Frame", "Inset", true, 2, 2, 1) diff --git a/SVUI_Tooltip/SVUI_Tooltip.lua b/SVUI_Tooltip/SVUI_Tooltip.lua index 1124717..9fa0b36 100644 --- a/SVUI_Tooltip/SVUI_Tooltip.lua +++ b/SVUI_Tooltip/SVUI_Tooltip.lua @@ -241,10 +241,10 @@ local ClearMaskColors = function(self, hide) --self[3]:SetVertexColor(0, 0, 0, 0) --self[4]:SetVertexColor(0, 0, 0, 0) - self[5]:SetTexture(0, 0, 0, 0) - self[6]:SetTexture(0, 0, 0, 0) - self[7]:SetTexture(0, 0, 0, 0) - self[8]:SetTexture(0, 0, 0, 0) + self[5]:SetColorTexture(0, 0, 0, 0) + self[6]:SetColorTexture(0, 0, 0, 0) + self[7]:SetColorTexture(0, 0, 0, 0) + self[8]:SetColorTexture(0, 0, 0, 0) -- if(hide) then -- self:SetBackdropColor(0, 0, 0, 0) @@ -441,7 +441,7 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self) ShowInspectInfo(self, unit, unitLevel, colors.r, colors.g, colors.b, 0) end else - if UnitIsTapped(unit) and not UnitIsTappedByPlayer(unit) then + if UnitIsTapDenied(unit) then colors = TAPPED_COLOR else colors = FACTION_BAR_COLORS[UnitReaction(unit, "player")] @@ -821,25 +821,25 @@ function MOD:SetCustomStyle(tooltip) mask[5]:SetPoint("TOPLEFT", mask, "TOPLEFT", 0, 0) mask[5]:SetPoint("TOPRIGHT", mask, "TOPRIGHT", 0, 0) mask[5]:SetHeight(1) - mask[5]:SetTexture(0,0,0) + mask[5]:SetColorTexture(0,0,0) --[[ BORDER BOTTOM ]] mask[6] = mask:CreateTexture(nil, "OVERLAY") mask[6]:SetPoint("BOTTOMLEFT", mask, "BOTTOMLEFT", 0, 0) mask[6]:SetPoint("BOTTOMRIGHT", mask, "BOTTOMRIGHT", 0, 0) mask[6]:SetHeight(1) - mask[6]:SetTexture(0,0,0) + mask[6]:SetColorTexture(0,0,0) --[[ BORDER RIGHT ]] mask[7] = mask:CreateTexture(nil, "OVERLAY") mask[7]:SetPoint("TOPRIGHT", mask, "TOPRIGHT", 0, 0) mask[7]:SetPoint("BOTTOMRIGHT", mask, "BOTTOMRIGHT", 0, 0) mask[7]:SetWidth(1) - mask[7]:SetTexture(0,0,0) + mask[7]:SetColorTexture(0,0,0) --[[ BORDER LEFT ]] mask[8] = mask:CreateTexture(nil, "OVERLAY") mask[8]:SetPoint("TOPLEFT", mask, "TOPLEFT", 0, 0) mask[8]:SetPoint("BOTTOMLEFT", mask, "BOTTOMLEFT", 0, 0) mask[8]:SetWidth(1) - mask[8]:SetTexture(0,0,0) + mask[8]:SetColorTexture(0,0,0) mask:SetBackdrop(SV.media.backdrop.tooltip) --mask:SetBackdropBorderColor(0, 0, 0) @@ -942,7 +942,7 @@ function MOD:Load() NewHook(GameTooltip, "SetUnitAura", _hook_OnSetUnitAura) NewHook(GameTooltip, "SetUnitBuff", _hook_OnSetUnitAura) NewHook(GameTooltip, "SetUnitDebuff", _hook_OnSetUnitAura) - NewHook(GameTooltip, "SetUnitConsolidatedBuff", _hook_OnSetHyperUnitAura) + --NewHook(GameTooltip, "SetUnitConsolidatedBuff", _hook_OnSetHyperUnitAura) if(SPELL_IDS) then NewHook("SetItemRef", _hook_OnItemRef) diff --git a/SVUI_Tooltip/SVUI_Tooltip.toc b/SVUI_Tooltip/SVUI_Tooltip.toc index d124e52..1ab77e5 100644 --- a/SVUI_Tooltip/SVUI_Tooltip.toc +++ b/SVUI_Tooltip/SVUI_Tooltip.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.2.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Tooltip|r diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.lua b/SVUI_UnitFrames/SVUI_UnitFrames.lua index 12c85a6..a5ab671 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.lua +++ b/SVUI_UnitFrames/SVUI_UnitFrames.lua @@ -473,13 +473,13 @@ function MOD:RefreshUnitLayout(frame, template) if(frame.InfoPanelBG) then if(SV.db.UnitFrames.infoBackgrounds) then - frame.InfoPanelBG:SetTexture(1,1,1,1) - frame.InfoPanelLeft:SetTexture(1,1,1,1) - frame.InfoPanelRight:SetTexture(1,1,1,1) + frame.InfoPanelBG:SetColorTexture(1,1,1,1) + frame.InfoPanelLeft:SetColorTexture(1,1,1,1) + frame.InfoPanelRight:SetColorTexture(1,1,1,1) else - frame.InfoPanelBG:SetTexture(0,0,0,0) - frame.InfoPanelLeft:SetTexture(0,0,0,0) - frame.InfoPanelRight:SetTexture(0,0,0,0) + frame.InfoPanelBG:SetColorTexture(0,0,0,0) + frame.InfoPanelLeft:SetColorTexture(0,0,0,0) + frame.InfoPanelRight:SetColorTexture(0,0,0,0) end end @@ -1379,6 +1379,7 @@ function MOD:Load() hooksecurefunc("CompactUnitFrame_RegisterEvents", CompactUnitFrame_UnregisterEvents) hooksecurefunc("UnitFrameThreatIndicator_Initialize", UnitFrameThreatIndicator_Hook) + --[[ InterfaceOptionsFrameCategoriesButton10:SetScale(0.0001) InterfaceOptionsFrameCategoriesButton11:SetScale(0.0001) InterfaceOptionsStatusTextPanelPlayer:SetScale(0.0001) @@ -1397,6 +1398,7 @@ function MOD:Load() InterfaceOptionsCombatPanelEnemyCastBarsOnNameplates:SetPoint(InterfaceOptionsCombatPanelEnemyCastBarsOnPortrait:GetPoint()) InterfaceOptionsDisplayPanelShowAggroPercentage:SetScale(0.0001) InterfaceOptionsDisplayPanelShowAggroPercentage:SetAlpha(0) + ]]-- if not IsAddOnLoaded("Blizzard_ArenaUI") then self:RegisterEvent("ADDON_LOADED") diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.toc b/SVUI_UnitFrames/SVUI_UnitFrames.toc index 4aad130..fa710a5 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.toc +++ b/SVUI_UnitFrames/SVUI_UnitFrames.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Author: Munglunch ## Version: 1.2.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00UnitFrames|r diff --git a/SVUI_UnitFrames/bodyguard.lua b/SVUI_UnitFrames/bodyguard.lua index 63c2202..f94c07a 100644 --- a/SVUI_UnitFrames/bodyguard.lua +++ b/SVUI_UnitFrames/bodyguard.lua @@ -104,7 +104,7 @@ function BodyGuard:RefreshData() self.CurrentStatus = 0 self.Initialized = true - local buildings = C_Garrison.GetBuildings() + local buildings = C_Garrison.GetBuildings(LE_GARRISON_TYPE_6_0) for i = 1, #buildings do local building = buildings[i] diff --git a/SVUI_UnitFrames/class_resources/deathknight.lua b/SVUI_UnitFrames/class_resources/deathknight.lua index b2cf204..053d2e6 100644 --- a/SVUI_UnitFrames/class_resources/deathknight.lua +++ b/SVUI_UnitFrames/class_resources/deathknight.lua @@ -143,7 +143,7 @@ local Reposition = function(self) bar[i].bar.bg:SetTexture(graphic) bar[i].bar.bg:SetAlpha(0.5) bar[i].bar.bg.multiplier = 0.1 - bar[i].fg:SetTexture(0,0,0,0) + bar[i].fg:SetColorTexture(0,0,0,0) bar[i].fg:SetAlpha(0) bar[i].bar.FX:SetAlpha(0.2) bar[i].bar:SetStatusBarTexture(graphic) diff --git a/SVUI_UnitFrames/class_resources/druid.lua b/SVUI_UnitFrames/class_resources/druid.lua index 866c37d..bd8ff3e 100644 --- a/SVUI_UnitFrames/class_resources/druid.lua +++ b/SVUI_UnitFrames/class_resources/druid.lua @@ -98,10 +98,10 @@ local Reposition = function(self) local db = SV.db.UnitFrames.player local bar = self.Druidness; if not bar or not db then print("Error") return end - self.Druidness.Chicken.isEnabled = db.classbar.enableChicken; + --self.Druidness.Chicken.isEnabled = db.classbar.enableChicken; self.Druidness.Mana.isEnabled = db.classbar.enableAltMana; self.Druidness.Cat.isEnabled = db.classbar.enableCat; - local chicken = bar.Chicken; + --local chicken = bar.Chicken; local height = db.classbar.height local offset = (height - 10) local adjustedBar = (height * 1.5) @@ -121,26 +121,26 @@ local Reposition = function(self) bar:ClearAllPoints() bar:SetAllPoints(bar.Holder) - chicken:ClearAllPoints() - chicken:SetAllPoints() + -- chicken:ClearAllPoints() + -- chicken:SetAllPoints() - chicken.LunarBar:SetSize(width, adjustedBar) - chicken.LunarBar:SetStatusBarColor(.13,.32,1) + -- chicken.LunarBar:SetSize(width, adjustedBar) + -- chicken.LunarBar:SetStatusBarColor(.13,.32,1) - chicken.Moon:SetSize(height, height) - chicken.Moon[1]:SetSize(adjustedAnim, adjustedAnim) - chicken.Moon[2]:SetSize(scaled, scaled) + -- chicken.Moon:SetSize(height, height) + -- chicken.Moon[1]:SetSize(adjustedAnim, adjustedAnim) + -- chicken.Moon[2]:SetSize(scaled, scaled) - chicken.SolarBar:SetSize(width, adjustedBar) - chicken.SolarBar:SetStatusBarColor(1,1,0.21) + -- chicken.SolarBar:SetSize(width, adjustedBar) + -- chicken.SolarBar:SetStatusBarColor(1,1,0.21) - chicken.Sun:SetSize(height, height) - chicken.Sun[1]:SetSize(adjustedAnim, adjustedAnim) - chicken.Sun[2]:SetSize(scaled, scaled) + -- chicken.Sun:SetSize(height, height) + -- chicken.Sun[1]:SetSize(adjustedAnim, adjustedAnim) + -- chicken.Sun[2]:SetSize(scaled, scaled) - chicken.Text:SetPoint("TOPLEFT", chicken, "TOPLEFT", 10, 0) - chicken.Text:SetPoint("BOTTOMRIGHT", chicken, "BOTTOMRIGHT", -10, 0) - chicken.Text:SetFont(TRACKER_FONT, scaled, 'OUTLINE') + -- chicken.Text:SetPoint("TOPLEFT", chicken, "TOPLEFT", 10, 0) + -- chicken.Text:SetPoint("BOTTOMRIGHT", chicken, "BOTTOMRIGHT", -10, 0) + -- chicken.Text:SetFont(TRACKER_FONT, scaled, 'OUTLINE') local max = MAX_COMBO_POINTS; local cat = bar.Cat; @@ -242,7 +242,7 @@ function MOD:CreateClassBar(playerFrame) local bar = CreateFrame('Frame', nil, playerFrame) bar:SetFrameLevel(playerFrame.TextGrip:GetFrameLevel() + 30) bar:SetSize(100,40) - +--[[ local chicken = CreateFrame('Frame', nil, bar) chicken:SetAllPoints(bar) @@ -316,7 +316,7 @@ function MOD:CreateClassBar(playerFrame) chicken.PostUpdatePower = EclipseDirection; chicken.PostUpdateAura = EclipseDirection; - +]]-- local cat = CreateFrame('Frame',nil,bar) cat:SetAllPoints(bar) local max = MAX_COMBO_POINTS; @@ -357,7 +357,7 @@ function MOD:CreateClassBar(playerFrame) mana.Text:SetFontObject(SVUI_Font_Unit) bar.Cat = cat; - bar.Chicken = chicken; + --bar.Chicken = chicken; bar.Mana = mana; local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) diff --git a/SVUI_UnitFrames/class_resources/mage.lua b/SVUI_UnitFrames/class_resources/mage.lua index 5f47b3d..8d15586 100644 --- a/SVUI_UnitFrames/class_resources/mage.lua +++ b/SVUI_UnitFrames/class_resources/mage.lua @@ -143,28 +143,28 @@ function MOD:CreateClassBar(playerFrame) local bgTexture = bgFrame:CreateTexture(nil, "BACKGROUND") bgTexture:SetAllPoints(bgFrame) - bgTexture:SetTexture(0.09,0.01,0,0.5) + bgTexture:SetColorTexture(0.09,0.01,0,0.5) local borderB = bgFrame:CreateTexture(nil,"OVERLAY") - borderB:SetTexture(0,0,0) + borderB:SetColorTexture(0,0,0) borderB:SetPoint("BOTTOMLEFT") borderB:SetPoint("BOTTOMRIGHT") borderB:SetHeight(2) local borderT = bgFrame:CreateTexture(nil,"OVERLAY") - borderT:SetTexture(0,0,0) + borderT:SetColorTexture(0,0,0) borderT:SetPoint("TOPLEFT") borderT:SetPoint("TOPRIGHT") borderT:SetHeight(2) local borderL = bgFrame:CreateTexture(nil,"OVERLAY") - borderL:SetTexture(0,0,0) + borderL:SetColorTexture(0,0,0) borderL:SetPoint("TOPLEFT") borderL:SetPoint("BOTTOMLEFT") borderL:SetWidth(2) local borderR = bgFrame:CreateTexture(nil,"OVERLAY") - borderR:SetTexture(0,0,0) + borderR:SetColorTexture(0,0,0) borderR:SetPoint("TOPRIGHT") borderR:SetPoint("BOTTOMRIGHT") borderR:SetWidth(2) diff --git a/SVUI_UnitFrames/class_resources/warlock.lua b/SVUI_UnitFrames/class_resources/warlock.lua index 1b5c258..4b80161 100644 --- a/SVUI_UnitFrames/class_resources/warlock.lua +++ b/SVUI_UnitFrames/class_resources/warlock.lua @@ -219,28 +219,28 @@ function MOD:CreateClassBar(playerFrame) local bgTexture = bgFrame:CreateTexture(nil, "BACKGROUND") bgTexture:SetAllPoints(bgFrame) - bgTexture:SetTexture(0.1,0,0,0.75) + bgTexture:SetColorTexture(0.1,0,0,0.75) local borderB = bgFrame:CreateTexture(nil,"OVERLAY") - borderB:SetTexture(0,0,0) + borderB:SetColorTexture(0,0,0) borderB:SetPoint("BOTTOMLEFT") borderB:SetPoint("BOTTOMRIGHT") borderB:SetHeight(2) local borderT = bgFrame:CreateTexture(nil,"OVERLAY") - borderT:SetTexture(0,0,0) + borderT:SetColorTexture(0,0,0) borderT:SetPoint("TOPLEFT") borderT:SetPoint("TOPRIGHT") borderT:SetHeight(2) local borderL = bgFrame:CreateTexture(nil,"OVERLAY") - borderL:SetTexture(0,0,0) + borderL:SetColorTexture(0,0,0) borderL:SetPoint("TOPLEFT") borderL:SetPoint("BOTTOMLEFT") borderL:SetWidth(2) local borderR = bgFrame:CreateTexture(nil,"OVERLAY") - borderR:SetTexture(0,0,0) + borderR:SetColorTexture(0,0,0) borderR:SetPoint("TOPRIGHT") borderR:SetPoint("BOTTOMRIGHT") borderR:SetWidth(2) diff --git a/SVUI_UnitFrames/class_resources/warrior.lua b/SVUI_UnitFrames/class_resources/warrior.lua index e278c96..7615ed2 100644 --- a/SVUI_UnitFrames/class_resources/warrior.lua +++ b/SVUI_UnitFrames/class_resources/warrior.lua @@ -76,28 +76,28 @@ function MOD:CreateClassBar(playerFrame) local bgTexture = bgFrame:CreateTexture(nil, "BACKGROUND") bgTexture:SetAllPoints(bgFrame) - bgTexture:SetTexture(0.2,0,0,0.5) + bgTexture:SetColorTexture(0.2,0,0,0.5) local borderB = bgFrame:CreateTexture(nil,"OVERLAY") - borderB:SetTexture(0,0,0) + borderB:SetColorTexture(0,0,0) borderB:SetPoint("BOTTOMLEFT") borderB:SetPoint("BOTTOMRIGHT") borderB:SetHeight(2) local borderT = bgFrame:CreateTexture(nil,"OVERLAY") - borderT:SetTexture(0,0,0) + borderT:SetColorTexture(0,0,0) borderT:SetPoint("TOPLEFT") borderT:SetPoint("TOPRIGHT") borderT:SetHeight(2) local borderL = bgFrame:CreateTexture(nil,"OVERLAY") - borderL:SetTexture(0,0,0) + borderL:SetColorTexture(0,0,0) borderL:SetPoint("TOPLEFT") borderL:SetPoint("BOTTOMLEFT") borderL:SetWidth(2) local borderR = bgFrame:CreateTexture(nil,"OVERLAY") - borderR:SetTexture(0,0,0) + borderR:SetColorTexture(0,0,0) borderR:SetPoint("TOPRIGHT") borderR:SetPoint("BOTTOMRIGHT") borderR:SetWidth(2) diff --git a/SVUI_UnitFrames/elements/castbar.lua b/SVUI_UnitFrames/elements/castbar.lua index 2126fa3..b4037d4 100644 --- a/SVUI_UnitFrames/elements/castbar.lua +++ b/SVUI_UnitFrames/elements/castbar.lua @@ -236,13 +236,16 @@ local function SetCastbarFading(castbar, texture) fader.txt:SetText("") fader.anim = fader:CreateAnimationGroup("Flash") fader.anim.fadein = fader.anim:CreateAnimation("ALPHA", "FadeIn") - fader.anim.fadein:SetChange(1) + fader.anim.fadein:SetFromAlpha(0) + fader.anim.fadein:SetToAlpha(1) fader.anim.fadein:SetOrder(1) fader.anim.fadeout1 = fader.anim:CreateAnimation("ALPHA", "FadeOut") - fader.anim.fadeout1:SetChange(-.25) + fader.anim.fadeout1:SetFromAlpha(1) + fader.anim.fadeout1:SetToAlpha(0.75) fader.anim.fadeout1:SetOrder(2) fader.anim.fadeout2 = fader.anim:CreateAnimation("ALPHA", "FadeOut") - fader.anim.fadeout2:SetChange(-.75) + fader.anim.fadeout1:SetFromAlpha(0.75) + fader.anim.fadeout1:SetToAlpha(0.25) fader.anim.fadeout2:SetOrder(3) fader.anim.fadein:SetDuration(0) fader.anim.fadeout1:SetDuration(.8) @@ -684,25 +687,25 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss, ha castbar.bg:SetVertexColor(0,0,0,0.5) local borderB = bgFrame:CreateTexture(nil,"OVERLAY") - borderB:SetTexture(0,0,0) + borderB:SetColorTexture(0,0,0) borderB:SetPoint("BOTTOMLEFT") borderB:SetPoint("BOTTOMRIGHT") borderB:SetHeight(2) local borderT = bgFrame:CreateTexture(nil,"OVERLAY") - borderT:SetTexture(0,0,0) + borderT:SetColorTexture(0,0,0) borderT:SetPoint("TOPLEFT") borderT:SetPoint("TOPRIGHT") borderT:SetHeight(2) local borderL = bgFrame:CreateTexture(nil,"OVERLAY") - borderL:SetTexture(0,0,0) + borderL:SetColorTexture(0,0,0) borderL:SetPoint("TOPLEFT") borderL:SetPoint("BOTTOMLEFT") borderL:SetWidth(2) local borderR = bgFrame:CreateTexture(nil,"OVERLAY") - borderR:SetTexture(0,0,0) + borderR:SetColorTexture(0,0,0) borderR:SetPoint("TOPRIGHT") borderR:SetPoint("BOTTOMRIGHT") borderR:SetWidth(2) diff --git a/SVUI_UnitFrames/elements/essentials.lua b/SVUI_UnitFrames/elements/essentials.lua index f10435b..7f7fb75 100644 --- a/SVUI_UnitFrames/elements/essentials.lua +++ b/SVUI_UnitFrames/elements/essentials.lua @@ -236,7 +236,7 @@ local function ADDInfoBG(frame) local bg = frame.InfoPanel:CreateTexture(nil, "BACKGROUND") bg:SetPoint("TOPLEFT", frame.InfoPanel, "TOPLEFT", 0, 1) bg:SetPoint("BOTTOMRIGHT", frame.InfoPanel, "BOTTOMRIGHT", 0, 1) - bg:SetTexture(1, 1, 1, 1) + bg:SetColorTexture(1, 1, 1, 1) bg:SetGradientAlpha("VERTICAL", 0, 0, 0, 0, 0, 0, 0, 0.7) frame.InfoPanelBG = bg @@ -244,7 +244,7 @@ local function ADDInfoBG(frame) left:SetPoint("TOPLEFT", frame.InfoPanel, "TOPLEFT", 0, -1) left:SetPoint("BOTTOMLEFT", frame.InfoPanel, "BOTTOMLEFT", 0, -2) left:SetWidth(2) - left:SetTexture(1, 1, 1, 1) + left:SetColorTexture(1, 1, 1, 1) left:SetGradientAlpha("VERTICAL", 0, 0, 0, 0, 0, 0, 0, 1) frame.InfoPanelLeft = left @@ -252,7 +252,7 @@ local function ADDInfoBG(frame) right:SetPoint("TOPRIGHT", frame.InfoPanel, "TOPRIGHT", 0, -1) right:SetPoint("BOTTOMRIGHT", frame.InfoPanel, "BOTTOMRIGHT", 0, -2) right:SetWidth(2) - right:SetTexture(1, 1, 1, 1) + right:SetColorTexture(1, 1, 1, 1) right:SetGradientAlpha("VERTICAL", 0, 0, 0, 0, 0, 0, 0, 1) frame.InfoPanelRight = right end @@ -322,25 +322,25 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) frame.ActionPanel.class.texture:SetTexture([[Interface\Glues\CharacterCreate\UI-CharacterCreate-Classes]]) local border1 = frame.ActionPanel.class:CreateTexture(nil, "OVERLAY") - border1:SetTexture(0, 0, 0) + border1:SetColorTexture(0, 0, 0) border1:SetPoint("TOPLEFT") border1:SetPoint("TOPRIGHT") border1:SetHeight(2) local border2 = frame.ActionPanel.class:CreateTexture(nil, "OVERLAY") - border2:SetTexture(0, 0, 0) + border2:SetColorTexture(0, 0, 0) border2:SetPoint("BOTTOMLEFT") border2:SetPoint("BOTTOMRIGHT") border2:SetHeight(2) local border3 = frame.ActionPanel.class:CreateTexture(nil, "OVERLAY") - border3:SetTexture(0, 0, 0) + border3:SetColorTexture(0, 0, 0) border3:SetPoint("TOPRIGHT") border3:SetPoint("BOTTOMRIGHT") border3:SetWidth(2) local border4 = frame.ActionPanel.class:CreateTexture(nil, "OVERLAY") - border4:SetTexture(0, 0, 0) + border4:SetColorTexture(0, 0, 0) border4:SetPoint("TOPLEFT") border4:SetPoint("BOTTOMLEFT") border4:SetWidth(2) diff --git a/SVUI_UnitFrames/elements/misc.lua b/SVUI_UnitFrames/elements/misc.lua index 3b898f8..93d145f 100644 --- a/SVUI_UnitFrames/elements/misc.lua +++ b/SVUI_UnitFrames/elements/misc.lua @@ -180,7 +180,7 @@ function MOD:CreateFriendshipBar(frame) buddy:SetStatusBarColor(1,0,0) local bg = buddy:CreateTexture(nil, "BACKGROUND") bg:SetAllPoints(buddy) - bg:SetTexture(0.2,0,0) + bg:SetColorTexture(0.2,0,0) local icon = buddy:CreateTexture(nil, "OVERLAY") icon:SetPoint("LEFT", buddy, "LEFT", -11, 0) icon:SetSize(22,22) diff --git a/SVUI_UnitFrames/elements/tags.lua b/SVUI_UnitFrames/elements/tags.lua index 69bb117..51cdf24 100644 --- a/SVUI_UnitFrames/elements/tags.lua +++ b/SVUI_UnitFrames/elements/tags.lua @@ -165,11 +165,14 @@ local function GetClassPower(class) elseif class == "DRUID" and GetShapeshiftFormID() == MOONKIN_FORM then currentPower = UnitPower("player", SPELL_POWER_ECLIPSE) maxPower = UnitPowerMax("player", SPELL_POWER_ECLIPSE) + r, g, b = .30, .52, .90 + --[[ if GetEclipseDirection() == "moon"then r, g, b = .80, .82, .60 else r, g, b = .30, .52, .90 end + ]]-- elseif class == "PRIEST" and spec == SPEC_PRIEST_SHADOW and UnitLevel("player") > SHADOW_ORBS_SHOW_LEVEL then currentPower = UnitPower("player", SPELL_POWER_SHADOW_ORBS) maxPower = UnitPowerMax("player", SPELL_POWER_SHADOW_ORBS) diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_ActionPanel/oUF_ActionPanel.lua b/SVUI_UnitFrames/libs/Plugins/oUF_ActionPanel/oUF_ActionPanel.lua index 2817a87..a842d77 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_ActionPanel/oUF_ActionPanel.lua +++ b/SVUI_UnitFrames/libs/Plugins/oUF_ActionPanel/oUF_ActionPanel.lua @@ -7,8 +7,7 @@ local assert = _G.assert; local type = _G.type; --BLIZZARD API local UnitIsConnected = _G.UnitIsConnected; -local UnitIsTappedByPlayer = _G.UnitIsTappedByPlayer; -local UnitIsTapped = _G.UnitIsTapped; +local UnitIsTapDenied = _G.UnitIsTapDenied; local UnitIsPlayer = _G.UnitIsPlayer; local UnitIsFriend = _G.UnitIsFriend; local UnitIsDeadOrGhost = _G.UnitIsDeadOrGhost; @@ -85,12 +84,12 @@ local Update = function(self, event, unit) texture:SetAlpha(1) texture:SetTexture(media[2]) --texture:SetGradient("VERTICAL",0,0,1,0,1,0) - elseif(unit ~= "player" and (unit ~= "vehicle" and (not UnitIsFriend(unit, "player")) and (not UnitIsPlayer(unit)) and UnitIsTapped(unit) and (not UnitIsTappedByPlayer(unit)))) then + elseif(unit ~= "player" and (unit ~= "vehicle" and (not UnitIsFriend(unit, "player")) and (not UnitIsPlayer(unit)) and UnitIsTapDenied(unit))) then texture:SetAlpha(1) texture:SetTexture(media[3]) --texture:SetGradient("VERTICAL",1,1,0,1,0,0) else - texture:SetTexture(0,0,0,0) + texture:SetColorTexture(0,0,0,0) end end end diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_Druidness/oUF_Druidness.lua b/SVUI_UnitFrames/libs/Plugins/oUF_Druidness/oUF_Druidness.lua index b19bab3..710beb6 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_Druidness/oUF_Druidness.lua +++ b/SVUI_UnitFrames/libs/Plugins/oUF_Druidness/oUF_Druidness.lua @@ -88,19 +88,19 @@ end local UpdateVisibility = function(self, event) local bar = self.Druidness - local chicken = bar.Chicken + --local chicken = bar.Chicken local cat = bar.Cat local mana = bar.Mana local form = GetShapeshiftFormID() if(form) then if(form == MOONKIN_FORM) then - chicken:ProxyShow() + --chicken:ProxyShow() mana:Hide() cat:Hide() self:RegisterEvent('UNIT_AURA', UpdateAura) else - chicken:Hide() + --chicken:Hide() self:UnregisterEvent('UNIT_AURA', UpdateAura) if (form == BEAR_FORM or form == CAT_FORM) then @@ -117,10 +117,10 @@ local UpdateVisibility = function(self, event) else local ptt = GetSpecialization() if(ptt and ptt == 1) then -- player has balance spec - chicken:ProxyShow() + --chicken:ProxyShow() self:RegisterEvent('UNIT_AURA', UpdateAura) else - chicken:Hide() + --chicken:Hide() self:UnregisterEvent('UNIT_AURA', UpdateAura) end mana:Hide() @@ -133,24 +133,24 @@ local UpdatePower = function(self, event, unit, powerType) local bar = self.Druidness if(powerType == 'ECLIPSE' and bar.Chicken) then - local chicken = bar.Chicken + --local chicken = bar.Chicken local power = UnitPower('player', SPELL_POWER_ECLIPSE) local maxPower = UnitPowerMax('player', SPELL_POWER_ECLIPSE) if maxPower == 0 then maxPower = 100 end --print(maxPower)print(power) - if(chicken.LunarBar) then - chicken.LunarBar:SetMinMaxValues(-maxPower, maxPower) - chicken.LunarBar:SetValue(power) - end - - if(chicken.SolarBar) then - chicken.SolarBar:SetMinMaxValues(-maxPower, maxPower) - chicken.SolarBar:SetValue(power * -1) - end - - if(chicken.PostUpdatePower) then - chicken:PostUpdatePower() - end + --if(chicken.LunarBar) then + -- chicken.LunarBar:SetMinMaxValues(-maxPower, maxPower) + -- chicken.LunarBar:SetValue(power) + --end + + --if(chicken.SolarBar) then + -- chicken.SolarBar:SetMinMaxValues(-maxPower, maxPower) + -- chicken.SolarBar:SetValue(power * -1) + --end + + --if(chicken.PostUpdatePower) then + -- chicken:PostUpdatePower() + --end end if(bar.Mana and bar.Mana.ManaBar) then @@ -251,21 +251,21 @@ local function Enable(self) local bar = self.Druidness if(bar) then - local chicken = bar.Chicken; + --local chicken = bar.Chicken; local mana = bar.Mana; local cpoints = bar.Cat; - chicken.__owner = self; - chicken.ForceUpdate = ForceUpdate; - chicken.ProxyShow = ProxyShow; + --chicken.__owner = self; + --chicken.ForceUpdate = ForceUpdate; + --chicken.ProxyShow = ProxyShow; mana.ProxyShow = ProxyShow; cpoints.ProxyShow = ProxyShow; - if(chicken.LunarBar and chicken.LunarBar:IsObjectType'StatusBar' and not chicken.LunarBar:GetStatusBarTexture()) then - chicken.LunarBar:SetStatusBarTexture([[Interface\TargetingFrame\UI-StatusBar]]) - end - if(chicken.SolarBar and chicken.SolarBar:IsObjectType'StatusBar' and not chicken.SolarBar:GetStatusBarTexture()) then - chicken.SolarBar:SetStatusBarTexture([[Interface\TargetingFrame\UI-StatusBar]]) - end + --if(chicken.LunarBar and chicken.LunarBar:IsObjectType'StatusBar' and not chicken.LunarBar:GetStatusBarTexture()) then + -- chicken.LunarBar:SetStatusBarTexture([[Interface\TargetingFrame\UI-StatusBar]]) + --end + --if(chicken.SolarBar and chicken.SolarBar:IsObjectType'StatusBar' and not chicken.SolarBar:GetStatusBarTexture()) then + -- chicken.SolarBar:SetStatusBarTexture([[Interface\TargetingFrame\UI-StatusBar]]) + --end self:RegisterEvent('UNIT_POWER_FREQUENT', UpdatePower) self:RegisterEvent('PLAYER_TALENT_UPDATE', UpdateVisibility, true) @@ -282,9 +282,9 @@ local function Disable(self) local bar = self.Druidness if(bar) then - local chicken = bar.Chicken + --local chicken = bar.Chicken local mana = bar.Mana - chicken:Hide() + --chicken:Hide() mana:Hide() self:RegisterEvent('UNIT_POWER_FREQUENT', UpdatePower) diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_Gladiator/oUF_Gladiator.lua b/SVUI_UnitFrames/libs/Plugins/oUF_Gladiator/oUF_Gladiator.lua index 75dd1ed..dcf266c 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_Gladiator/oUF_Gladiator.lua +++ b/SVUI_UnitFrames/libs/Plugins/oUF_Gladiator/oUF_Gladiator.lua @@ -29,7 +29,7 @@ local GetArenaOpponentSpec = _G.GetArenaOpponentSpec; local GetSpecializationInfoByID = _G.GetSpecializationInfoByID; local UnitName = _G.UnitName; local SendChatMessage = _G.SendChatMessage; -local CooldownFrame_SetTimer = _G.CooldownFrame_SetTimer; +local CooldownFrame_Set = _G.CooldownFrame_Set; local _, ns = ... local oUF = ns.oUF @@ -89,7 +89,7 @@ local function LogUpdate(self, event, ...) trinket.CD:SetScript("OnUpdate", Trinket_OnUpdate) trinket.Icon:SetDesaturated(true) trinket.Unavailable:Show() - CooldownFrame_SetTimer(trinket.CD, startTime, duration, 1) + CooldownFrame_Set(trinket.CD, startTime, duration, 1) end elseif(alert and event == "UNIT_SPELLCAST_SUCCEEDED") then local unitID, spellName, _, _, spellID = ... @@ -115,7 +115,7 @@ local Update = function(self, event, ...) trinket.Icon:SetTexture(tIcon) trinket:Show() if event == 'PLAYER_ENTERING_WORLD' then - CooldownFrame_SetTimer(trinket.CD, 1, 1, 1) + CooldownFrame_Set(trinket.CD, 1, 1, 1) end end end diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_PriestOrbs/oUF_PriestOrbs.lua b/SVUI_UnitFrames/libs/Plugins/oUF_PriestOrbs/oUF_PriestOrbs.lua index 87cb043..674680f 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_PriestOrbs/oUF_PriestOrbs.lua +++ b/SVUI_UnitFrames/libs/Plugins/oUF_PriestOrbs/oUF_PriestOrbs.lua @@ -46,16 +46,22 @@ local function Update(self, event, unit) local color = OrbColors[spec] local name, _, icon, count if(spec == SPEC_PRIEST_SHADOW and level >= SHADOW_ORBS_SHOW_LEVEL) then - numOrbs = UnitPower("player", SPELL_POWER_SHADOW_ORBS) - pb:Show() + if (DARK_EVANGELISM) then + numOrbs = UnitPower("player", SPELL_POWER_SHADOW_ORBS) + pb:Show() + end; elseif(spec == SPEC_PRIEST_DISC and level >= DISC_ORBS_SHOW_LEVEL) then - name, _, icon, count = UnitBuff("player", EVANGELISM) - numOrbs = count or 0 - pb:Show() + if (EVANGELISM) then + name, _, icon, count = UnitBuff("player", EVANGELISM) + numOrbs = count or 0 + pb:Show() + end; elseif(spec == SPEC_PRIEST_HOLY and level >= HOLY_ORBS_SHOW_LEVEL) then - name, _, icon, count = UnitBuff("player", SERENDIPITY) - numOrbs = count or 0 - pb:Show() + if (SERENDIPITY) then + name, _, icon, count = UnitBuff("player", SERENDIPITY) + numOrbs = count or 0 + pb:Show() + end; else invalid = true; pb:Hide() diff --git a/SVUI_UnitFrames/libs/oUF/elements/castbar.lua b/SVUI_UnitFrames/libs/oUF/elements/castbar.lua index d0e229c..6772dcd 100644 --- a/SVUI_UnitFrames/libs/oUF/elements/castbar.lua +++ b/SVUI_UnitFrames/libs/oUF/elements/castbar.lua @@ -28,7 +28,7 @@ local CreateFrame = _G.CreateFrame; local GetNetStats = _G.GetNetStats; local UnitCastingInfo = _G.UnitCastingInfo; local UnitChannelInfo = _G.UnitChannelInfo; -local GetTradeskillRepeatCount = _G.GetTradeskillRepeatCount; +--local GetTradeskillRepeatCount = _G.GetTradeskillRepeatCount; local CastingBarFrame = _G.CastingBarFrame; local PetCastingBarFrame = _G.PetCastingBarFrame; @@ -70,7 +70,7 @@ local UNIT_SPELLCAST_START = function(self, event, unit, spell) endTime = endTime / 1e3 startTime = startTime / 1e3 - local repeatCount = GetTradeskillRepeatCount() or 1 + local repeatCount = 1 local start = GetTime() - startTime if(tradeskill and repeatCount >= 1) then @@ -485,7 +485,7 @@ local Enable = function(object, unit) local sz = castbar.SafeZone if(sz and sz:IsObjectType'Texture' and not sz:GetTexture()) then - sz:SetTexture(1, 0, 0) + sz:SetColorTexture(1, 0, 0) end castbar:Hide() diff --git a/SVUI_UnitFrames/libs/oUF/elements/health.lua b/SVUI_UnitFrames/libs/oUF/elements/health.lua index e78747f..e3d31de 100644 --- a/SVUI_UnitFrames/libs/oUF/elements/health.lua +++ b/SVUI_UnitFrames/libs/oUF/elements/health.lua @@ -25,9 +25,7 @@ local UnitIsConnected = _G.UnitIsConnected; local UnitIsDeadOrGhost = _G.UnitIsDeadOrGhost; local UnitIsPlayer = _G.UnitIsPlayer; local UnitPlayerControlled = _G.UnitPlayerControlled; -local UnitIsTapped = _G.UnitIsTapped; -local UnitIsTappedByPlayer = _G.UnitIsTappedByPlayer; -local UnitIsTappedByAllThreatList = _G.UnitIsTappedByAllThreatList; +local UnitIsTapDenied = _G.UnitIsTapDenied; local parent, ns = ... @@ -63,7 +61,7 @@ local Update = function(self, event, unit) local reaction = UnitReaction(unit, 'player'); local classColors = oUF.colors.class[class]; local bgColors = classColors or oUF.colors.reaction[reaction]; - if(health.colorTapping and not UnitPlayerControlled(unit) and UnitIsTapped(unit) and not UnitIsTappedByPlayer(unit) and not UnitIsTappedByAllThreatList(unit)) then + if(health.colorTapping and not UnitPlayerControlled(unit) and UnitIsTapDenied(unit)) then t = oUF.colors.tapped elseif(health.colorDisconnected and not UnitIsConnected(unit)) then t = oUF.colors.disconnected @@ -85,7 +83,7 @@ local Update = function(self, event, unit) end if(b) then - if((health.colorClass and health.colorSmooth) or (health.colorSmooth and self.isForced and not (UnitIsTapped(unit) and not UnitIsTappedByPlayer(unit)))) then + if((health.colorClass and health.colorSmooth) or (health.colorSmooth and self.isForced and not UnitIsTapDenied(unit))) then r, g, b = self.ColorGradient(min,max,1,0,0,1,1,0,r,g,b) end health:SetStatusBarColor(r, g, b) diff --git a/SVUI_UnitFrames/libs/oUF/elements/power.lua b/SVUI_UnitFrames/libs/oUF/elements/power.lua index 9275a54..d246560 100644 --- a/SVUI_UnitFrames/libs/oUF/elements/power.lua +++ b/SVUI_UnitFrames/libs/oUF/elements/power.lua @@ -45,7 +45,7 @@ local Update = function(self, event, unit) end local r, g, b, t - if(power.colorTapping and not UnitPlayerControlled(unit) and UnitIsTapped(unit) and not UnitIsTappedByPlayer(unit) and not UnitIsTappedByAllThreatList(unit)) then + if(power.colorTapping and not UnitPlayerControlled(unit) and UnitIsTapDenied(unit)) then t = self.colors.tapped elseif(power.colorDisconnected and not UnitIsConnected(unit)) then t = self.colors.disconnected