From 76f0691540f99ad8ccb73ae3bd51c83d8c1fc6ca Mon Sep 17 00:00:00 2001 From: MarcelineVQ Date: Tue, 17 Mar 2026 16:02:39 -0700 Subject: [PATCH] dpslog: fix DAMAGE_SPLIT aura offset (0x178->0x16C for client Spell.dbc), fix SPELL_EXTRA_ATTACKS count, DEFLECT note, EXHAUSTED note --- src/dpslog/WeirdUtils_DPSLog/DPSLog.lua | 2 +- src/dpslog/dpslog.zig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dpslog/WeirdUtils_DPSLog/DPSLog.lua b/src/dpslog/WeirdUtils_DPSLog/DPSLog.lua index 0dafadd..39b8272 100644 --- a/src/dpslog/WeirdUtils_DPSLog/DPSLog.lua +++ b/src/dpslog/WeirdUtils_DPSLog/DPSLog.lua @@ -79,7 +79,7 @@ local SUBEVENTS = { { "ENVIRONMENTAL (LAVA)", "ENVIRONMENTAL_DAMAGE", 4, "LAVA" }, { "ENVIRONMENTAL (SLIME)", "ENVIRONMENTAL_DAMAGE", 4, "SLIME" }, { "ENVIRONMENTAL (FIRE)", "ENVIRONMENTAL_DAMAGE", 4, "FIRE" }, - { "ENVIRONMENTAL (EXHAUSTED)", "ENVIRONMENTAL_DAMAGE", 4, "EXHAUSTED" }, + { "ENVIRONMENTAL (EXHAUSTED)", "ENVIRONMENTAL_DAMAGE", 4, "EXHAUSTED" }, -- twow does not implement fatigue damage -- Misses — swing { "SWING_MISSED (MISS)", "SWING_MISSED", 4, "MISS" }, { "SWING_MISSED (DODGE)", "SWING_MISSED", 4, "DODGE" }, diff --git a/src/dpslog/dpslog.zig b/src/dpslog/dpslog.zig index a7b72c6..3f031f1 100644 --- a/src/dpslog/dpslog.zig +++ b/src/dpslog/dpslog.zig @@ -1390,9 +1390,9 @@ fn isEnergizeEffect(e: u32) bool { /// SPELL_AURA_SPLIT_DAMAGE_PCT=81, SPLIT_DAMAGE_FLAT=153, SPLIT_DAMAGE_GROUP_PCT=193 fn isDamageSplitSpell(spell_id: u32) bool { if (getSpellRecord(spell_id)) |rec| { - // EffectApplyAuraName[0..2] at offset 0x178, 0x17C, 0x180 + // EffectApplyAuraName[0..2] at offset 0x16C, 0x170, 0x174 (client Spell.dbc layout) inline for (0..3) |i| { - const aura = hook.readMem(u32, rec + 0x178 + @as(u32, @intCast(i)) * 4); + const aura = hook.readMem(u32, rec + 0x16C + @as(u32, @intCast(i)) * 4); if (aura == 81 or aura == 153 or aura == 193) return true; } }