From 402b91804501fc6e64423f65be7ca5b26bbde105 Mon Sep 17 00:00:00 2001 From: andrew6180 <16847730+andrew6180@users.noreply.github.com> Date: Mon, 7 Oct 2024 11:18:13 -0700 Subject: [PATCH] Parser: fix energize events. Remove energize overflow since its not tracked in 3.3.5 --- classes/class_resources.lua | 10 +--------- classes/class_spellresources.lua | 2 +- core/parser.lua | 5 ++--- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/classes/class_resources.lua b/classes/class_resources.lua index e28f4cb7..2426a75f 100644 --- a/classes/class_resources.lua +++ b/classes/class_resources.lua @@ -1017,19 +1017,11 @@ function atributo_energy:ToolTipRegenRecebido (instancia, numero, barra, keydown for i = 1, #allGeneratorSpells do local thisGenerator = allGeneratorSpells [i] local spellName, _, spellIcon = _GetSpellInfo(thisGenerator[1].id) - GameCooltip:AddLine(spellName, FormatTooltipNumber (_, thisGenerator[2]) .. " (|cFFFF5555overflow: " .. FormatTooltipNumber (_, thisGenerator[3]) .. "|r | " .. _cstr ("%.1f", (thisGenerator[2] / allGenerated) * 100).."%)") + GameCooltip:AddLine(spellName, FormatTooltipNumber (_, thisGenerator[2])) GameCooltip:AddIcon (spellIcon, nil, nil, icon_size.W, icon_size.H, .1, .9, .1, .9) _detalhes:AddTooltipBackgroundStatusbar() end - --auto regen overflow - _detalhes:AddTooltipSpellHeaderText (self.nome .. " Auto Regen Overflow", headerColor, 1, [[Interface\CHARACTERFRAME\Disconnect-Icon]], 0.3, 0.7, 0.3, 0.7) - _detalhes:AddTooltipHeaderStatusbar (r, g, b, 1) - - GameCooltip:AddLine("Auto Regen Overflow", FormatTooltipNumber (_, self.passiveover) .. " ( " .. _cstr ("%.1f", self.passiveover / (self.passiveover + self.total) * 100) .. "%)") - GameCooltip:AddIcon ([[Interface\COMMON\Indicator-Red]], nil, nil, icon_size.W, icon_size.H) - _detalhes:AddTooltipBackgroundStatusbar() - return true end diff --git a/classes/class_spellresources.lua b/classes/class_spellresources.lua index e5848ae0..71ecaa3c 100644 --- a/classes/class_spellresources.lua +++ b/classes/class_spellresources.lua @@ -19,6 +19,6 @@ function habilidade_energy:Add(serial, nome, flag, amount, who_nome, powertype, overpower) self.counter = self.counter + 1 self.total = self.total + amount - self.totalover = self.totalover + overpower + self.totalover = 0 self.targets[nome] = (self.targets[nome] or 0) + amount end diff --git a/core/parser.lua b/core/parser.lua index 2348cbc5..3b0dc40c 100755 --- a/core/parser.lua +++ b/core/parser.lua @@ -3298,7 +3298,7 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1 end -- ~energy ~resource - function parser:energize (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, spellType, amount, overpower, powerType, altpower) + function parser:energize (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, spellType, amount, powerType) if (not sourceName) then sourceName = "[*] " .. spellName elseif (not targetName) then @@ -3375,7 +3375,6 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1 --regen produced amount sourceActor.total = sourceActor.total + amount - sourceActor.totalover = sourceActor.totalover + overpower --target regenerated amount targetActor.received = targetActor.received + amount @@ -3392,7 +3391,7 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1 end --return spell:Add (alvo_serial, alvo_name, alvo_flags, amount, who_name, powertype) - return _spell_energy_func (spellTable, targetSerial, targetName, targetFlags, amount, sourceName, powerType, overpower) + return _spell_energy_func (spellTable, targetSerial, targetName, targetFlags, amount, sourceName, powerType) else --is a resource sourceActor.resource = sourceActor.resource + resourceAmount