diff --git a/Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua b/Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua index d2f7854..cdb3cfe 100644 --- a/Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua +++ b/Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua @@ -48,7 +48,8 @@ local BreakStuffHandler = CreateFrame('Button', "BreakStuffHandler", UIParent, ' BreakStuffHandler:SetScript('OnEvent', function(self, event, ...) self[event](self, ...) end) BreakStuffHandler:SetPoint("LEFT",UIParent,"RIGHT",500) BreakStuffHandler.TipLines = {} -BreakStuffHandler.TText = "" +BreakStuffHandler.TTextLeft = "" +BreakStuffHandler.TTextRight = "" BreakStuffHandler.ReadyToSmash = false; --[[ ########################################################## @@ -132,6 +133,7 @@ do if(spell) then ApplyButton(link, spell, r, g, b) else + spell = "Open" if(DE and IsThisBreakable(link)) then rr, gg, bb = 0.5, 0.5, 1 ApplyButton(link, DE, rr, gg, bb) @@ -144,8 +146,8 @@ do ApplyButton(link, hasKey, rr, gg, bb) end end - - BreakStuffHandler.TText = ("|cff%02x%02x%02x%s:|r |cff%02x%02x%02x%s|r"):format(rr, gg, bb, spell, r, g, b, item) + BreakStuffHandler.TTextLeft = spell + BreakStuffHandler.TTextRight = item end end end @@ -236,7 +238,7 @@ end local SetClonedTip = function(self) GameTooltip:SetOwner(self, "ANCHOR_TOPLEFT", 0, 4) GameTooltip:ClearLines() - GameTooltip:AddLine(self.TText) + GameTooltip:AddDoubleLine(self.TTextLeft, self.TTextRight, 0,1,0,1,1,1) -- for index = 1, #self.TipLines do -- GameTooltip:AddLine(self.TipLines[index]) -- end diff --git a/Interface/AddOns/SVUI/packages/chat/SVChat.lua b/Interface/AddOns/SVUI/packages/chat/SVChat.lua index a9bdd68..3886ed1 100644 --- a/Interface/AddOns/SVUI/packages/chat/SVChat.lua +++ b/Interface/AddOns/SVUI/packages/chat/SVChat.lua @@ -622,14 +622,15 @@ do chat:SetFading(CHAT_FADING) chat:SetScript("OnHyperlinkClick", SVUI_OnHyperlinkShow) - local alertSize = SuperDockChatTabBar.currentSize; + local alertSize = SuperDockChatTabBar.currentSize * 2; local alert = CreateFrame("Frame", nil, tab) alert:SetSize(alertSize, alertSize) - alert:SetPoint("CENTER", tab, "CENTER", 0, 0) + alert:SetFrameStrata("DIALOG") + alert:SetPoint("CENTER", tab, "TOP", 0, 0) local alticon = alert:CreateTexture(nil, "OVERLAY") alticon:SetAllPoints(alert) alticon:SetTexture(WHISPER_ALERT) - alticon:Hide() + alert:Hide() chat.WhisperAlert = alert chat.InitConfig = true @@ -763,7 +764,7 @@ do ['glyph'] = true, } - local _hook_FCFOnMouseScroll = function(self, delta) + local _hook_OnMouseWheel = function(self, delta) if(IsShiftKeyDown()) then if(delta > 0) then self:ScrollToTop() @@ -771,10 +772,10 @@ do self:ScrollToBottom() end end - if(self:AtBottom()) then + if(self:AtBottom() and ScrollIndicator:IsShown()) then SuperVillain.Animate:StopFlash(ScrollIndicator) ScrollIndicator:Hide() - else + elseif(not self:AtBottom() and not ScrollIndicator:IsShown()) then ScrollIndicator:Show() SuperVillain.Animate:Flash(ScrollIndicator,1,true) end @@ -843,6 +844,13 @@ do HideUIPanel(GameTooltip) ActiveHyperLink = false; end + if(self:AtBottom() and ScrollIndicator:IsShown()) then + SuperVillain.Animate:StopFlash(ScrollIndicator) + ScrollIndicator:Hide() + elseif(not self:AtBottom() and not ScrollIndicator:IsShown()) then + ScrollIndicator:Show() + SuperVillain.Animate:Flash(ScrollIndicator,1,true) + end end local _hook_TabOnEnter = function(self) @@ -894,7 +902,6 @@ do NewHook('FCF_OpenTemporaryWindow', MOD.RefreshChatFrames) NewHook('ChatEdit_OnEnterPressed', _hook_ChatEditOnEnterKey) NewHook('FCF_SetChatWindowFontSize', _hook_ChatFontUpdate) - NewHook('FloatingChatFrame_OnMouseScroll', _hook_FCFOnMouseScroll) NewHook(GeneralDockManager, 'SetPoint', _hook_GDMFrameSetPoint) NewHook(GeneralDockManagerScrollFrame, 'SetPoint', _hook_GDMScrollSetPoint) for _, name in pairs(CHAT_FRAMES) do @@ -904,6 +911,7 @@ do chat:HookScript('OnHyperlinkEnter', _hook_OnHyperlinkEnter) chat:HookScript('OnHyperlinkLeave', _hook_OnHyperlinkLeave) chat:HookScript('OnMessageScrollChanged', _hook_OnMessageScrollChanged) + chat:HookScript('OnMouseWheel', _hook_OnMouseWheel) tab:HookScript('OnEnter', _hook_TabOnEnter) tab:HookScript('OnLeave', _hook_TabOnLeave) chat.hookedHyperLinks = true @@ -921,12 +929,13 @@ function MOD:Load() if(not SuperVillain.db.SVChat.enable) then return end ScrollIndicator:SetParent(SuperDockWindowLeft) - ScrollIndicator:SetSize(22,22) - ScrollIndicator:SetPoint("BOTTOM", SuperDockWindowLeft, "BOTTOMRIGHT", 0, 0) + ScrollIndicator:SetSize(20,20) + ScrollIndicator:SetPoint("BOTTOMRIGHT", SuperDockWindowLeft, "BOTTOMRIGHT", 6, 0) ScrollIndicator:SetFrameStrata("HIGH") ScrollIndicator.icon = ScrollIndicator:CreateTexture(nil, "OVERLAY") ScrollIndicator.icon:SetAllPoints() ScrollIndicator.icon:SetTexture(SCROLL_ALERT) + ScrollIndicator.icon:SetBlendMode("ADD") ScrollIndicator:Hide() diff --git a/Interface/AddOns/SVUI/packages/stats/stats/gold.lua b/Interface/AddOns/SVUI/packages/stats/stats/gold.lua index d571c8e..355d4ff 100644 --- a/Interface/AddOns/SVUI/packages/stats/stats/gold.lua +++ b/Interface/AddOns/SVUI/packages/stats/stats/gold.lua @@ -102,7 +102,7 @@ local function Gold_OnEvent(self, event,...) else gains = gains + adjusted end; - self.text:SetText(FormatCurrency(current, true)) + self.text:SetText(FormatCurrency(current, MOD.db.shortGold)) SVUI_Global["Accountant"][SuperVillain.realm]["gold"][SuperVillain.name] = GetMoney() end; diff --git a/Interface/AddOns/SVUI/packages/unit/frames.lua b/Interface/AddOns/SVUI/packages/unit/frames.lua index 834d490..43a4678 100644 --- a/Interface/AddOns/SVUI/packages/unit/frames.lua +++ b/Interface/AddOns/SVUI/packages/unit/frames.lua @@ -780,7 +780,7 @@ local function CreatePrepFrame(frameName, parentFrame, parentID) prep:SetFrameStrata("MEDIUM") prep:SetAllPoints(parentFrame) prep:SetID(parentID) - prep:SetPanelTemplate("Bar", true, 3, 3, 3) + prep:SetPanelTemplate("Bar", true, 3, 1, 1) local health = CreateFrame("StatusBar", nil, prep) health:SetAllPoints(prep) @@ -811,7 +811,7 @@ local function CreatePrepFrame(frameName, parentFrame, parentID) prep.SpecIcon = icon local text = prep.Health:CreateFontString(nil, "OVERLAY") - text:SetFont(SuperVillain.Media.font.names, 12, "OUTLINE") + text:SetFont(SuperVillain.Media.font.names, 16, "OUTLINE") text:SetTextColor(1, 1, 1) text:SetPoint("CENTER") prep.SpecClass = text @@ -978,8 +978,8 @@ local ArenaPrepHandler_OnEvent = function(self, event) prepframe.SpecClass:SetText(spec .. " - " .. LOCALIZED_CLASS_NAMES_MALE[class]) prepframe.SpecIcon.Icon:SetTexture(icon or [[INTERFACE\ICONS\INV_MISC_QUESTIONMARK]]) - local color = RAID_CLASS_COLORS[class] - local textcolor = SVUI_CLASS_COLORS[class] or color + local color = SVUI_CLASS_COLORS[class] + local textcolor = RAID_CLASS_COLORS[class] or color if color then prepframe.Health:SetStatusBarColor(color.r, color.g, color.b) prepframe.SpecClass:SetTextColor(textcolor.r, textcolor.g, textcolor.b) diff --git a/Interface/AddOns/SVUI/scripts/misc.lua b/Interface/AddOns/SVUI/scripts/misc.lua index 687e3e4..7bb98f2 100644 --- a/Interface/AddOns/SVUI/scripts/misc.lua +++ b/Interface/AddOns/SVUI/scripts/misc.lua @@ -170,7 +170,7 @@ end local PVPCommunicator_OnEvent = function(self, event, ...) local instance, groupType = IsInInstance() - if(instance and groupType == "pvp") then + if((instance and groupType == "pvp") or event == "UPDATE_BATTLEFIELD_SCORE") then if(not self.InPVP) then self:EnteringBattleGround() end @@ -253,7 +253,7 @@ local function LoadPVPComm() docklet:Disable() end -SuperVillain.Registry:NewScript(LoadPVPComm) +--SuperVillain.Registry:NewScript(LoadPVPComm) --[[ ########################################################## CHAT BUBBLES @@ -404,6 +404,19 @@ local DressUpdateHandler = function(self, elapsed) end end +local DressUp_OnEnter = function(self) + if InCombatLockdown() then return end + GameTooltip:SetOwner(self, "ANCHOR_TOPLEFT", 0, 4) + GameTooltip:ClearLines() + GameTooltip:AddLine(self.TText, 1, 1, 1) + GameTooltip:Show() +end + +local DressUp_OnLeave = function(self) + if InCombatLockdown() then return end + if(GameTooltip:IsShown()) then GameTooltip:Hide() end +end + local function LoadDressupHelper() --[[ PAPER DOLL ENHANCEMENT ]]-- local tabard1 = SuperVillain:CreateButton(DressUpFrame, "Tabard", "BOTTOMLEFT", 26, 79, 80, 22, "") @@ -442,15 +455,25 @@ local function LoadDressupHelper() --[[ CLOAK AND HELMET TOGGLES ]]-- helmet = CreateFrame('CheckButton', nil, CharacterModelFrame, "OptionsCheckButtonTemplate") helmet:SetSize(24, 24) + helmet:Formula409() + helmet:SetCheckboxTemplate(true) helmet.text = helmet:CreateFontString(nil, 'OVERLAY', "GameFontNormal") helmet.text:SetPoint("LEFT", 24, 0) + helmet.TText = "Show/Hide Helmet" + helmet:SetScript('OnEnter', DressUp_OnEnter) + helmet:SetScript('OnLeave', DressUp_OnLeave) + helmet:SetScript('OnUpdate', DressUpdateHandler) cloak = CreateFrame('CheckButton', nil, CharacterModelFrame, "OptionsCheckButtonTemplate") cloak:SetSize(24, 24) + cloak:Formula409() + cloak:SetCheckboxTemplate(true) cloak.text = cloak:CreateFontString(nil, 'OVERLAY', "GameFontNormal") cloak.text:SetPoint("LEFT", 24, 0) + cloak.TText = "Show/Hide Cloak" + cloak:SetScript('OnEnter', DressUp_OnEnter) + cloak:SetScript('OnLeave', DressUp_OnLeave) - helmet:SetScript('OnUpdate', DressUpdateHandler) helmet:SetScript('OnClick', function(self, btn) ShowHelm(helmet:GetChecked()) end) diff --git a/Interface/AddOns/SVUI/system/database.lua b/Interface/AddOns/SVUI/system/database.lua index 321825d..5720620 100644 --- a/Interface/AddOns/SVUI/system/database.lua +++ b/Interface/AddOns/SVUI/system/database.lua @@ -783,6 +783,7 @@ local DefaultSettings = { ["fontSize"] = 12, ["fontOutline"] = "OUTLINE", ["showBackground"] = true, + ["shortGold"] = true, ["panels"] = { ["BottomRightDataPanel"] = { ["right"] = "Bags", diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/stat.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/stat.lua index a9d9a67..1e89d07 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/modules/stat.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/stat.lua @@ -64,7 +64,12 @@ SuperVillain.Options.args.SVStats = { desc = L["Display statistic background textures"], type = "toggle", set = function(i, h)MOD:ChangeDBVar(h, i[#i]);SuperVillain:StaticPopup_Show("RL_CLIENT")end, - }, + }, + shortGold = { + order = 6, + type = "toggle", + name = L["Shortened Gold Text"], + }, panels = { type = "group", name = L["Panels"],