Skip to content

Commit 6f4e95b

Browse files
authored
Only apply combustion fire resistance effect with skills that can ignite (#6320)
* Only apply combustion fire resistance effect with skills that can ignite * Handle combustion in calcPerform instead * Include a source
1 parent 30c5f90 commit 6f4e95b

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

src/Data/Skills/sup_int.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ skills["SupportChanceToIgnite"] = {
963963
mod("FireDamage", "MORE", nil),
964964
},
965965
["ignites_apply_fire_resistance_+"] = {
966-
mod("FireResist", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Combustion" }, { type = "Condition", var = "Ignited" }),
966+
mod("CombustionFireResist", "BASE", nil),
967967
},
968968
},
969969
qualityStats = {

src/Modules/CalcPerform.lua

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2011,6 +2011,8 @@ function calcs.perform(env, avoidCache, fullDPSSkipEHP)
20112011
end
20122012
end
20132013
end
2014+
2015+
local appliedCombustion = false
20142016
for _, activeSkill in ipairs(env.player.activeSkillList) do
20152017
local skillModList = activeSkill.skillModList
20162018
local skillCfg = activeSkill.skillCfg
@@ -2244,6 +2246,19 @@ function calcs.perform(env, avoidCache, fullDPSSkipEHP)
22442246
local effect = activeSkill.minion and 6 or m_floor(6 * (1 + modDB:Sum("INC", nil, "WitherEffect") / 100))
22452247
modDB:NewMod("WitherEffectStack", "MAX", effect)
22462248
end
2249+
--Handle combustion
2250+
if activeSkill.activeEffect.grantedEffect.name ~= "Arcanist Brand" and not appliedCombustion then
2251+
for _, support in ipairs(activeSkill.supportList) do
2252+
if support.gemData.name == "Combustion" then
2253+
if not activeSkill.skillModList:Flag(activeSkill.skillCfg, "CannotIgnite") then
2254+
local value = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "CombustionFireResist")
2255+
enemyDB:NewMod("FireResist", "BASE", value, "Combustion", { type = "GlobalEffect", effectType = "Debuff", effectName = "Combustion" }, { type = "Condition", var = "Ignited" })
2256+
appliedCombustion = true
2257+
end
2258+
break
2259+
end
2260+
end
2261+
end
22472262
if activeSkill.minion and activeSkill.minion.activeSkillList then
22482263
local castingMinion = activeSkill.minion
22492264
for _, activeSkill in ipairs(activeSkill.minion.activeSkillList) do

0 commit comments

Comments
 (0)