NegativeDamage.Multiplier

Author: Coronia

docs/New-or-Enhanced-Logics.md

@@ -81,7 +81,7 @@ This page describes all the engine features that are either new and introduced b
   - `DisableWeapons` can be used to disable ability to fire any and all weapons.
     - On TechnoTypes with `OpenTopped=true`, `OpenTopped.CheckTransportDisableWeapons` can be set to true to make passengers not be able to fire out if transport's weapons are disabled by `DisableWeapons`.
   - `Unkillable` can be used to prevent the techno from being killed by taken damage (minimum health will be 1).
-  - `PreventNegativeDamage` can be used to prevent the techno from taking negative damage. This includes both negative `Damage` and negative `Verses`.
+  - `NegativeDamage.Multiplier` will be multiplied on the negative damage taken by the attached object. This includes both negative `Damage` and negative `Verses`.
   - It is possible to set groups for attach effect types by defining strings in `Groups`.
     - Groups can be used instead of types for removing effects and weapon filters.
 
@@ -200,7 +200,7 @@ ReflectDamage.Override=                            ; integer
 ReflectDamage.UseInvokerAsOwner=false              ; boolean
 DisableWeapons=false                               ; boolean
 Unkillable=false                                   ; boolean
-PreventNegativeDamage=false                        ; boolean
+NegativeDamage.Multiplier=1.0                      ; floating point value
 LaserTrail.Type=                                   ; lasertrail type
 Groups=                                            ; comma-separated list of strings (group IDs)
 

src/Ext/Techno/Body.Update.cpp

@@ -43,7 +43,7 @@ void TechnoExt::ExtData::OnEarlyUpdate()
 	this->ApplyMindControlRangeLimit();
 	this->UpdateRecountBurst();
 	this->UpdateRearmInEMPState();
-	
+
 	if (this->AttackMoveFollowerTempCount)
 	{
 		this->AttackMoveFollowerTempCount--;
@@ -1833,11 +1833,11 @@ void TechnoExt::ExtData::RecalculateStatMultipliers()
 	double armor = 1.0;
 	double speed = 1.0;
 	double ROF = 1.0;
+	double negativeDamage = 1.0;
 	bool cloak = false;
 	bool forceDecloak = false;
 	bool disableWeapons = false;
 	bool unkillable = false;
-	bool preventNegativeDamage = false;
 	bool hasRangeModifier = false;
 	bool hasTint = false;
 	bool reflectsDamage = false;
@@ -1857,11 +1857,11 @@ void TechnoExt::ExtData::RecalculateStatMultipliers()
 		speed *= type->SpeedMultiplier;
 		armor *= type->ArmorMultiplier;
 		ROF *= type->ROFMultiplier;
+		negativeDamage *= type->NegativeDamage_Multiplier;
 		cloak |= type->Cloakable;
 		forceDecloak |= type->ForceDecloak;
 		disableWeapons |= type->DisableWeapons;
 		unkillable |= type->Unkillable;
-		preventNegativeDamage |= type->PreventNegativeDamage;
 		hasRangeModifier |= (type->WeaponRange_ExtraRange != 0.0 || type->WeaponRange_Multiplier != 0.0);
 		hasTint |= type->HasTint();
 		reflectsDamage |= type->ReflectDamage;
@@ -1876,11 +1876,11 @@ void TechnoExt::ExtData::RecalculateStatMultipliers()
 	pAE.ArmorMultiplier = armor;
 	pAE.SpeedMultiplier = speed;
 	pAE.ROFMultiplier = ROF;
+	pAE.NegativeDamageMultiplier = negativeDamage;
 	pAE.Cloakable = cloak;
 	pAE.ForceDecloak = forceDecloak;
 	pAE.DisableWeapons = disableWeapons;
 	pAE.Unkillable = unkillable;
-	pAE.PreventNegativeDamage = preventNegativeDamage;
 	pAE.HasRangeModifier = hasRangeModifier;
 	pAE.HasTint = hasTint;
 	pAE.ReflectDamage = reflectsDamage;

src/Ext/Techno/Hooks.ReceiveDamage.cpp

@@ -138,10 +138,10 @@ DEFINE_HOOK(0x701900, TechnoClass_ReceiveDamage_Shield, 0x6)
 			ReceiveDamageTemp::SkipLowDamageCheck = true;
 		}
 
-		if (pExt->AE.PreventNegativeDamage && nDamageLeft != 0 && pWHExt->CanTargetHouse(pSourceHouse, pThis)
+		if (pExt->AE.NegativeDamageMultiplier != 1.0 && nDamageLeft != 0 && pWHExt->CanTargetHouse(pSourceHouse, pThis)
 			&& MapClass::GetTotalDamage(nDamageLeft, args->WH, pThis->GetTechnoType()->Armor, args->DistanceToEpicenter) < 0)
 		{
-			damage = 0;
+			damage = static_cast<int>(damage * pExt->AE.NegativeDamageMultiplier);
 		}
 	}
 

src/New/Entity/AttachEffectClass.h

@@ -96,11 +96,11 @@ struct AttachEffectTechnoProperties
 	double ArmorMultiplier;
 	double SpeedMultiplier;
 	double ROFMultiplier;
+	double NegativeDamageMultiplier;
 	bool Cloakable;
 	bool ForceDecloak;
 	bool DisableWeapons;
 	bool Unkillable;
-	bool PreventNegativeDamage;
 	bool HasRangeModifier;
 	bool HasTint;
 	bool ReflectDamage;
@@ -115,11 +115,11 @@ struct AttachEffectTechnoProperties
 		, ArmorMultiplier { 1.0 }
 		, SpeedMultiplier { 1.0 }
 		, ROFMultiplier { 1.0 }
+		, NegativeDamageMultiplier { 1.0 }
 		, Cloakable { false }
 		, ForceDecloak { false }
 		, DisableWeapons { false }
 		, Unkillable { false }
-		, PreventNegativeDamage { false }
 		, HasRangeModifier { false }
 		, HasTint { false }
 		, ReflectDamage { false }

src/New/Entity/ShieldClass.cpp

@@ -222,8 +222,8 @@ int ShieldClass::ReceiveDamage(args_ReceiveDamage* args)
 	const int maxDmg = static_cast<int>(max * pWHExt->Shield_ReceivedDamage_MaxMultiplier);
 	shieldDamage = Math::clamp(shieldDamage, minDmg, maxDmg);
 
-	if (shieldDamage < 0 && TechnoExt::ExtMap.Find(pTechno)->AE.PreventNegativeDamage)
-		shieldDamage = 0;
+	if (shieldDamage < 0)
+		shieldDamage = static_cast<int>(shieldDamage * TechnoExt::ExtMap.Find(pTechno)->AE.NegativeDamageMultiplier);
 
 	if (Phobos::DisplayDamageNumbers && shieldDamage != 0)
 		GeneralUtils::DisplayDamageNumberString(shieldDamage, DamageDisplayType::Shield, pTechno->GetRenderCoords(), TechnoExt::ExtMap.Find(pTechno)->DamageNumberOffset);

src/New/Type/AttachEffectTypeClass.cpp

@@ -195,7 +195,7 @@ void AttachEffectTypeClass::LoadFromINI(CCINIClass* pINI)
 
 	this->DisableWeapons.Read(exINI, pSection, "DisableWeapons");
 	this->Unkillable.Read(exINI, pSection, "Unkillable");
-	this->PreventNegativeDamage.Read(exINI, pSection, "PreventNegativeDamage");
+	this->NegativeDamage_Multiplier.Read(exINI, pSection, "NegativeDamage.Multiplier");
 	this->LaserTrail_Type.Read(exINI, pSection, "LaserTrail.Type");
 
 	// Groups
@@ -293,7 +293,7 @@ void AttachEffectTypeClass::Serialize(T& Stm)
 		.Process(this->ReflectDamage_UseInvokerAsOwner)
 		.Process(this->DisableWeapons)
 		.Process(this->Unkillable)
-		.Process(this->PreventNegativeDamage)
+		.Process(this->NegativeDamage_Multiplier)
 		.Process(this->LaserTrail_Type)
 		.Process(this->Groups)
 		;

src/New/Type/AttachEffectTypeClass.h

@@ -127,7 +127,7 @@ class AttachEffectTypeClass final : public Enumerable<AttachEffectTypeClass>
 	Valueable<bool> ReflectDamage_UseInvokerAsOwner;
 	Valueable<bool> DisableWeapons;
 	Valueable<bool> Unkillable;
-	Valueable<bool> PreventNegativeDamage;
+	Valueable<double> NegativeDamage_Multiplier;
 	ValueableIdx<LaserTrailTypeClass> LaserTrail_Type;
 
 	std::vector<std::string> Groups;
@@ -219,7 +219,7 @@ class AttachEffectTypeClass final : public Enumerable<AttachEffectTypeClass>
 		, ReflectDamage_UseInvokerAsOwner { false }
 		, DisableWeapons { false }
 		, Unkillable { false }
-		, PreventNegativeDamage { false }
+		, NegativeDamage_Multiplier { 1.0 }
 		, LaserTrail_Type { -1 }
 		, Groups {}
 	{};