Fixed an issue where after reloading, overall data won't show the players nickname.
Fixed overkill damage on death log tooltip.
Fixed the percent bars for the healing done target on the player breakdown window.
Fixed an issue with resource tooltips.
And more...
This commit is contained in:
Tercio Jose
2021-12-10 16:57:26 -03:00
parent 7adae64a15
commit 8be58e717b
15 changed files with 194 additions and 109 deletions
+2
View File
@@ -5306,6 +5306,8 @@ end
shadow.end_time = time()
end
shadow.displayName = actor.displayName or actor.nome
shadow.boss_fight_component = actor.boss_fight_component or shadow.boss_fight_component
shadow.fight_component = actor.fight_component or shadow.fight_component
shadow.grupo = actor.grupo or shadow.grupo
+16 -16
View File
@@ -1940,7 +1940,7 @@ function atributo_heal:MontaInfoHealingDone()
barra.on_focus = false
end
self:FocusLock (barra, tabela[1])
self:FocusLock(barra, tabela[1])
barra.other_actor = tabela [6]
@@ -1967,19 +1967,17 @@ function atributo_heal:MontaInfoHealingDone()
end
--> TOP CURADOS
local meus_inimigos = {}
local healedTargets = {}
tabela = self.targets
for target_name, amount in _pairs (tabela) do
_table_insert (meus_inimigos, {target_name, amount, amount / total*100})
_table_insert (healedTargets, {target_name, amount, amount / total*100})
end
_table_sort (meus_inimigos, _detalhes.Sort2)
local amt_alvos = #meus_inimigos
gump:JI_AtualizaContainerAlvos (amt_alvos)
local max_inimigos = meus_inimigos[1] and meus_inimigos[1][2] or 0
for index, tabela in _ipairs (meus_inimigos) do
_table_sort(healedTargets, _detalhes.Sort2)
gump:JI_AtualizaContainerAlvos(#healedTargets)
local topHealingDone = healedTargets[1] and healedTargets[1][2]
for index, tabela in _ipairs (healedTargets) do
local barra = info.barras2 [index]
@@ -1988,10 +1986,12 @@ function atributo_heal:MontaInfoHealingDone()
barra.textura:SetStatusBarColor (1, 1, 1, 1)
end
local healingDone = tabela[2]
if (index == 1) then
barra.textura:SetValue (100)
barra.textura:SetValue(100)
else
barra.textura:SetValue (tabela[2]/max_*100)
barra.textura:SetValue(healingDone / topHealingDone * 100)
end
local target_actor = instancia.showing (2, tabela[1])
@@ -2004,12 +2004,12 @@ function atributo_heal:MontaInfoHealingDone()
end
barra.lineText1:SetText (index .. ". " .. _detalhes:GetOnlyName (tabela[1]))
barra.textura:SetStatusBarColor (1, 1, 1, 1)
barra.textura:SetStatusBarColor(1, 1, 1, 1)
if (info.sub_atributo == 2) then
barra.lineText4:SetText (_detalhes:comma_value (_math_floor (tabela[2]/meu_tempo)) .." (" .. _cstr ("%.1f", tabela[3]) .. "%)")
barra.lineText4:SetText (_detalhes:comma_value (_math_floor (healingDone/meu_tempo)) .." (" .. _cstr ("%.1f", tabela[3]) .. "%)")
else
barra.lineText4:SetText (SelectedToKFunction (_, tabela[2]) .. " (" .. _cstr ("%.1f", tabela[3]) .. "%)")
barra.lineText4:SetText (SelectedToKFunction (_, healingDone) .. " (" .. _cstr ("%.1f", tabela[3]) .. "%)")
end
barra.minha_tabela = self
+2 -2
View File
@@ -1344,8 +1344,8 @@ function atributo_energy:MontaTooltipAlvos (esta_barra, index)
end
local spellname, _, spellicon = _GetSpellInfo (spell [1])
GameTooltip:AddDoubleLine (spellname .. ": ", _detalhes:comma_value (spell [2]) .. " (" .. _cstr ("%.1f", (spell [2] / total_regenerado) * 100).."%)", 1, 1, 1, 1, 1, 1)
GameTooltip:AddTexture (icone_magia)
GameTooltip:AddDoubleLine(spellname .. ": ", _detalhes:comma_value (spell [2]) .. " (" .. _cstr ("%.1f", (spell [2] / total_regenerado) * 100).."%)", 1, 1, 1, 1, 1, 1)
GameTooltip:AddTexture(spellicon)
end
end
+10 -7
View File
@@ -245,13 +245,16 @@ function _detalhes:ToolTipDead (instancia, morte, esta_barra, keydown)
local critOrCrush = critical .. crushing
if (overkill > 0) then
--check the type of overkill that should be shown
--if show_totalhitdamage_on_overkill is true it'll show the total damage of the hit
--if false it shows the total damage of the hit minus the overkill
if (not _detalhes.show_totalhitdamage_on_overkill) then
amount = amount - overkill
end
--> deprecated as the parser now removes the overkill damage from total damage
--> this should now sum the overkill from [10] with the damage from [3]
--check the type of overkill that should be shown
--if show_totalhitdamage_on_overkill is true it'll show the total damage of the hit
--if false it shows the total damage of the hit minus the overkill
--if (not _detalhes.show_totalhitdamage_on_overkill) then
-- amount = amount - overkill
--end
overkill = " (" .. _detalhes:ToK (overkill) .. " |cFFFF8800overkill|r)"
GameCooltip:AddLine ("" .. _cstr ("%.1f", time - hora_da_morte) .. "s |cFFFFFF00" .. spellname .. "|r (|cFFC6B0D9" .. source .. "|r)", "-" .. _detalhes:ToK (amount) .. critOrCrush .. overkill .. " (" .. hp .. "%)", 1, "white", "white")
else
+14 -22
View File
@@ -113,37 +113,29 @@ function historico:adicionar_overall (tabela)
_detalhes.tabela_overall.overall_enemy_name = "-- x -- x --"
end
end
--
if (_detalhes.tabela_overall.start_time == 0) then
--print ("start_time == 0 NO!")
_detalhes.tabela_overall:SetStartTime (tabela.start_time)
_detalhes.tabela_overall:SetEndTime (tabela.end_time)
else
--print ("start_time ~= 0 OKAY", tabela.start_time, _detalhes.tabela_overall:GetCombatTime(), tabela.start_time - _detalhes.tabela_overall:GetCombatTime())
_detalhes.tabela_overall:SetStartTime (tabela.start_time - _detalhes.tabela_overall:GetCombatTime())
_detalhes.tabela_overall:SetEndTime (tabela.end_time)
end
if (_detalhes.tabela_overall.data_inicio == 0) then
_detalhes.tabela_overall.data_inicio = _detalhes.tabela_vigente.data_inicio or 0
end
--
if (_detalhes.tabela_overall.start_time == 0) then
_detalhes.tabela_overall:SetStartTime (tabela.start_time)
_detalhes.tabela_overall:SetEndTime (tabela.end_time)
else
_detalhes.tabela_overall:SetStartTime (tabela.start_time - _detalhes.tabela_overall:GetCombatTime())
_detalhes.tabela_overall:SetEndTime (tabela.end_time)
end
if (_detalhes.tabela_overall.data_inicio == 0) then
_detalhes.tabela_overall.data_inicio = _detalhes.tabela_vigente.data_inicio or 0
end
_detalhes.tabela_overall:seta_data (_detalhes._detalhes_props.DATA_TYPE_END)
_detalhes:ClockPluginTickOnSegment()
for id, instance in _detalhes:ListInstances() do
if (instance:IsEnabled()) then
if (instance:GetSegment() == -1) then
instance:ForceRefresh()
--instance:RefreshMainWindow (true)
--print ("isntance", id, "overall updated.")
end
end
end
end
function _detalhes:ScheduleAddCombatToOverall (combat) --deprecated (15/03/2019)