Simplify calc and add test

Author: LocalIdentity

spec/System/TestSkills_spec.lua

@@ -94,6 +94,23 @@ describe("TestSkills", function()
 		assert.True(build.calcsTab.mainOutput.SpiritReservedPercent > oneCurseReservation)
 	end)
 
+	it("applies life reservation efficiency to Atziri's Communion Blasphemy reservation", function()
+		build.skillsTab:PasteSocketGroup("Blasphemy 20/0  1\nDespair 20/0  1\nAtziri's Communion 1/0  1\n")
+		runCallback("OnFrame")
+
+		assert.are.equals(0, build.calcsTab.mainOutput.SpiritReserved)
+		assert.are.equals(0, build.calcsTab.mainOutput.SpiritReservedPercent)
+		assert.are.equals(26, build.calcsTab.mainOutput.LifeReserved)
+		assert.are.equals(40, build.calcsTab.mainOutput.LifeReservedPercent)
+
+		build.configTab.input.customMods = "100% increased Life Reservation Efficiency"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		assert.are.equals(13, build.calcsTab.mainOutput.LifeReserved)
+		assert.are.equals(20, build.calcsTab.mainOutput.LifeReservedPercent)
+	end)
+
 	it("applies active skill reservation multiplier to linked buff spirit reservation", function()
 		build.skillsTab:PasteSocketGroup("Purity of Fire 20/0  1\nVitality II 1/0  1\n")
 		runCallback("OnFrame")

src/Modules/CalcDefence.lua

@@ -225,6 +225,16 @@ function calcs.doActorLifeManaSpiritReservation(actor)
 				pool.Life.baseFlat = skillModList:Sum("BASE", skillCfg, "LifeCostBase") + (activeSkill.activeEffect.grantedEffectLevel.cost.Life or 0)
 			end
 			pool.Life.basePercent = activeSkill.skillData.lifeReservationPercent or activeSkill.activeEffect.grantedEffectLevel.lifeReservationPercent or 0
+			if activeSkill.skillTypes[SkillType.IsBlasphemy] and activeSkill.activeEffect.srcInstance.supportEffect and activeSkill.activeEffect.srcInstance.supportEffect.isSupporting then
+				-- Sadly no better way to get key/val table element count in lua.
+				local instances = 0
+				for _ in pairs(activeSkill.activeEffect.srcInstance.supportEffect.isSupporting) do
+					instances = instances + 1
+				end
+				for name, values in pairs(pool) do
+					values.baseFlat = values.baseFlat + (activeSkill.skillData["blasphemyReservationFlat" .. name] or 0) * instances
+				end
+			end
 			if skillModList:Flag(skillCfg, "BloodMagicReserved") then
 				pool.Life.baseFlat = pool.Life.baseFlat + pool.Mana.baseFlat
 				pool.Mana.baseFlat = 0
@@ -235,14 +245,12 @@ function calcs.doActorLifeManaSpiritReservation(actor)
 				activeSkill.skillData["LifeReservationPercentForced"] = activeSkill.skillData["ManaReservationPercentForced"]
 				activeSkill.skillData["ManaReservationPercentForced"] = nil
 			end
-			do
-				local lifePerSpirit = skillModList:Sum("BASE", skillCfg, "LifeReservePercentPerSpirit")
-				if lifePerSpirit > 0 then
-					pool.Life.basePercent = pool.Life.basePercent + pool.Spirit.baseFlat * lifePerSpirit
-					pool.Spirit.baseFlat = 0
-					pool.Life.basePercent = pool.Life.basePercent + pool.Spirit.basePercent * lifePerSpirit
-					pool.Spirit.basePercent = 0
-				end
+			local spiritToLifeReservation = skillModList:Sum("BASE", skillCfg, "LifeReservePercentPerSpirit")
+			if spiritToLifeReservation > 0 then
+				pool.Life.basePercent = pool.Life.basePercent + pool.Spirit.baseFlat * spiritToLifeReservation
+				pool.Spirit.baseFlat = 0
+				pool.Life.basePercent = pool.Life.basePercent + pool.Spirit.basePercent * spiritToLifeReservation
+				pool.Spirit.basePercent = 0
 			end
 			for name, values in pairs(pool) do
 				values.more = skillModList:More(skillCfg, name.."Reserved", "Reserved")
@@ -278,37 +286,6 @@ function calcs.doActorLifeManaSpiritReservation(actor)
 					values.count = activeSkillCount
 					local minionFreeSpiritCount = skillModList:Sum("BASE", skillCfg, "MinionFreeSpiritCount")
 					values.reservedFlat = values.reservedFlat * m_max(activeSkillCount - minionFreeSpiritCount, 0)
-				end
-				if activeSkill.skillTypes[SkillType.IsBlasphemy] and activeSkill.activeEffect.srcInstance.supportEffect and activeSkill.activeEffect.srcInstance.supportEffect.isSupporting and activeSkill.skillData["blasphemyReservationFlat" .. name] then
-					-- Sadly no better way to get key/val table element count in lua.
-					local instances = 0
-					for _ in pairs(activeSkill.activeEffect.srcInstance.supportEffect.isSupporting) do
-						instances = instances + 1
-					end
-
-					-- Extra reservation of blasphemy needs to be separated from the reservation caused by curses
-					local blasphemyFlat = activeSkill.skillData["blasphemyReservationFlat" .. name]
-					local blasphemyEffectiveFlat = m_max(round(blasphemyFlat * mult * (100 + values.inc) / 100 * values.more / (1 + values.efficiency / 100) / values.efficiencyMore, 0), 0)
-					local lifePerSpirit = skillModList:Sum("BASE", skillCfg, "LifeReservePercentPerSpirit")
-					if name == "Spirit" and lifePerSpirit > 0 then
-						local lifeBasePercent = blasphemyFlat * instances * lifePerSpirit
-						local lifeEffectivePercent = m_max(round(lifeBasePercent * mult * (100 + values.inc) / 100 * values.more / (1 + values.efficiency / 100) / values.efficiencyMore, 2), 0)
-						actor["reserved_LifePercent"] = actor["reserved_LifePercent"] + lifeEffectivePercent
-						if breakdown then
-							t_insert(breakdown["LifeReserved"].reservations, {
-								skillName = activeSkill.activeEffect.grantedEffect.name,
-								base = lifeBasePercent .. "%",
-								mult = mult ~= 1 and ("x "..mult),
-								more = values.more ~= 1 and ("x "..values.more),
-								inc = values.inc ~= 0 and ("x "..(1 + values.inc / 100)),
-								efficiency = values.efficiency ~= 0 and ("x " .. round(100 / (100 + values.efficiency), 4)),
-								efficiencyMore = values.efficiencyMore ~= 1 and ("x "..values.efficiencyMore),
-								total = lifeEffectivePercent .. "%",
-							})
-						end
-					else
-						values.reservedFlat = values.reservedFlat + blasphemyEffectiveFlat * instances
-					end
 				end
 					-- Blood Sacrament increases reservation per stage channelled
 				if activeSkill.skillCfg.skillName == "Blood Sacrament" and activeSkill.activeStageCount then