GainSelfHealAllowAllies and self healing pip

Author: Coronia

CREDITS.md

@@ -419,7 +419,7 @@ This page lists all the individual contributions to the project by their author.
   - Enhanced Bombard trajectory
   - Shield armor inheritance customization
   - Fix `DefaultDisguise` showing wrong house colors for different players
-  - Allowed player's self-healing effects to be benefited by houses with `PlayerControl=true` in campaign
+  - Allowed player's self-healing effects to be benefited by allied or `PlayerControl=true` houses
 - **NaotoYuuki** - Vertical & meteor trajectory projectile prototypes
 - **handama** - AI script action to `16005 Jump Back To Previous Script`
 - **TaranDahl (航味麻酱)**:

docs/Fixed-or-Improved-Logics.md

@@ -620,6 +620,7 @@ BallisticScatter.Max= ; floating point value, distance in cells
 - It is now possible to set a global cap for the effects of `InfantryGainSelfHeal` and `UnitsGainSelfHeal` by setting `InfantryGainSelfHealCap` & `UnitsGainSelfHealCap` under `[General]`, respectively.
 - Whether or not `MultiplayPassive=true` houses benefit from these effects can be controlled via `GainSelfHealAllowMultiplayPassive`.
 - In campaign, whether or not these effects for player can be benefited by houses with `PlayerControl=true` can be controlled via `GainSelfHealAllowPlayerControl`.
+- Whether or not these effects can be benefited by allied houses can be controlled via `GainSelfHealAllowAllies`.
 - It is also possible to change the pip frames displayed from `pips.shp` individually for infantry, units and buildings by setting the frames for infantry & unit self-healing on `Pips.SelfHeal.Infantry/Units/Buildings` under `[AudioVisual]`, respectively.
   - `Pips.SelfHeal.Infantry/Units/Buildings.Offset` can be used to customize the pixel offsets for the displayed pips, individually for infantry, units and buildings.
 - Whether or not a TechnoType benefits from effects of `InfantryGainSelfHeal` or `UnitsGainSelfHeal` buildings or neither can now be controlled by setting `SelfHealGainType`.
@@ -632,6 +633,7 @@ InfantryGainSelfHealCap=                ; integer, maximum amount of InfantryGai
 UnitsGainSelfHealCap=                   ; integer, maximum amount of UnitsGainSelfHeal that can be in effect at once, must be 1 or higher
 GainSelfHealAllowMultiplayPassive=true  ; boolean
 GainSelfHealAllowPlayerControl=false    ; boolean
+GainSelfHealAllowAllies=false           ; boolean
 
 [AudioVisual]
 Pips.SelfHeal.Infantry=13,20            ; integer, frames of pips.shp for infantry & unit-self healing pips, respectively

docs/Whats-New.md

@@ -341,7 +341,7 @@ New:
 - Play an anim when recycling a spawner (by TaranDahl)
 - Recycle the spawner on other FLH (by TaranDahl)
 - Technos can maintain a suitable distance after firing (by CrimRecya)
-- Allowed player's self-healing effects to be benefited by houses with `PlayerControl=true` in campaign (by Ollerus)
+- Allowed player's self-healing effects to be benefited by allied or `PlayerControl=true` houses (by Ollerus)
 
 Vanilla fixes:
 - Prevent the units with locomotors that cause problems from entering the tank bunker (by TaranDahl)

src/Ext/Rules/Body.cpp

@@ -72,6 +72,7 @@ void RulesExt::ExtData::LoadBeforeTypeData(RulesClass* pThis, CCINIClass* pINI)
 	this->UnitsGainSelfHealCap.Read(exINI, GameStrings::General, "UnitsGainSelfHealCap");
 	this->GainSelfHealAllowMultiplayPassive.Read(exINI, GameStrings::General, "GainSelfHealAllowMultiplayPassive");
 	this->GainSelfHealAllowPlayerControl.Read(exINI, GameStrings::General, "GainSelfHealAllowPlayerControl");
+	this->GainSelfHealAllowAllies.Read(exINI, GameStrings::General, "GainSelfHealAllowAllies");
 	this->EnemyInsignia.Read(exINI, GameStrings::General, "EnemyInsignia");
 	this->DisguiseBlinkingVisibility.Read(exINI, GameStrings::General, "DisguiseBlinkingVisibility");
 	this->ChronoSparkleDisplayDelay.Read(exINI, GameStrings::General, "ChronoSparkleDisplayDelay");
@@ -312,6 +313,7 @@ void RulesExt::ExtData::Serialize(T& Stm)
 		.Process(this->UnitsGainSelfHealCap)
 		.Process(this->GainSelfHealAllowMultiplayPassive)
 		.Process(this->GainSelfHealAllowPlayerControl)
+		.Process(this->GainSelfHealAllowAllies)
 		.Process(this->EnemyInsignia)
 		.Process(this->DisguiseBlinkingVisibility)
 		.Process(this->ChronoSparkleDisplayDelay)

src/Ext/Rules/Body.h

@@ -36,6 +36,7 @@ class RulesExt
 		Nullable<int> UnitsGainSelfHealCap;
 		Valueable<bool> GainSelfHealAllowMultiplayPassive;
 		Valueable<bool> GainSelfHealAllowPlayerControl;
+		Valueable<bool> GainSelfHealAllowAllies;
 		Valueable<bool> EnemyInsignia;
 		Valueable<AffectedHouse> DisguiseBlinkingVisibility;
 		Valueable<int> ChronoSparkleDisplayDelay;
@@ -202,6 +203,7 @@ class RulesExt
 			, UnitsGainSelfHealCap {}
 			, GainSelfHealAllowMultiplayPassive { true }
 			, GainSelfHealAllowPlayerControl { false }
+			, GainSelfHealAllowAllies { false }
 			, EnemyInsignia { true }
 			, DisguiseBlinkingVisibility { AffectedHouse::Owner }
 			, ChronoSparkleDisplayDelay { 24 }

src/Ext/Techno/Body.Update.cpp

@@ -678,66 +678,57 @@ void TechnoExt::ApplyGainedSelfHeal(TechnoClass* pThis)
 
 		if (selfHealType == SelfHealGainType::NoHeal)
 			return;
+		else if (selfHealType == SelfHealGainType::Infantry && Unsorted::CurrentFrame % RulesClass::Instance->SelfHealInfantryFrames)
+			return;
+		else if (Unsorted::CurrentFrame % RulesClass::Instance->SelfHealUnitFrames)
+			return;
 
 		int amount = 0;
-		auto const pOwner = pThis->Owner;
-
-		if (selfHealType == SelfHealGainType::Infantry)
-		{
-			if (Unsorted::CurrentFrame % RulesClass::Instance->SelfHealInfantryFrames)
-				return;
-
-			const bool hasCap = RulesExt::Global()->InfantryGainSelfHealCap.isset();
-			const int cap = RulesExt::Global()->InfantryGainSelfHealCap.Get();
-			int count = hasCap ? std::clamp(pOwner->InfantrySelfHeal, 1, cap) : pOwner->InfantrySelfHeal;
 
-			if (RulesExt::Global()->GainSelfHealAllowPlayerControl && SessionClass::IsCampaign() && (!hasCap || count < cap))
+		auto countSelfHealing = [](const bool infantryHeal)
 			{
-				for (auto pHouse : HouseClass::Array)
-				{
-					if (pHouse != pOwner && pHouse->IsControlledByCurrentPlayer())
-					{
-						count += pHouse->InfantrySelfHeal;
+				auto const pOwner = pThis->Owner;
+				const bool hasCap = RulesExt::Global()->InfantryGainSelfHealCap.isset();
+				const int cap = RulesExt::Global()->InfantryGainSelfHealCap.Get();
+				int count = std::max(infantryHeal ? pOwner->InfantrySelfHeal : pOwner->UnitsSelfHeal, 1);
 
-						if (hasCap && count >= cap)
-						{
-							count = cap;
-							break;
-						}
-					}
+				if (hasCap && count >= cap)
+				{
+					count = cap;
+					return count;
 				}
-			}
 
-			amount = RulesClass::Instance->SelfHealInfantryAmount * count;
-		}
-		else
-		{
-			if (Unsorted::CurrentFrame % RulesClass::Instance->SelfHealUnitFrames)
-				return;
+				const bool allowPlayerControl = RulesExt::Global()->GainSelfHealAllowPlayerControl && SessionClass::IsCampaign();
+				const bool allowAllies = RulesExt::Global()->GainSelfHealAllowAllies;
 
-			const bool hasCap = RulesExt::Global()->UnitsGainSelfHealCap.isset();
-			const int cap = RulesExt::Global()->UnitsGainSelfHealCap.Get();
-			int count = hasCap ? std::clamp(pOwner->UnitsSelfHeal, 1, cap) : pOwner->UnitsSelfHeal;
-
-			if (RulesExt::Global()->GainSelfHealAllowPlayerControl && SessionClass::IsCampaign() && (!hasCap || count < cap))
-			{
-				for (auto pHouse : HouseClass::Array)
+				if (allowPlayerControl || allowAllies)
 				{
-					if (pHouse != pOwner && pHouse->IsControlledByCurrentPlayer())
+					for (auto pHouse : HouseClass::Array)
 					{
-						count += pHouse->UnitsSelfHeal;
+						if (pHouse == pOwner)
+							continue;
 
-						if (hasCap && count >= cap)
+						if ((allowPlayerControl && pHouse->IsControlledByCurrentPlayer())
+							|| (allowAllies && !pHouse->IsControlledByCurrentPlayer() && pHouse->IsAlliedWith(pOwner)))
 						{
-							count = cap;
-							break;
+							count += infantryHeal ? pHouse->InfantrySelfHeal : pHouse->UnitsSelfHeal;
+
+							if (hasCap && count >= cap)
+							{
+								count = cap;
+								return count;
+							}
 						}
 					}
 				}
-			}
 
-			amount = RulesClass::Instance->SelfHealUnitAmount * count;
-		}
+				return count;
+			};
+
+		if (selfHealType == SelfHealGainType::Infantry)
+			amount = RulesClass::Instance->SelfHealInfantryAmount * countSelfHealing(true);
+		else
+			amount = RulesClass::Instance->SelfHealUnitAmount * countSelfHealing(false);
 
 		if (amount)
 		{

src/Ext/Techno/Body.Visuals.cpp

@@ -26,13 +26,44 @@ void TechnoExt::DrawSelfHealPips(TechnoClass* pThis, Point2D* pLocation, Rectang
 	if (pThis->WhatAmI() == AbstractType::Infantry || (pThis->GetTechnoType()->Organic && pThis->WhatAmI() == AbstractType::Unit))
 		isOrganic = true;
 
-	if (pThis->Owner->InfantrySelfHeal > 0 && (hasInfantrySelfHeal || (isOrganic && !hasUnitSelfHeal)))
+	auto hasSelfHeal = [](const bool infantryHeal)
+		{
+			if (infantryHeal ? pThis->Owner->InfantrySelfHeal > 0 : pThis->Owner->UnitsSelfHeal > 0)
+				return true;
+
+			const bool allowPlayerControl = RulesExt::Global()->GainSelfHealAllowPlayerControl && SessionClass::IsCampaign();
+			const bool allowAllies = RulesExt::Global()->GainSelfHealAllowAllies;
+
+			if (allowPlayerControl || allowAllies)
+			{
+				for (auto pHouse : HouseClass::Array)
+				{
+					if (pHouse == pOwner)
+						continue;
+
+					if (allowPlayerControl && pHouse->IsControlledByCurrentPlayer())
+					{
+						if (infantryHeal ? pHouse->InfantrySelfHeal > 0 : pHouse->UnitsSelfHeal > 0)
+							return true;
+					}
+					else if (allowAllies && !pHouse->IsControlledByCurrentPlayer() && pHouse->IsAlliedWith(pOwner))
+					{
+						if (infantryHeal ? pHouse->InfantrySelfHeal > 0 : pHouse->UnitsSelfHeal > 0)
+							return true;
+					}
+				}
+			}
+
+			return false;
+		};
+
+	if ((hasInfantrySelfHeal || (isOrganic && !hasUnitSelfHeal)) && hasSelfHeal(true))
 	{
 		drawPip = true;
 		selfHealFrames = RulesClass::Instance->SelfHealInfantryFrames;
 		isInfantryHeal = true;
 	}
-	else if (pThis->Owner->UnitsSelfHeal > 0 && (hasUnitSelfHeal || (pThis->WhatAmI() == AbstractType::Unit && !isOrganic)))
+	else if ((hasUnitSelfHeal || (pThis->WhatAmI() == AbstractType::Unit && !isOrganic)) && hasSelfHeal(false))
 	{
 		drawPip = true;
 		selfHealFrames = RulesClass::Instance->SelfHealUnitFrames;