diff --git a/SVUI_!Core/SVUI_!Core.toc b/SVUI_!Core/SVUI_!Core.toc index f8a15b3..33bf354 100644 --- a/SVUI_!Core/SVUI_!Core.toc +++ b/SVUI_!Core/SVUI_!Core.toc @@ -1,6 +1,6 @@ ## Interface: 70000 ## Author: Munglunch -## Version: 1.3.2 +## Version: 1.3.3 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Core|r ## Notes: SVUI [|cff9911FFCore Framework|r]. ## SavedVariables: SVUI_Global, SVUI_Errors, SVUI_Filters, SVUI_Media, SVUI_Shared diff --git a/SVUI_!Core/system/alerts.lua b/SVUI_!Core/system/alerts.lua index d303c25..bd98155 100644 --- a/SVUI_!Core/system/alerts.lua +++ b/SVUI_!Core/system/alerts.lua @@ -900,31 +900,33 @@ local AlertFramePostMove_Hook = function(forced) 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; - for index, rollFrame in pairs(SV.RollFrames) do - rollFrame:ClearAllPoints() - if(POSITION == "TOP") then - rollFrame:SetPoint("TOP", lastFrame, "BOTTOM", 0, -4) - else - rollFrame:SetPoint("BOTTOM", lastFrame, "TOP", 0, 4) - end - lastFrame = rollFrame; - if(rollFrame:IsShown()) then - newAnchor = rollFrame - end - end - AlertFrame:ClearAllPoints() - if(newAnchor) then - AlertFrame:SetAllPoints(newAnchor) - else - AlertFrame:SetPoint(POSITION, SVUI_AlertFrame, POSITION, 0, 0) - end - else - AlertFrame:ClearAllPoints() - AlertFrame:SetPoint(POSITION, SVUI_AlertFrame, POSITION, 0, 0) - end + -- if(SV.RollFrames and SV.RollFrames[1]) then + -- local lastFrame = SVUI_AlertFrame; + -- local newAnchor; + -- for index, rollFrame in pairs(SV.RollFrames) do + -- rollFrame:ClearAllPoints() + -- if(POSITION == "TOP") then + -- rollFrame:SetPoint("TOP", lastFrame, "BOTTOM", 0, -4) + -- else + -- rollFrame:SetPoint("BOTTOM", lastFrame, "TOP", 0, 4) + -- end + -- lastFrame = rollFrame; + -- if(rollFrame:IsShown()) then + -- newAnchor = rollFrame + -- end + -- end + -- AlertFrame:ClearAllPoints() + -- if(newAnchor) then + -- AlertFrame:SetAllPoints(newAnchor) + -- else + -- AlertFrame:SetPoint(POSITION, SVUI_AlertFrame, POSITION, 0, 0) + -- end + -- else + -- AlertFrame:ClearAllPoints() + -- AlertFrame:SetPoint(POSITION, SVUI_AlertFrame, POSITION, 0, 0) + -- end + AlertFrame:ClearAllPoints() + AlertFrame:SetPoint(POSITION, SVUI_AlertFrame, POSITION, 0, 0) end --[[ ########################################################## diff --git a/SVUI_!Core/system/core.lua b/SVUI_!Core/system/core.lua index 4efd37c..54d8be8 100644 --- a/SVUI_!Core/system/core.lua +++ b/SVUI_!Core/system/core.lua @@ -156,7 +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 }, + ["DEMONHUNTER"] = { r = 0.454, g = 0.015, b = 0.894 }, }; ---- IF WE NEED TO FORCE DEFAULT COLORS, USE THIS INSTEAD ---- diff --git a/SVUI_!Options/SVUI_!Options.toc b/SVUI_!Options/SVUI_!Options.toc index 54e3a20..c89454f 100644 --- a/SVUI_!Options/SVUI_!Options.toc +++ b/SVUI_!Options/SVUI_!Options.toc @@ -1,6 +1,6 @@ ## Interface: 70000 ## Author: Munglunch -## Version: 1.3.2 +## Version: 1.3.3 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Options|r ## Notes: SVUI [|cff9911FFConfig Options|r] ## RequiredDeps: SVUI_!Core diff --git a/SVUI_ActionBars/Loader.lua b/SVUI_ActionBars/Loader.lua index b558beb..1e38f5b 100644 --- a/SVUI_ActionBars/Loader.lua +++ b/SVUI_ActionBars/Loader.lua @@ -92,7 +92,8 @@ SV.defaults[Schema] = { ["SHAMAN"] = "", ["WARRIOR"] = "[bonusbar:1] 7; [bonusbar:2] 8;", ["DEATHKNIGHT"] = "", - ["MONK"] = "[bonusbar:1] 7; [bonusbar:2] 8; [bonusbar:3] 9;", + ["MONK"] = "[bonusbar:1] 7; [bonusbar:2] 8; [bonusbar:3] 9;", + ["DEMONHUNTER"] = "", }, ["alpha"] = 1 }, @@ -121,6 +122,7 @@ SV.defaults[Schema] = { ["WARRIOR"] = "", ["DEATHKNIGHT"] = "", ["MONK"] = "", + ["DEMONHUNTER"] = "", }, ["alpha"] = 1 }, @@ -149,6 +151,7 @@ SV.defaults[Schema] = { ["WARRIOR"] = "", ["DEATHKNIGHT"] = "", ["MONK"] = "", + ["DEMONHUNTER"] = "", }, ["alpha"] = 1 }, @@ -177,6 +180,7 @@ SV.defaults[Schema] = { ["WARRIOR"] = "", ["DEATHKNIGHT"] = "", ["MONK"] = "", + ["DEMONHUNTER"] = "", }, ["alpha"] = 1 }, @@ -205,6 +209,7 @@ SV.defaults[Schema] = { ["WARRIOR"] = "", ["DEATHKNIGHT"] = "", ["MONK"] = "", + ["DEMONHUNTER"] = "", }, ["alpha"] = 1 }, @@ -233,6 +238,7 @@ SV.defaults[Schema] = { ["WARRIOR"] = "", ["DEATHKNIGHT"] = "", ["MONK"] = "", + ["DEMONHUNTER"] = "", }, ["alpha"] = 1 }, @@ -261,6 +267,7 @@ SV.defaults[Schema] = { ["WARRIOR"] = "", ["DEATHKNIGHT"] = "", ["MONK"] = "", + ["DEMONHUNTER"] = "", }, ["alpha"] = 1 }, @@ -289,6 +296,7 @@ SV.defaults[Schema] = { ["WARRIOR"] = "", ["DEATHKNIGHT"] = "", ["MONK"] = "", + ["DEMONHUNTER"] = "", }, ["alpha"] = 1 }, @@ -346,6 +354,7 @@ SV.defaults[Schema] = { ["WARRIOR"] = "", ["DEATHKNIGHT"] = "", ["MONK"] = "", + ["DEMONHUNTER"] = "", }, ["alpha"] = 1 }, diff --git a/SVUI_ActionBars/SVUI_ActionBars.toc b/SVUI_ActionBars/SVUI_ActionBars.toc index df2a197..0031285 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.toc +++ b/SVUI_ActionBars/SVUI_ActionBars.toc @@ -1,6 +1,6 @@ ## Interface: 70000 ## Author: Munglunch -## Version: 1.3.2 +## Version: 1.3.3 ## 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 e88f287..6b06d91 100644 --- a/SVUI_Auras/SVUI_Auras.toc +++ b/SVUI_Auras/SVUI_Auras.toc @@ -1,6 +1,6 @@ ## Interface: 70000 ## Author: Munglunch -## Version: 1.3.2 +## Version: 1.3.3 ## 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 80485fc..a36f216 100644 --- a/SVUI_Chat/SVUI_Chat.toc +++ b/SVUI_Chat/SVUI_Chat.toc @@ -1,6 +1,6 @@ ## Interface: 70000 ## Author: Munglunch -## Version: 1.3.2 +## Version: 1.3.3 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Chat|r ## Notes: Chat Plugin for [|cff9911FFSVUI|r]. ## SavedVariables: SVUI_Global_ChatCache diff --git a/SVUI_Inventory/Loader.lua b/SVUI_Inventory/Loader.lua index ff4b333..03b2961 100644 --- a/SVUI_Inventory/Loader.lua +++ b/SVUI_Inventory/Loader.lua @@ -59,6 +59,7 @@ SV.defaults[Schema] = { ["yOffset"] = 40, ["point"] = "BOTTOMLEFT", }, + ["separateBags"] = false, ["bagSize"] = 34, ["bankSize"] = 34, ["alignToChat"] = false, @@ -204,6 +205,12 @@ function MOD:LoadOptions() guiInline = true, name = L["Bag/Bank Positioning"], args = { + separateBags = { + order = 0, + type = "toggle", + name = L["Separate Bag Windows"], + desc = L["Allows the use of multiple panels for bags, instead of just one."] + }, alignToChat = { order = 1, type = "toggle", diff --git a/SVUI_Inventory/SVUI_Inventory.lua b/SVUI_Inventory/SVUI_Inventory.lua index 6185a02..32b8d9e 100644 --- a/SVUI_Inventory/SVUI_Inventory.lua +++ b/SVUI_Inventory/SVUI_Inventory.lua @@ -58,7 +58,6 @@ local DEBUG_BAGS = false; local CreateFrame = _G.CreateFrame; local hooksecurefunc = _G.hooksecurefunc; local numBagFrame = NUM_BAG_FRAMES + 1; -local MULTI_BAG_LAYOUT = false; local MULTI_BAG_HEIGHT_OFFSET = 0; local LOOT_CACHE, GEAR_CACHE, GEARSET_LISTING = {}, {}, {}; local internalTimer; @@ -317,7 +316,7 @@ local ContainerFrame_UpdateLayout = function(self) local containerWidth, numContainerColumns, buttonSize local precount = 0; for i, bagID in ipairs(self.BagIDs) do - if((not MULTI_BAG_LAYOUT) or (isBank or (bagID > 0))) then + if((not SV.db.Inventory.separateBags) or (isBank or (bagID > 0))) then local numSlots = GetContainerNumSlots(bagID); precount = precount + (numSlots or 0); end @@ -354,7 +353,7 @@ local ContainerFrame_UpdateLayout = function(self) local numContainerSlots, fullContainerSlots = GetNumBankSlots(); local totalSlots = 0; - if(MULTI_BAG_LAYOUT) then + if(SV.db.Inventory.separateBags) then local bpCount = GetContainerNumSlots(0); local bpRows = ceil(bpCount / numContainerColumns); containerHeight = (((buttonSize + buttonSpacing) * bpRows) - buttonSpacing) + self.topOffset + self.bottomOffset; @@ -766,7 +765,7 @@ function MOD:ModifyBags() MULTI_BAG_HEIGHT_OFFSET = 0; - if(MULTI_BAG_LAYOUT) then + if(SV.db.Inventory.separateBags) then for bagID,bag in pairs(self.MasterFrame.Bags) do if(bagID == 1 or bagID == 3) then local bagHeight = bag:GetHeight() @@ -1099,7 +1098,7 @@ do local Container_OnShow = function(self) NEXT_ACTION_ALLOWED = true MOD:PositionBagBar() - if(MULTI_BAG_LAYOUT) then + if(SV.db.Inventory.separateBags) then for bagID, bagFrame in ipairs(MOD.MasterFrame.Bags) do bagFrame:Show() end @@ -1296,7 +1295,7 @@ do frame.currencyButton[h]:Hide() end - if(MULTI_BAG_LAYOUT) then + if(SV.db.Inventory.separateBags) then for i, bagID in ipairs(frame.BagIDs) do if(bagID > 0) then local singleBagFrameName = "SVUI_ContainerFrameBag" .. bagID; diff --git a/SVUI_Inventory/SVUI_Inventory.toc b/SVUI_Inventory/SVUI_Inventory.toc index da92fe2..0935329 100644 --- a/SVUI_Inventory/SVUI_Inventory.toc +++ b/SVUI_Inventory/SVUI_Inventory.toc @@ -1,6 +1,6 @@ ## Interface: 70000 ## Author: Munglunch -## Version: 1.3.2 +## Version: 1.3.3 ## 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 697c4a2..5c5b45f 100644 --- a/SVUI_Maps/SVUI_Maps.toc +++ b/SVUI_Maps/SVUI_Maps.toc @@ -1,6 +1,6 @@ ## Interface: 70000 ## Author: Munglunch -## Version: 1.3.2 +## Version: 1.3.3 ## 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 e24c6b5..c6dbc02 100644 --- a/SVUI_NamePlates/SVUI_NamePlates.toc +++ b/SVUI_NamePlates/SVUI_NamePlates.toc @@ -1,6 +1,6 @@ ## Interface: 70000 ## Author: Munglunch -## Version: 1.3.2 +## Version: 1.3.3 ## 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 3a4b2e4..7170b0e 100644 --- a/SVUI_QuestTracker/SVUI_QuestTracker.toc +++ b/SVUI_QuestTracker/SVUI_QuestTracker.toc @@ -1,6 +1,6 @@ ## Interface: 70000 ## Author: Munglunch -## Version: 1.3.2 +## Version: 1.3.3 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00QuestTracker|r ## Notes: QuestTracker Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_Skins/Loader.lua b/SVUI_Skins/Loader.lua index e6957a5..10b62ac 100644 --- a/SVUI_Skins/Loader.lua +++ b/SVUI_Skins/Loader.lua @@ -116,6 +116,7 @@ SV.defaults[Schema] = { ["petbattleui"] = true, ["losscontrol"] = true, ["itemUpgrade"] = true, + ["talkingHead"] = true, }, ["addons"] = { ["enable"] = true, diff --git a/SVUI_Skins/SVUI_Skins.toc b/SVUI_Skins/SVUI_Skins.toc index df702a7..11b2949 100644 --- a/SVUI_Skins/SVUI_Skins.toc +++ b/SVUI_Skins/SVUI_Skins.toc @@ -1,6 +1,6 @@ ## Interface: 70000 ## Author: Munglunch, Azilroka, Sortokk -## Version: 1.3.2 +## Version: 1.3.3 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Skins|r ## Notes: SVUI [|cff9911FFSkins System and AddOn Frames|r]. ## SavedVariables: SVUIUI_STYLE_GLOBAL diff --git a/SVUI_Skins/components/blizzard/misc.lua b/SVUI_Skins/components/blizzard/misc.lua index 49a17a3..afcc476 100644 --- a/SVUI_Skins/components/blizzard/misc.lua +++ b/SVUI_Skins/components/blizzard/misc.lua @@ -740,6 +740,11 @@ local function MiscStyles() SV.API:Set("Tab", _G["WorldStateScoreFrameTab2"]) SV.API:Set("Tab", _G["WorldStateScoreFrameTab3"]) end + + if(SV.db.Skins.blizzard.talkingHead) then + --TalkingHeadFrame:RemoveTextures() + --TalkingHeadFrame:SetStyle("Frame", "Window") + end end --[[ ########################################################## diff --git a/SVUI_Tooltip/SVUI_Tooltip.toc b/SVUI_Tooltip/SVUI_Tooltip.toc index 141a52d..23729e4 100644 --- a/SVUI_Tooltip/SVUI_Tooltip.toc +++ b/SVUI_Tooltip/SVUI_Tooltip.toc @@ -1,6 +1,6 @@ ## Interface: 70000 ## Author: Munglunch -## Version: 1.3.2 +## Version: 1.3.3 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Tooltip|r ## Notes: Tooltip Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.toc b/SVUI_UnitFrames/SVUI_UnitFrames.toc index 4ca8512..e8ba7a5 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.toc +++ b/SVUI_UnitFrames/SVUI_UnitFrames.toc @@ -1,6 +1,6 @@ ## Interface: 70000 ## Author: Munglunch -## Version: 1.3.2 +## Version: 1.3.3 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00UnitFrames|r ## Notes: UnitFrames Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.xml b/SVUI_UnitFrames/SVUI_UnitFrames.xml index ddbe6f8..30f67b6 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.xml +++ b/SVUI_UnitFrames/SVUI_UnitFrames.xml @@ -123,6 +123,7 @@ <Script file="elements\misc.lua"/> <Script file="class_resources\deathknight.lua"/> + <Script file="class_resources\demonhunter.lua"/> <Script file="class_resources\druid.lua"/> <Script file="class_resources\hunter.lua"/> <Script file="class_resources\mage.lua"/> diff --git a/SVUI_UnitFrames/class_resources/demonhunter.lua b/SVUI_UnitFrames/class_resources/demonhunter.lua new file mode 100644 index 0000000..b812e42 --- /dev/null +++ b/SVUI_UnitFrames/class_resources/demonhunter.lua @@ -0,0 +1,92 @@ +--[[ +########################################################## +S V U I By: Munglunch +########################################################## +LOCALIZED LUA FUNCTIONS +########################################################## +]]-- +--[[ GLOBALS ]]-- +local _G = _G; +local unpack = _G.unpack; +local select = _G.select; +local pairs = _G.pairs; +local ipairs = _G.ipairs; +local type = _G.type; +local error = _G.error; +local pcall = _G.pcall; +local tostring = _G.tostring; +local tonumber = _G.tonumber; +local assert = _G.assert; +local math = _G.math; +--[[ MATH METHODS ]]-- +local random = math.random; +--[[ +########################################################## +GET ADDON DATA +########################################################## +]]-- +local SV = _G['SVUI'] +local L = SV.L; +local LSM = _G.LibStub("LibSharedMedia-3.0") +local MOD = SV.UnitFrames + +if(not MOD) then return end + +local oUF_SVUI = MOD.oUF +assert(oUF_SVUI, "SVUI UnitFrames: unable to locate oUF.") +if(SV.class ~= "DEMONHUNTER") then return end +--[[ +########################################################## +LOCALS +########################################################## +]]-- + +--[[ +########################################################## +POSITIONING +########################################################## +]]-- + +local Reposition = function(self) + local db = SV.db.UnitFrames.player + local bar = self.Illidanian; + local max = self.MaxClassPower; + local size = db.classbar.height + local inset = size * 0.1 + local width = size * max; + + local spec = GetSpecialization() + + bar.Holder:SetSize(width, size) + if(not db.classbar.detachFromFrame) then + SV:ResetAnchors(L["Classbar"]) + end + local holderUpdate = bar.Holder:GetScript('OnSizeChanged') + if holderUpdate then + holderUpdate(bar.Holder) + end + + bar:ClearAllPoints() + bar:SetAllPoints(bar.Holder) +end +--[[ +########################################################## +DEATHKNIGHT +########################################################## +]]-- +function MOD:CreateClassBar(playerFrame) + local max = 6 + local bar = CreateFrame("Frame", nil, playerFrame) + bar:SetFrameLevel(playerFrame.TextGrip:GetFrameLevel() + 30) + + local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) + classBarHolder:SetPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) + bar:SetPoint("TOPLEFT", classBarHolder, "TOPLEFT", 0, 0) + bar.Holder = classBarHolder + SV:NewAnchor(bar.Holder, L["Classbar"], OnMove) + + playerFrame.MaxClassPower = max; + playerFrame.RefreshClassBar = Reposition; + playerFrame.Illidanian = bar + return 'Illidanian' +end diff --git a/SVUI_UnitFrames/groups.lua b/SVUI_UnitFrames/groups.lua index 1a3ec46..c301246 100644 --- a/SVUI_UnitFrames/groups.lua +++ b/SVUI_UnitFrames/groups.lua @@ -109,7 +109,7 @@ local groupTagPoints = { local GroupDistributor = { ["CLASS"] = function(x) - x:SetAttribute("groupingOrder","DEATHKNIGHT,DRUID,HUNTER,MAGE,PALADIN,PRIEST,SHAMAN,WARLOCK,WARRIOR,MONK") + x:SetAttribute("groupingOrder","DEATHKNIGHT,DRUID,HUNTER,MAGE,PALADIN,PRIEST,SHAMAN,WARLOCK,WARRIOR,MONK,DEMONHUNTER") x:SetAttribute("sortMethod","NAME") x:SetAttribute("groupBy","CLASS") end, diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_AuraWatch/oUF_AuraWatch.toc b/SVUI_UnitFrames/libs/Plugins/oUF_AuraWatch/oUF_AuraWatch.toc index 46c5bcc..fc257be 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_AuraWatch/oUF_AuraWatch.toc +++ b/SVUI_UnitFrames/libs/Plugins/oUF_AuraWatch/oUF_AuraWatch.toc @@ -1,7 +1,7 @@ ## Interface: 30300 ## Title: oUF AuraWatch ## Author: Astromech -## Version: 1.3.28-6 +## Version: 1.3.38-6 ## Notes: Adds aura timers to oUF ## OptionalDeps: oUF ## X-oUF: oUF