Skip to content
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

Jump to bottom

Add proper support for DPS with Scourge Arrow, Divine Ire, Flameblast and Incinerate #6245

Merged
merged 3 commits into from
Aug 13, 2023
Merged

Add proper support for DPS with Scourge Arrow, Divine Ire, Flameblast and Incinerate #6245

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
8c6ff7b
Add proper support for DPS with Channeled skills that use stages
May 31, 2023
6269584
Fix breakdowns
Aug 8, 2023
5ced695
Merge branch 'dev' into add_channel-stages-dps
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
4 changes: 2 additions & 2 deletions src/Data/Skills/act_dex.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7999,8 +7999,8 @@ skills["ScourgeArrow"] = {
},
statDescriptionScope = "skill_stat_descriptions",
castTime = 1,
initialFunc = function(activeSkill, output)
activeSkill.skillData.dpsMultiplier = 1 / math.max(activeSkill.skillModList:Sum("BASE", cfg, "Multiplier:ScourgeArrowStage"), 1)
preDamageFunc = function(activeSkill, output)
activeSkill.skillData.hitTimeMultiplier = math.max(activeSkill.skillModList:Sum("BASE", cfg, "Multiplier:ScourgeArrowStage") - 0.5, 0.5) --First stage takes 0.5x time to channel compared to subsequent stages
end,
parts = {
{
Expand Down
20 changes: 16 additions & 4 deletions src/Data/Skills/act_int.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2789,6 +2789,11 @@ skills["DivineTempest"] = {
skillTypes = { [SkillType.Spell] = true, [SkillType.Area] = true, [SkillType.Damage] = true, [SkillType.Channel] = true, [SkillType.Lightning] = true, [SkillType.Totemable] = true, [SkillType.AreaSpell] = true, [SkillType.Physical] = true, },
statDescriptionScope = "skill_stat_descriptions",
castTime = 0.22,
preDamageFunc = function(activeSkill, output)
local skillCfg = activeSkill.skillCfg
local skillModList = activeSkill.skillModList
activeSkill.skillData.hitTimeMultiplier = math.max(skillModList:Sum("BASE", skillCfg, "Multiplier:DivineIreStage") / (1 + skillModList:Sum("BASE", skillCfg, "Multiplier:DivineIreUniqueEnemyCount") + skillModList:Sum("BASE", skillCfg, "NormalEnemyHitMultiplier") * skillModList:Sum("BASE", skillCfg, "Multiplier:DivineIreNormalEnemyCount")), 1)
end,
parts = {
{
name = "Channelling",
Expand All @@ -2810,13 +2815,16 @@ skills["DivineTempest"] = {
["divine_tempest_ailment_damage_+%_final_per_stage"] = {
mod("Damage", "MORE", nil, 0, KeywordFlag.Ailment, { type = "Multiplier", var = "DivineIreStageAfterFirst" }),
},
["divine_tempest_stage_on_hitting_normal_magic_%_chance"] = {
mod("NormalEnemyHitMultiplier", "BASE", nil),
div = 100
},
},
baseFlags = {
spell = true,
area = true,
},
baseMods = {
skill("showAverage", true, { type = "SkillPart", skillPart = 2 }),
mod("Multiplier:DivineIreMaxStages", "BASE", 20, 0, 0, { type = "SkillPart", skillPart = 2 }),
skill("radius", 38),
},
Expand Down Expand Up @@ -4059,6 +4067,9 @@ skills["Flameblast"] = {
skillTypes = { [SkillType.Spell] = true, [SkillType.Damage] = true, [SkillType.Area] = true, [SkillType.Totemable] = true, [SkillType.Fire] = true, [SkillType.Channel] = true, [SkillType.AreaSpell] = true, [SkillType.Cooldown] = true, },
statDescriptionScope = "skill_stat_descriptions",
castTime = 0.2,
preDamageFunc = function(activeSkill, output)
activeSkill.skillData.hitTimeMultiplier = math.max(activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:FlameblastStage") - activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:FlameblastMinimumStage"), 1)
end,
statMap = {
["charged_blast_spell_damage_+%_final_per_stack"] = {
mod("Damage", "MORE", nil, ModFlag.Hit, 0, { type = "Multiplier", var = "FlameblastStage" }),
Expand All @@ -4084,8 +4095,7 @@ skills["Flameblast"] = {
},
baseMods = {
skill("radius", 2),
skill("showAverage", true),
mod("PvpTvalueMultiplier", "MORE", 100, 0, 0, { type = "Multiplier", var = "FlameblastStage" }),
mod("PvpTvalueMultiplier", "MORE", 100, 0, 0, { type = "Multiplier", var = "FlameblastStageAfterFirst" }),
},
qualityStats = {
Default = {
Expand Down Expand Up @@ -6186,6 +6196,9 @@ skills["ExpandingFireCone"] = {
skillTypes = { [SkillType.Spell] = true, [SkillType.Damage] = true, [SkillType.Totemable] = true, [SkillType.Fire] = true, [SkillType.Channel] = true, [SkillType.Area] = true, [SkillType.AreaSpell] = true, [SkillType.Cooldown] = true, },
statDescriptionScope = "skill_stat_descriptions",
castTime = 0.2,
preDamageFunc = function(activeSkill, output)
activeSkill.skillData.hitTimeMultiplier = math.max(activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:IncinerateStage") - activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:IncinerateMinimumStage") - 0.4175, 0.5825) --First stage takes 0.5825x time to channel compared to subsequent stages
end,
parts = {
{
name = "Channelling",
Expand Down Expand Up @@ -6231,7 +6244,6 @@ skills["ExpandingFireCone"] = {
area = true,
},
baseMods = {
skill("showAverage", true, { type = "SkillPart", skillPart = 2 }),
skill("radius", 25),
skill("radiusLabel", "Flame Length:"),
skill("radiusSecondary", 20),
Expand Down
4 changes: 2 additions & 2 deletions src/Export/Skills/act_dex.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,8 +1561,8 @@ local skills, mod, flag, skill = ...

#skill ScourgeArrow
#flags attack projectile
initialFunc = function(activeSkill, output)
activeSkill.skillData.dpsMultiplier = 1 / math.max(activeSkill.skillModList:Sum("BASE", cfg, "Multiplier:ScourgeArrowStage"), 1)
preDamageFunc = function(activeSkill, output)
activeSkill.skillData.hitTimeMultiplier = math.max(activeSkill.skillModList:Sum("BASE", cfg, "Multiplier:ScourgeArrowStage") - 0.5, 0.5) --First stage takes 0.5x time to channel compared to subsequent stages
end,
parts = {
{
Expand Down
20 changes: 16 additions & 4 deletions src/Export/Skills/act_int.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,11 @@ local skills, mod, flag, skill = ...

#skill DivineTempest
#flags spell area
preDamageFunc = function(activeSkill, output)
local skillCfg = activeSkill.skillCfg
local skillModList = activeSkill.skillModList
activeSkill.skillData.hitTimeMultiplier = math.max(skillModList:Sum("BASE", skillCfg, "Multiplier:DivineIreStage") / (1 + skillModList:Sum("BASE", skillCfg, "Multiplier:DivineIreUniqueEnemyCount") + skillModList:Sum("BASE", skillCfg, "NormalEnemyHitMultiplier") * skillModList:Sum("BASE", skillCfg, "Multiplier:DivineIreNormalEnemyCount")), 1)
end,
parts = {
{
name = "Channelling",
Expand All @@ -652,8 +657,11 @@ local skills, mod, flag, skill = ...
["divine_tempest_ailment_damage_+%_final_per_stage"] = {
mod("Damage", "MORE", nil, 0, KeywordFlag.Ailment, { type = "Multiplier", var = "DivineIreStageAfterFirst" }),
},
["divine_tempest_stage_on_hitting_normal_magic_%_chance"] = {
mod("NormalEnemyHitMultiplier", "BASE", nil),
div = 100
},
},
#baseMod skill("showAverage", true, { type = "SkillPart", skillPart = 2 })
#baseMod mod("Multiplier:DivineIreMaxStages", "BASE", 20, 0, 0, { type = "SkillPart", skillPart = 2 })
#baseMod skill("radius", 38)
#mods
Expand Down Expand Up @@ -882,6 +890,9 @@ local skills, mod, flag, skill = ...

#skill Flameblast
#flags spell area
preDamageFunc = function(activeSkill, output)
activeSkill.skillData.hitTimeMultiplier = math.max(activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:FlameblastStage") - activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:FlameblastMinimumStage"), 1)
end,
statMap = {
["charged_blast_spell_damage_+%_final_per_stack"] = {
mod("Damage", "MORE", nil, ModFlag.Hit, 0, { type = "Multiplier", var = "FlameblastStage" }),
Expand All @@ -902,8 +913,7 @@ local skills, mod, flag, skill = ...
},
},
#baseMod skill("radius", 2)
#baseMod skill("showAverage", true)
#baseMod mod("PvpTvalueMultiplier", "MORE", 100, 0, 0, { type = "Multiplier", var = "FlameblastStage" })
#baseMod mod("PvpTvalueMultiplier", "MORE", 100, 0, 0, { type = "Multiplier", var = "FlameblastStageAfterFirst" })
#mods

#skill VaalFlameblast
Expand Down Expand Up @@ -1367,6 +1377,9 @@ local skills, mod, flag, skill = ...

#skill ExpandingFireCone
#flags spell area
preDamageFunc = function(activeSkill, output)
activeSkill.skillData.hitTimeMultiplier = math.max(activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:IncinerateStage") - activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:IncinerateMinimumStage") - 0.4175, 0.5825) --First stage takes 0.5825x time to channel compared to subsequent stages
end,
parts = {
{
name = "Channelling",
Expand Down Expand Up @@ -1407,7 +1420,6 @@ local skills, mod, flag, skill = ...
--Display Only
},
},
#baseMod skill("showAverage", true, { type = "SkillPart", skillPart = 2 })
#baseMod skill("radius", 25)
#baseMod skill("radiusLabel", "Flame Length:")
#baseMod skill("radiusSecondary", 20)
Expand Down
1 change: 1 addition & 0 deletions src/Modules/Build.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ function buildMode:Init(dbFileName, buildName, buildXML, convertBuild)
{ stat = "Speed", label = "Effective Trigger Rate", fmt = ".2f", compPercent = true, condFunc = function(v,o) return (o.TriggerTime or 0) ~= 0 and o.ServerTriggerRate ~= o.Speed end },
{ stat = "WarcryCastTime", label = "Cast Time", fmt = ".2fs", compPercent = true, lowerIsBetter = true, flag = "warcry" },
{ stat = "HitSpeed", label = "Hit Rate", fmt = ".2f", compPercent = true, condFunc = function(v,o) return not o.TriggerTime end },
{ stat = "HitTime", label = "Channel Time", fmt = ".2fs", compPercent = true, condFunc = function(v,o) return not o.TriggerTime end },
{ stat = "TrapThrowingTime", label = "Trap Throwing Time", fmt = ".2fs", compPercent = true, lowerIsBetter = true, },
{ stat = "TrapCooldown", label = "Trap Cooldown", fmt = ".3fs", lowerIsBetter = true },
{ stat = "MineLayingTime", label = "Mine Throwing Time", fmt = ".2fs", compPercent = true, lowerIsBetter = true, },
Expand Down
53 changes: 50 additions & 3 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2023,7 +2023,7 @@ function calcs.offence(env, actor, activeSkill)
output.Speed = output.Speed * totemActionSpeed
output.CastRate = output.Speed
end
if output.Cooldown then
if output.Cooldown and not activeSkill.skillTypes[SkillType.Channel] then
output.Speed = m_min(output.Speed, 1 / output.Cooldown * output.Repeats)
end
if output.Cooldown and skillFlags.selfCast then
Expand Down Expand Up @@ -2077,9 +2077,14 @@ function calcs.offence(env, actor, activeSkill)
end
elseif skillData.hitTimeMultiplier and output.Time and not skillData.triggeredOnDeath then
output.HitTime = output.Time * skillData.hitTimeMultiplier
output.HitSpeed = 1 / output.HitTime
if output.Cooldown and skillData.triggered then
output.HitSpeed = 1 / (m_max(output.HitTime, output.Cooldown))
elseif output.Cooldown then
output.HitSpeed = 1 / (output.HitTime + output.Cooldown)
else
output.HitSpeed = 1 / output.HitTime
end
end

-- Other Misc DPS multipliers (like custom source)
skillData.dpsMultiplier = ( skillData.dpsMultiplier or 1 ) * ( 1 + skillModList:Sum("INC", cfg, "DPS") / 100 ) * skillModList:More(cfg, "DPS")
if env.configInput.repeatMode == "FINAL" or skillModList:Flag(nil, "OnlyFinalRepeat") then
Expand All @@ -2097,6 +2102,7 @@ function calcs.offence(env, actor, activeSkill)
combineStat("HitChance", "AVERAGE")
combineStat("Speed", "AVERAGE")
combineStat("HitSpeed", "OR")
combineStat("HitTime", "OR")
if output.Speed == 0 then
output.Time = 0
else
Expand All @@ -2114,6 +2120,47 @@ function calcs.offence(env, actor, activeSkill)
}
end
end
if skillData.hitTimeOverride and not skillData.triggeredOnDeath then
output.HitTime = skillData.hitTimeOverride
output.HitSpeed = 1 / output.HitTime
elseif skillData.hitTimeMultiplier and output.Time and not skillData.triggeredOnDeath then
output.HitTime = output.Time * skillData.hitTimeMultiplier
if output.Cooldown and skillData.triggered then
output.HitSpeed = 1 / (m_max(output.HitTime, output.Cooldown))
elseif output.Cooldown then
output.HitSpeed = 1 / (output.HitTime + output.Cooldown)
else
output.HitSpeed = m_min(1 / output.HitTime, data.misc.ServerTickRate)
end
end
end
if breakdown then
if skillData.hitTimeOverride and not skillData.triggeredOnDeath then
breakdown.HitSpeed = { }
t_insert(breakdown.HitSpeed, s_format("1 / %.2f ^8(hit time override)", output.HitTime))
t_insert(breakdown.HitSpeed, s_format("= %.2f", output.HitSpeed))
elseif skillData.hitTimeMultiplier and output.Time and not skillData.triggeredOnDeath then
breakdown.HitTime = { }
if m_floor(skillData.hitTimeMultiplier) ~= skillData.hitTimeMultiplier then
t_insert(breakdown.HitTime, s_format(colorCodes.CUSTOM.."NOTE: First stage has a %.2fx channel time multiplier", skillData.hitTimeMultiplier - m_floor(skillData.hitTimeMultiplier)))
end
if isAttack then
t_insert(breakdown.HitTime, s_format("%.2f ^8(attack time)", output.Time))
else
t_insert(breakdown.HitTime, s_format("%.2f ^8(cast time)", output.Time))
end
t_insert(breakdown.HitTime, s_format("x %.2f ^8(channel time multiplier)", skillData.hitTimeMultiplier))
t_insert(breakdown.HitTime, s_format("= %.2f", output.HitTime))
breakdown.HitSpeed = { }
if output.Cooldown and skillData.triggered then
t_insert(breakdown.HitSpeed, s_format("1 / min(%.2f, %.2f) ^8min(hit time, cooldown)", output.HitTime, output.Cooldown))
elseif output.Cooldown then
t_insert(breakdown.HitSpeed, s_format("1 / (%.2f + %.2f) ^8(hit time + cooldown)", output.HitTime, output.Cooldown))
else
t_insert(breakdown.HitSpeed, s_format("1 / %.2f ^8(hit time)", output.HitTime))
end
t_insert(breakdown.HitSpeed, s_format("= %.2f", output.HitSpeed))
end
end

-- Grab quantity multiplier
Expand Down
2 changes: 2 additions & 0 deletions src/Modules/CalcSections.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,8 @@ return {
{ label = "Adj. Trigger Rate", flag = "triggered", { format = "{2:output:ServerTriggerRate}", { breakdown = "ServerTriggerRate" }, }, },
{ label = "Eff. Trigger Rate", flag = "triggered", notFlag = "noDisplay", { format = "{2:output:Speed}", { breakdown = "Speed" }, }, },
{ label = "Cast time", flag = "spell", notFlag = "triggered", { format = "{2:output:Time}s", }, },
{ label = "Channel time", haveOutput = "HitTime", { format = "{2:output:HitTime}s", { breakdown = "HitTime" } }, },
{ label = "Hit Rate", haveOutput = "HitSpeed", { format = "{2:output:HitSpeed}", { breakdown = "HitSpeed" } }, },
} }
} },
{ 1, "Crit", 1, colorCodes.OFFENCE, {{ defaultCollapsed = false, label = "Crits", data = {
Expand Down
7 changes: 7 additions & 0 deletions src/Modules/ConfigOptions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,13 @@ return {
{ var = "darkPactSkeletonLife", type = "count", label = "Skeleton ^xE05030Life:", ifSkill = "Dark Pact", tooltip = "Sets the maximum ^xE05030Life ^7of the Skeleton that is being targeted.", apply = function(val, modList, enemyModList)
modList:NewMod("SkillData", "LIST", { key = "skeletonLife", value = val }, "Config", { type = "SkillName", skillName = "Dark Pact" })
end },
{ label = "Divine Ire:", ifSkill = "Divine Ire" },
{ var = "divineIreNormalEnemy", type = "count", label = "Normal Enemies in AoE:", tooltip = "# of Normal Enemies in Divine Ire's Channel radius", ifSkill = "Divine Ire", apply = function(val, modList, enemyModList)
modList:NewMod("Multiplier:DivineIreNormalEnemyCount", "BASE", val, "Config")
end },
{ var = "divineIreUniqueEnemy", type = "count", label = "Unique Enemies in AoE:", tooltip = "# of Unique Enemies in Divine Ire's Channel radius", ifSkill = "Divine Ire", apply = function(val, modList, enemyModList)
modList:NewMod("Multiplier:DivineIreUniqueEnemyCount", "BASE", val, "Config")
end },
{ label = "Predator:", ifSkill = "Predator" },
{ var = "deathmarkDeathmarkActive", type = "check", label = "Is the enemy marked with Signal Prey?", ifSkill = "Predator", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:EnemyHasDeathmark", "FLAG", true, "Config")
Expand Down
Loading