Fix Recovery rate mods multiplying Life / Mana regeneration rate (#1001)

Recovery rate mods in PoE 2 are additive with regeneration rate mods instead of multiplicative in PoE 1

Co-authored-by: LocalIdentity <localidentity2@gmail.com>

Author: LocalIdentity

src/Modules/CalcDefence.lua

@@ -1496,8 +1496,8 @@ function calcs.defence(env, actor)
 		local resource = resourceName:gsub(" ", "")
 		local pool = output[resource] or 0
 		local baseRegen = 0
-		local inc = modDB:Sum("INC", nil, resource.."Regen")
-		local more = modDB:More(nil, resource.."Regen")
+		local inc = modDB:Sum("INC", nil, resource.."Regen", resource.."RecoveryRate")
+		local more = modDB:More(nil, resource.."Regen", resource.."RecoveryRate")
 		local regen = 0
 		local regenRate = 0
 		local recoveryRateMod = output[resource.."RecoveryRateMod"] or 1
@@ -1531,7 +1531,7 @@ function calcs.defence(env, actor)
 					end
 				end
 			end
-			regenRate = round(regen * recoveryRateMod, 1)
+			regenRate = round(regen, 1)
 			output[resource.."Regen"] = regenRate
 		end
 		output[resource.."RegenInc"] = inc
@@ -1552,7 +1552,6 @@ function calcs.defence(env, actor)
 				base = { "%.1f ^8(base)", baseRegen },
 				{ "%.2f ^8(increased/reduced)", 1 + inc/100 },
 				{ "%.2f ^8(more/less)", more },
-				{ "%.2f ^8(recovery rate modifier)", recoveryRateMod },
 				total = s_format("= %.1f ^8per second", regenRate)
 			})
 			if modDB:Flag(nil, "UnaffectedBy"..resource.."Regen") then

src/Modules/CalcSections.lua

@@ -1437,9 +1437,8 @@ return {
 	{ label = "Recovery", { format = "{1:output:LifeRegenRecovery} ({1:output:LifeRegenPercent}%)",
 		{ breakdown = "LifeRegenRecovery" }, 
 		{ label = "Sources", modName = { "LifeRegen", "LifeRegenPercent", "LifeDegen", "LifeDegenPercent", "LifeRecovery" }, modType = "BASE" },
-		{ label = "Increased Life Regeneration Rate", modName = { "LifeRegen" }, modType = "INC" },
-		{ label = "More Life Regeneration Rate", modName = { "LifeRegen" }, modType = "MORE" },
-		{ label = "Recovery modifiers", modName = "LifeRecoveryRate" },
+		{ label = "Increased Life Recovery", modName = { "LifeRegen", "LifeRecoveryRate" }, modType = "INC" },
+		{ label = "More Life Recovery", modName = { "LifeRegen", "LifeRecoveryRate" }, modType = "MORE" },
 	}, },
 	{ label = "Recoup", haveOutput = "LifeRecoup", { format = "{1:output:LifeRecoup}%", { breakdown = "LifeRecoup" }, 
 		{ label = "Sources", modName = "LifeRecoup" },
@@ -1492,9 +1491,8 @@ return {
 	{ label = "Recovery", { format = "{1:output:ManaRegenRecovery} ({1:output:ManaRegenPercent}%)",
 		{ breakdown = "ManaRegenRecovery" }, 
 		{ label = "Sources", modName = { "ManaRegen", "ManaRegenPercent", "ManaDegen", "ManaDegenPercent", "ManaRecovery" }, modType = "BASE" },
-		{ label = "Increased Mana Regeneration Rate", modName = { "ManaRegen" }, modType = "INC" },
-		{ label = "More Mana Regeneration Rate", modName = { "ManaRegen" }, modType = "MORE" },
-		{ label = "Recovery modifiers", modName = "ManaRecoveryRate" },
+		{ label = "Increased Mana Recovery", modName = { "ManaRegen", "ManaRecoveryRate" }, modType = "INC" },
+		{ label = "More Mana Recovery", modName = { "ManaRegen", "ManaRecoveryRate" }, modType = "MORE" },
 	}, },
 	{ label = "Recoup", haveOutput = "ManaRecoup", { format = "{1:output:ManaRecoup}%", { breakdown = "ManaRecoup" }, 
 		{ label = "Sources", modName = "ManaRecoup" },
@@ -1536,9 +1534,8 @@ return {
 	{ label = "Recovery", { format = "{1:output:EnergyShieldRegenRecovery} ({1:output:EnergyShieldRegenPercent}%)",
 		{ breakdown = "EnergyShieldRegenRecovery" }, 
 		{ label = "Sources", modName = { "EnergyShieldRegen", "EnergyShieldRegenPercent", "EnergyShieldDegen", "EnergyShieldDegenPercent", "EnergyShieldRecovery" }, modType = "BASE" },
-		{ label = "Increased Energy Shield Regeneration Rate", modName = { "EnergyShieldRegen" }, modType = "INC" },
-		{ label = "More Energy Shield Regeneration Rate", modName = { "EnergyShieldRegen" }, modType = "MORE" },
-		{ label = "Recovery modifiers", modName = "EnergyShieldRecoveryRate" },
+		{ label = "Increased Energy Shield Recovery", modName = { "EnergyShieldRegen", "EnergyShieldRecoveryRate" }, modType = "INC" },
+		{ label = "More Energy Shield Recovery", modName = { "EnergyShieldRegen", "EnergyShieldRecoveryRate" }, modType = "MORE" },
 	}, },
 	{ label = "Recoup", haveOutput = "EnergyShieldRecoup", { format = "{1:output:EnergyShieldRecoup}%", { breakdown = "EnergyShieldRecoup" }, 
 		{ label = "Sources", modName = "EnergyShieldRecoup" },