Skip to content

Fix Damage conversion / gain calcs #1374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2025
Merged

Fix Damage conversion / gain calcs #1374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,11 @@ local function calcConvertedDamage(activeSkill, output, cfg, damageType)
local conversionTable = activeSkill.conversionTable
for _, otherType in ipairs(dmgTypeList) do
local convMult = conversionTable[otherType][damageType]
local moreMinDamage = skillModList:More(cfg, "Min"..otherType.."Damage")
local moreMaxDamage = skillModList:More(cfg, "Max"..otherType.."Damage")
if convMult > 0 then
-- Damage is being converted/gained from the other damage type
local min, max = output[otherType.."MinBase"], output[otherType.."MaxBase"]
convertedMin = convertedMin + (min or 0) * convMult * moreMinDamage
convertedMax = convertedMax + (max or 0) * convMult * moreMaxDamage
convertedMin = convertedMin + (min or 0) * convMult
convertedMax = convertedMax + (max or 0) * convMult
end
end
if convertedMin ~= 0 and convertedMax ~= 0 then
Expand All @@ -90,12 +88,12 @@ local function calcGainedDamage(activeSkill, output, cfg, damageType)

local gainedMin, gainedMax = 0, 0
for _, otherType in ipairs(dmgTypeList) do
local baseMin = m_floor(output[otherType.."MinBase"])
local baseMax = m_floor(output[otherType.."MaxBase"])
local baseMin = m_floor(output[otherType.."MinBase"] * activeSkill.skillConversionTable[otherType].mult)
local baseMax = m_floor(output[otherType.."MaxBase"] * activeSkill.skillConversionTable[otherType].mult)
local gainMult = gainTable[otherType][damageType]
if gainMult and gainMult > 0 then
-- Damage is being converted/gained from the other damage type
local convertedMin, convertedMax = calcConvertedDamage(activeSkill, cfg, output, otherType)
local convertedMin, convertedMax = calcConvertedDamage(activeSkill, output, cfg, otherType)
gainedMin = gainedMin + (baseMin + convertedMin) * gainMult
gainedMax = gainedMax + (baseMax + convertedMax) * gainMult
end
Expand Down Expand Up @@ -2047,15 +2045,18 @@ function calcs.offence(env, actor, activeSkill)
end

-- Calculate damage conversion percentages
activeSkill.skillConversionTable = wipeTable(activeSkill.skillConversionTable)
activeSkill.conversionTable = wipeTable(activeSkill.conversionTable)
activeSkill.gainTable = wipeTable(activeSkill.gainTable)

-- Initialize conversion tables
for _, type in ipairs(dmgTypeList) do
activeSkill.skillConversionTable[type] = {}
activeSkill.conversionTable[type] = {}
activeSkill.gainTable[type] = {}
for _, otherType in ipairs(dmgTypeList) do
activeSkill.conversionTable[type][otherType] = 0
activeSkill.skillConversionTable[type][otherType] = 0
end
end

Expand Down Expand Up @@ -2102,6 +2103,7 @@ function calcs.offence(env, actor, activeSkill)
activeSkill.conversionTable[damageType][toType] = amount
end
activeSkill.conversionTable[damageType].mult = 1 - m_min(skillTotal / 100, 1)
activeSkill.skillConversionTable[damageType].mult = 1 - m_min(skillTotal / 100, 1)
end

-- Second step: Process global conversion and gains
Expand Down