Skip to content

Commit f49266e

Browse files
authored
Improve ailment titles (#569)
Updated "Dmg. per {ailment}" row in calcs tab to "Dmg. of all {ailment}s" Also updated "Total damage" and "Average ailment DPS" titles in breakdown of "{ailment} DPS" row tp "Total damage per {ailment}" and "Average {ailment} DPS"
1 parent cf62094 commit f49266e

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/Modules/CalcOffence.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3983,7 +3983,7 @@ function calcs.offence(env, actor, activeSkill)
39833983
t_insert(breakdownDPS, pass.label..":")
39843984
end
39853985
if sourceHitDmg == sourceCritDmg or output.CritChance == 0 then
3986-
t_insert(breakdownDPS, "Total damage:")
3986+
t_insert(breakdownDPS, "Total base DPS per " .. type .. ":")
39873987
t_insert(breakdownDPS, s_format("%.1f ^8(source damage)",sourceHitDmg))
39883988
if sourceMult > 1 then
39893989
t_insert(breakdownDPS, s_format("x %.2f ^8(inflicting as though dealing more damage)", sourceMult))
@@ -4007,7 +4007,7 @@ function calcs.offence(env, actor, activeSkill)
40074007
end
40084008
end
40094009
if baseFromHit > 0 and baseFromCrit > 0 then
4010-
t_insert(breakdownDPS, "Total damage:")
4010+
t_insert(breakdownDPS, "Total base DPS per " .. type .. ":")
40114011
t_insert(breakdownDPS, s_format("%.1f + %.1f", baseFromHit, baseFromCrit))
40124012
if sourceMult == 1 then
40134013
t_insert(breakdownDPS, s_format("= %.1f", baseVal))
@@ -4267,7 +4267,7 @@ function calcs.offence(env, actor, activeSkill)
42674267
t_insert(breakdown[ailment .. "DPS"], s_format("x %.2f ^8(ailment magnitude effect)", globalOutput[ailment .. "MagnitudeEffect"]))
42684268
t_insert(breakdown[ailment .. "DPS"], s_format("= %.1f", baseVal, 1))
42694269
t_insert(breakdown[ailment .. "DPS"], "")
4270-
t_insert(breakdown[ailment .. "DPS"], "Average ailment DPS:")
4270+
t_insert(breakdown[ailment .. "DPS"], "Average DPS for all " .. ailment .. "s:")
42714271
if baseVal ~= ailmentDPSUncapped then
42724272
t_insert(breakdown[ailment .. "DPS"], s_format("%.1f ^8(base damage per second)", baseVal))
42734273
end
@@ -4312,9 +4312,9 @@ function calcs.offence(env, actor, activeSkill)
43124312
if isAttack then
43134313
t_insert(breakdown[ailment .. "Damage"], pass.label..":")
43144314
end
4315-
t_insert(breakdown[ailment .. "Damage"], s_format("%.1f ^8(damage per second)", output[ailment .. "DPS"]))
4315+
t_insert(breakdown[ailment .. "Damage"], s_format("%.1f ^8(DPS of all stacks)", baseVal))
43164316
t_insert(breakdown[ailment .. "Damage"], s_format("x %.2fs ^8(ailment duration)", globalOutput[ailment .. "Duration"]))
4317-
t_insert(breakdown[ailment .. "Damage"], s_format("= %.1f ^8damage per ailment stack", output[ailment .. "Damage"]))
4317+
t_insert(breakdown[ailment .. "Damage"], s_format("= %.1f ^8total damage of all stacks", output[ailment .. "Damage"]))
43184318
end
43194319
if globalOutput[ailment .. "Duration"] ~= data.misc[ailment .. "DurationBase"] then
43204320
globalBreakdown[ailment .. "Duration"] = {

src/Modules/CalcSections.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ return {
923923
{ label = "Player modifiers", modName = { "EnemyBleedDuration", "EnemyAilmentDuration", "SkillAndDamagingAilmentDuration", "BleedFaster" }, cfg = "bleed" },
924924
{ label = "Enemy modifiers", modName = { "SelfBleedDuration", "SelfAilmentDuration", "SelfBleedFaster", "BleedExpireRate" }, enemy = true },
925925
}, },
926-
{ label = "Dmg. per Bleed", { format = "{1:output:BleedDamage}",
926+
{ label = "Dmg. of all Bleeds", { format = "{1:output:BleedDamage}",
927927
{ breakdown = "MainHand.BleedDamage" },
928928
{ breakdown = "OffHand.BleedDamage" },
929929
{ breakdown = "BleedDamage" },
@@ -976,7 +976,7 @@ return {
976976
{ label = "Player modifiers", modName = { "EnemyPoisonDuration", "EnemyAilmentDuration", "SkillAndDamagingAilmentDuration", "PoisonFaster" }, cfg = "poison" },
977977
{ label = "Enemy modifiers", modName = { "SelfPoisonDuration", "SelfAilmentDuration", "SelfPoisonFaster" }, enemy = true },
978978
}, },
979-
{ label = "Dmg. per Poison", { format = "{1:output:PoisonDamage}",
979+
{ label = "Dmg. of all Poisons", { format = "{1:output:PoisonDamage}",
980980
{ breakdown = "MainHand.PoisonDamage" },
981981
{ breakdown = "OffHand.PoisonDamage" },
982982
{ breakdown = "PoisonDamage" },
@@ -1032,7 +1032,7 @@ return {
10321032
{ label = "Player modifiers", modName = { "EnemyIgniteDuration", "EnemyAilmentDuration", "EnemyElementalAilmentDuration", "SkillAndDamagingAilmentDuration", "IgniteFaster", "IgniteSlower" }, cfg = "skill" },
10331033
{ label = "Enemy modifiers", modName = {"SelfIgniteDuration", "SelfAilmentDuration", "SelfElementalAilmentDuration", "SelfIgniteFaster"}, enemy = true },
10341034
}, },
1035-
{ label = "Dmg. per Ignite", { format = "{1:output:IgniteDamage}",
1035+
{ label = "Dmg. of all Ignites", { format = "{1:output:IgniteDamage}",
10361036
{ breakdown = "MainHand.IgniteDamage" },
10371037
{ breakdown = "OffHand.IgniteDamage" },
10381038
{ breakdown = "IgniteDamage" },

0 commit comments

Comments
 (0)