Skip to content

Add support for Wintertide Brand average DOT calculation #6868

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
Wires77 merged 2 commits into from
Jun 12, 2025
Merged

Add support for Wintertide Brand average DOT calculation #6868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
732a6f3
Add support for Wintertide Brand average DOT calculation
czarandy Nov 19, 2023
ceeaf46
Merge remote-tracking branch 'fork/dev' into czarandy/dev
Wires77 Jun 12, 2025
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
24 changes: 23 additions & 1 deletion src/Data/Skills/act_int.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19197,12 +19197,34 @@ skills["WintertideBrand"] = {
castTime = 0.7,
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")
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 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
activeSkill.skillModList:NewMod("Damage", "MORE", dpsMultiplier, "Wintertide Brand Average Multiplier")
end
end,
parts = {
{
name = "Manual Stages",
stages = true
},
{
name = "Average Damage",
}
},
statMap = {
["base_skill_show_average_damage_instead_of_dps"] = {
},
["immolation_brand_burn_damage_+%_final_per_stage"] = {
mod("Damage", "MORE", nil, 0, 0, { type = "Multiplier", var = "WintertideBrandStage", limitVar = "WintertideBrandMaxStages" }),
-- Only apply to Manual Stages part
mod("Damage", "MORE", nil, 0, 0, { type = "Multiplier", var = "WintertideBrandStage", limitVar = "WintertideBrandMaxStages" }, { type = "SkillPart", skillPart = 1 }),
mod("Multiplier:WintertideBrandDamagePerStage", "BASE", nil),
},
["winter_brand_max_number_of_stages"] = {
mod("Multiplier:WintertideBrandMaxStages", "BASE", nil),
Expand Down
26 changes: 24 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 @@ -4083,12 +4083,34 @@ local skills, mod, flag, skill = ...
#flags spell area duration brand
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")
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 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
activeSkill.skillModList:NewMod("Damage", "MORE", dpsMultiplier, "Wintertide Brand Average Multiplier")
end
end,
parts = {
{
name = "Manual Stages",
stages = true
},
{
name = "Average Damage",
}
},
statMap = {
["base_skill_show_average_damage_instead_of_dps"] = {
},
["immolation_brand_burn_damage_+%_final_per_stage"] = {
mod("Damage", "MORE", nil, 0, 0, { type = "Multiplier", var = "WintertideBrandStage", limitVar = "WintertideBrandMaxStages" }),
-- Only apply to Manual Stages part
mod("Damage", "MORE", nil, 0, 0, { type = "Multiplier", var = "WintertideBrandStage", limitVar = "WintertideBrandMaxStages" }, { type = "SkillPart", skillPart = 1 }),
mod("Multiplier:WintertideBrandDamagePerStage", "BASE", nil),
},
["winter_brand_max_number_of_stages"] = {
mod("Multiplier:WintertideBrandMaxStages", "BASE", nil),
Expand Down Expand Up @@ -4148,4 +4170,4 @@ local skills, mod, flag, skill = ...
},
},
#baseMod skill("radius", 40)
#mods
#mods