From d5e1c1b01cc474033b6848674ac53c47ec9fd063 Mon Sep 17 00:00:00 2001 From: Openarl Date: Tue, 2 May 2017 23:19:31 +1000 Subject: [PATCH] Last minute fixes --- Modules/CalcDefence.lua | 7 +++++++ Modules/CalcSections.lua | 1 + README.md | 2 +- changelog.txt | 2 +- manifest.xml | 6 +++--- runtime-win32.zip | Bin 1290866 -> 1290866 bytes 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Modules/CalcDefence.lua b/Modules/CalcDefence.lua index 46c1d7a6..ea282900 100644 --- a/Modules/CalcDefence.lua +++ b/Modules/CalcDefence.lua @@ -346,6 +346,13 @@ function calcs.defence(env, actor) end if output.TotalDegen and output.TotalRegen then output.NetRegen = output.TotalRegen - output.TotalDegen + if breakdown then + breakdown.NetRegen = { + s_format("%.1f ^8(total life%s regen)", output.TotalRegen, modDB:Sum("FLAG", nil, "EnergyShieldProtectsMana") and "" or " + energy shield"), + s_format("- %.1f ^8(total degen)", output.TotalDegen), + s_format("= %.1f", output.NetRegen), + } + end end -- Incoming hit damage multipliers diff --git a/Modules/CalcSections.lua b/Modules/CalcSections.lua index 83713b13..dccfe58d 100644 --- a/Modules/CalcSections.lua +++ b/Modules/CalcSections.lua @@ -780,6 +780,7 @@ return { { breakdown = "TotalDegen" }, { label = "Sources", modName = { "PhysicalDegen", "FireDegen", "ColdDegen", "LightningDegen", "ChaosDegen" }, modType = "BASE" }, }, }, + { label = "Net Regen", haveOutput = "NetRegen", { format = "{1:output:NetRegen}", { breakdown = "NetRegen" }, }, }, } }, { 1, "MiscDefences", 3, "Other Defences", data.colorCodes.DEFENCE, { { label = "Movement Speed", { format = "x {2:output:MovementSpeedMod}", { modName = "MovementSpeed" }, }, }, diff --git a/README.md b/README.md index 6d93fcf2..5ca4d80e 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Head over to the [Releases](https://github.com/Openarl/PathOfBuilding/releases) used in-game on the character sheet, but it can be overriden using a new option in the Configuration tab * Added a new "Damage Taken" section to the Calcs tab that shows the incoming damage multipliers for each damage type * These factor in mitigation (resistances/armour) and modifiers to damage taken - * The multipliers for hits and degens are calculated and shown separately + * The multipliers for hits and DoTs are calculated and shown separately * The multiplier for Physical hit damage includes the Physical Damage Reduction estimate mentioned above * Added self-degen calculations for Righteous Fire and Blood Rage: * The sidebar will display "Total Degen" and "Net Regen" (Total Regen minus Total Degen) diff --git a/changelog.txt b/changelog.txt index e3e3e8f6..25eb65b0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,7 +3,7 @@ VERSION[1.4.8][2017/05/02] used in-game on the character sheet, but it can be overriden using a new option in the Configuration tab * Added a new "Damage Taken" section to the Calcs tab that shows the incoming damage multipliers for each damage type * These factor in mitigation (resistances/armour) and modifiers to damage taken - * The multipliers for hits and degens are calculated and shown separately + * The multipliers for hits and DoTs are calculated and shown separately * The multiplier for Physical hit damage includes the Physical Damage Reduction estimate mentioned above * Added self-degen calculations for Righteous Fire and Blood Rage: * The sidebar will display "Total Degen" and "Net Regen" (Total Regen minus Total Degen) diff --git a/manifest.xml b/manifest.xml index 7e419dc7..8ebda031 100644 --- a/manifest.xml +++ b/manifest.xml @@ -7,7 +7,7 @@ - + @@ -47,11 +47,11 @@ - + - + diff --git a/runtime-win32.zip b/runtime-win32.zip index d4094b26cada3aa633d147c36d92182a104e7d01..d052dadb6743f5867e18bf58da2934d6ac6d47d7 100644 GIT binary patch delta 97 zcmezL#P8D+zlIjZ7N!>FEi7~RnTvKVYM;-~0>rF9%m&2lK+FNeoIuP4#N0s41H`;Q f%m>8$Kr8^nf

^eLlZ1<5Z9-+ZQhpKFFEi7~Rna|Cc(>|Y{1&CRJm<@>8ftUk`If0l9h`E872Z(ur fm=B2gfmi^D1%X&-`+R<3#;G7vwl7{He4ZBo3|%9O