Skip to content

Commit 9b94996

Browse files
deathbeamdeathbeam
committed
Use "Recovery" instead of "Regen" when having non-regen recovery
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
1 parent 749629e commit 9b94996

File tree

2 files changed

+26
-27
lines changed

2 files changed

+26
-27
lines changed

‎src/Modules/Build.lua‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -328,35 +328,38 @@ function buildMode:Init(dbFileName, buildName, buildXML, convertBuild)
328328
{ stat = "LifeUnreserved", label = "Unreserved Life", fmt = "d", color = colorCodes.LIFE, condFunc = function(v,o) return v < o.Life end, compPercent = true, warnFunc = function(v) return v <= 0 and "Your unreserved Life is below 1" end },
329329
{ stat = "LifeRecoverable", label = "Life Recoverable", fmt = "d", color = colorCodes.LIFE, condFunc = function(v,o) return v < o.LifeUnreserved end, },
330330
{ stat = "LifeUnreservedPercent", label = "Unreserved Life", fmt = "d%%", color = colorCodes.LIFE, condFunc = function(v,o) return v < 100 end },
331-
{ stat = "LifeRegenRecovery", label = "Life Regen", fmt = ".1f", color = colorCodes.LIFE },
331+
{ stat = "LifeRegenRecovery", label = "Life Regen", fmt = ".1f", color = colorCodes.LIFE, condFunc = function(v,o) return o.LifeRecovery <= 0 and o.LifeRegenRecovery ~= 0 end },
332+
{ stat = "LifeRegenRecovery", label = "Life Recovery", fmt = ".1f", color = colorCodes.LIFE, condFunc = function(v,o) return o.LifeRecovery > 0 and o.LifeRegenRecovery ~= 0 end },
332333
{ stat = "LifeLeechGainRate", label = "Life Leech/On Hit Rate", fmt = ".1f", color = colorCodes.LIFE, compPercent = true },
333334
{ stat = "LifeLeechGainPerHit", label = "Life Leech/Gain per Hit", fmt = ".1f", color = colorCodes.LIFE, compPercent = true },
334335
{ },
335336
{ stat = "Mana", label = "Total Mana", fmt = "d", color = colorCodes.MANA, compPercent = true },
336337
{ stat = "Spec:ManaInc", label = "%Inc Mana from Tree", color = colorCodes.MANA, fmt = "d%%" },
337338
{ stat = "ManaUnreserved", label = "Unreserved Mana", fmt = "d", color = colorCodes.MANA, condFunc = function(v,o) return v < o.Mana end, compPercent = true, warnFunc = function(v) return v < 0 and "Your unreserved Mana is negative" end },
338339
{ stat = "ManaUnreservedPercent", label = "Unreserved Mana", fmt = "d%%", color = colorCodes.MANA, condFunc = function(v,o) return v < 100 end },
339-
{ stat = "ManaRegenRecovery", label = "Mana Regen", fmt = ".1f", color = colorCodes.MANA },
340+
{ stat = "ManaRegenRecovery", label = "Mana Regen", fmt = ".1f", color = colorCodes.MANA, condFunc = function(v,o) return o.ManaRecovery <= 0 and o.ManaRegenRecovery ~= 0 end },
341+
{ stat = "ManaRegenRecovery", label = "Mana Recovery", fmt = ".1f", color = colorCodes.MANA, condFunc = function(v,o) return o.ManaRecovery > 0 and o.ManaRegenRecovery ~= 0 end },
340342
{ stat = "ManaLeechGainRate", label = "Mana Leech/On Hit Rate", fmt = ".1f", color = colorCodes.MANA, compPercent = true },
341343
{ stat = "ManaLeechGainPerHit", label = "Mana Leech/Gain per Hit", fmt = ".1f", color = colorCodes.MANA, compPercent = true },
342344
{ },
343345
{ stat = "EnergyShield", label = "Energy Shield", fmt = "d", color = colorCodes.ES, compPercent = true },
344346
{ stat = "EnergyShieldRecoveryCap", label = "Recoverable ES", color = colorCodes.ES, fmt = "d", condFunc = function(v,o) return o.CappingES end },
345347
{ stat = "Spec:EnergyShieldInc", label = "%Inc ES from Tree", color = colorCodes.ES, fmt = "d%%" },
346-
{ stat = "EnergyShieldRegenRecovery", label = "Energy Shield Regen", color = colorCodes.ES, fmt = ".1f" },
348+
{ stat = "EnergyShieldRegenRecovery", label = "ES Regen", color = colorCodes.ES, fmt = ".1f", condFunc = function(v,o) return o.EnergyShieldRecovery <= 0 and o.EnergyShieldRegenRecovery ~= 0 end },
349+
{ stat = "EnergyShieldRegenRecovery", label = "ES Recovery", color = colorCodes.ES, fmt = ".1f", condFunc = function(v,o) return o.EnergyShieldRecovery > 0 and o.EnergyShieldRegenRecovery ~= 0 end },
347350
{ stat = "EnergyShieldLeechGainRate", label = "ES Leech/On Hit Rate", color = colorCodes.ES, fmt = ".1f", compPercent = true },
348351
{ stat = "EnergyShieldLeechGainPerHit", label = "ES Leech/Gain per Hit", color = colorCodes.ES, fmt = ".1f", compPercent = true },
349352
{ },
350353
{ stat = "Ward", label = "Ward", fmt = "d", color = colorCodes.WARD, compPercent = true },
351354
{ },
352355
{ stat = "Rage", label = "Rage", fmt = "d", color = colorCodes.RAGE, compPercent = true },
353-
{ stat = "RageRegenRecovery", label = "Rage Regen", fmt = ".1f", color = colorCodes.RAGE, compPercent = true },
356+
{ stat = "RageRegenRecovery", label = "Rage Recovery", fmt = ".1f", color = colorCodes.RAGE, compPercent = true },
354357
{ },
355358
{ stat = "TotalDegen", label = "Total Degen", fmt = ".1f", lowerIsBetter = true },
356-
{ stat = "TotalNetRegen", label = "Total Net Regen", fmt = "+.1f" },
357-
{ stat = "NetLifeRegen", label = "Net Life Regen", fmt = "+.1f", color = colorCodes.LIFE },
358-
{ stat = "NetManaRegen", label = "Net Mana Regen", fmt = "+.1f", color = colorCodes.MANA },
359-
{ stat = "NetEnergyShieldRegen", label = "Net Energy Shield Regen", fmt = "+.1f", color = colorCodes.ES },
359+
{ stat = "TotalNetRegen", label = "Total Net Recovery", fmt = "+.1f" },
360+
{ stat = "NetLifeRegen", label = "Net Life Recovery", fmt = "+.1f", color = colorCodes.LIFE },
361+
{ stat = "NetManaRegen", label = "Net Mana Recovery", fmt = "+.1f", color = colorCodes.MANA },
362+
{ stat = "NetEnergyShieldRegen", label = "Net ES Recovery", fmt = "+.1f", color = colorCodes.ES },
360363
{ },
361364
{ stat = "Evasion", label = "Evasion rating", fmt = "d", color = colorCodes.EVASION, compPercent = true },
362365
{ stat = "Spec:EvasionInc", label = "%Inc Evasion from Tree", color = colorCodes.EVASION, fmt = "d%%" },
@@ -416,10 +419,10 @@ function buildMode:Init(dbFileName, buildName, buildXML, convertBuild)
416419
{ stat = "CombinedDPS", label = "Combined DPS", fmt = ".1f", compPercent = true, condFunc = function(v,o) return v ~= ((o.TotalDPS or 0) + (o.TotalDot or 0)) and v ~= o.WithImpaleDPS and v ~= o.WithPoisonDPS and v ~= o.WithIgniteDPS and v ~= o.WithBleedDPS end},
417420
{ stat = "Cooldown", label = "Skill Cooldown", fmt = ".3fs", lowerIsBetter = true },
418421
{ stat = "Life", label = "Total Life", fmt = ".1f", color = colorCodes.LIFE, compPercent = true },
419-
{ stat = "LifeRegenRecovery", label = "Life Regen", fmt = ".1f", color = colorCodes.LIFE },
422+
{ stat = "LifeRegenRecovery", label = "Life Recovery", fmt = ".1f", color = colorCodes.LIFE },
420423
{ stat = "LifeLeechGainRate", label = "Life Leech/On Hit Rate", fmt = ".1f", color = colorCodes.LIFE, compPercent = true },
421424
{ stat = "EnergyShield", label = "Energy Shield", fmt = "d", color = colorCodes.ES, compPercent = true },
422-
{ stat = "EnergyShieldRegenRecovery", label = "Energy Shield Regen", fmt = ".1f", color = colorCodes.ES },
425+
{ stat = "EnergyShieldRegenRecovery", label = "ES Recovery", fmt = ".1f", color = colorCodes.ES },
423426
{ stat = "EnergyShieldLeechGainRate", label = "ES Leech/On Hit Rate", fmt = ".1f", color = colorCodes.ES, compPercent = true },
424427
}
425428
self.extraSaveStats = {

‎src/Modules/CalcSections.lua‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,9 +1282,9 @@ return {
12821282
{ label = "Inc. Item Quantity", { format = "{0:mod:1}%", { modName = "LootQuantity", modType = "INC", cfg = "skill" }, }, },
12831283
{ label = "Inc. Item Rarity", { format = "{0:mod:1}%", { modName = "LootRarity", modType = "INC", cfg = "skill" }, }, },
12841284
{ label = "Culling Strike", haveOutput = "CullPercent", { format = "{0:output:CullPercent}%", { modName = { "CullPercent", "CriticalCullPercent" }, cfg = "skill" } } },
1285-
{ label = "Enemy Life Regen", haveOutput = "EnemyLifeRegen", { format = "{0:output:EnemyLifeRegen}%", { modName = "LifeRegen", modType = "INC", enemy = true }, }, },
1286-
{ label = "Enemy Mana Regen", haveOutput = "EnemyManaRegen", { format = "{0:output:EnemyManaRegen}%", { modName = "ManaRegen", modType = "INC", enemy = true }, }, },
1287-
{ label = "Enemy ES Regen", haveOutput = "EnemyEnergyShieldRegen", { format = "{0:output:EnemyEnergyShieldRegen}%", { modName = "EnergyShieldRegen", modType = "INC", enemy = true }, }, },
1285+
{ label = "Enemy Life Recovery", haveOutput = "EnemyLifeRegen", { format = "{0:output:EnemyLifeRegen}%", { modName = "LifeRegen", modType = "INC", enemy = true }, }, },
1286+
{ label = "Enemy Mana Recovery", haveOutput = "EnemyManaRegen", { format = "{0:output:EnemyManaRegen}%", { modName = "ManaRegen", modType = "INC", enemy = true }, }, },
1287+
{ label = "Enemy ES Recovery", haveOutput = "EnemyEnergyShieldRegen", { format = "{0:output:EnemyEnergyShieldRegen}%", { modName = "EnergyShieldRegen", modType = "INC", enemy = true }, }, },
12881288
} }
12891289
} },
12901290
-- attributes/resists
@@ -1320,8 +1320,7 @@ return {
13201320
{ breakdown = "EnergyShieldRechargeDelay" },
13211321
{ modName = "EnergyShieldRechargeFaster" },
13221322
}, },
1323-
{ label = "Increased Regen", { format = "{0:output:LifeRegenInc}%", { modName = "LifeRegen", modType = "INC" }, }, },
1324-
{ label = "Regen", { format = "{1:output:LifeRegenRecovery} ({1:output:LifeRegenPercent}%)",
1323+
{ label = "Recovery", { format = "{1:output:LifeRegenRecovery} ({1:output:LifeRegenPercent}%)",
13251324
{ breakdown = "LifeRegenRecovery" },
13261325
{ label = "Sources", modName = { "LifeRegen", "LifeRegenPercent", "LifeDegen", "LifeDegenPercent", "LifeRecovery" }, modType = "BASE" },
13271326
{ label = "Increased Life Regeneration Rate", modName = { "LifeRegen" }, modType = "INC" },
@@ -1370,8 +1369,7 @@ return {
13701369
{ label = "Total", { format = "{0:output:Mana}", { breakdown = "Mana" }, }, },
13711370
{ label = "Reserved", { format = "{0:output:ManaReserved} ({0:output:ManaReservedPercent}%)", { breakdown = "ManaReserved" }, }, },
13721371
{ label = "Unreserved", { format = "{0:output:ManaUnreserved} ({0:output:ManaUnreservedPercent}%)" }, },
1373-
{ label = "Increased Regen", { format = "{0:output:ManaRegenInc}%", { modName = "ManaRegen", modType = "INC" }, }, },
1374-
{ label = "Regen", { format = "{1:output:ManaRegenRecovery} ({1:output:ManaRegenPercent}%)",
1372+
{ label = "Recovery", { format = "{1:output:ManaRegenRecovery} ({1:output:ManaRegenPercent}%)",
13751373
{ breakdown = "ManaRegenRecovery" },
13761374
{ label = "Sources", modName = { "ManaRegen", "ManaRegenPercent", "ManaDegen", "ManaDegenPercent", "ManaRecovery" }, modType = "BASE" },
13771375
{ label = "Increased Mana Regeneration Rate", modName = { "ManaRegen" }, modType = "INC" },
@@ -1402,12 +1400,11 @@ return {
14021400
{ breakdown = "EnergyShieldRechargeDelay" },
14031401
{ modName = "EnergyShieldRechargeFaster" },
14041402
}, },
1405-
{ label = "Increased Regen", { format = "{0:output:EnergyShieldRegenInc}%", { modName = "EnergyShieldRegen", modType = "INC" }, }, },
1406-
{ label = "Regen", { format = "{1:output:EnergyShieldRegenRecovery} ({1:output:EnergyShieldRegenPercent}%)",
1403+
{ label = "Recovery", { format = "{1:output:EnergyShieldRegenRecovery} ({1:output:EnergyShieldRegenPercent}%)",
14071404
{ breakdown = "EnergyShieldRegenRecovery" },
14081405
{ label = "Sources", modName = { "EnergyShieldRegen", "EnergyShieldRegenPercent", "EnergyShieldDegen", "EnergyShieldDegenPercent", "EnergyShieldRecovery" }, modType = "BASE" },
1409-
{ label = "Increased EnergyShield Regeneration Rate", modName = { "EnergyShieldRegen" }, modType = "INC" },
1410-
{ label = "More EnergyShield Regeneration Rate", modName = { "EnergyShieldRegen" }, modType = "MORE" },
1406+
{ label = "Increased Energy Shield Regeneration Rate", modName = { "EnergyShieldRegen" }, modType = "INC" },
1407+
{ label = "More Energy Shield Regeneration Rate", modName = { "EnergyShieldRegen" }, modType = "MORE" },
14111408
{ label = "Recovery modifiers", modName = "EnergyShieldRecoveryRate" },
14121409
}, },
14131410
{ label = "Recoup", haveOutput = "EnergyShieldRecoup", { format = "{1:output:EnergyShieldRecoup}%", { breakdown = "EnergyShieldRecoup" },
@@ -1602,8 +1599,7 @@ return {
16021599
extra = "{0:output:Rage}",
16031600
{ label = "Total", { format = "{0:output:Rage}", }, },
16041601
{ label = "Maximum Rage", { format = "{0:output:MaximumRage}", { modName = "MaximumRage", modType = "BASE" }, }, },
1605-
{ label = "Increased Regen", { format = "{0:output:RageRegenInc}%", { modName = "RageRegen", modType = "INC" }, }, },
1606-
{ label = "Regen", { format = "{1:output:RageRegenRecovery} ({1:output:RageRegenPercent}%)",
1602+
{ label = "Recovery", { format = "{1:output:RageRegenRecovery} ({1:output:RageRegenPercent}%)",
16071603
{ breakdown = "RageRegenRecovery" },
16081604
{ label = "Sources", modName = { "RageRegen", "RageRegenPercent", "RageDegen", "RageDegenPercent", "RageRecovery" }, modType = "BASE" },
16091605
{ label = "Increased Rage Regeneration Rate", modName = { "RageRegen" }, modType = "INC" },
@@ -2067,12 +2063,12 @@ return {
20672063
{ breakdown = "TotalDegen" },
20682064
{ label = "Sources", modName = { "PhysicalDegen", "FireDegen", "ColdDegen", "LightningDegen", "ChaosDegen" }, modType = "BASE" },
20692065
}, },
2070-
{ label = "Total Net Regen", haveOutput = "TotalNetRegen", { format = "{1:output:TotalNetRegen}",
2066+
{ label = "Total Net Recovery", haveOutput = "TotalNetRegen", { format = "{1:output:TotalNetRegen}",
20712067
{ breakdown = "TotalNetRegen" },
20722068
}, },
2073-
{ label = "Net Life Regen", color = colorCodes.LIFE, haveOutput = "NetLifeRegen", { format = "{1:output:NetLifeRegen}", { breakdown = "NetLifeRegen" }, }, },
2074-
{ label = "Net Mana Regen", color = colorCodes.MANA, haveOutput = "NetManaRegen", { format = "{1:output:NetManaRegen}", { breakdown = "NetManaRegen" }, }, },
2075-
{ label = "Net ES Regen", color = colorCodes.ES, haveOutput = "NetEnergyShieldRegen", { format = "{1:output:NetEnergyShieldRegen}", { breakdown = "NetEnergyShieldRegen" }, }, }
2069+
{ label = "Net Life Recovery", color = colorCodes.LIFE, haveOutput = "NetLifeRegen", { format = "{1:output:NetLifeRegen}", { breakdown = "NetLifeRegen" }, }, },
2070+
{ label = "Net Mana Recovery", color = colorCodes.MANA, haveOutput = "NetManaRegen", { format = "{1:output:NetManaRegen}", { breakdown = "NetManaRegen" }, }, },
2071+
{ label = "Net ES Recovery", color = colorCodes.ES, haveOutput = "NetEnergyShieldRegen", { format = "{1:output:NetEnergyShieldRegen}", { breakdown = "NetEnergyShieldRegen" }, }, }
20762072
} }, { defaultCollapsed = true, label = "Recoup and Hit Taken Over Time", data = {
20772073
colWidth = 190,
20782074
extra = colorCodes.LIFE.."{0:output:netLifeRecoupAndLossLostOverTimeAvg}, "..colorCodes.MANA.."{0:output:ManaRecoupRecoveryAvg}, "..colorCodes.ES.."{0:output:EnergyShieldRecoupRecoveryAvg}",

0 commit comments

Comments
 (0)