From 183bc0bdd1588cdb6eccc179bf4a5de7aae99d11 Mon Sep 17 00:00:00 2001 From: Tercio Date: Mon, 30 Jan 2017 11:21:32 -0200 Subject: [PATCH] - Ticket #166: add 'toggle spark option on Streamer plugin'. - Fixed a random error '1263' which some users were getting. --- boot.lua | 13 +++--- classes/classe_damage.lua | 2 +- classes/classe_heal.lua | 2 +- plugins/Details_Streamer/Details_Streamer.lua | 45 ++++++++++++++++--- 4 files changed, 47 insertions(+), 15 deletions(-) diff --git a/boot.lua b/boot.lua index af8d80a7..61466964 100644 --- a/boot.lua +++ b/boot.lua @@ -3,7 +3,7 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") - _detalhes.build_counter = 3315 + _detalhes.build_counter = 3325 _detalhes.userversion = "v7.1.5." .. _detalhes.build_counter _detalhes.realversion = 116 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" @@ -21,14 +21,11 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ -|cFFFFFF00v7.1.5.3315.116 (|cFFFFCC00Jan 23th, 2016|r|cFFFFFF00)|r:\n\n -|cFFFFFF00-|r Ticket #162: 'no Monochrome font' available, added an experimental slash command: /run _detalhes:UseOutline ("MONOCHROME").\n\n -|cFFFFFF00-|r Ticket #158: 'no elapsed time shown on report to chat', added the elapsed time when reporting a segment.\n\n -|cFFFFFF00-|r Ticket #164: 'error when browsing segments', an attempt to fix the problem has been made.\n\n +|cFFFFFF00v7.1.5.3325.116 (|cFFFFCC00Jan 30th, 2016|r|cFFFFFF00)|r:\n\n +|cFFFFFF00-|r Ticket #166: add 'toggle spark option on Streamer plugin'.\n\n +|cFFFFFF00-|r Fixed a random error '1263' which some users were getting.\n\n + -|cFFFFFF00v7.1.5.3305.116 (|cFFFFCC00Jan 15th, 2016|r|cFFFFFF00)|r:\n\n -|cFFFFFF00-|r Another fix for mythic dungeons overall data reset (thanks Tharai @ Curseforge).\n\n -|cFFFFFF00-|r Fix for spec detection on PvP Arenas (thanks Pas06 @ Curseforge).\n\n --]] -- diff --git a/classes/classe_damage.lua b/classes/classe_damage.lua index f335f634..0bfebb5f 100644 --- a/classes/classe_damage.lua +++ b/classes/classe_damage.lua @@ -3065,7 +3065,7 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown) end end - tinsert (playerPhases, {phase, playersTable [self.nome] or 0, myRank, playersTable [self.nome]/totalDamage*100}) + tinsert (playerPhases, {phase, playersTable [self.nome] or 0, myRank, (playersTable [self.nome] or 0) / totalDamage * 100}) end table.sort (playerPhases, function(a, b) return a[1] < b[1] end) diff --git a/classes/classe_heal.lua b/classes/classe_heal.lua index 552ea775..cd3a44b0 100644 --- a/classes/classe_heal.lua +++ b/classes/classe_heal.lua @@ -1260,7 +1260,7 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown) end end - tinsert (playerPhases, {phase, playersTable [self.nome] or 0, myRank, playersTable [self.nome]/totalDamage*100}) + tinsert (playerPhases, {phase, playersTable [self.nome] or 0, myRank, (playersTable [self.nome] or 0) / totalDamage * 100}) end table.sort (playerPhases, function(a, b) return a[1] < b[1] end) diff --git a/plugins/Details_Streamer/Details_Streamer.lua b/plugins/Details_Streamer/Details_Streamer.lua index 6746fb0d..38091101 100644 --- a/plugins/Details_Streamer/Details_Streamer.lua +++ b/plugins/Details_Streamer/Details_Streamer.lua @@ -402,7 +402,13 @@ local function CreatePluginFrames() end line.statusbar:SetValue (percent) - line.spark:Show() + + if (StreamOverlay.db.use_spark) then + line.spark:Show() + else + line.spark:Hide() + end + if (castinfo.Success) then line.spark:SetVertexColor (1, 1, 1, 0.4) line.spark:SetPoint ("left", line.statusbar, "left", (line.statusbar:GetWidth() / 100 * percent) - 8, 0) @@ -902,7 +908,11 @@ listener.track_spell_cast = function() percent = math.abs (percent - 100) castinfo.Percent = percent line.statusbar:SetValue (percent) - line.spark:Show() + if (StreamOverlay.db.use_spark) then + line.spark:Show() + else + line.spark:Hide() + end line.spark:SetVertexColor (1, 1, 1, 0.5 + (percent/100)) line.spark:SetVertexColor (1, 1, 1, 1) line.spark:SetPoint ("left", line.statusbar, "left", (line.statusbar:GetWidth() / 100 * percent) - 6, 0) @@ -921,7 +931,11 @@ listener.track_spell_cast = function() local percent = current / diff * 100 castinfo.Percent = percent line.statusbar:SetValue (percent) - line.spark:Show() + if (StreamOverlay.db.use_spark) then + line.spark:Show() + else + line.spark:Hide() + end line.spark:SetVertexColor (1, 1, 1, 0.5 + (percent/100)) line.spark:SetPoint ("left", line.statusbar, "left", (line.statusbar:GetWidth() / 100 * percent) - 6, 0) end @@ -945,7 +959,13 @@ listener.track_spell_cast = function() local percent = current / diff * 100 castinfo.Percent = percent line.statusbar:SetValue (percent) - line.spark:Show() + + if (StreamOverlay.db.use_spark) then + line.spark:Show() + else + line.spark:Hide() + end + line.spark:SetVertexColor (1, 1, 1, 0.5 + (percent/100)) line.spark:SetPoint ("left", line.statusbar, "left", (line.statusbar:GetWidth() / 100 * percent) - 6, 0) end @@ -1717,7 +1737,20 @@ function StreamOverlay.OpenOptionsPanel() desc = "How high the frame is placed in your interface, high values makes it be shown above backpack, talents frame, etc.", name = "Window Strata" }, - + + {type = "space"}, + { + type = "toggle", + name = "Show Spark", + desc = "Show or hide the spark at bars", + order = 1, + get = function() return StreamOverlay.db.use_spark end, + set = function (self, val) + StreamOverlay.db.use_spark = not StreamOverlay.db.use_spark + + + end, + }, } @@ -1848,6 +1881,8 @@ function StreamOverlay:OnEvent (_, event, ...) minimap = {hide = false, radius = 160, minimapPos = 160}, + use_spark = true, + per_second = { enabled = false, size = 32,