Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

container_segments 424 error: now it is ensuring to wipe the combatObject that got removed from containerSegments

Browse Source
This commit is contained in:
Tercio Jose
2023-06-06 17:36:13 -03:00
parent c7a1e06638
commit 0c397b5816
16 changed files with 97 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/class_combat.lua
+8 -8
View File
@@ -34,8 +34,8 @@
--local pointers
local ipairs = ipairs -- lua local
local pairs = pairs -- lua local
local _bit_band = bit.band -- lua local
local _date = date -- lua local
local bitBand = bit.band -- lua local
local date = date -- lua local
local tremove = table.remove -- lua local
local rawget = rawget
local _math_max = math.max
@@ -583,14 +583,14 @@ function classCombat:NovaTabela(bTimeStarted, overallCombatObject, combatId, ...
--try discover if is a pvp combat
local who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags = ...
if (who_serial) then --aqui ir� identificar o boss ou o oponente
if (alvo_name and _bit_band (alvo_flags, REACTION_HOSTILE) ~= 0) then --tentando pegar o inimigo pelo alvo
if (alvo_name and bitBand (alvo_flags, REACTION_HOSTILE) ~= 0) then --tentando pegar o inimigo pelo alvo
combatObject.contra = alvo_name
if (_bit_band (alvo_flags, CONTROL_PLAYER) ~= 0) then
if (bitBand (alvo_flags, CONTROL_PLAYER) ~= 0) then
combatObject.pvp = true --o alvo � da fac��o oposta ou foi dado mind control
end
elseif (who_name and _bit_band (who_flags, REACTION_HOSTILE) ~= 0) then --tentando pegar o inimigo pelo who caso o mob � quem deu o primeiro hit
elseif (who_name and bitBand (who_flags, REACTION_HOSTILE) ~= 0) then --tentando pegar o inimigo pelo who caso o mob � quem deu o primeiro hit
combatObject.contra = who_name
if (_bit_band (who_flags, CONTROL_PLAYER) ~= 0) then
if (bitBand (who_flags, CONTROL_PLAYER) ~= 0) then
combatObject.pvp = true --o who � da fac��o oposta ou foi dado mind control
end
else
@@ -763,9 +763,9 @@ end
function classCombat:seta_data(tipo)
if (tipo == Details._detalhes_props.DATA_TYPE_START) then
self.data_inicio = _date("%H:%M:%S")
self.data_inicio = date("%H:%M:%S")
elseif (tipo == Details._detalhes_props.DATA_TYPE_END) then
self.data_fim = _date("%H:%M:%S")
self.data_fim = date("%H:%M:%S")
end
end
classes/class_damage.lua
+1 -1
View File
@@ -6200,7 +6200,7 @@ end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--core functions
--limpa as tabelas tempor�rias ao resetar
--limpa as tabelas tempor�rias ao ResetAllCombatData
function damageClass:ClearTempTables()
for i = #ntable, 1, -1 do
ntable [i] = nil
classes/class_instance.lua
+1 -1
View File
@@ -3733,7 +3733,7 @@ function _detalhes:envia_relatorio (linhas, custom)
end
--adicionar o tempo de luta
--add the combat time
local segmentTime = ""
if (combatObject) then
local combatTime = combatObject:GetCombatTime()
classes/container_segments.lua
+33 -27
View File
@@ -11,18 +11,19 @@ local addonName, Details222 = ...
local combatClass = Details.combate
local segmentClass = Details.historico
local timeMachine = Details.timeMachine
local bitBand = bit.band
------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--API
--reset only the overall data
function Details:ResetSegmentOverallData()
return segmentClass:resetar_overall()
return segmentClass:ResetOverallData()
end
--reset segments and overall data
function Details:ResetSegmentData()
return segmentClass:resetar()
return segmentClass:ResetAllCombatData()
end
--returns the current active segment
@@ -89,7 +90,7 @@ function segmentClass:adicionar_overall(combatObject)
for index, combat in ipairs(Details.tabela_historico.tabelas) do
combat.overall_added = false
end
segmentClass:resetar_overall()
segmentClass:ResetOverallData()
end
end
end
@@ -201,7 +202,7 @@ function Details:CanAddCombatToOverall (tabela)
end
--raid boss - flag 0x1
if (bit.band(Details.overall_flag, 0x1) ~= 0) then
if (bitBand(Details.overall_flag, 0x1) ~= 0) then
if (tabela.is_boss and tabela.instance_type == "raid" and not tabela.is_pvp) then
if (tabela:GetCombatTime() >= 30) then
return true
@@ -210,28 +211,28 @@ function Details:CanAddCombatToOverall (tabela)
end
--raid trash - flag 0x2
if (bit.band(Details.overall_flag, 0x2) ~= 0) then
if (bitBand(Details.overall_flag, 0x2) ~= 0) then
if (tabela.is_trash and tabela.instance_type == "raid") then
return true
end
end
--dungeon boss - flag 0x4
if (bit.band(Details.overall_flag, 0x4) ~= 0) then
if (bitBand(Details.overall_flag, 0x4) ~= 0) then
if (tabela.is_boss and tabela.instance_type == "party" and not tabela.is_pvp) then
return true
end
end
--dungeon trash - flag 0x8
if (bit.band(Details.overall_flag, 0x8) ~= 0) then
if (bitBand(Details.overall_flag, 0x8) ~= 0) then
if ((tabela.is_trash or tabela.is_mythic_dungeon_trash) and tabela.instance_type == "party") then
return true
end
end
--any combat
if (bit.band(Details.overall_flag, 0x10) ~= 0) then
if (bitBand(Details.overall_flag, 0x10) ~= 0) then
return true
end
@@ -245,7 +246,7 @@ end
---add the combat to the segment table, check adding to overall
---@param combatObject combat
function segmentClass:adicionar(combatObject)
function segmentClass:AddCombat(combatObject)
---@type combat[]
local segmentTable = self.tabelas
---@type number
@@ -263,7 +264,7 @@ function segmentClass:adicionar(combatObject)
end
--add to the first index of the segment table
tinsert(segmentTable, 1, combatObject)
table.insert(segmentTable, 1, combatObject)
--count boss tries
---@type string
@@ -354,9 +355,11 @@ function segmentClass:adicionar(combatObject)
end
--remove
thirdCombat = tremove(segmentTable, 3)
Details:DestroyCombat(thirdCombat)
Details:SendEvent("DETAILS_DATA_SEGMENTREMOVED")
local combatObjectRemoved = table.remove(segmentTable, 3)
if (combatObjectRemoved) then
Details:DestroyCombat(thirdCombat)
Details:SendEvent("DETAILS_DATA_SEGMENTREMOVED")
end
end
end
end
@@ -365,9 +368,9 @@ function segmentClass:adicionar(combatObject)
--check if the segment table is full
if (#segmentTable > maxSegmentsAllowed) then
---@type combat
local combatObjectRemoved
local combatObjectToBeRemoved
---@type number
local segmentIdRemoved
local segmentIdToBeRemoved
--verify if the last combat is a boss and if there's more bosses with the same bossId in the segment table
--then check which combat has the least amount of elapsed time and remove it
@@ -396,33 +399,36 @@ function segmentClass:adicionar(combatObject)
end
if (shorterCombatObject) then
combatObjectRemoved = shorterCombatObject
segmentIdRemoved = shorterSegmentId
combatObjectToBeRemoved = shorterCombatObject
segmentIdToBeRemoved = shorterSegmentId
end
end
--if couldn't find a boss to remove, then remove the oldest segment
if (not combatObjectRemoved) then
combatObjectRemoved = segmentTable[#segmentTable]
segmentIdRemoved = #segmentTable
if (not combatObjectToBeRemoved) then
combatObjectToBeRemoved = segmentTable[#segmentTable]
segmentIdToBeRemoved = #segmentTable
end
--check time machine
for _, actorObject in combatObjectRemoved:GetContainer(DETAILS_ATTRIBUTE_DAMAGE):ListActors() do
for _, actorObject in combatObjectToBeRemoved:GetContainer(DETAILS_ATTRIBUTE_DAMAGE):ListActors() do
if (actorObject.timeMachine) then
actorObject:DesregistrarNaTimeMachine()
end
end
for _, actorObject in combatObjectRemoved:GetContainer(DETAILS_ATTRIBUTE_HEAL):ListActors() do
for _, actorObject in combatObjectToBeRemoved:GetContainer(DETAILS_ATTRIBUTE_HEAL):ListActors() do
if (actorObject.timeMachine) then
actorObject:DesregistrarNaTimeMachine()
end
end
--remove it
combatObjectRemoved = tremove(segmentTable, segmentIdRemoved)
Details:DestroyCombat(combatObjectRemoved)
Details:SendEvent("DETAILS_DATA_SEGMENTREMOVED")
---@type combat
local combatObjectRemoved = table.remove(segmentTable, segmentIdToBeRemoved)
if (combatObjectRemoved) then
Details:DestroyCombat(combatObjectRemoved)
Details:SendEvent("DETAILS_DATA_SEGMENTREMOVED")
end
end
--update the combat shown on all instances
@@ -462,7 +468,7 @@ function Details:SetOverallResetOptions(resetOnNewBoss, resetOnNewChallenge, res
Details.overall_clear_pvp = resetOnNewPVP
end
function segmentClass:resetar_overall()
function segmentClass:ResetOverallData()
Details:CloseBreakdownWindow()
Details:DestroyCombat(Details.tabela_overall)
@@ -487,7 +493,7 @@ function segmentClass:resetar_overall()
Details:ClockPluginTickOnSegment()
end
function segmentClass:resetar()
function segmentClass:ResetAllCombatData()
if (Details.bosswindow) then
Details.bosswindow:Reset()
end