Skip to content
This repository was archived by the owner on Oct 21, 2025. It is now read-only.

Add support for all damage conversion (like Avatar of Fire) #53

Merged
merged 1 commit into from
Jan 19, 2025
Merged

Add support for all damage conversion (like Avatar of Fire) #53

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
7 changes: 5 additions & 2 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1819,9 +1819,12 @@ function calcs.offence(env, actor, activeSkill)
for _, toType in ipairs(dmgTypeList) do
local conv
if skill then
conv = m_max(skillModList:Sum("BASE", skillCfg, "Skill"..fromType.."DamageConvertTo"..toType), 0)
conv = m_max(skillModList:Sum("BASE", skillCfg,
"SkillDamageConvertTo"..toType,
"Skill"..fromType.."DamageConvertTo"..toType), 0)
else
conv = m_max(skillModList:Sum("BASE", skillCfg,
"DamageConvertTo"..toType,
fromType.."DamageConvertTo"..toType,
isElemental[fromType] and "ElementalDamageConvertTo"..toType or nil,
fromType ~= "Chaos" and "NonChaosDamageConvertTo"..toType or nil), 0)
Expand Down Expand Up @@ -3033,7 +3036,7 @@ function calcs.offence(env, actor, activeSkill)
local gainedMin, gainedMax = calcGainedDamage(activeSkill, output, cfg, damageType)
local baseMin = output[damageTypeMin.."Base"]
local baseMax = output[damageTypeMax.."Base"]
local summedMin = baseMin * convMult + convertedMin + gainedMin
local summedMin = baseMin * convMult + convertedMin + gainedMin
local summedMax = baseMax * convMult + convertedMax + gainedMax
output[damageType.."SummedMinBase"] = m_floor(summedMin)
output[damageType.."SummedMaxBase"] = m_floor(summedMax)
Expand Down
Loading