Skip to content

Fix Damage "Gain as" when using Conversion mods on gear / tree #1390

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
LocalIdentity merged 1 commit into from
Sep 15, 2025
Merged

Fix Damage "Gain as" when using Conversion mods on gear / tree #1390

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
8 changes: 2 additions & 6 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ 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"] * activeSkill.skillConversionTable[otherType].mult)
local baseMax = m_floor(output[otherType.."MaxBase"] * activeSkill.skillConversionTable[otherType].mult)
local baseMin = m_floor(output[otherType.."MinBase"] * activeSkill.conversionTable[otherType].mult)
local baseMax = m_floor(output[otherType.."MaxBase"] * activeSkill.conversionTable[otherType].mult)
local gainMult = gainTable[otherType][damageType]
if gainMult and gainMult > 0 then
-- Damage is being converted/gained from the other damage type
Expand Down Expand Up @@ -2045,18 +2045,15 @@ 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 @@ -2103,7 +2100,6 @@ 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
Loading