Better Reservation calcs for spectre

Author: Blitz54

src/Modules/CalcActiveSkill.lua

@@ -533,12 +533,6 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 		activeEffect.grantedEffectLevel = grantedEffectLevel
 		return
 	end
-	-- For Spectre base reservation
-	if activeSkill.actor and activeSkill.actor.minionData and activeSkill.actor.minionData.experienceMultiplier then
-		local xpMult = activeSkill.actor.minionData.experienceMultiplier
-		local newBaseReserve = round(50 * m_max(xpMult, 0) / 10) * 10
-		env.player.mainSkill.skillData.spiritReservationFlat = newBaseReserve
-	end
 	-- Add support gem modifiers to skill mod list
 	for _, skillEffect in pairs(activeSkill.effectList) do
 		if skillEffect.grantedEffect.support then

src/Modules/CalcDefence.lua

@@ -243,6 +243,12 @@ function calcs.doActorLifeManaSpiritReservation(actor)
 					end
 					values.reservedFlat = values.reservedFlat * instances * mult
 					values.reservedPercent = values.reservedPercent * instances * mult
+				end
+				if activeSkill.skillCfg.skillName == "Spectre: {0} " and activeSkill.minion then
+					local xpMult = activeSkill.minion.minionData.experienceMultiplier
+					local selectedSpectreReserve = round(50 * m_max(xpMult, 0) / 10) * 10
+					pool.Spirit.baseFlat = selectedSpectreReserve + skillModList:Sum("BASE", skillCfg, "ExtraSpirit")
+					values.reservedFlat = values.reservedFlat
 				end
 					-- Blood Sacrament increases reservation per stage channelled
 				if activeSkill.skillCfg.skillName == "Blood Sacrament" and activeSkill.activeStageCount then