Skip to content

Fix Brand attachment duration not being scaled by Temporal Chains #8796

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 1 commit into from
Jul 8, 2025
Merged

Fix Brand attachment duration not being scaled by Temporal Chains #8796

Show file tree
Hide file tree
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
17 changes: 15 additions & 2 deletions src/Data/Skills/act_int.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,9 @@ skills["BrandSupport"] = {
duration = true,
brand = true,
},
baseMods = {
skill("debuff", true),
},
qualityStats = {
Default = {
{ "sigil_repeat_frequency_+%", 0.5 },
Expand Down Expand Up @@ -832,6 +835,7 @@ skills["ArmageddonBrand"] = {
},
baseMods = {
skill("radiusSecondary", 8),
skill("debuff", true),
},
qualityStats = {
Default = {
Expand Down Expand Up @@ -1013,6 +1017,9 @@ skills["ArmageddonBrandAltY"] = {
duration = true,
brand = true,
},
baseMods = {
skill("debuff", true),
},
qualityStats = {
Default = {
{ "active_skill_base_area_of_effect_radius", 0.1 },
Expand Down Expand Up @@ -13258,6 +13265,7 @@ skills["PenanceBrandAltX"] = {
baseMods = {
skill("radius", 28),
mod("Multiplier:PenanceBrandofDissipationMaxStages", "BASE", 20, 0, 0, { type = "SkillPart", skillPart = 1 }),
skill("debuff", true),
},
qualityStats = {
Default = {
Expand Down Expand Up @@ -13352,6 +13360,7 @@ skills["PenanceBrandAltY"] = {
baseMods = {
skill("radius", 28),
skill("showAverage", true),
skill("debuff", true),
},
qualityStats = {
Default = {
Expand Down Expand Up @@ -16550,6 +16559,7 @@ skills["StormBrand"] = {
},
baseMods = {
skill("radius", 9),
skill("debuff", true),
},
qualityStats = {
Default = {
Expand Down Expand Up @@ -16648,6 +16658,7 @@ skills["StormBrandAltX"] = {
},
baseMods = {
skill("radius", 9),
skill("debuff", true),
},
qualityStats = {
Default = {
Expand Down Expand Up @@ -20162,13 +20173,14 @@ skills["WintertideBrand"] = {
activeSkill.skillData.hitTimeOverride = activeSkill.skillData.repeatFrequency / (1 + activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "Speed", "BrandActivationFrequency") / 100) / activeSkill.skillModList:More(activeSkill.skillCfg, "BrandActivationFrequency")
if activeSkill.skillPart == 2 then
local skillMaxStages = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:WintertideBrandMaxStages")
local duration = calcSkillDuration(activeSkill.skillModList, activeSkill.skillCfg, activeSkill.skillData, {})
local debuffDurationMult = 1 / math.max(data.misc.BuffExpirationSlowCap, calcLib.mod(activeSkill.actor.enemy.modDB, activeSkill.skillCfg, "BuffExpireFaster"))
local duration = calcSkillDuration(activeSkill.skillModList, activeSkill.skillCfg, activeSkill.skillData, {}) * debuffDurationMult
local maxStages = math.min(duration / activeSkill.skillData.hitTimeOverride + 1, skillMaxStages)
local timeToReachMaxStages = (maxStages - 1) * activeSkill.skillData.hitTimeOverride
local timeAtMaxStages = duration - timeToReachMaxStages
local damagePerStage = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:WintertideBrandDamagePerStage")
-- Get the average damage before reaching max stages and then damage at max stages
local dpsMultiplier = ((2 + damagePerStage + maxStages * damagePerStage)/2*timeToReachMaxStages+timeAtMaxStages*(1+maxStages*damagePerStage))/duration
local dpsMultiplier = ((2 + damagePerStage + maxStages * damagePerStage) / 2 * timeToReachMaxStages + timeAtMaxStages * (1 + maxStages * damagePerStage)) / duration
activeSkill.skillModList:NewMod("Damage", "MORE", dpsMultiplier, "Wintertide Brand Average Multiplier")
end
end,
Expand Down Expand Up @@ -20204,6 +20216,7 @@ skills["WintertideBrand"] = {
},
baseMods = {
skill("radius", 20),
skill("debuff", true),
skill("debuffTertiary", true),
},
qualityStats = {
Expand Down
13 changes: 11 additions & 2 deletions src/Export/Skills/act_int.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ local skills, mod, flag, skill = ...
preDamageFunc = function(activeSkill, output)
activeSkill.skillData.hitTimeOverride = activeSkill.skillData.repeatFrequency / (1 + activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "Speed", "BrandActivationFrequency") / 100) / activeSkill.skillModList:More(activeSkill.skillCfg, "BrandActivationFrequency")
end,
#baseMod skill("debuff", true)
#mods

#skill SupportBrandSupport
Expand Down Expand Up @@ -110,6 +111,7 @@ local skills, mod, flag, skill = ...
},
},
#baseMod skill("radiusSecondary", 8)
#baseMod skill("debuff", true)
#mods

#skill ArmageddonBrandAltX
Expand All @@ -129,6 +131,7 @@ local skills, mod, flag, skill = ...
["base_skill_show_average_damage_instead_of_dps"] = {
},
},
#baseMod skill("debuff", true)
#mods

#skill AssassinsMark
Expand Down Expand Up @@ -2939,6 +2942,7 @@ local skills, mod, flag, skill = ...
},
#baseMod skill("radius", 28)
#baseMod mod("Multiplier:PenanceBrandofDissipationMaxStages", "BASE", 20, 0, 0, { type = "SkillPart", skillPart = 1 })
#baseMod skill("debuff", true)
#mods

#skill PenanceBrandAltY
Expand All @@ -2948,6 +2952,7 @@ local skills, mod, flag, skill = ...
end,
#baseMod skill("radius", 28)
#baseMod skill("showAverage", true)
#baseMod skill("debuff", true)
#mods

#skill PowerSiphon
Expand Down Expand Up @@ -3553,6 +3558,7 @@ local skills, mod, flag, skill = ...
},
},
#baseMod skill("radius", 9)
#baseMod skill("debuff", true)
#mods

#skill StormBrandAltX
Expand All @@ -3565,6 +3571,7 @@ local skills, mod, flag, skill = ...
},
},
#baseMod skill("radius", 9)
#baseMod skill("debuff", true)
#mods

#skill StormblastMine
Expand Down Expand Up @@ -4168,13 +4175,14 @@ local skills, mod, flag, skill = ...
activeSkill.skillData.hitTimeOverride = activeSkill.skillData.repeatFrequency / (1 + activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "Speed", "BrandActivationFrequency") / 100) / activeSkill.skillModList:More(activeSkill.skillCfg, "BrandActivationFrequency")
if activeSkill.skillPart == 2 then
local skillMaxStages = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:WintertideBrandMaxStages")
local duration = calcSkillDuration(activeSkill.skillModList, activeSkill.skillCfg, activeSkill.skillData, {})
local debuffDurationMult = 1 / math.max(data.misc.BuffExpirationSlowCap, calcLib.mod(activeSkill.actor.enemy.modDB, activeSkill.skillCfg, "BuffExpireFaster"))
local duration = calcSkillDuration(activeSkill.skillModList, activeSkill.skillCfg, activeSkill.skillData, {}) * debuffDurationMult
local maxStages = math.min(duration / activeSkill.skillData.hitTimeOverride + 1, skillMaxStages)
local timeToReachMaxStages = (maxStages - 1) * activeSkill.skillData.hitTimeOverride
local timeAtMaxStages = duration - timeToReachMaxStages
local damagePerStage = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:WintertideBrandDamagePerStage")
-- Get the average damage before reaching max stages and then damage at max stages
local dpsMultiplier = ((2 + damagePerStage + maxStages * damagePerStage)/2*timeToReachMaxStages+timeAtMaxStages*(1+maxStages*damagePerStage))/duration
local dpsMultiplier = ((2 + damagePerStage + maxStages * damagePerStage) / 2 * timeToReachMaxStages + timeAtMaxStages * (1 + maxStages * damagePerStage)) / duration
activeSkill.skillModList:NewMod("Damage", "MORE", dpsMultiplier, "Wintertide Brand Average Multiplier")
end
end,
Expand Down Expand Up @@ -4203,6 +4211,7 @@ local skills, mod, flag, skill = ...
},
},
#baseMod skill("radius", 20)
#baseMod skill("debuff", true)
#baseMod skill("debuffTertiary", true)
#mods

Expand Down
2 changes: 1 addition & 1 deletion src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2297,7 +2297,7 @@ function calcs.offence(env, actor, activeSkill)
output.HitSpeed = 1 / output.HitTime
--Brands always have hitTimeOverride
if activeSkill.skillTypes[SkillType.Brand] and not skillModList:Flag(nil, "UnlimitedBrandDuration") then
output.BrandTicks = m_floor(output.Duration * output.HitSpeed)
output.BrandTicks = m_floor(output.Duration * output.HitSpeed * debuffDurationMult)
end
elseif skillData.hitTimeMultiplier and output.Time and not skillData.triggeredOnDeath then
output.HitTime = output.Time * skillData.hitTimeMultiplier
Expand Down