diff --git a/Modules/Build.lua b/Modules/Build.lua index 68411ffa..b4f47b9e 100644 --- a/Modules/Build.lua +++ b/Modules/Build.lua @@ -297,9 +297,10 @@ function buildMode:Init(dbFileName, buildName, buildXML, targetVersion) { stat = "ManaLeechGainPerHit", label = "Mana Leech/Gain per Hit", fmt = ".1f", compPercent = true }, { }, { stat = "TotalDegen", label = "Total Degen", fmt = ".1f", lowerIsBetter = true }, - { stat = "NetRegen", label = "Net Regen", fmt = "+.1f" }, + { stat = "TotalNetRegen", label = "Total Net Regen", fmt = "+.1f" }, { stat = "NetLifeRegen", label = "Net Life Regen", fmt = "+.1f" }, { stat = "NetManaRegen", label = "Net Mana Regen", fmt = "+.1f" }, + { stat = "NetEnergyShieldRegen", label = "Net Energy Shield Regen", fmt = "+.1f" }, { }, { stat = "EnergyShield", label = "Energy Shield", fmt = "d", compPercent = true }, { stat = "Spec:EnergyShieldInc", label = "%Inc ES from Tree", fmt = "d%%" }, diff --git a/Modules/CalcDefence-3_0.lua b/Modules/CalcDefence-3_0.lua index 2604d44c..11da17e1 100644 --- a/Modules/CalcDefence-3_0.lua +++ b/Modules/CalcDefence-3_0.lua @@ -839,6 +839,7 @@ function calcs.defence(env, actor) output.NetLifeRegen = output.NetLifeRegen - totalLifeDegen output.NetManaRegen = output.NetManaRegen - totalManaDegen output.NetEnergyShieldRegen = output.NetEnergyShieldRegen - totalEnergyShieldDegen + output.TotalNetRegen = output.NetLifeRegen + output.NetManaRegen + output.NetEnergyShieldRegen if breakdown then t_insert(breakdown.NetLifeRegen, s_format("%.1f ^8(total life regen)", output.LifeRegen)) t_insert(breakdown.NetLifeRegen, s_format("- %.1f ^8(total life degen)", totalLifeDegen)) @@ -849,6 +850,12 @@ function calcs.defence(env, actor) t_insert(breakdown.NetEnergyShieldRegen, s_format("%.1f ^8(total energy shield regen)", output.EnergyShieldRegen)) t_insert(breakdown.NetEnergyShieldRegen, s_format("- %.1f ^8(total energy shield degen)", totalEnergyShieldDegen)) t_insert(breakdown.NetEnergyShieldRegen, s_format("= %.1f", output.NetEnergyShieldRegen)) + breakdown.TotalNetRegen = { + s_format("Net Life Regen: %d", output.NetLifeRegen), + s_format("+ Net Mana Regen: %d", output.NetManaRegen), + s_format("+ Net Energy Shield Regen: %d", output.NetEnergyShieldRegen), + s_format("= Total Net Regen: %d", output.TotalNetRegen) + } end end diff --git a/Modules/CalcSections-3_0.lua b/Modules/CalcSections-3_0.lua index 71dc0ef3..a66530fa 100644 --- a/Modules/CalcSections-3_0.lua +++ b/Modules/CalcSections-3_0.lua @@ -1542,9 +1542,12 @@ return { { breakdown = "TotalDegen" }, { label = "Sources", modName = { "PhysicalDegen", "FireDegen", "ColdDegen", "LightningDegen", "ChaosDegen" }, modType = "BASE" }, }, }, + { label = "Total Net Regen", haveOutput = "TotalNetRegen", { format = "{1:output:TotalNetRegen}", + { breakdown = "TotalNetRegen" }, + }, }, { label = "Net Life Regen", haveOutput = "NetLifeRegen", { format = "{1:output:NetLifeRegen}", { breakdown = "NetLifeRegen" }, }, }, { label = "Net Mana Regen", haveOutput = "NetManaRegen", { format = "{1:output:NetManaRegen}", { breakdown = "NetManaRegen" }, }, }, - { label = "Net Energy Shield Regen", haveOutput = "NetEnergyShieldRegen", { format = "{1:output:NetEnergyShieldRegen}", { breakdown = "NetEnergyShieldRegen" }, }, }, + { label = "Net ES. Regen", haveOutput = "NetEnergyShieldRegen", { format = "{1:output:NetEnergyShieldRegen}", { breakdown = "NetEnergyShieldRegen" }, }, }, } } } }, }