diff --git a/SVUI_!Core/SVUI_!Core.toc b/SVUI_!Core/SVUI_!Core.toc index 7c5022c..078ecb9 100644 --- a/SVUI_!Core/SVUI_!Core.toc +++ b/SVUI_!Core/SVUI_!Core.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.9 +## Version: 1.1.95 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Core|r ## Notes: SVUI [|cff9911FFCore Framework|r]. ## SavedVariables: SVUI_Global, SVUI_Errors, SVUI_Filters, SVUI_Media diff --git a/SVUI_!Core/system/credits.lua b/SVUI_!Core/system/credits.lua index 755e2c4..fe3d21d 100644 --- a/SVUI_!Core/system/credits.lua +++ b/SVUI_!Core/system/credits.lua @@ -242,7 +242,7 @@ function CreditFrame:CallBack() ROLLED_CREDITS = 0; self:ShowCredit(title, list); else - self:Hide(); + KillCredits() end end diff --git a/SVUI_!Core/system/media.lua b/SVUI_!Core/system/media.lua index ee7ecc2..8d3287b 100644 --- a/SVUI_!Core/system/media.lua +++ b/SVUI_!Core/system/media.lua @@ -781,7 +781,6 @@ local function ChangeSystemFonts() _alterFont("Tooltip_Small", "tipdialog", -1) _alterFont("SystemFont_Shadow_Huge3", "combat", 0, "OUTLINE") _alterFont("CombatTextFont", "combat", 64, "OUTLINE") - _alterFont("SubSpellFont", "caps", 1, "OUTLINE", 0.8, 0.8, 0.8) _alterFont("CoreAbilityFont", "zone", 10, "NONE", 0, 0, 0) end diff --git a/SVUI_!Core/system/overrides.lua b/SVUI_!Core/system/overrides.lua index eee8bbc..42e9823 100644 --- a/SVUI_!Core/system/overrides.lua +++ b/SVUI_!Core/system/overrides.lua @@ -63,7 +63,7 @@ local dead_rollz = {}; local AUTOROLL_ENABLED = false; local AUTOROLL_SOULBOUND = false; local AUTOROLL_LEVEL = MAX_PLAYER_LEVEL; -local AUTOROLL_QUALITY = 2; +local AUTOROLL_QUALITY = '2'; local AUTOROLL_DE = true; --[[ ########################################################## @@ -962,7 +962,7 @@ local function UpdateLootingUpvalues() AUTOROLL_SOULBOUND = SV.db.Extras.autoRollSoulbound; AUTOROLL_LEVEL = SV.db.Extras.autoRollMaxLevel; local dbQuality = SV.db.Extras.autoRollQuality; - AUTOROLL_QUALITY = tonumber(dbQuality); + AUTOROLL_QUALITY = tonumber(dbQuality) or '2'; AUTOROLL_DE = SV.db.Extras.autoRollDisenchant; end diff --git a/SVUI_!Options/SVUI_!Options.toc b/SVUI_!Options/SVUI_!Options.toc index 7b72f36..b4f398a 100644 --- a/SVUI_!Options/SVUI_!Options.toc +++ b/SVUI_!Options/SVUI_!Options.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.9 +## Version: 1.1.95 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Options|r ## Notes: SVUI [|cff9911FFConfig Options|r] ## RequiredDeps: SVUI_!Core diff --git a/SVUI_ActionBars/SVUI_ActionBars.lua b/SVUI_ActionBars/SVUI_ActionBars.lua index 3155eef..1796580 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.lua +++ b/SVUI_ActionBars/SVUI_ActionBars.lua @@ -969,7 +969,8 @@ CreateActionBars = function(self) elseif(i == 5) then thisBar:SetPoint("BOTTOMRIGHT", _G["SVUI_ActionBar1"], "BOTTOMLEFT", -space, 0) else - thisBar:SetPoint("BOTTOM", DEFAULT_MAIN_ANCHOR, "TOP", 0, space) + local nextGap = (i == 2) and -space or space + thisBar:SetPoint("BOTTOM", DEFAULT_MAIN_ANCHOR, "TOP", 0, nextGap) DEFAULT_MAIN_ANCHOR = thisBar if(enabled) then self.MainAnchor:ClearAllPoints() @@ -1428,9 +1429,10 @@ local function RemoveDefaults() MultiCastActionBarFrame:UnregisterAllEvents() MultiCastActionBarFrame:Hide() MultiCastActionBarFrame:SetParent(removalManager) - IconIntroTracker:UnregisterAllEvents() - IconIntroTracker:Hide() - IconIntroTracker:SetParent(removalManager) + + -- IconIntroTracker:UnregisterAllEvents() + -- IconIntroTracker:Hide() + -- IconIntroTracker:SetParent(removalManager) InterfaceOptionsCombatPanelActionButtonUseKeyDown:SetScale(0.0001) InterfaceOptionsCombatPanelActionButtonUseKeyDown:SetAlpha(0) @@ -1454,6 +1456,58 @@ local function RemoveDefaults() MOD.DefaultsRemoved = true end +local function pushSpellToActionBar(self,spellID,slotIndex,slotPos) + local slotParent = _G["SVUI_Bar1Button"..slotPos]; + if(not slotParent) then return end + local _, _, icon = GetSpellInfo(spellID); + local freeIcon; + + for a,b in pairs(self.iconList) do + if b.isFree then + freeIcon = b; + end + end + + if not freeIcon then -- Make a new one + freeIcon = CreateFrame("FRAME", self:GetName().."Icon"..(#self.iconList+1), UIParent, "IconIntroTemplate"); + self.iconList[#self.iconList+1] = freeIcon; + end + + freeIcon.icon.icon:SetTexture(icon); + freeIcon.icon.slot = slotIndex; + freeIcon:ClearAllPoints(); + freeIcon:SetPoint("CENTER", slotParent, 0, 0); + freeIcon:SetFrameLevel(slotParent:GetFrameLevel() + 1); + freeIcon.icon.flyin:Play(1); + freeIcon.isFree = false; + + if not HasAction(slotPos) then + PickupSpell(spellID) + PlaceAction(slotPos) + end +end + +IconIntroTracker_OnEvent = function(self, event, ...) + if event == "SPELL_PUSHED_TO_ACTIONBAR" or event == "COMBAT_LOG_EVENT_UNFILTERED" then + if InCombatLockdown() then + if not self.queue then + self.queue={} + end + local spellID, slotIndex, slotPos = ...; + tinsert(self.queue,{spellID,slotIndex,slotPos}) + self:RegisterEvent("PLAYER_REGEN_ENABLED") + else + pushSpellToActionBar(self,...) + end + elseif event == "PLAYER_REGEN_ENABLED" then + for i=1,#self.queue do + pushSpellToActionBar(self,unpack(self.queue[i])) + end + wipe(self.queue) + self:UnregisterEvent("PLAYER_REGEN_ENABLED") + end +end + function MOD:PLAYER_REGEN_ENABLED() self:UnregisterEvent("PLAYER_REGEN_ENABLED") if(not MOD.DefaultsRemoved) then diff --git a/SVUI_ActionBars/SVUI_ActionBars.toc b/SVUI_ActionBars/SVUI_ActionBars.toc index 5931b8c..3ecec27 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.toc +++ b/SVUI_ActionBars/SVUI_ActionBars.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.9 +## Version: 1.1.95 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Action Bars|r ## Notes: Action Bar Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0, LibActionButton-1.0 diff --git a/SVUI_Auras/SVUI_Auras.toc b/SVUI_Auras/SVUI_Auras.toc index 322e7cb..79c4cf6 100644 --- a/SVUI_Auras/SVUI_Auras.toc +++ b/SVUI_Auras/SVUI_Auras.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.9 +## Version: 1.1.95 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Auras|r ## Notes: Aura Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_Chat/SVUI_Chat.toc b/SVUI_Chat/SVUI_Chat.toc index 22f89d6..e40afeb 100644 --- a/SVUI_Chat/SVUI_Chat.toc +++ b/SVUI_Chat/SVUI_Chat.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.9 +## Version: 1.1.95 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Chat|r ## Notes: Chat Plugin for [|cff9911FFSVUI|r]. ## SavedVariablesPerCharacter: SVUI_Private_ChatCache diff --git a/SVUI_Inventory/SVUI_Inventory.toc b/SVUI_Inventory/SVUI_Inventory.toc index 4f55640..0488b62 100644 --- a/SVUI_Inventory/SVUI_Inventory.toc +++ b/SVUI_Inventory/SVUI_Inventory.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.9 +## Version: 1.1.95 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Inventory|r ## Notes: Inventory Plugin for [|cff9911FFSVUI|r]. ## SavedVariables: SVUI_LootCache diff --git a/SVUI_Maps/SVUI_Maps.toc b/SVUI_Maps/SVUI_Maps.toc index 121caf2..98385eb 100644 --- a/SVUI_Maps/SVUI_Maps.toc +++ b/SVUI_Maps/SVUI_Maps.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.9 +## Version: 1.1.95 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Maps|r ## Notes: Maps Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_NamePlates/SVUI_NamePlates.toc b/SVUI_NamePlates/SVUI_NamePlates.toc index c7509ab..87a210b 100644 --- a/SVUI_NamePlates/SVUI_NamePlates.toc +++ b/SVUI_NamePlates/SVUI_NamePlates.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.9 +## Version: 1.1.95 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00NamePlates|r ## Notes: NamePlates Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_QuestTracker/SVUI_QuestTracker.toc b/SVUI_QuestTracker/SVUI_QuestTracker.toc index 38817e7..5d2da1f 100644 --- a/SVUI_QuestTracker/SVUI_QuestTracker.toc +++ b/SVUI_QuestTracker/SVUI_QuestTracker.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.9 +## Version: 1.1.95 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00QuestTracker|r ## Notes: QuestTracker Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_QuestTracker/components/quests.lua b/SVUI_QuestTracker/components/quests.lua index 147d602..029db7d 100644 --- a/SVUI_QuestTracker/components/quests.lua +++ b/SVUI_QuestTracker/components/quests.lua @@ -1,7 +1,7 @@ --[[ ########################################################## S V U I By: Munglunch -########################################################## +########################################################## LOCALIZED LUA FUNCTIONS ########################################################## ]]-- @@ -34,8 +34,8 @@ local CreateFrame = _G.CreateFrame; local InCombatLockdown = _G.InCombatLockdown; local GameTooltip = _G.GameTooltip; local hooksecurefunc = _G.hooksecurefunc; ---[[ -########################################################## +--[[ +########################################################## GET ADDON DATA ########################################################## ]]-- @@ -43,8 +43,8 @@ local SV = _G['SVUI'] local L = SV.L local LSM = _G.LibStub("LibSharedMedia-3.0") local MOD = SV.QuestTracker; ---[[ -########################################################## +--[[ +########################################################## LOCALS ########################################################## ]]-- @@ -82,8 +82,8 @@ local ItemBlacklist = { [110799] = true, [109164] = true, }; ---[[ -########################################################## +--[[ +########################################################## ITEM BAR/BUTTON CONSTRUCT ########################################################## ]]-- @@ -410,8 +410,8 @@ function ItemBar:Update() self.needsUpdate = nil end ---[[ -########################################################## +--[[ +########################################################## QUEST CACHING ########################################################## ]]-- @@ -477,17 +477,17 @@ local function UpdateCachedQuests(needsSorting) end end - tsort(QUESTS_BY_LOCATION, function(a,b) + tsort(QUESTS_BY_LOCATION, function(a,b) if(a[2] and b[2]) then - return a[2] < b[2] + return a[2] < b[2] else return false end end); - tsort(QUESTS_BY_LOCATION, function(a,b) + tsort(QUESTS_BY_LOCATION, function(a,b) if(a[1] and b[1]) then - return a[1] < b[1] + return a[1] < b[1] else return false end @@ -509,17 +509,17 @@ local function UpdateCachedDistance() tinsert(QUESTS_BY_LOCATION, {distanceSq, header, questID}); end - tsort(QUESTS_BY_LOCATION, function(a,b) + tsort(QUESTS_BY_LOCATION, function(a,b) if(a[2] and b[2]) then - return a[2] < b[2] + return a[2] < b[2] else return false end end); - tsort(QUESTS_BY_LOCATION, function(a,b) + tsort(QUESTS_BY_LOCATION, function(a,b) if(a[1] and b[1]) then - return a[1] < b[1] + return a[1] < b[1] else return false end @@ -553,17 +553,17 @@ local function AddCachedQuest(questLogIndex) local header = QUEST_HEADER_MAP[questID] or "Misc" tinsert(QUESTS_BY_LOCATION, {distanceSq, header, questID}); - tsort(QUESTS_BY_LOCATION, function(a,b) + tsort(QUESTS_BY_LOCATION, function(a,b) if(a[2] and b[2]) then - return a[2] < b[2] + return a[2] < b[2] else return false end end); - tsort(QUESTS_BY_LOCATION, function(a,b) + tsort(QUESTS_BY_LOCATION, function(a,b) if(a[1] and b[1]) then - return a[1] < b[1] + return a[1] < b[1] else return false end @@ -576,8 +576,8 @@ local function AddCachedQuest(questLogIndex) return false; end ---[[ -########################################################## +--[[ +########################################################## SCRIPT HANDLERS ########################################################## ]]-- @@ -662,8 +662,8 @@ local ViewButton_OnClick = function(self, button) end end end ---[[ -########################################################## +--[[ +########################################################## TRACKER FUNCTIONS ########################################################## ]]-- @@ -698,7 +698,7 @@ local StopTimer = function(self) end local GetQuestRow = function(self, index) - if(not self.Rows[index]) then + if(not self.Rows[index]) then local previousFrame = self.Rows[#self.Rows] local index = #self.Rows + 1; local yOffset = -3; @@ -786,11 +786,11 @@ local GetQuestRow = function(self, index) row.Timer.Bar:SetStatusBarColor(0.5,0,1) --1,0.15,0.08 row.Timer.Bar:SetMinMaxValues(0, 1) row.Timer.Bar:SetValue(0) - + local bgFrame = CreateFrame("Frame", nil, row.Timer.Bar) bgFrame:InsetPoints(row.Timer.Bar, -2, -2) bgFrame:SetFrameLevel(bgFrame:GetFrameLevel() - 1) - + bgFrame.bg = bgFrame:CreateTexture(nil, "BACKGROUND") bgFrame.bg:SetAllPoints(bgFrame) bgFrame.bg:SetTexture(SV.media.statusbar.default) @@ -1025,8 +1025,8 @@ local _hook_WorldMapFrameOnHide = function() MOD.Headers["Quests"]:Refresh() MOD:UpdateDimensions(); end ---[[ -########################################################## +--[[ +########################################################## CORE FUNCTIONS ########################################################## ]]-- @@ -1187,7 +1187,7 @@ function MOD:InitializeQuests() self:RegisterEvent("QUEST_LOG_UPDATE", self.UpdateObjectives); self:RegisterEvent("QUEST_WATCH_LIST_CHANGED", self.UpdateObjectives); - self:RegisterEvent("QUEST_ACCEPTED", self.UpdateObjectives); + self:RegisterEvent("QUEST_ACCEPTED", self.UpdateObjectives); self:RegisterEvent("QUEST_POI_UPDATE", self.UpdateObjectives); self:RegisterEvent("QUEST_TURNED_IN", self.UpdateObjectives); @@ -1203,4 +1203,4 @@ function MOD:InitializeQuests() ItemBar:Show() SV.Events:On("QUEST_UPVALUES_UPDATED", UpdateQuestLocals, true); -end \ No newline at end of file +end diff --git a/SVUI_Skins/SVUI_Skins.toc b/SVUI_Skins/SVUI_Skins.toc index 6e2d701..faa43e5 100644 --- a/SVUI_Skins/SVUI_Skins.toc +++ b/SVUI_Skins/SVUI_Skins.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch, Azilroka, Sortokk -## Version: 1.1.9 +## Version: 1.1.95 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Skins|r ## Notes: SVUI [|cff9911FFSkins System and AddOn Frames|r]. ## SavedVariables: SVUIUI_STYLE_GLOBAL diff --git a/SVUI_Skins/components/addons/MasterPlan.lua b/SVUI_Skins/components/addons/MasterPlan.lua index ec59970..dcbd218 100644 --- a/SVUI_Skins/components/addons/MasterPlan.lua +++ b/SVUI_Skins/components/addons/MasterPlan.lua @@ -23,6 +23,7 @@ local RING_TEXTURE = [[Interface\AddOns\SVUI_Skins\artwork\FOLLOWER-RING]] local LVL_TEXTURE = [[Interface\AddOns\SVUI_Skins\artwork\FOLLOWER-LEVEL]] local HIGHLIGHT_TEXTURE = SV.media.background.default local DEFAULT_COLOR = {r = 0.25, g = 0.25, b = 0.25}; +local FOCUS_RINGS = {} --[[ ########################################################## STYLE @@ -40,13 +41,23 @@ local StyleRewardIcon = function(self) end end -local MasterPlan_GarrPortraits = function(self, atlas) +local MasterPlan_GarrPortraits = function(self) local parent = self:GetParent() + parent:RemoveTextures() self:ClearAllPoints() self:SetPoint("TOPLEFT", parent, "TOPLEFT", -3, 0) self:SetPoint("BOTTOMRIGHT", parent, "BOTTOMRIGHT", 3, -6) self:SetTexture(RING_TEXTURE) self:SetVertexColor(1, 0.86, 0) + if(parent:GetWidth() == 36) then + tinsert(FOCUS_RINGS, parent) + end +end + +local GarrMission_FocusRings = function(self) + for k,frame in pairs(FOCUS_RINGS) do + frame:RemoveTextures() + end end local GarrMission_Rewards = function(self) @@ -106,6 +117,8 @@ local function StyleMasterPlan() SV:SetAtlasFilter("GarrMission_TopBorderCorner"); SV:SetAtlasFilter("Garr_MissionList-IconBG"); + -- SV:SetAtlasFunc("GarrMission_FocusRings", GarrMission_FocusRings) + -- SV:SetAtlasFilter("GarrMission_MissionParchment", "GarrMission_FocusRings"); SV.API:Set("Tab", GarrisonMissionFrameTab3) SV.API:Set("Tab", GarrisonMissionFrameTab4) diff --git a/SVUI_Skins/components/atlas.lua b/SVUI_Skins/components/atlas.lua index cf02325..bf71095 100644 --- a/SVUI_Skins/components/atlas.lua +++ b/SVUI_Skins/components/atlas.lua @@ -39,6 +39,7 @@ local GarrMission_MaterialFrame = function(self) local frame = self:GetParent() frame:RemoveTextures() frame:SetStyle("Frame", "Inset", true, 1, -5, -7) + self:SetTexture("") end SV:SetAtlasFunc("GarrMission_MaterialFrame", GarrMission_MaterialFrame) diff --git a/SVUI_Skins/components/atlas/garrison.lua b/SVUI_Skins/components/atlas/garrison.lua index cf02325..60141db 100644 --- a/SVUI_Skins/components/atlas/garrison.lua +++ b/SVUI_Skins/components/atlas/garrison.lua @@ -39,13 +39,13 @@ local GarrMission_MaterialFrame = function(self) local frame = self:GetParent() frame:RemoveTextures() frame:SetStyle("Frame", "Inset", true, 1, -5, -7) + self:SetTexture("") end SV:SetAtlasFunc("GarrMission_MaterialFrame", GarrMission_MaterialFrame) SV:SetAtlasFilter("GarrMission_PortraitRing_LevelBorder", "GarrMission_PortraitsFromLevel") SV:SetAtlasFilter("GarrMission_PortraitRing_iLvlBorder", "GarrMission_PortraitsFromLevel") SV:SetAtlasFilter("Garr_Mission_MaterialFrame", "GarrMission_MaterialFrame") - SV:SetAtlasFilter("Garr_FollowerToast-Uncommon"); SV:SetAtlasFilter("Garr_FollowerToast-Epic"); SV:SetAtlasFilter("Garr_FollowerToast-Rare"); diff --git a/SVUI_Skins/components/blizzard/dressup.lua b/SVUI_Skins/components/blizzard/dressup.lua deleted file mode 100644 index bfc72ff..0000000 --- a/SVUI_Skins/components/blizzard/dressup.lua +++ /dev/null @@ -1,47 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -DRESSUP MODR -########################################################## -]]-- -local function DressUpStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.dressingroom ~= true then - return - end - - DressUpFrame:SetSize(500, 600) - SV.API:Set("Window", DressUpFrame, true, true) - - DressUpModel:ClearAllPoints() - DressUpModel:SetPoint("TOPLEFT", DressUpFrame, "TOPLEFT", 12, -76) - DressUpModel:SetPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 36) - - DressUpModel:SetStyle("!_Frame", "Model") - - DressUpFrameCancelButton:SetPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 12) - DressUpFrameCancelButton:SetStyle("Button") - - DressUpFrameResetButton:SetPoint("RIGHT", DressUpFrameCancelButton, "LEFT", -12, 0) - DressUpFrameResetButton:SetStyle("Button") - - SV.API:Set("CloseButton", DressUpFrameCloseButton, DressUpFrame.Panel) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(DressUpStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/gossip.lua b/SVUI_Skins/components/blizzard/gossip.lua deleted file mode 100644 index 44b0f32..0000000 --- a/SVUI_Skins/components/blizzard/gossip.lua +++ /dev/null @@ -1,75 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; -local ipairs = _G.ipairs; -local pairs = _G.pairs; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -GOSSIP MODR -########################################################## -]]-- -local function GossipStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.gossip ~= true then return end - - SV.API:Set("Window", GossipFrame, true, true) - - ItemTextFrame:RemoveTextures(true) - ItemTextScrollFrame:RemoveTextures() - SV.API:Set("CloseButton", GossipFrameCloseButton) - SV.API:Set("PageButton", ItemTextPrevPageButton) - SV.API:Set("PageButton", ItemTextNextPageButton) - ItemTextPageText:SetTextColor(1, 1, 1) - hooksecurefunc(ItemTextPageText, "SetTextColor", function(q, k, l, m) - if k ~= 1 or l ~= 1 or m ~= 1 then - ItemTextPageText:SetTextColor(1, 1, 1) - end - end) - ItemTextFrame:SetStyle("Frame", "Pattern") - ItemTextFrameInset:Die() - SV.API:Set("ScrollFrame", ItemTextScrollFrameScrollBar) - SV.API:Set("CloseButton", ItemTextFrameCloseButton) - local r = {"GossipFrameGreetingPanel", "GossipFrameInset", "GossipGreetingScrollFrame"} - SV.API:Set("ScrollFrame", GossipGreetingScrollFrameScrollBar, 5) - for s, t in pairs(r)do - _G[t]:RemoveTextures() - end - GossipFrame:SetStyle("Frame", "Window") - GossipGreetingScrollFrame:SetStyle("!_Frame", "Inset", true) - GossipGreetingScrollFrame.spellTex = GossipGreetingScrollFrame:CreateTexture(nil, "ARTWORK") - GossipGreetingScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBG]]) - GossipGreetingScrollFrame.spellTex:SetPoint("TOPLEFT", 2, -2) - GossipGreetingScrollFrame.spellTex:SetSize(506, 615) - GossipGreetingScrollFrame.spellTex:SetTexCoord(0, 1, 0.02, 1) - _G["GossipFramePortrait"]:Die() - _G["GossipFrameGreetingGoodbyeButton"]:RemoveTextures() - _G["GossipFrameGreetingGoodbyeButton"]:SetStyle("Button") - SV.API:Set("CloseButton", GossipFrameCloseButton, GossipFrame.Panel) - - NPCFriendshipStatusBar:RemoveTextures() - NPCFriendshipStatusBar:SetStatusBarTexture(SV.media.statusbar.default) - NPCFriendshipStatusBar:SetStyle("Frame", "Bar") - - NPCFriendshipStatusBar:ClearAllPoints() - NPCFriendshipStatusBar:SetPoint("TOPLEFT", GossipFrame, "TOPLEFT", 58, -34) - - NPCFriendshipStatusBar.icon:SetSize(32,32) - NPCFriendshipStatusBar.icon:ClearAllPoints() - NPCFriendshipStatusBar.icon:SetPoint("RIGHT", NPCFriendshipStatusBar, "LEFT", 0, -2) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(GossipStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/loothistory.lua b/SVUI_Skins/components/blizzard/loothistory.lua deleted file mode 100644 index 59c40cf..0000000 --- a/SVUI_Skins/components/blizzard/loothistory.lua +++ /dev/null @@ -1,150 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; -local math = _G.math; ---[[ MATH METHODS ]]-- -local ceil = math.ceil; -- Basic ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -HELPERS -########################################################## -]]-- -local MissingLootFrame_OnShow = function(self) - local numMissing = GetNumMissingLootItems() - for i = 1, numMissing do - local slot = _G["MissingLootFrameItem"..i] - local icon = slot.icon; - SV.API:Set("ItemButton", slot, true) - local texture, name, count, quality = GetMissingLootItemInfo(i); - local r,g,b,hex = GetItemQualityColor(quality) - if(not r) then - r,g,b = 0,0,0 - end - icon:SetTexture(texture) - _G.MissingLootFrame:SetBackdropBorderColor(r,g,b) - end - 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 - local frame = _G.LootHistoryFrame.itemFrames[i] - if not frame.isStyled then - local Icon = frame.Icon:GetTexture() - frame:RemoveTextures() - frame.Icon:SetTexture(Icon) - frame.Icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - - frame:SetStyle("!_Frame", "Button") - frame.Panel:WrapPoints(frame.Icon) - frame.Icon:SetParent(frame.Panel) - - frame.isStyled = true - end - end -end - -local _hook_MasterLootFrame_OnShow = function() - local MasterLooterFrame = _G.MasterLooterFrame; - local item = MasterLooterFrame.Item; - local LootFrame = _G.LootFrame; - if item then - local icon = item.Icon; - local tex = icon:GetTexture() - local colors = ITEM_QUALITY_COLORS[LootFrame.selectedQuality] - item:RemoveTextures() - icon:SetTexture(tex) - icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - item:SetStyle("Frame", "Pattern") - item.Panel:WrapPoints(icon) - item:SetBackdropBorderColor(colors.r, colors.g, colors.b) - end - for i = 1, MasterLooterFrame:GetNumChildren()do - local child = select(i, MasterLooterFrame:GetChildren()) - if child and not child.isStyled and not child:GetName() then - if child:GetObjectType() == "Button" then - if child:GetPushedTexture() then - SV.API:Set("CloseButton", child) - else - child:SetStyle("!_Frame") - child:SetStyle("Button") - end - child.isStyled = true - end - end - end -end ---[[ -########################################################## -LOOTHISTORY MODR -########################################################## -]]-- -local function LootHistoryStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.loot ~= true then return end - - local MasterLooterFrame = _G.MasterLooterFrame; - local MissingLootFrame = _G.MissingLootFrame; - local LootHistoryFrame = _G.LootHistoryFrame; - local BonusRollFrame = _G.BonusRollFrame; - local MissingLootFramePassButton = _G.MissingLootFramePassButton; - - LootHistoryFrame:SetFrameStrata('HIGH') - - MissingLootFrame:RemoveTextures() - MissingLootFrame:SetStyle("Frame", "Pattern") - - SV.API:Set("CloseButton", MissingLootFramePassButton) - hooksecurefunc("MissingLootFrame_Show", MissingLootFrame_OnShow) - LootHistoryFrame:RemoveTextures() - SV.API:Set("CloseButton", LootHistoryFrame.CloseButton) - LootHistoryFrame:RemoveTextures() - LootHistoryFrame:SetStyle("!_Frame", 'Transparent') - SV.API:Set("CloseButton", LootHistoryFrame.ResizeButton) - LootHistoryFrame.ResizeButton:SetStyle("!_Frame") - LootHistoryFrame.ResizeButton:SetWidth(LootHistoryFrame:GetWidth()) - LootHistoryFrame.ResizeButton:SetHeight(19) - LootHistoryFrame.ResizeButton:ClearAllPoints() - LootHistoryFrame.ResizeButton:SetPoint("TOP", LootHistoryFrame, "BOTTOM", 0, -2) - LootHistoryFrame.ResizeButton:SetNormalTexture("") - - local txt = LootHistoryFrame.ResizeButton:CreateFontString(nil,"OVERLAY") - txt:SetFont(SV.media.font.default, 14, "NONE") - txt:SetAllPoints(LootHistoryFrame.ResizeButton) - txt:SetJustifyH("CENTER") - txt:SetText("RESIZE") - - LootHistoryFrameScrollFrame:RemoveTextures() - SV.API:Set("ScrollFrame", LootHistoryFrameScrollFrameScrollBar) - hooksecurefunc("LootHistoryFrame_FullUpdate", LootHistoryFrame_OnUpdate) - - MasterLooterFrame:RemoveTextures() - MasterLooterFrame:SetStyle("!_Frame") - MasterLooterFrame:SetFrameStrata('FULLSCREEN_DIALOG') - - hooksecurefunc("MasterLooterFrame_Show", _hook_MasterLootFrame_OnShow) - - BonusRollFrame:RemoveTextures() - SV.API:Set("Alert", BonusRollFrame) - BonusRollFrame.PromptFrame.Icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - BonusRollFrame.PromptFrame.Timer.Bar:SetTexture(SV.media.statusbar.default) - BonusRollFrame.PromptFrame.Timer.Bar:SetVertexColor(0.1, 1, 0.1) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(LootHistoryStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/lossofcontrol.lua b/SVUI_Skins/components/blizzard/lossofcontrol.lua deleted file mode 100644 index c0a609b..0000000 --- a/SVUI_Skins/components/blizzard/lossofcontrol.lua +++ /dev/null @@ -1,57 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -LOSSOFCONTROL MODR -########################################################## -]]-- -local _hook_LossOfControl = function(self, ...) - self.Icon:ClearAllPoints() - self.Icon:SetPoint("CENTER", self, "CENTER", 0, 0) - self.AbilityName:ClearAllPoints() - self.AbilityName:SetPoint("BOTTOM", self, 0, -28) - self.AbilityName.scrollTime = nil; - self.AbilityName:SetFont(SV.media.font.dialog, 20, 'OUTLINE') - self.TimeLeft.NumberText:ClearAllPoints() - self.TimeLeft.NumberText:SetPoint("BOTTOM", self, 4, -58) - self.TimeLeft.NumberText.scrollTime = nil; - self.TimeLeft.NumberText:SetFont(SV.media.font.number, 20, 'OUTLINE') - self.TimeLeft.SecondsText:ClearAllPoints() - self.TimeLeft.SecondsText:SetPoint("BOTTOM", self, 0, -80) - self.TimeLeft.SecondsText.scrollTime = nil; - self.TimeLeft.SecondsText:SetFont(SV.media.font.default, 20, 'OUTLINE') - if self.Anim:IsPlaying() then - self.Anim:Stop() - end -end - -local function LossOfControlStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.losscontrol ~= true then return end - local IconBackdrop = CreateFrame("Frame", nil, LossOfControlFrame) - IconBackdrop:WrapPoints(LossOfControlFrame.Icon) - IconBackdrop:SetFrameLevel(LossOfControlFrame:GetFrameLevel()-1) - IconBackdrop:SetStyle("Frame", "Icon") - LossOfControlFrame.Icon:SetTexCoord(.1, .9, .1, .9) - LossOfControlFrame:RemoveTextures() - LossOfControlFrame.AbilityName:ClearAllPoints() - --local bg = CreateFrame("Frame", nil, LossOfControlFrame) - hooksecurefunc("LossOfControlFrame_SetUpDisplay", _hook_LossOfControl) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(LossOfControlStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/mailbox.lua b/SVUI_Skins/components/blizzard/mailbox.lua deleted file mode 100644 index 803fad7..0000000 --- a/SVUI_Skins/components/blizzard/mailbox.lua +++ /dev/null @@ -1,139 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -HELPERS -########################################################## -]]-- -local function MailFrame_OnUpdate() - for b = 1, ATTACHMENTS_MAX_SEND do - local d = _G["SendMailAttachment"..b] - if not d.styled then - d:RemoveTextures()d:SetStyle("!_Frame", "Default") - d:SetStyle("Button") - d.styled = true - end - local e = d:GetNormalTexture() - if e then - e:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - e:InsetPoints() - end - end -end ---[[ -########################################################## -MAILBOX MODR -########################################################## -]]-- -local function MailBoxStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.mail ~= true then return end - - SV.API:Set("Window", MailFrame) - - for b = 1, INBOXITEMS_TO_DISPLAY do - local i = _G["MailItem"..b] - i:RemoveTextures() - i:SetStyle("Frame", "Inset") - i.Panel:SetPoint("TOPLEFT", 2, 1) - i.Panel:SetPoint("BOTTOMRIGHT", -2, 2) - local d = _G["MailItem"..b.."Button"] - d:RemoveTextures() - d:SetStyle("Button") - local e = _G["MailItem"..b.."ButtonIcon"] - e:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - e:InsetPoints() - end - SV.API:Set("CloseButton", MailFrameCloseButton) - SV.API:Set("PageButton", InboxPrevPageButton) - SV.API:Set("PageButton", InboxNextPageButton) - MailFrameTab1:RemoveTextures() - MailFrameTab2:RemoveTextures() - SV.API:Set("Tab", MailFrameTab1) - SV.API:Set("Tab", MailFrameTab2) - SendMailScrollFrame:RemoveTextures(true) - SendMailScrollFrame:SetStyle("!_Frame", "Inset") - SV.API:Set("ScrollFrame", SendMailScrollFrameScrollBar) - SendMailNameEditBox:SetStyle("Editbox") - SendMailSubjectEditBox:SetStyle("Editbox") - SendMailMoneyGold:SetStyle("Editbox") - SendMailMoneySilver:SetStyle("Editbox") - SendMailMoneyCopper:SetStyle("Editbox") - SendMailMoneyBg:Die() - SendMailMoneyInset:RemoveTextures() - - _G["SendMailMoneySilver"]:SetStyle("Editbox") - _G["SendMailMoneySilver"].Panel:SetPoint("TOPLEFT", -2, 1) - _G["SendMailMoneySilver"].Panel:SetPoint("BOTTOMRIGHT", -12, -1) - _G["SendMailMoneySilver"]:SetTextInsets(-1, -1, -2, -2) - - _G["SendMailMoneyCopper"]:SetStyle("Editbox") - _G["SendMailMoneyCopper"].Panel:SetPoint("TOPLEFT", -2, 1) - _G["SendMailMoneyCopper"].Panel:SetPoint("BOTTOMRIGHT", -12, -1) - _G["SendMailMoneyCopper"]:SetTextInsets(-1, -1, -2, -2) - - SendMailNameEditBox.Panel:SetPoint("BOTTOMRIGHT", 2, 4) - SendMailSubjectEditBox.Panel:SetPoint("BOTTOMRIGHT", 2, 0) - SendMailFrame:RemoveTextures() - - hooksecurefunc("SendMailFrame_Update", MailFrame_OnUpdate) - SendMailMailButton:SetStyle("Button") - SendMailCancelButton:SetStyle("Button") - OpenMailFrame:RemoveTextures(true) - OpenMailFrame:SetStyle("!_Frame", "Transparent", true) - OpenMailFrameInset:Die() - SV.API:Set("CloseButton", OpenMailFrameCloseButton) - OpenMailReportSpamButton:SetStyle("Button") - OpenMailReplyButton:SetStyle("Button") - OpenMailDeleteButton:SetStyle("Button") - OpenMailCancelButton:SetStyle("Button") - InboxFrame:RemoveTextures() - MailFrameInset:Die() - OpenMailScrollFrame:RemoveTextures(true) - OpenMailScrollFrame:SetStyle("!_Frame", "Default") - SV.API:Set("ScrollFrame", OpenMailScrollFrameScrollBar) - SendMailBodyEditBox:SetTextColor(1, 1, 1) - OpenMailBodyText:SetTextColor(1, 1, 1) - InvoiceTextFontNormal:SetTextColor(1, 1, 1) - OpenMailArithmeticLine:Die() - OpenMailLetterButton:RemoveTextures() - OpenMailLetterButton:SetStyle("!_Frame", "Default") - OpenMailLetterButton:SetStyle("Button") - OpenMailLetterButtonIconTexture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - OpenMailLetterButtonIconTexture:InsetPoints() - OpenMailMoneyButton:RemoveTextures() - OpenMailMoneyButton:SetStyle("!_Frame", "Default") - OpenMailMoneyButton:SetStyle("Button") - OpenMailMoneyButtonIconTexture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - OpenMailMoneyButtonIconTexture:InsetPoints() - for b = 1, ATTACHMENTS_MAX_SEND do - local d = _G["OpenMailAttachmentButton"..b] - d:RemoveTextures() - d:SetStyle("Button") - local e = _G["OpenMailAttachmentButton"..b.."IconTexture"] - if e then - e:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - e:InsetPoints() - end - end - OpenMailReplyButton:SetPoint("RIGHT", OpenMailDeleteButton, "LEFT", -2, 0) - OpenMailDeleteButton:SetPoint("RIGHT", OpenMailCancelButton, "LEFT", -2, 0) - SendMailMailButton:SetPoint("RIGHT", SendMailCancelButton, "LEFT", -2, 0) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(MailBoxStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/merchant.lua b/SVUI_Skins/components/blizzard/merchant.lua deleted file mode 100644 index 638c065..0000000 --- a/SVUI_Skins/components/blizzard/merchant.lua +++ /dev/null @@ -1,86 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -FRAME MODR -########################################################## -]]-- -local function MerchantStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.merchant ~= true then return end - MerchantFrame:RemoveTextures(true) - MerchantFrame:SetStyle("Frame", "Window", false, nil, 2, 4) - local level = MerchantFrame:GetFrameLevel() - if(level > 0) then - MerchantFrame:SetFrameLevel(level - 1) - else - MerchantFrame:SetFrameLevel(0) - end - MerchantBuyBackItem:RemoveTextures(true) - MerchantBuyBackItem:SetStyle("Frame", "Inset", true, 2, 2, 3) - MerchantBuyBackItem.Panel:SetFrameLevel(MerchantBuyBackItem.Panel:GetFrameLevel() + 1) - MerchantBuyBackItemItemButton:RemoveTextures() - MerchantBuyBackItemItemButton:SetStyle("Button") - MerchantExtraCurrencyInset:RemoveTextures() - MerchantExtraCurrencyBg:RemoveTextures() - MerchantFrameInset:RemoveTextures() - MerchantMoneyBg:RemoveTextures() - MerchantMoneyInset:RemoveTextures() - MerchantFrameInset:SetStyle("Frame", "Inset") - MerchantFrameInset.Panel:SetFrameLevel(MerchantFrameInset.Panel:GetFrameLevel() + 1) - SV.API:Set("DropDown", MerchantFrameLootFilter) - for b = 1, 2 do - SV.API:Set("Tab", _G["MerchantFrameTab"..b]) - end - for b = 1, 12 do - local d = _G["MerchantItem"..b.."ItemButton"] - local e = _G["MerchantItem"..b.."ItemButtonIconTexture"] - local o = _G["MerchantItem"..b]o:RemoveTextures(true) - o:SetStyle("!_Frame", "Inset") - d:RemoveTextures() - d:SetStyle("Button") - d:SetPoint("TOPLEFT", o, "TOPLEFT", 4, -4) - e:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - e:InsetPoints() - _G["MerchantItem"..b.."MoneyFrame"]:ClearAllPoints() - _G["MerchantItem"..b.."MoneyFrame"]:SetPoint("BOTTOMLEFT", d, "BOTTOMRIGHT", 3, 0) - end - MerchantBuyBackItemItemButton:RemoveTextures() - MerchantBuyBackItemItemButton:SetStyle("Button") - MerchantBuyBackItemItemButtonIconTexture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - MerchantBuyBackItemItemButtonIconTexture:InsetPoints() - MerchantRepairItemButton:SetStyle("Button") - for b = 1, MerchantRepairItemButton:GetNumRegions()do - local p = select(b, MerchantRepairItemButton:GetRegions()) - if p:GetObjectType() == "Texture"then - p:SetTexCoord(0.04, 0.24, 0.06, 0.5) - p:InsetPoints() - end - end MerchantGuildBankRepairButton:SetStyle("Button") - MerchantGuildBankRepairButtonIcon:SetTexCoord(0.61, 0.82, 0.1, 0.52) - MerchantGuildBankRepairButtonIcon:InsetPoints() - MerchantRepairAllButton:SetStyle("Button") - MerchantRepairAllIcon:SetTexCoord(0.34, 0.1, 0.34, 0.535, 0.535, 0.1, 0.535, 0.535) - MerchantRepairAllIcon:InsetPoints() - MerchantFrame:SetWidth(360) - SV.API:Set("CloseButton", MerchantFrameCloseButton, MerchantFrame.Panel) - SV.API:Set("PageButton", MerchantNextPageButton) - SV.API:Set("PageButton", MerchantPrevPageButton) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(MerchantStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/misc.lua b/SVUI_Skins/components/blizzard/misc.lua index 51cab55..6125e81 100644 --- a/SVUI_Skins/components/blizzard/misc.lua +++ b/SVUI_Skins/components/blizzard/misc.lua @@ -12,13 +12,13 @@ local SV = _G['SVUI']; local L = SV.L; local MOD = SV.Skins; local Schema = MOD.Schema; ---[[ -########################################################## +--[[ +########################################################## ########################################################## ]]-- local MissingLootFrame_OnShow = function(self) local numMissing = GetNumMissingLootItems() - for i = 1, numMissing do + for i = 1, numMissing do local slot = _G["MissingLootFrameItem"..i] local icon = slot.icon; SV.API:Set("!_ItemButton", slot) @@ -29,16 +29,16 @@ local MissingLootFrame_OnShow = function(self) end icon:SetTexture(texture) _G.MissingLootFrame:SetBackdropBorderColor(r,g,b) - end + end local calc = (ceil(numMissing * 0.5) * 43) + 38 _G.MissingLootFrame:SetHeight(calc + _G.MissingLootFrameLabel:GetHeight()) -end +end local LootHistoryFrame_OnUpdate = function(self) local numItems = _G.C_LootHistory.GetNumItems() - for i = 1, numItems do + for i = 1, numItems do local frame = _G.LootHistoryFrame.itemFrames[i] - if not frame.isStyled then + if not frame.isStyled then local Icon = frame.Icon:GetTexture() frame:RemoveTextures() frame.Icon:SetTexture(Icon) @@ -48,16 +48,16 @@ local LootHistoryFrame_OnUpdate = function(self) frame.Panel:WrapPoints(frame.Icon) frame.Icon:SetParent(frame.Panel) - frame.isStyled = true - end - end + frame.isStyled = true + end + end end local _hook_MasterLootFrame_OnShow = function() local MasterLooterFrame = _G.MasterLooterFrame; local item = MasterLooterFrame.Item; local LootFrame = _G.LootFrame; - if item then + if item then local icon = item.Icon; local tex = icon:GetTexture() local colors = ITEM_QUALITY_COLORS[LootFrame.selectedQuality] @@ -67,21 +67,21 @@ local _hook_MasterLootFrame_OnShow = function() item:SetStyle("Frame", "Pattern") item.Panel:WrapPoints(icon) item:SetBackdropBorderColor(colors.r, colors.g, colors.b) - end - for i = 1, MasterLooterFrame:GetNumChildren()do + end + for i = 1, MasterLooterFrame:GetNumChildren()do local child = select(i, MasterLooterFrame:GetChildren()) if child and not child.isStyled and not child:GetName() then - if child:GetObjectType() == "Button" then + if child:GetObjectType() == "Button" then if child:GetPushedTexture() then SV.API:Set("CloseButton", child) else child:SetStyle("!_Frame") child:SetStyle("Button") - end - child.isStyled = true - end - end - end + end + child.isStyled = true + end + end + end end local _hook_LossOfControl = function(self, ...) @@ -101,15 +101,15 @@ local _hook_LossOfControl = function(self, ...) self.TimeLeft.SecondsText:SetFont(SV.media.font.default, 20, 'OUTLINE') if self.Anim:IsPlaying() then self.Anim:Stop() - end + end end local function MailFrame_OnUpdate() - for i = 1, ATTACHMENTS_MAX_SEND do + for i = 1, ATTACHMENTS_MAX_SEND do local slot = _G["SendMailAttachment"..i] if(not slot.Panel) then slot:RemoveTextures() - slot:SetStyle("!_ActionSlot") + slot:SetStyle("!_ActionSlot") end if(slot.GetNormalTexture) then local icon = slot:GetNormalTexture() @@ -117,8 +117,8 @@ local function MailFrame_OnUpdate() icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) icon:InsetPoints() end - end - end + end + end end local _hook_GreetingPanelShow = function(self) @@ -158,7 +158,7 @@ local function StyleTradeSlots(name) bg:SetFrameLevel(level - 3) end end - end + end end local TABARD_REGIONS = { @@ -167,13 +167,13 @@ local TABARD_REGIONS = { ["TabardFrameEmblemBottomRight"] = true, ["TabardFrameEmblemBottomLeft"] = true, } ---[[ -########################################################## +--[[ +########################################################## ########################################################## ]]-- local function MiscStyles() if SV.db.Skins.blizzard.enable ~= true then - return + return end if(SV.db.Skins.blizzard.dressingroom) then @@ -205,9 +205,9 @@ local function MiscStyles() SV.API:Set("PageButton", ItemTextNextPageButton) ItemTextPageText:SetTextColor(1, 1, 1) hooksecurefunc(ItemTextPageText, "SetTextColor", function(q, k, l, m) - if k ~= 1 or l ~= 1 or m ~= 1 then + if k ~= 1 or l ~= 1 or m ~= 1 then ItemTextPageText:SetTextColor(1, 1, 1) - end + end end) ItemTextFrame:SetStyle("Frame", "Pattern") ItemTextFrameInset:Die() @@ -215,9 +215,9 @@ local function MiscStyles() SV.API:Set("CloseButton", ItemTextFrameCloseButton) local r = {"GossipFrameGreetingPanel", "GossipFrameInset", "GossipGreetingScrollFrame"} SV.API:Set("ScrollFrame", GossipGreetingScrollFrameScrollBar, 5) - for s, t in pairs(r)do + for s, t in pairs(r)do _G[t]:RemoveTextures() - end + end GossipFrame:SetStyle("Frame", "Window") GossipGreetingScrollFrame:SetStyle("!_Frame", "Inset", true) GossipGreetingScrollFrame.spellTex = GossipGreetingScrollFrame:CreateTexture(nil, "ARTWORK") @@ -259,13 +259,13 @@ local function MiscStyles() SV.API:Set("CloseButton", GuildRegistrarFrameCloseButton) GuildRegistrarFrameEditBox:SetStyle("Editbox") - for i = 1, GuildRegistrarFrameEditBox:GetNumRegions() do + for i = 1, GuildRegistrarFrameEditBox:GetNumRegions() do local region = select(i, GuildRegistrarFrameEditBox:GetRegions()) if region and region:GetObjectType() == "Texture"then - if region:GetTexture() == "Interface\\ChatFrame\\UI-ChatInputBorder-Left" or region:GetTexture() == "Interface\\ChatFrame\\UI-ChatInputBorder-Right" then + if region:GetTexture() == "Interface\\ChatFrame\\UI-ChatInputBorder-Left" or region:GetTexture() == "Interface\\ChatFrame\\UI-ChatInputBorder-Right" then region:Die() - end - end + end + end end GuildRegistrarFrameEditBox:SetHeight(20) @@ -379,7 +379,7 @@ local function MiscStyles() SendMailMoneyCopper.Panel:SetPoint("TOPLEFT", -2, 1) SendMailMoneyCopper.Panel:SetPoint("BOTTOMRIGHT", -12, -1) SendMailMoneyCopper:SetTextInsets(-1, -1, -2, -2) - + hooksecurefunc("SendMailFrame_Update", MailFrame_OnUpdate) SendMailCancelButton:SetStyle("Button") SendMailMailButton:SetStyle("Button") @@ -418,7 +418,7 @@ local function MiscStyles() OpenMailMoneyButtonIconTexture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) OpenMailMoneyButtonIconTexture:InsetPoints() - for i = 1, INBOXITEMS_TO_DISPLAY do + for i = 1, INBOXITEMS_TO_DISPLAY do local slot = _G["MailItem"..i] if(slot) then slot:RemoveTextures() @@ -440,7 +440,7 @@ local function MiscStyles() end end - for i = 1, ATTACHMENTS_MAX_SEND do + for i = 1, ATTACHMENTS_MAX_SEND do local slot = _G["OpenMailAttachmentButton"..i] if(slot) then slot:RemoveTextures() @@ -451,7 +451,7 @@ local function MiscStyles() icon:InsetPoints() end end - end + end end if(SV.db.Skins.blizzard.merchant) then @@ -459,11 +459,11 @@ local function MiscStyles() MerchantFrame:RemoveTextures(true) MerchantFrame:SetStyle("Frame", "Window", false, nil, 2, 4) MerchantFrame:SetWidth(360) - + local level = MerchantFrame:GetFrameLevel() - if(level > 0) then + if(level > 0) then MerchantFrame:SetFrameLevel(level - 1) - else + else MerchantFrame:SetFrameLevel(0) end @@ -486,11 +486,11 @@ local function MiscStyles() SV.API:Set("Tab", _G["MerchantFrameTab2"]) for i = 1, 12 do - local slot = _G["MerchantItem"..i] - + local slot = _G["MerchantItem"..i] + if(slot) then slot:RemoveTextures(true) - slot:SetStyle("!_Frame", "Inset") + slot:SetStyle("Frame", "Inset") local button = _G["MerchantItem"..i.."ItemButton"] if(button) then @@ -517,13 +517,13 @@ local function MiscStyles() MerchantBuyBackItemItemButtonIconTexture:InsetPoints() MerchantRepairItemButton:SetStyle("Button") - for i = 1, MerchantRepairItemButton:GetNumRegions()do + for i = 1, MerchantRepairItemButton:GetNumRegions()do local region = select(i, MerchantRepairItemButton:GetRegions()) if region:GetObjectType() == "Texture" then region:SetTexCoord(0.04, 0.24, 0.06, 0.5) region:InsetPoints() - end - end + end + end MerchantGuildBankRepairButton:SetStyle("Button") MerchantGuildBankRepairButtonIcon:SetTexCoord(0.61, 0.82, 0.1, 0.52) @@ -561,10 +561,10 @@ local function MiscStyles() if(frame) then frame:SetTextColor(1, 1, 1) end - end + end PetitionFrameInstructions:SetTextColor(1, 1, 1) - + PetitionFrameRenameButton:SetPoint("LEFT", PetitionFrameRequestButton, "RIGHT", 3, 0) PetitionFrameRenameButton:SetPoint("RIGHT", PetitionFrameCancelButton, "LEFT", -3, 0) end @@ -583,22 +583,22 @@ local function MiscStyles() SV.API:Set("PageButton", PetStableNextPageButton) for i = 1, NUM_PET_ACTIVE_SLOTS do SV.API:Set("!_ItemButton", _G['PetStableActivePet'..i]) - end + end for i = 1, NUM_PET_STABLE_SLOTS do SV.API:Set("!_ItemButton", _G['PetStableStabledPet'..i]) - end + end PetStableSelectedPetIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) end if(SV.db.Skins.blizzard.tabard) then for i=1, TabardFrame:GetNumRegions() do local region = select(i, TabardFrame:GetRegions()) - if(region and region.GetObjectType and region:GetObjectType() == "Texture") then + if(region and region.GetObjectType and region:GetObjectType() == "Texture") then local regionName = region:GetName(); if(not TABARD_REGIONS[regionName]) then region:Die() end - end + end end TabardFrame:SetStyle("Frame", "Window2", false) @@ -612,7 +612,7 @@ local function MiscStyles() TabardFrameMoneyInset:Die() TabardFrameMoneyBg:RemoveTextures() - for i = 1, 5 do + for i = 1, 5 do local name = "TabardFrameCustomization"..i; local frame = _G[name]; if(frame) then @@ -639,20 +639,20 @@ local function MiscStyles() hooksecurefunc(TabardCharacterModelRotateLeftButton, "SetPoint", function(self, p1, a, p2, x, y) if((p1 ~= "BOTTOMLEFT") or (x ~= 4) or (y ~= 4)) then self:SetPoint("BOTTOMLEFT", 4, 4) - end + end end) hooksecurefunc(TabardCharacterModelRotateRightButton, "SetPoint", function(self, p1, a, p2, x, y) local anchor = _G.TabardCharacterModelRotateLeftButton if((anchor) and ((p1 ~= "TOPLEFT") or (x ~= 4) or (y ~= 0))) then self:SetPoint("TOPLEFT", anchor, "TOPRIGHT", 4, 0) - end + end end) end if(SV.db.Skins.blizzard.taxi) then SV.API:Set("Window", TaxiFrame) - SV.API:Set("CloseButton", TaxiFrame.CloseButton) + SV.API:Set("CloseButton", TaxiFrame.CloseButton) end if (SV.db.Skins.blizzard.trade) then @@ -668,7 +668,7 @@ local function MiscStyles() TradeFrameRecipientPortrait:Die() SV.API:Set("Window", TradeFrame, true) - + TradeFrameTradeButton:SetStyle("Button") TradeFrameCancelButton:SetStyle("Button") SV.API:Set("CloseButton", TradeFrameCloseButton, TradeFrame.Panel) @@ -706,7 +706,7 @@ local function MiscStyles() TradeHighlightRecipientEnchantBottom:SetTexture(0.28, 0.75, 1, 0.2) TradeHighlightRecipientEnchantMiddle:SetTexture(0.28, 0.75, 1, 0.2) TradeHighlightRecipientEnchant:SetFrameStrata("HIGH") - end + end if(SV.db.Skins.blizzard.bgscore) then WorldStateScoreScrollFrame:RemoveTextures() @@ -720,10 +720,10 @@ local function MiscStyles() SV.API:Set("Tab", _G["WorldStateScoreFrameTab2"]) SV.API:Set("Tab", _G["WorldStateScoreFrameTab3"]) end -end ---[[ -########################################################## +end +--[[ +########################################################## MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(MiscStyles) \ No newline at end of file +MOD:SaveCustomStyle(MiscStyles) diff --git a/SVUI_Skins/components/blizzard/petition.lua b/SVUI_Skins/components/blizzard/petition.lua deleted file mode 100644 index 678cdd3..0000000 --- a/SVUI_Skins/components/blizzard/petition.lua +++ /dev/null @@ -1,59 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -PETITIONFRAME MODR -########################################################## -]]-- -local function PetitionFrameStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.petition ~= true then - return - end - - SV.API:Set("Window", PetitionFrame, nil, true) - PetitionFrameInset:Die() - - PetitionFrameSignButton:SetStyle("Button") - PetitionFrameRequestButton:SetStyle("Button") - PetitionFrameRenameButton:SetStyle("Button") - PetitionFrameCancelButton:SetStyle("Button") - - SV.API:Set("CloseButton", PetitionFrameCloseButton) - - PetitionFrameCharterTitle:SetTextColor(1, 1, 0) - PetitionFrameCharterName:SetTextColor(1, 1, 1) - PetitionFrameMasterTitle:SetTextColor(1, 1, 0) - PetitionFrameMasterName:SetTextColor(1, 1, 1) - PetitionFrameMemberTitle:SetTextColor(1, 1, 0) - - for i=1, 9 do - local frameName = ("PetitionFrameMemberName%d"):format(i) - local frame = _G[frameName]; - if(frame) then - frame:SetTextColor(1, 1, 1) - end - end - - PetitionFrameInstructions:SetTextColor(1, 1, 1) - - PetitionFrameRenameButton:SetPoint("LEFT", PetitionFrameRequestButton, "RIGHT", 3, 0) - PetitionFrameRenameButton:SetPoint("RIGHT", PetitionFrameCancelButton, "LEFT", -3, 0) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(PetitionFrameStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/petstable.lua b/SVUI_Skins/components/blizzard/petstable.lua deleted file mode 100644 index a16cbc3..0000000 --- a/SVUI_Skins/components/blizzard/petstable.lua +++ /dev/null @@ -1,46 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -PETSTABLE MODR -########################################################## -]]-- -local function PetStableStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.stable ~= true then return end - PetStableFrame:RemoveTextures() - PetStableFrameInset:RemoveTextures() - PetStableLeftInset:RemoveTextures() - PetStableBottomInset:RemoveTextures() - PetStableFrame:SetStyle("Frame", "Window") - PetStableFrameInset:SetStyle("!_Frame", 'Inset') - SV.API:Set("CloseButton", PetStableFrameCloseButton) - PetStablePrevPageButton:SetStyle("Button") - PetStableNextPageButton:SetStyle("Button") - SV.API:Set("PageButton", PetStablePrevPageButton) - SV.API:Set("PageButton", PetStableNextPageButton) - for j = 1, NUM_PET_ACTIVE_SLOTS do - SV.API:Set("ItemButton", _G['PetStableActivePet'..j], true) - end - for j = 1, NUM_PET_STABLE_SLOTS do - SV.API:Set("ItemButton", _G['PetStableStabledPet'..j], true) - end - PetStableSelectedPetIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(PetStableStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/spellbook.lua b/SVUI_Skins/components/blizzard/spellbook.lua index 36e5f0d..7e9be06 100644 --- a/SVUI_Skins/components/blizzard/spellbook.lua +++ b/SVUI_Skins/components/blizzard/spellbook.lua @@ -14,44 +14,44 @@ local SV = _G["SVUI"]; local L = SV.L; local MOD = SV.Skins; local Schema = MOD.Schema; ---[[ -########################################################## +--[[ +########################################################## FRAME LISTS ########################################################## ]]-- local proButtons = { - "PrimaryProfession1SpellButtonTop", - "PrimaryProfession1SpellButtonBottom", - "PrimaryProfession2SpellButtonTop", - "PrimaryProfession2SpellButtonBottom", - "SecondaryProfession1SpellButtonLeft", - "SecondaryProfession1SpellButtonRight", - "SecondaryProfession2SpellButtonLeft", - "SecondaryProfession2SpellButtonRight", - "SecondaryProfession3SpellButtonLeft", - "SecondaryProfession3SpellButtonRight", - "SecondaryProfession4SpellButtonLeft", + "PrimaryProfession1SpellButtonTop", + "PrimaryProfession1SpellButtonBottom", + "PrimaryProfession2SpellButtonTop", + "PrimaryProfession2SpellButtonBottom", + "SecondaryProfession1SpellButtonLeft", + "SecondaryProfession1SpellButtonRight", + "SecondaryProfession2SpellButtonLeft", + "SecondaryProfession2SpellButtonRight", + "SecondaryProfession3SpellButtonLeft", + "SecondaryProfession3SpellButtonRight", + "SecondaryProfession4SpellButtonLeft", "SecondaryProfession4SpellButtonRight" } local proFrames = { - "PrimaryProfession1", - "PrimaryProfession2", - "SecondaryProfession1", - "SecondaryProfession2", - "SecondaryProfession3", + "PrimaryProfession1", + "PrimaryProfession2", + "SecondaryProfession1", + "SecondaryProfession2", + "SecondaryProfession3", "SecondaryProfession4" } local proBars = { - "PrimaryProfession1StatusBar", - "PrimaryProfession2StatusBar", - "SecondaryProfession1StatusBar", - "SecondaryProfession2StatusBar", - "SecondaryProfession3StatusBar", + "PrimaryProfession1StatusBar", + "PrimaryProfession2StatusBar", + "SecondaryProfession1StatusBar", + "SecondaryProfession2StatusBar", + "SecondaryProfession3StatusBar", "SecondaryProfession4StatusBar" } ---[[ -########################################################## +--[[ +########################################################## HELPERS ########################################################## ]]-- @@ -88,18 +88,18 @@ local function ChangeTabHelper(tab) local a1, p, a2, x, y = tab:GetPoint() tab:SetPoint(a1, p, a2, 1, y) -end +end local function GetSpecTabHelper(index) local tab = SpellBookCoreAbilitiesFrame.SpecTabs[index] if(not tab) then return end ChangeTabHelper(tab) - if(index > 1) then + if(index > 1) then local a1, p, a2, x, y = tab:GetPoint() tab:ClearAllPoints() tab:SetPoint(a1, p, a2, 0, y) - end -end + end +end local function AbilityButtonHelper(index) local button = SpellBookCoreAbilitiesFrame.Abilities[index] @@ -108,9 +108,9 @@ local function AbilityButtonHelper(index) local icon = button.iconTexture; if(not InCombatLockdown()) then - if not button.properFrameLevel then - button.properFrameLevel = button:GetFrameLevel() + 1 - end + if not button.properFrameLevel then + button.properFrameLevel = button:GetFrameLevel() + 1 + end button:SetFrameLevel(button.properFrameLevel) end @@ -120,20 +120,20 @@ local function AbilityButtonHelper(index) if(button.iconTexture) then button.iconTexture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) button.iconTexture:ClearAllPoints() - button.iconTexture:InsetPoints(button, 1, 1) + button.iconTexture:InsetPoints(button, 1, 1) end - if(button.Name) then - button.Name:SetFontObject(NumberFont_Outline_Large) - button.Name:SetTextColor(1,1,0) + if(button.Name) then + button.Name:SetFontObject(NumberFont_Outline_Large) + button.Name:SetTextColor(1,1,0) end - if(button.InfoText) then + if(button.InfoText) then button.InfoText:SetFontObject(SubSpellFont) button.InfoText:SetTextColor(0.8,0.8,0.8) end end -end +end local ButtonUpdateHelper = function(self) local name = self:GetName(); @@ -144,13 +144,13 @@ local ButtonUpdateHelper = function(self) if(not InCombatLockdown()) then self:SetFrameLevel(SpellBookFrame:GetFrameLevel() + 5) - end + end if(icon) then iconTex = icon:GetTexture() end - self:RemoveTextures() + self:RemoveTextures() self:SetStyle("Frame", "Icon", true, 2, 0, 0) if(icon) then @@ -166,32 +166,34 @@ local ButtonUpdateHelper = function(self) end end - if(icon) then - icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) + if(icon) then + icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) end if(self.SpellName) then self.SpellName:SetFontObject(NumberFont_Outline_Large) self.SpellName:SetTextColor(1,1,0) end - + if(self.SpellSubName) then self.SpellSubName:SetFontObject(SubSpellFont) self.SpellSubName:SetTextColor(0.8,0.8,0.8) end -end ---[[ -########################################################## +end +--[[ +########################################################## SPELLBOOK MODR ########################################################## ]]-- local function 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); + SV.API:Set("Window", SpellBookFrame, false, false, 1, 3, 3) SV.API:Set("CloseButton", SpellBookFrameCloseButton) - if(SpellBookFrameInset) then + if(SpellBookFrameInset) then SpellBookFrameInset:RemoveTextures() SpellBookFrameInset:SetStyle("!_Frame", "Inset", true, 6) end @@ -217,9 +219,9 @@ local function SpellBookStyle() for i = 1, MAX_SKILLLINE_TABS do local tabName = "SpellBookSkillLineTab" .. i local tab = _G[tabName] - if(tab) then + if(tab) then if(_G[tabName .. "Flash"]) then _G[tabName .. "Flash"]:Die() end - ChangeTabHelper(tab) + ChangeTabHelper(tab) end end @@ -228,27 +230,27 @@ local function SpellBookStyle() for _, gName in pairs(proFrames)do local frame = _G[gName] if(frame) then - if(_G[gName .. "Missing"]) then - _G[gName .. "Missing"]:SetTextColor(1, 1, 0) + if(_G[gName .. "Missing"]) then + _G[gName .. "Missing"]:SetTextColor(1, 1, 0) end - if(frame.missingText) then - frame.missingText:SetTextColor(1, 0, 0) + if(frame.missingText) then + frame.missingText:SetTextColor(1, 0, 0) end - if(frame.missingHeader) then - frame.missingHeader:SetFontObject(NumberFont_Outline_Large) - frame.missingHeader:SetTextColor(1,1,0) + if(frame.missingHeader) then + frame.missingHeader:SetFontObject(NumberFont_Outline_Large) + frame.missingHeader:SetTextColor(1,1,0) end - if(frame.missingText) then - frame.missingText:SetFontObject(NumberFont_Shadow_Small) - frame.missingText:SetTextColor(0.9,0.9,0.9) + if(frame.missingText) then + frame.missingText:SetFontObject(NumberFont_Shadow_Small) + frame.missingText:SetTextColor(0.9,0.9,0.9) end - if(frame.rank) then - frame.rank:SetFontObject(NumberFontNormal) - frame.rank:SetTextColor(0.9,0.9,0.9) + if(frame.rank) then + frame.rank:SetFontObject(NumberFontNormal) + frame.rank:SetTextColor(0.9,0.9,0.9) end - if(frame.professionName) then - frame.professionName:SetFontObject(NumberFont_Outline_Large) - frame.professionName:SetTextColor(1,1,0) + if(frame.professionName) then + frame.professionName:SetFontObject(NumberFont_Outline_Large) + frame.professionName:SetTextColor(1,1,0) end end end @@ -265,11 +267,11 @@ local function SpellBookStyle() if not button.Panel then button:SetStyle("Frame", "Inset", false, 3, 3, 3) button.Panel:SetAllPoints() - end + end end - if(button.spellString) then - button.spellString:SetFontObject(NumberFontNormal) - button.spellString:SetTextColor(1,1,0) + if(button.spellString) then + button.spellString:SetFontObject(NumberFontNormal) + button.spellString:SetTextColor(1,1,0) end if(button.subSpellString) then button.subSpellString:SetFontObject(SubSpellFont) @@ -277,7 +279,7 @@ local function SpellBookStyle() end end - for _, gName in pairs(proBars) do + for _, gName in pairs(proBars) do local bar = _G[gName] if(bar) then bar:RemoveTextures() @@ -290,27 +292,27 @@ local function SpellBookStyle() end end - if(SpellBookFrameTabButton1) then + if(SpellBookFrameTabButton1) then SV.API:Set("Tab", SpellBookFrameTabButton1) SpellBookFrameTabButton1:ClearAllPoints() SpellBookFrameTabButton1:SetPoint('TOPLEFT', SpellBookFrame, 'BOTTOMLEFT', 0, 2) end - if(SpellBookFrameTabButton2) then - SV.API:Set("Tab", SpellBookFrameTabButton2) + if(SpellBookFrameTabButton2) then + SV.API:Set("Tab", SpellBookFrameTabButton2) end - if(SpellBookFrameTabButton3) then - SV.API:Set("Tab", SpellBookFrameTabButton3) + if(SpellBookFrameTabButton3) then + SV.API:Set("Tab", SpellBookFrameTabButton3) end - if(SpellBookFrameTabButton4) then - SV.API:Set("Tab", SpellBookFrameTabButton4) + if(SpellBookFrameTabButton4) then + SV.API:Set("Tab", SpellBookFrameTabButton4) end - if(SpellBookFrameTabButton5) then - SV.API:Set("Tab", SpellBookFrameTabButton5) + if(SpellBookFrameTabButton5) then + SV.API:Set("Tab", SpellBookFrameTabButton5) end -end ---[[ -########################################################## +end +--[[ +########################################################## MOD LOADING ########################################################## ]]-- -MOD:SaveCustomStyle(SpellBookStyle) \ No newline at end of file +MOD:SaveCustomStyle(SpellBookStyle) diff --git a/SVUI_Skins/components/blizzard/tabard.lua b/SVUI_Skins/components/blizzard/tabard.lua deleted file mode 100644 index a13ff16..0000000 --- a/SVUI_Skins/components/blizzard/tabard.lua +++ /dev/null @@ -1,91 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; -local ipairs = _G.ipairs; -local pairs = _G.pairs; -local type = _G.type; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -HELPERS -########################################################## -]]-- -local function cleanT(a,b) - for c=1,a:GetNumRegions()do - local d=select(c,a:GetRegions()) - if d and d:GetObjectType()=="Texture"then - local n=d:GetName(); - if n=='TabardFrameEmblemTopRight' or n=='TabardFrameEmblemTopLeft' or n=='TabardFrameEmblemBottomRight' or n=='TabardFrameEmblemBottomLeft' then return end - if b and type(b)=='boolean'then - d:Die() - elseif d:GetDrawLayer()==b then - d:SetTexture("") - elseif b and type(b)=='string'and d:GetTexture()~=b then - d:SetTexture("") - else - d:SetTexture("") - end - end - end -end ---[[ -########################################################## -TABARDFRAME MODR -########################################################## -]]-- -local function TabardFrameStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.tabard ~= true then - return - end - cleanT(TabardFrame, true) - TabardFrame:SetStyle("Frame", "Window2", false) - TabardModel:SetStyle("!_Frame", "Transparent") - TabardFrameCancelButton:SetStyle("Button") - TabardFrameAcceptButton:SetStyle("Button") - SV.API:Set("CloseButton", TabardFrameCloseButton) - TabardFrameCostFrame:RemoveTextures() - TabardFrameCustomizationFrame:RemoveTextures() - TabardFrameInset:Die() - TabardFrameMoneyInset:Die() - TabardFrameMoneyBg:RemoveTextures() - for b = 1, 5 do - local c = "TabardFrameCustomization"..b;_G[c]:RemoveTextures() - SV.API:Set("PageButton", _G[c.."LeftButton"]) - SV.API:Set("PageButton", _G[c.."RightButton"]) - if b > 1 then - _G[c]:ClearAllPoints() - _G[c]:SetPoint("TOP", _G["TabardFrameCustomization"..b-1], "BOTTOM", 0, -6) - else - local d, e, f, g, h = _G[c]:GetPoint() - _G[c]:SetPoint(d, e, f, g, h + 4) - end - end - TabardCharacterModelRotateLeftButton:SetPoint("BOTTOMLEFT", 4, 4) - TabardCharacterModelRotateRightButton:SetPoint("TOPLEFT", TabardCharacterModelRotateLeftButton, "TOPRIGHT", 4, 0) - hooksecurefunc(TabardCharacterModelRotateLeftButton, "SetPoint", function(self, d, j, k, l, m) - if d ~= "BOTTOMLEFT" or l ~= 4 or m ~= 4 then - self:SetPoint("BOTTOMLEFT", 4, 4) - end - end) - hooksecurefunc(TabardCharacterModelRotateRightButton, "SetPoint", function(self, d, j, k, l, m) - if d ~= "TOPLEFT" or l ~= 4 or m ~= 0 then - self:SetPoint("TOPLEFT", _G.TabardCharacterModelRotateLeftButton, "TOPRIGHT", 4, 0) - end - end) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(TabardFrameStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/taxi.lua b/SVUI_Skins/components/blizzard/taxi.lua deleted file mode 100644 index b20d4ba..0000000 --- a/SVUI_Skins/components/blizzard/taxi.lua +++ /dev/null @@ -1,37 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -TAXIFRAME MODR -########################################################## -]]-- -local function TaxiStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.taxi ~= true then - return - end - - SV.API:Set("Window", TaxiFrame) - - --TaxiRouteMap:SetStyle("Frame", "Blackout") - --TaxiRouteMap.Panel:WrapPoints(TaxiRouteMap, 4, 4) - - SV.API:Set("CloseButton", TaxiFrame.CloseButton) -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(TaxiStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/trade.lua b/SVUI_Skins/components/blizzard/trade.lua deleted file mode 100644 index f495370..0000000 --- a/SVUI_Skins/components/blizzard/trade.lua +++ /dev/null @@ -1,110 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; -local ipairs = _G.ipairs; -local pairs = _G.pairs; -local type = _G.type; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -TRADEFRAME MODR -########################################################## -]]-- -local function TradeFrameStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.trade ~= true then - return - end - - SV.API:Set("Window", TradeFrame, true) - - TradeFrameInset:Die() - TradeFrameTradeButton:SetStyle("Button") - TradeFrameCancelButton:SetStyle("Button") - SV.API:Set("CloseButton", TradeFrameCloseButton, TradeFrame.Panel) - TradePlayerInputMoneyFrameGold:SetStyle("Editbox") - TradePlayerInputMoneyFrameSilver:SetStyle("Editbox") - TradePlayerInputMoneyFrameCopper:SetStyle("Editbox") - TradeRecipientItemsInset:Die() - TradePlayerItemsInset:Die() - TradePlayerInputMoneyInset:Die() - TradePlayerEnchantInset:Die() - TradeRecipientEnchantInset:Die() - TradeRecipientMoneyInset:Die() - TradeRecipientMoneyBg:Die() - local inputs = { - "TradePlayerInputMoneyFrameSilver", - "TradePlayerInputMoneyFrameCopper" - } - for _,frame in pairs(inputs)do - _G[frame]:SetStyle("Editbox") - _G[frame].Panel:SetPoint("TOPLEFT", -2, 1) - _G[frame].Panel:SetPoint("BOTTOMRIGHT", -12, -1) - _G[frame]:SetTextInsets(-1, -1, -2, -2) - end - for i = 1, 7 do - local W = _G["TradePlayerItem"..i] - local X = _G["TradeRecipientItem"..i] - local Y = _G["TradePlayerItem"..i.."ItemButton"] - local Z = _G["TradeRecipientItem"..i.."ItemButton"] - local b = _G["TradePlayerItem"..i.."ItemButtonIconTexture"] - local z = _G["TradeRecipientItem"..i.."ItemButtonIconTexture"] - if Y and Z then - W:RemoveTextures() - X:RemoveTextures() - Y:RemoveTextures() - Z:RemoveTextures() - b:InsetPoints(Y) - b:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - Y:SetStyle("!_Frame", "Button", true) - Y:SetStyle("Button") - Y.bg = CreateFrame("Frame", nil, Y) - Y.bg:SetStyle("Frame", "Inset") - Y.bg:SetPoint("TOPLEFT", Y, "TOPRIGHT", 4, 0) - Y.bg:SetPoint("BOTTOMRIGHT", _G["TradePlayerItem"..i.."NameFrame"], "BOTTOMRIGHT", 0, 14) - Y.bg:SetFrameLevel(Y:GetFrameLevel()-3) - Y:SetFrameLevel(Y:GetFrameLevel()-1) - z:InsetPoints(Z) - z:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - Z:SetStyle("!_Frame", "Button", true) - Z:SetStyle("Button") - Z.bg = CreateFrame("Frame", nil, Z) - Z.bg:SetStyle("Frame", "Inset") - Z.bg:SetPoint("TOPLEFT", Z, "TOPRIGHT", 4, 0) - Z.bg:SetPoint("BOTTOMRIGHT", _G["TradeRecipientItem"..i.."NameFrame"], "BOTTOMRIGHT", 0, 14) - Z.bg:SetFrameLevel(Z:GetFrameLevel()-3) - Z:SetFrameLevel(Z:GetFrameLevel()-1) - end - end - TradeHighlightPlayerTop:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerBottom:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerMiddle:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayer:SetFrameStrata("HIGH") - TradeHighlightPlayerEnchantTop:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerEnchantBottom:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerEnchantMiddle:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerEnchant:SetFrameStrata("HIGH") - TradeHighlightRecipientTop:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientBottom:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientMiddle:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipient:SetFrameStrata("HIGH") - TradeHighlightRecipientEnchantTop:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientEnchantBottom:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientEnchantMiddle:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientEnchant:SetFrameStrata("HIGH") -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(TradeFrameStyle) \ No newline at end of file diff --git a/SVUI_Skins/components/blizzard/worldstate.lua b/SVUI_Skins/components/blizzard/worldstate.lua deleted file mode 100644 index 23f303e..0000000 --- a/SVUI_Skins/components/blizzard/worldstate.lua +++ /dev/null @@ -1,38 +0,0 @@ ---[[ -############################################################################## -S V U I By: Munglunch -############################################################################## ---]] ---[[ GLOBALS ]]-- -local _G = _G; -local unpack = _G.unpack; -local select = _G.select; ---[[ ADDON ]]-- -local SV = _G['SVUI']; -local L = SV.L; -local MOD = SV.Skins; -local Schema = MOD.Schema; ---[[ -########################################################## -WORLDSTATE MODR -########################################################## -]]-- -local function WorldStateStyle() - if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.bgscore ~= true then return end - WorldStateScoreScrollFrame:RemoveTextures() - WorldStateScoreFrame:RemoveTextures() - WorldStateScoreFrame:SetStyle("Frame", "Window") - SV.API:Set("CloseButton", WorldStateScoreFrameCloseButton) - SV.API:Set("ScrollFrame", WorldStateScoreScrollFrameScrollBar) - WorldStateScoreFrameInset:SetAlpha(0) - WorldStateScoreFrameLeaveButton:SetStyle("Button") - for b = 1, 3 do - SV.API:Set("Tab", _G["WorldStateScoreFrameTab"..b]) - end -end ---[[ -########################################################## -MOD LOADING -########################################################## -]]-- -MOD:SaveCustomStyle(WorldStateStyle) \ No newline at end of file diff --git a/SVUI_Tooltip/SVUI_Tooltip.toc b/SVUI_Tooltip/SVUI_Tooltip.toc index 60b3847..5f6a13c 100644 --- a/SVUI_Tooltip/SVUI_Tooltip.toc +++ b/SVUI_Tooltip/SVUI_Tooltip.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.9 +## Version: 1.1.95 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Tooltip|r ## Notes: Tooltip Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.lua b/SVUI_UnitFrames/SVUI_UnitFrames.lua index 6248d1f..10a6807 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.lua +++ b/SVUI_UnitFrames/SVUI_UnitFrames.lua @@ -465,6 +465,7 @@ function MOD:RefreshUnitLayout(frame, template) frame.StatusPanel:SetSize(size, size) frame.StatusPanel:SetPoint("CENTER", MASTER_GRIP, "CENTER", 0, 0) end + self:UpdateStatusMedia(frame) end if(frame.InfoPanelBG) then diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.toc b/SVUI_UnitFrames/SVUI_UnitFrames.toc index 7060895..5e56254 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.toc +++ b/SVUI_UnitFrames/SVUI_UnitFrames.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.9 +## Version: 1.1.95 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00UnitFrames|r ## Notes: UnitFrames Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_UnitFrames/elements/essentials.lua b/SVUI_UnitFrames/elements/essentials.lua index d736f8b..43a2736 100644 --- a/SVUI_UnitFrames/elements/essentials.lua +++ b/SVUI_UnitFrames/elements/essentials.lua @@ -362,8 +362,8 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) local info = CreateFrame("Frame", nil, frame) info:SetFrameStrata("BACKGROUND") info:SetFrameLevel(0) - info:SetPoint("TOPLEFT", frame.ActionPanel, "BOTTOMLEFT", 0, 1) - info:SetPoint("TOPRIGHT", frame.ActionPanel, "BOTTOMRIGHT", 0, 1) + info:SetPoint("TOPLEFT", frame, "BOTTOMLEFT", 0, 1) + info:SetPoint("TOPRIGHT", frame, "BOTTOMRIGHT", 0, 1) info:SetHeight(baseSize) frame.InfoPanel = info; @@ -408,14 +408,11 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) frame.TextGrip.Misc:SetPoint("CENTER", frame, "CENTER", 0, 0) end - frame.MasterGrip = CreateFrame("Frame", nil, frame) - frame.MasterGrip:SetAllPoints(frame) - - frame.StatusPanel = CreateFrame("Frame", nil, frame.MasterGrip) + frame.StatusPanel = CreateFrame("Frame", nil, frame) frame.StatusPanel:EnableMouse(false) if(unit and (unit == "player" or unit == "pet" or unit == "target" or unit == "targettarget" or unit == "focus" or unit == "focustarget")) then - frame.StatusPanel:SetAllPoints(frame.MasterGrip) + frame.StatusPanel:SetAllPoints(frame) frame.StatusPanel.media = { [[Interface\Addons\SVUI_UnitFrames\assets\TARGET-DC]], [[Interface\Addons\SVUI_UnitFrames\assets\TARGET-DEAD]], @@ -423,7 +420,7 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) } else frame.StatusPanel:SetSize(50, 50) - frame.StatusPanel:SetPoint("CENTER", frame.MasterGrip, "CENTER", 0, 0) + frame.StatusPanel:SetPoint("CENTER", frame, "CENTER", 0, 0) frame.StatusPanel.media = { [[Interface\Addons\SVUI_UnitFrames\assets\UNIT-DC]], [[Interface\Addons\SVUI_UnitFrames\assets\UNIT-DEAD]], @@ -439,6 +436,23 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) frame.Threat = CreateThreat(frame, unit) end end + +function MOD:UpdateStatusMedia(frame) + local width,height = frame:GetSize() + if((height > (width * 0.5)) or (width < 75)) then + frame.StatusPanel.media = { + [[Interface\Addons\SVUI_UnitFrames\assets\UNIT-DC]], + [[Interface\Addons\SVUI_UnitFrames\assets\UNIT-DEAD]], + [[Interface\Addons\SVUI_UnitFrames\assets\UNIT-TAPPED]] + } + else + frame.StatusPanel.media = { + [[Interface\Addons\SVUI_UnitFrames\assets\TARGET-DC]], + [[Interface\Addons\SVUI_UnitFrames\assets\TARGET-DEAD]], + [[Interface\Addons\SVUI_UnitFrames\assets\TARGET-TAPPED]] + } + end +end --[[ ########################################################## HEALTH ANIMATIONS @@ -566,7 +580,7 @@ local OverlayHealthUpdate = function(health, unit, min, max) local t = oUF_SVUI.colors.health health:SetStatusBarColor(t[1], t[2], t[3], 0.9) else - health:SetStatusBarColor(1, 0.25 * mu, 0, 0.85) + health:SetStatusBarColor(1-(0.65 * mu), 0.9 * mu, 0, 0.85) health.animation[1]:SetVertexColor(1, 0.1 * mu, 0, 0.5) end diff --git a/SVUI_UnitFrames/frames.lua b/SVUI_UnitFrames/frames.lua index f957a77..3145200 100644 --- a/SVUI_UnitFrames/frames.lua +++ b/SVUI_UnitFrames/frames.lua @@ -165,7 +165,6 @@ local UpdatePlayerFrame = function(self) local USE_CLASSBAR = db.classbar.enable; local classBarHeight = db.classbar.height; local classBarWidth = db.width * 0.4; - local MASTER_GRIP = self.MasterGrip local iconDB = db.icons self:RegisterForClicks(SV.db.UnitFrames.fastClickTarget and "AnyDown" or "AnyUp") @@ -186,7 +185,7 @@ local UpdatePlayerFrame = function(self) local size = iconDB.restIcon.size; resting:ClearAllPoints() resting:SetSize(size, size) - SV:SetReversePoint(resting, iconDB.restIcon.attachTo, MASTER_GRIP, iconDB.restIcon.xOffset, iconDB.restIcon.yOffset) + SV:SetReversePoint(resting, iconDB.restIcon.attachTo, self, iconDB.restIcon.xOffset, iconDB.restIcon.yOffset) if not self:IsElementEnabled("Resting")then self:EnableElement("Resting") end @@ -203,7 +202,7 @@ local UpdatePlayerFrame = function(self) local size = iconDB.combatIcon.size; combat:ClearAllPoints() combat:SetSize(size, size) - SV:SetReversePoint(combat, iconDB.combatIcon.attachTo, MASTER_GRIP, iconDB.combatIcon.xOffset, iconDB.combatIcon.yOffset) + SV:SetReversePoint(combat, iconDB.combatIcon.attachTo, self, iconDB.combatIcon.xOffset, iconDB.combatIcon.yOffset) if not self:IsElementEnabled("Combat")then self:EnableElement("Combat") end @@ -217,7 +216,7 @@ local UpdatePlayerFrame = function(self) local pvp = self.PvPText; local point = db.pvp.position; pvp:ClearAllPoints() - pvp:SetPoint(db.pvp.position, MASTER_GRIP, db.pvp.position) + pvp:SetPoint(db.pvp.position, self, db.pvp.position) self:Tag(pvp, db.pvp.tags) end do diff --git a/SVUI_UnitFrames/libs/oUF/elements/portraits.lua b/SVUI_UnitFrames/libs/oUF/elements/portraits.lua index 384ae4f..6964833 100644 --- a/SVUI_UnitFrames/libs/oUF/elements/portraits.lua +++ b/SVUI_UnitFrames/libs/oUF/elements/portraits.lua @@ -61,13 +61,13 @@ local Update = function(self, event, unit, forced) if not UnitIsPlayer(unit)then color = self.colors.reaction[UnitReaction(unit,"player")] if(color ~= nil) then - r,g,b = color[1], color[2], color[3] + r,g,b = color[1]*0.35, color[2]*0.35, color[3]*0.35 end else local _,unitClass = UnitClass(unit) if unitClass then color = self.colors.class[unitClass] - r,g,b = color[1], color[2], color[3] + r,g,b = color[1]*0.65, color[2]*0.65, color[3]*0.65 end end portrait:SetBackdropColor(r,g,b)