Initial commit

- Warheads can now damage the enemy without killing them (minimum health will be 1).
- Verified in conventional weapons and radiation types.

In `rulesmd.ini`:

[SOMEWARHEAD]  ; Warhead
CanKill=false  ; boolean

Author: FS-21

CREDITS.md

@@ -134,6 +134,7 @@ This page lists all the individual contributions to the project by their author.
   - Customizable FLH when infantry is prone or deployed
   - Initial strength for cloned infantry
   - Map Events 604 & 605 for checking if a specific Techno enters in a cell
+  - Warhead that can not kill
 - **Starkku**:
   - Misc. minor bugfixes & improvements
   - AI script actions:

docs/New-or-Enhanced-Logics.md

@@ -1475,6 +1475,17 @@ In `rulesmd.ini`:
 RemoveMindControl=false  ; boolean
 ```
 
+### Warhead that can not kill
+
+- Warheads can now damage the enemy without killing them (minimum health will be 1).
+- Verified in conventional weapons and radiation types.
+
+In `rulesmd.ini`:
+```ini
+[SOMEWARHEAD]  ; Warhead
+CanKill=false  ; boolean
+```
+
 ### Chance-based extra damage or Warhead detonation / 'critical hits'
 
 - Warheads can now apply additional chance-based damage or Warhead detonation ('critical hits') with the ability to customize chance, damage, affected targets, affected target HP threshold and animations of critical hit.

docs/Whats-New.md

@@ -318,6 +318,7 @@ New:
 - Custom exit cell for infantry factory (by Starkku)
 - Option for vehicles to keep target when issued move command (by Starkku)
 - Skip anim delay for burst fire (by TaranDahl)
+- Warhead that can not kill (by FS-21)
 
 Vanilla fixes:
 - Aircraft will now behave as expected according to it's `MovementZone` and `SpeedType` when moving onto different surfaces. In particular, this fixes erratic behavior when vanilla aircraft is ordered to move onto water surface and instead the movement order changes to a shore nearby (by CrimRecya)

src/Ext/RadSite/Body.cpp

@@ -14,6 +14,19 @@ void RadSiteExt::ExtData::Initialize()
 bool RadSiteExt::ExtData::ApplyRadiationDamage(TechnoClass* pTarget, int& damage, int distance)
 {
 	auto const pWarhead = this->Type->GetWarhead();
+	auto const pWHExt = WarheadTypeExt::ExtMap.Find(pWarhead);
+
+	// Check if the WH should affect the techno target or skip it
+	double versus = MapClass::GetTotalDamage(damage, pWarhead, pTarget->GetTechnoType()->Armor, 0);
+	int nDamageTotal = damage * versus;
+
+	if (pTarget->Health > 0 && !pWHExt->CanKill && nDamageTotal >= pTarget->Health)
+	{
+		pTarget->Health = 1;
+		pTarget->EstimatedHealth = 1;
+
+		return false;
+	}
 
 	if (!this->Type->GetWarheadDetonate())
 	{

src/Ext/Techno/Hooks.ReceiveDamage.cpp

@@ -12,19 +12,36 @@ namespace ReceiveDamageTemp
 // #issue 88 : shield logic
 DEFINE_HOOK(0x701900, TechnoClass_ReceiveDamage_Shield, 0x6)
 {
+	enum { SkipGameCode = 0x701A38 };
+
 	GET(TechnoClass*, pThis, ECX);
 	LEA_STACK(args_ReceiveDamage*, args, 0x4);
 
 	const auto pExt = TechnoExt::ExtMap.Find(pThis);
 
 	int nDamageLeft = *args->Damage;
+	double versus = MapClass::GetTotalDamage(nDamageLeft, args->WH, pThis->GetTechnoType()->Armor, 0);
+	int nDamageTotal = nDamageLeft * versus;
+	auto const pWHExt = WarheadTypeExt::ExtMap.Find(args->WH);
 
 	if (!args->IgnoreDefenses)
 	{
 		if (const auto pShieldData = pExt->Shield.get())
 		{
 			if (!pShieldData->IsActive())
+			{
+				// Check if the warhead can not kill targets
+				if (pThis->Health > 0 && !pWHExt->CanKill && nDamageTotal >= pThis->Health)
+				{
+					*args->Damage = 0;
+					pThis->Health = 1;
+					pThis->EstimatedHealth = 1;
+
+					return SkipGameCode;
+				}
+
 				return 0;
+			}
 
 			nDamageLeft = pShieldData->ReceiveDamage(args);
 
@@ -41,6 +58,18 @@ DEFINE_HOOK(0x701900, TechnoClass_ReceiveDamage_Shield, 0x6)
 		}
 	}
 
+	// Update remaining damage and check if the target will die and should be avoided
+	nDamageTotal = nDamageLeft * versus;
+
+	if (pThis->Health > 0 && !pWHExt->CanKill && nDamageTotal >= pThis->Health)
+	{
+		*args->Damage = 0;
+		pThis->Health = 1;
+		pThis->EstimatedHealth = 1;
+
+		return SkipGameCode;
+	}
+
 	return 0;
 }
 

src/Ext/WarheadType/Body.cpp

@@ -266,6 +266,8 @@ void WarheadTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
 	this->SuppressReflectDamage.Read(exINI, pSection, "SuppressReflectDamage");
 	this->SuppressReflectDamage_Types.Read(exINI, pSection, "SuppressReflectDamage.Types");
 
+	this->CanKill.Read(exINI, pSection, "CanKill");
+
 	// Convert.From & Convert.To
 	TypeConvertGroup::Parse(this->Convert_Pairs, exINI, pSection, AffectedHouse::All);
 
@@ -499,6 +501,8 @@ void WarheadTypeExt::ExtData::Serialize(T& Stm)
 		.Process(this->PossibleCellSpreadDetonate)
 		.Process(this->Reflected)
 		.Process(this->DamageAreaTarget)
+
+		.Process(this->CanKill)
 		;
 }
 

src/Ext/WarheadType/Body.h

@@ -167,6 +167,8 @@ class WarheadTypeExt
 		bool PossibleCellSpreadDetonate;
 		TechnoClass* DamageAreaTarget;
 
+		Valueable<bool> CanKill;
+
 	private:
 		Valueable<double> Shield_Respawn_Rate_InMinutes;
 		Valueable<double> Shield_SelfHealing_Rate_InMinutes;
@@ -316,6 +318,8 @@ class WarheadTypeExt
 			, RemainingAnimCreationInterval { 0 }
 			, PossibleCellSpreadDetonate { false }
 			, DamageAreaTarget {}
+
+			, CanKill { true }
 		{ }
 
 		void ApplyConvert(HouseClass* pHouse, TechnoClass* pTarget);