Skip to content

Update "Dmg. per ailment" title and ailment DPS beakdown titles #569

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
LocalIdentity merged 1 commit into from
Jan 27, 2025
Merged

Update "Dmg. per ailment" title and ailment DPS beakdown titles #569

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
10 changes: 5 additions & 5 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3982,7 +3982,7 @@ function calcs.offence(env, actor, activeSkill)
t_insert(breakdownDPS, pass.label..":")
end
if sourceHitDmg == sourceCritDmg or output.CritChance == 0 then
t_insert(breakdownDPS, "Total damage:")
t_insert(breakdownDPS, "Total base DPS per " .. type .. ":")
t_insert(breakdownDPS, s_format("%.1f ^8(source damage)",sourceHitDmg))
if sourceMult > 1 then
t_insert(breakdownDPS, s_format("x %.2f ^8(inflicting as though dealing more damage)", sourceMult))
Expand All @@ -4006,7 +4006,7 @@ function calcs.offence(env, actor, activeSkill)
end
end
if baseFromHit > 0 and baseFromCrit > 0 then
t_insert(breakdownDPS, "Total damage:")
t_insert(breakdownDPS, "Total base DPS per " .. type .. ":")
t_insert(breakdownDPS, s_format("%.1f + %.1f", baseFromHit, baseFromCrit))
if sourceMult == 1 then
t_insert(breakdownDPS, s_format("= %.1f", baseVal))
Expand Down Expand Up @@ -4266,7 +4266,7 @@ function calcs.offence(env, actor, activeSkill)
t_insert(breakdown[ailment .. "DPS"], s_format("x %.2f ^8(ailment magnitude effect)", globalOutput[ailment .. "MagnitudeEffect"]))
t_insert(breakdown[ailment .. "DPS"], s_format("= %.1f", baseVal, 1))
t_insert(breakdown[ailment .. "DPS"], "")
t_insert(breakdown[ailment .. "DPS"], "Average ailment DPS:")
t_insert(breakdown[ailment .. "DPS"], "Average DPS for all " .. ailment .. "s:")
if baseVal ~= ailmentDPSUncapped then
t_insert(breakdown[ailment .. "DPS"], s_format("%.1f ^8(base damage per second)", baseVal))
end
Expand Down Expand Up @@ -4311,9 +4311,9 @@ function calcs.offence(env, actor, activeSkill)
if isAttack then
t_insert(breakdown[ailment .. "Damage"], pass.label..":")
end
t_insert(breakdown[ailment .. "Damage"], s_format("%.1f ^8(damage per second)", output[ailment .. "DPS"]))
t_insert(breakdown[ailment .. "Damage"], s_format("%.1f ^8(DPS of all stacks)", baseVal))
t_insert(breakdown[ailment .. "Damage"], s_format("x %.2fs ^8(ailment duration)", globalOutput[ailment .. "Duration"]))
t_insert(breakdown[ailment .. "Damage"], s_format("= %.1f ^8damage per ailment stack", output[ailment .. "Damage"]))
t_insert(breakdown[ailment .. "Damage"], s_format("= %.1f ^8total damage of all stacks", output[ailment .. "Damage"]))
end
if globalOutput[ailment .. "Duration"] ~= data.misc[ailment .. "DurationBase"] then
globalBreakdown[ailment .. "Duration"] = {
Expand Down
6 changes: 3 additions & 3 deletions src/Modules/CalcSections.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ return {
{ label = "Player modifiers", modName = { "EnemyBleedDuration", "EnemyAilmentDuration", "SkillAndDamagingAilmentDuration", "BleedFaster" }, cfg = "bleed" },
{ label = "Enemy modifiers", modName = { "SelfBleedDuration", "SelfAilmentDuration", "SelfBleedFaster", "BleedExpireRate" }, enemy = true },
}, },
{ label = "Dmg. per Bleed", { format = "{1:output:BleedDamage}",
{ label = "Dmg. of all Bleeds", { format = "{1:output:BleedDamage}",
{ breakdown = "MainHand.BleedDamage" },
{ breakdown = "OffHand.BleedDamage" },
{ breakdown = "BleedDamage" },
Expand Down Expand Up @@ -975,7 +975,7 @@ return {
{ label = "Player modifiers", modName = { "EnemyPoisonDuration", "EnemyAilmentDuration", "SkillAndDamagingAilmentDuration", "PoisonFaster" }, cfg = "poison" },
{ label = "Enemy modifiers", modName = { "SelfPoisonDuration", "SelfAilmentDuration", "SelfPoisonFaster" }, enemy = true },
}, },
{ label = "Dmg. per Poison", { format = "{1:output:PoisonDamage}",
{ label = "Dmg. of all Poisons", { format = "{1:output:PoisonDamage}",
{ breakdown = "MainHand.PoisonDamage" },
{ breakdown = "OffHand.PoisonDamage" },
{ breakdown = "PoisonDamage" },
Expand Down Expand Up @@ -1031,7 +1031,7 @@ return {
{ label = "Player modifiers", modName = { "EnemyIgniteDuration", "EnemyAilmentDuration", "EnemyElementalAilmentDuration", "SkillAndDamagingAilmentDuration", "IgniteFaster", "IgniteSlower" }, cfg = "skill" },
{ label = "Enemy modifiers", modName = {"SelfIgniteDuration", "SelfAilmentDuration", "SelfElementalAilmentDuration", "SelfIgniteFaster"}, enemy = true },
}, },
{ label = "Dmg. per Ignite", { format = "{1:output:IgniteDamage}",
{ label = "Dmg. of all Ignites", { format = "{1:output:IgniteDamage}",
{ breakdown = "MainHand.IgniteDamage" },
{ breakdown = "OffHand.IgniteDamage" },
{ breakdown = "IgniteDamage" },
Expand Down
Loading