Skip to content

Only apply combustion fire resistance effect with skills that can ignite #6320

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 3 commits into from
Aug 13, 2023
Merged

Only apply combustion fire resistance effect with skills that can ignite #6320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56ed792
Only apply combustion fire resistance effect with skills that can ignite
Lilylicious Aug 13, 2023
14f83f1
Handle combustion in calcPerform instead
Lilylicious Aug 13, 2023
bfccac2
Include a source
Lilylicious Aug 13, 2023
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
2 changes: 1 addition & 1 deletion src/Data/Skills/sup_int.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ skills["SupportChanceToIgnite"] = {
mod("FireDamage", "MORE", nil),
},
["ignites_apply_fire_resistance_+"] = {
mod("FireResist", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Combustion" }, { type = "Condition", var = "Ignited" }),
mod("CombustionFireResist", "BASE", nil),
},
},
qualityStats = {
Expand Down
15 changes: 15 additions & 0 deletions src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2011,6 +2011,8 @@ function calcs.perform(env, avoidCache, fullDPSSkipEHP)
end
end
end

local appliedCombustion = false
for _, activeSkill in ipairs(env.player.activeSkillList) do
local skillModList = activeSkill.skillModList
local skillCfg = activeSkill.skillCfg
Expand Down Expand Up @@ -2244,6 +2246,19 @@ function calcs.perform(env, avoidCache, fullDPSSkipEHP)
local effect = activeSkill.minion and 6 or m_floor(6 * (1 + modDB:Sum("INC", nil, "WitherEffect") / 100))
modDB:NewMod("WitherEffectStack", "MAX", effect)
end
--Handle combustion
if activeSkill.activeEffect.grantedEffect.name ~= "Arcanist Brand" and not appliedCombustion then
for _, support in ipairs(activeSkill.supportList) do
if support.gemData.name == "Combustion" then
if not activeSkill.skillModList:Flag(activeSkill.skillCfg, "CannotIgnite") then
local value = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "CombustionFireResist")
enemyDB:NewMod("FireResist", "BASE", value, "Combustion", { type = "GlobalEffect", effectType = "Debuff", effectName = "Combustion" }, { type = "Condition", var = "Ignited" })
appliedCombustion = true
end
break
end
end
end
if activeSkill.minion and activeSkill.minion.activeSkillList then
local castingMinion = activeSkill.minion
for _, activeSkill in ipairs(activeSkill.minion.activeSkillList) do
Expand Down