From 9b1c5193baee328cbeb1685e85548d3f86bdb1f2 Mon Sep 17 00:00:00 2001 From: "SVENT\\Eric" Date: Tue, 21 Feb 2023 18:07:06 +0100 Subject: [PATCH] Actually fixes the edge case where player bar isn't always shown when using the total bar. --- classes/class_damage.lua | 4 ++-- classes/class_heal.lua | 4 ++-- classes/class_resources.lua | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/classes/class_damage.lua b/classes/class_damage.lua index 0c0ac380..a125531c 100644 --- a/classes/class_damage.lua +++ b/classes/class_damage.lua @@ -2330,7 +2330,7 @@ function atributo_damage:RefreshWindow(instancia, combatObject, forcar, exportar Details.FadeHandler.Fader(row1, "out") totalBarIsShown = true - if (following and myPos and myPos+1 > instancia.rows_fit_in_window and instancia.barraS[2] < myPos) then + if (following and myPos and myPos+1 > instancia.rows_fit_in_window and instancia.barraS[2] < myPos+1) then for i = instancia.barraS[1], iterLast-1, 1 do if (actorTableContent[i]) then actorTableContent[i]:RefreshLine(instancia, lineContainer, whichRowLine, i, total, subAttribute, forcar, keyName, combatTime, percentageType, useAnimations, barsShowData, barsBrackets, barsSeparator) @@ -2400,7 +2400,7 @@ function atributo_damage:RefreshWindow(instancia, combatObject, forcar, exportar Details.FadeHandler.Fader(row1, "out") totalBarIsShown = true - if (following and myPos and myPos+1 > instancia.rows_fit_in_window and instancia.barraS[2] < myPos) then + if (following and myPos and myPos+1 > instancia.rows_fit_in_window and instancia.barraS[2] < myPos+1) then actorTableContent[myPos]:RefreshLine(instancia, lineContainer, whichRowLine, myPos, total, subAttribute, forcar, keyName, combatTime, percentageType, useAnimations, barsShowData, barsBrackets, barsSeparator) whichRowLine = whichRowLine+1 for i = iter_last-1, instancia.barraS[1], -1 do diff --git a/classes/class_heal.lua b/classes/class_heal.lua index 8cf78c13..d2bbb9aa 100644 --- a/classes/class_heal.lua +++ b/classes/class_heal.lua @@ -449,7 +449,7 @@ function atributo_heal:RefreshWindow (instancia, tabela_do_combate, forcar, expo Details.FadeHandler.Fader(row1, "out") - if (following and myPos and myPos+1 > instancia.rows_fit_in_window and instancia.barraS[2] < myPos) then + if (following and myPos and myPos+1 > instancia.rows_fit_in_window and instancia.barraS[2] < myPos+1) then for i = instancia.barraS[1], iter_last-1, 1 do --vai atualizar s� o range que esta sendo mostrado if (conteudo[i]) then conteudo[i]:RefreshLine(instancia, barras_container, whichRowLine, i, total, sub_atributo, forcar, keyName, combat_time, percentage_type, use_animations, bars_show_data, bars_brackets, bars_separator) @@ -519,7 +519,7 @@ function atributo_heal:RefreshWindow (instancia, tabela_do_combate, forcar, expo Details.FadeHandler.Fader(row1, "out") - if (following and myPos and myPos+1 > instancia.rows_fit_in_window and instancia.barraS[2] < myPos) then + if (following and myPos and myPos+1 > instancia.rows_fit_in_window and instancia.barraS[2] < myPos+1) then conteudo[myPos]:RefreshLine(instancia, barras_container, whichRowLine, myPos, total, sub_atributo, forcar, keyName, combat_time, percentage_type, use_animations, bars_show_data, bars_brackets, bars_separator) whichRowLine = whichRowLine+1 for i = iter_last-1, instancia.barraS[1], -1 do --vai atualizar s� o range que esta sendo mostrado diff --git a/classes/class_resources.lua b/classes/class_resources.lua index 3f900cbd..57c740de 100644 --- a/classes/class_resources.lua +++ b/classes/class_resources.lua @@ -539,7 +539,7 @@ function atributo_energy:RefreshWindow (instancia, tabela_do_combate, forcar, ex Details.FadeHandler.Fader(row1, "out") - if (following and myPos and myPos+1 > instancia.rows_fit_in_window and instancia.barraS[2] < myPos) then + if (following and myPos and myPos+1 > instancia.rows_fit_in_window and instancia.barraS[2] < myPos+1) then for i = instancia.barraS[1], iter_last-1, 1 do --vai atualizar s� o range que esta sendo mostrado conteudo[i]:RefreshLine(instancia, barras_container, whichRowLine, i, total, sub_atributo, forcar, keyName, combat_time, percentage_type, use_animations, bars_show_data, bars_brackets, bars_separator) --inst�ncia, index, total, valor da 1� barra whichRowLine = whichRowLine+1 @@ -600,7 +600,7 @@ function atributo_energy:RefreshWindow (instancia, tabela_do_combate, forcar, ex Details.FadeHandler.Fader(row1, "out") - if (following and myPos and myPos+1 > instancia.rows_fit_in_window and instancia.barraS[2] < myPos) then + if (following and myPos and myPos+1 > instancia.rows_fit_in_window and instancia.barraS[2] < myPos+1) then conteudo[myPos]:RefreshLine(instancia, barras_container, whichRowLine, myPos, total, sub_atributo, forcar, keyName, combat_time, percentage_type, use_animations, bars_show_data, bars_brackets, bars_separator) --inst�ncia, index, total, valor da 1� barra whichRowLine = whichRowLine+1 for i = iter_last-1, instancia.barraS[1], -1 do --vai atualizar s� o range que esta sendo mostrado