Skip to content
Open
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions src/Modules/CalcDefence.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1702,10 +1702,15 @@ function calcs.buildDefenceEstimations(env, actor)
conversionTotal = conversions["total"] + conversions["totalSkill"]
-- Calculate the amount converted/gained as
for _, damageTypeTo in ipairs(dmgTypeList) do
local gainAsPercent = (enemyDB:Sum("BASE", enemyCfg, (damageType.."DamageGainAs"..damageTypeTo)) + conversions[damageTypeTo.."skill"] + conversions[damageTypeTo]) / 100
if gainAsPercent > 0 then
local gainAsPercent = enemyDB:Sum("BASE", enemyCfg, (damageType.."DamageGainAs"..damageTypeTo)) / 100
local conversionPercent = (conversions[damageTypeTo.."skill"] + conversions[damageTypeTo]) / 100
if conversionPercent > 0 and damageType == "Physical" and damageTypeTo ~= "Chaos" then
local physBonus = 1 + data.monsterPhysConversionMultiTable[env.enemyLevel] / 100
conversionPercent = conversionPercent * physBonus
end
if gainAsPercent > 0 or conversionPercent > 0 then
enemyDamageConversion[damageTypeTo] = enemyDamageConversion[damageTypeTo] or { }
enemyDamageConversion[damageTypeTo][damageType] = enemyDamage * gainAsPercent
enemyDamageConversion[damageTypeTo][damageType] = enemyDamage * gainAsPercent + enemyDamage * conversionPercent
end
end
end
Expand Down