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

change implementation of extra attacks to 'details' way

Browse Source
This commit is contained in:
andrew6180
2024-12-09 12:08:52 -07:00
parent 1b6370da04
commit 3dfc122946
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.lua
+2
View File
@@ -377,6 +377,8 @@ do
_detalhes.cache_damage_group = {}
_detalhes.cache_healing_group = {}
_detalhes.cache_npc_ids = {}
-- extra attack cache
_detalhes.cache_extra_attack = {}
--cache de specs
_detalhes.cached_specs = {}
_detalhes.cached_talents = {}
core/control.lua
+1 -1
View File
@@ -316,7 +316,6 @@
-- ~start
function Details222.StartCombat(...)
Details.extra_attack = {} -- Reset Extra Attacks tracker ( used in parser.lua 470)
if (Details.debug) then
Details:Msg("(debug) |cFFFFFF00started a new combat|r|cFFFF7700", Details.encounter_table and Details.encounter_table.name or "")
--local from = debugstack(2, 1, 0)
@@ -378,6 +377,7 @@
Details:Destroy(Details.cache_damage_group)
Details:Destroy(Details.cache_healing_group)
Details:Destroy(Details.cache_extra_attack)
local bFromCombatStart = true
Details:UpdateParserGears(bFromCombatStart)
core/parser.lua
+17 -11
View File
@@ -354,8 +354,6 @@
local spell_create_is_summon = {
[34600] = true, -- snake trap
}
Details.extra_attack = Details.extra_attack or {}
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--internal functions
@@ -468,19 +466,27 @@
if (token == "SWING_DAMAGE") then
-- spellType or 00000001 because pets can have different melee damage types.
spellId, spellName, spellType, amount, overkill, school, resisted, blocked, absorbed, critical, glacing, crushing, isoffhand = 1, meleeString, spellType or 00000001, spellId, spellName, spellType, amount, overkill, school, resisted, blocked, absorbed, critical
if Details.combat_log.separate_extra_attacks and Details.extra_attack[sourceSerial] and #(Details.extra_attack[sourceSerial])>0 then
local extraAttackData = Details.extra_attack[sourceSerial][#Details.extra_attack[sourceSerial]]
spellId = extraAttackData[1]
spellName = extraAttackData[2]
extraAttackData[3] = extraAttackData[3] -1 -- Amount of Extra attacks e.x Ironfoe gives 2 attacks
if extraAttackData[3] == 0 then
table.remove(Details.extra_attack[sourceSerial]) -- remove table entry if no extra attacks remain on the proc
if Details.combat_log.separate_extra_attacks then
local extraAttacks = Details.cache_extra_attack[sourceSerial]
local numExtraAttacks = extraAttacks and #extraAttacks
if extraAttacks and numExtraAttacks > 0 then
local extraAttackData = extraAttacks[numExtraAttacks]
spellId = extraAttackData[1]
spellName = extraAttackData[2]
extraAttackData[3] = extraAttackData[3] - 1 -- Amount of Extra attacks e.x Ironfoe gives 2 attacks
if extraAttackData[3] == 0 then
table.remove(extraAttacks) -- remove table entry if no extra attacks remain on the proc
end
end
end
end
if (Details.combat_log.separate_extra_attacks and token == "SPELL_EXTRA_ATTACKS") then
if not Details.extra_attack[sourceSerial] then Details.extra_attack[sourceSerial] = {} end
table.insert(Details.extra_attack[sourceSerial],{spellId,spellName,amount})
local extraAttacks = Details.cache_extra_attack[sourceSerial]
if not extraAttacks then
extraAttacks = {}
Details.cache_extra_attack[sourceSerial] = extraAttacks
end
table.insert(extraAttacks,{ spellId, spellName, amount})
end
if (not targetName) then