improve implementation of Kaom's Heart 'You have no spirit' mod. changed mod parsing, mod calculation to consider the override and calculate negative spirit, and calc sections to display the override on the calc panel (#475)

Author: ltogniolli

src/Data/ModCache.lua

@@ -3058,7 +3058,7 @@ c["You have a Smoke Cloud around you while stationary"]={nil,"a Smoke Cloud arou
 c["You have no Accuracy Penalty at Distance"]={nil,"no Accuracy Penalty at Distance "}
 c["You have no Elemental Resistances"]={{[1]={flags=0,keywordFlags=0,name="FireResist",type="OVERRIDE",value=0},[2]={flags=0,keywordFlags=0,name="ColdResist",type="OVERRIDE",value=0},[3]={flags=0,keywordFlags=0,name="LightningResist",type="OVERRIDE",value=0}},nil}
 c["You have no Life Regeneration"]={{[1]={flags=0,keywordFlags=0,name="NoLifeRegen",type="FLAG",value=true}},nil}
-c["You have no Spirit"]={{[1]={flags=0,keywordFlags=0,name="NoSpirit",type="FLAG",value=true}},nil}
+c["You have no Spirit"]={{[1]={flags=0,keywordFlags=0,name="Spirit",type="OVERRIDE",value=0}},nil}
 c["You lose 5% of Energy Shield per second"]={{[1]={flags=0,keywordFlags=0,name="EnergyShieldDegenPercent",type="BASE",value=5}},nil}
 c["You take 10% of damage from Blocked Hits"]={{[1]={flags=0,keywordFlags=0,name="BlockEffect",type="BASE",value=10}},nil}
 c["You take 20% of damage from Blocked Hits"]={{[1]={flags=0,keywordFlags=0,name="BlockEffect",type="BASE",value=20}},nil}

src/Modules/CalcDefence.lua

@@ -70,7 +70,9 @@ function calcs.doActorLifeManaSpirit(actor)
 		local inc = modDB:Sum("INC", nil, res)
 		local more = modDB:More(nil, res)
 		local conv = m_min(modDB:Sum("BASE", nil, res .. "ConvertToEnergyShield", res .. "ConvertToArmour", res .. "ConvertToEvasion"), 100)
-		output[res] = m_max(round((base * (1 - conv/100) + extra) * (1 + inc/100) * more), 1)
+		local override = modDB:Override(nil, res)
+		output[res.."HasOverride"] = override ~= nil
+		output[res] = override or m_max(round((base * (1 - conv/100) + extra) * (1 + inc/100) * more), 1)
 		if breakdown then
 			if inc ~= 0 or more ~= 1 or conv ~= 0 or extra ~= 0 then
 				breakdown[res][1] = s_format("%g ^8(base)", base)
@@ -100,9 +102,6 @@ function calcs.doActorLifeManaSpirit(actor)
 		condList["FullLife"] = true
 	end
 	output.LowestOfMaximumLifeAndMaximumMana = m_min(output.Life, output.Mana)
-	if modDB:Flag(nil, "NoSpirit") then
-		output.Spirit = 0
-	end
 end
 
 -- Calculate life/mana/spirit reservation
@@ -229,22 +228,19 @@ function calcs.doActorLifeManaSpiritReservation(actor)
 
 	for _, pool in pairs({"Life", "Mana", "Spirit"}) do
 		local max = output[pool]
-		local reserved
+		local lowPerc = modDB:Sum("BASE", nil, "Low" .. pool .. "Percentage")
+		local reserved = (actor["reserved_"..pool.."Base"] or 0) + m_ceil(max * (actor["reserved_"..pool.."Percent"] or 0) / 100)
+		uncancellableReservation = actor["uncancellable_"..pool.."Reservation"] or 0
+		output[pool.."Reserved"] = m_min(reserved, max)
+		output[pool.."Unreserved"] = max - reserved
+		output[pool.."UncancellableReservation"] = m_min(uncancellableReservation, 0)
+		output[pool.."CancellableReservation"] = 100 - uncancellableReservation
 		if max > 0 then
-			local lowPerc = modDB:Sum("BASE", nil, "Low" .. pool .. "Percentage")
-			reserved = (actor["reserved_"..pool.."Base"] or 0) + m_ceil(max * (actor["reserved_"..pool.."Percent"] or 0) / 100)
-			uncancellableReservation = actor["uncancellable_"..pool.."Reservation"] or 0
-			output[pool.."Reserved"] = m_min(reserved, max)
 			output[pool.."ReservedPercent"] = m_min(reserved / max * 100, 100)
-			output[pool.."Unreserved"] = max - reserved
 			output[pool.."UnreservedPercent"] = (max - reserved) / max * 100
-			output[pool.."UncancellableReservation"] = m_min(uncancellableReservation, 0)
-			output[pool.."CancellableReservation"] = 100 - uncancellableReservation
 			if (max - reserved) / max <= (lowPerc > 0 and lowPerc or data.misc.LowPoolThreshold) then
 				condList["Low"..pool] = true
 			end
-		else
-			reserved = 0
 		end
 		for _, value in ipairs(modDB:List(nil, "GrantReserved"..pool.."AsAura")) do
 			local auraMod = copyTable(value.mod)

src/Modules/CalcSections.lua

@@ -1485,6 +1485,7 @@ return {
 	{ label = "Inc. from Tree", { format = "{0:mod:1}%", { modName = "Spirit", modType = "INC", modSource = "Tree" }, }, },
 	{ label = "Total Base", { format = "{0:mod:1}", { modName = "Spirit", modType = "BASE" }, }, },
 	{ label = "Total Increased", { format = "{0:mod:1}%", { modName = "Spirit", modType = "INC" }, }, },
+	{ label = "Override", haveOutput = "SpiritHasOverride", { format = "{0:mod:1}", { modName = "Spirit", modType = "OVERRIDE" }, }, },
 	{ label = "Total", { format = "{0:output:Spirit}", { breakdown = "Spirit" }, }, },
 	{ label = "Reserved", { format = "{0:output:SpiritReserved} ({0:output:SpiritReservedPercent}%)", { breakdown = "SpiritReserved" }, }, },
 	{ label = "Unreserved", { format = "{0:output:SpiritUnreserved} ({0:output:SpiritUnreservedPercent}%)" }, },

src/Modules/ModParser.lua

@@ -4272,7 +4272,9 @@ local specialModList = {
 		mod("ColdResist", "OVERRIDE", 0),
 		mod("LightningResist", "OVERRIDE", 0),
 	},
-	["you have no spirit"] = { flag("NoSpirit") },
+	["you have no spirit"] = {
+		mod("Spirit", "OVERRIDE", 0),
+	},
 	["you have no elemental resistances"] = {
 		mod("FireResist", "OVERRIDE", 0),
 		mod("ColdResist", "OVERRIDE", 0),