AE FeedbackWeapon

Author: Coronia

docs/New-or-Enhanced-Logics.md

@@ -41,6 +41,8 @@ This page describes all the engine features that are either new and introduced b
     - `ExtraWarheads.DetonationChances` can be used to customize the chance of each extra Warhead detonation occuring. Value from position matching the position from `ExtraWarheads` is used if found, or last listed value if not found. If list is empty, every extra Warhead detonation is guaranteed to occur.
     - `ExtraWarheads.FullDetonation` can be used to customize whether or not each individual Warhead is detonated fully (as part of a dummy weapon) or simply deals area damage and applies Phobos' Warhead effects. Value from position matching the position from `ExtraWarheads` is used if found, or last listed value if not found. If list is empty, defaults to true.
     - Note that the listed Warheads must be listed in `[Warheads]` for them to work.
+  - `FeedbackWeapon` can specify an auxiliary weapon to be fired on the firer itself when a weapon is fired.
+    - `FireInTransport` setting of the feedback weapon is respected to determine if it can be fired when the original weapon is fired from inside `OpenTopped=true` transport. If feedback weapon is fired, it is fired on the transport. `OpenToppedDamageMultiplier` is not applied on feedback weapons.
   - `Tint.Color` & `Tint.Intensity` can be used to set a color tint effect and additive lighting increase/decrease on the object the effect is attached to, respectively.
     - `Tint.VisibleToHouses` can be used to control which houses can see the tint effect.
   - `FirepowerMultiplier`, `ArmorMultiplier`, `SpeedMultiplier` and `ROFMultiplier` can be used to modify the object's firepower, armor strength, movement speed and weapon reload rate, respectively.
@@ -121,6 +123,7 @@ ExtraWarheads=                                     ; List of WarheadTypes
 ExtraWarheads.DamageOverrides=                     ; List of integers
 ExtraWarheads.DetonationChances=                   ; List of floating-point values (percentage or absolute)
 ExtraWarheads.FullDetonation=                      ; List of booleans
+FeedbackWeapon=                                    ; WeaponType
 Tint.Color=                                        ; integer - R,G,B
 Tint.Intensity=                                    ; floating point value
 Tint.VisibleToHouses=all                           ; List of Affected House Enumeration (none|owner/self|allies/ally|team|enemies/enemy|all)

src/Ext/Techno/Body.Update.cpp

@@ -1171,6 +1171,7 @@ void TechnoExt::ExtData::RecalculateStatMultipliers()
 	bool hasRestrictedArmorMultipliers = false;
 	bool hasCritModifiers = false;
 	bool hasExtraWarheads = false;
+	bool hasFeedbackWeapon = false;
 
 	for (const auto& attachEffect : this->AttachedEffects)
 	{
@@ -1193,6 +1194,7 @@ void TechnoExt::ExtData::RecalculateStatMultipliers()
 		hasRestrictedArmorMultipliers |= (type->ArmorMultiplier != 1.0 && (type->ArmorMultiplier_AllowWarheads.size() > 0 || type->ArmorMultiplier_DisallowWarheads.size() > 0));
 		hasCritModifiers |= (type->Crit_Multiplier != 1.0 || type->Crit_ExtraChance != 0.0);
 		hasExtraWarheads |= type->ExtraWarheads.size() > 0;
+		hasFeedbackWeapon |= type->FeedbackWeapon != nullptr;
 	}
 
 	this->AE.FirepowerMultiplier = firepower;
@@ -1210,6 +1212,7 @@ void TechnoExt::ExtData::RecalculateStatMultipliers()
 	this->AE.HasRestrictedArmorMultipliers = hasRestrictedArmorMultipliers;
 	this->AE.HasCritModifiers = hasCritModifiers;
 	this->AE.HasExtraWarheads = hasExtraWarheads;
+	this->AE.HasFeedbackWeapon = hasFeedbackWeapon;
 
 	if (forceDecloak && pThis->CloakState == CloakState::Cloaked)
 		pThis->Uncloak(true);

src/Ext/Techno/Hooks.Firing.cpp

@@ -586,6 +586,22 @@ DEFINE_HOOK(0x6FF43F, TechnoClass_FireAt_FeedbackWeapon, 0x6)
 		}
 	}
 
+	auto const pExt = TechnoExt::ExtMap.Find(pThis);
+
+	if (pExt->AE.HasFeedbackWeapon)
+	{
+		for (auto const& pAE : pExt->AttachedEffects)
+		{
+			if (auto const pWeaponFeedback = pAE->GetType()->FeedbackWeapon)
+			{
+				if (pThis->InOpenToppedTransport && !pWeaponFeedback->FireInTransport)
+					return 0;
+
+				WeaponTypeExt::DetonateAt(pWeaponFeedback, pThis, pThis);
+			}
+		}
+	}
+
 	return 0;
 }
 

src/New/Entity/AttachEffectClass.cpp

@@ -3,6 +3,7 @@
 
 #include <AnimClass.h>
 #include <BuildingClass.h>
+#include <MapClass.h>
 
 #include <Ext/Anim/Body.h>
 #include <Ext/Techno/Body.h>
@@ -57,7 +58,7 @@ AttachEffectClass::AttachEffectClass(AttachEffectTypeClass* pType, TechnoClass*
 				pArmor = pShieldData->GetArmorType();
 		}
 
-		this->Duration = Math::max(static_cast<int>(this->Duration * GeneralUtils::GetWarheadVersusArmor(this->Type->Duration_ApplyVersus_Warhead, pArmor)), 0);
+		this->Duration = Math::max(MapClass::GetTotalDamage(this->Duration, this->Type->Duration_ApplyVersus_Warhead, pArmor, 0), 0);
 	}
 
 	if (this->Type->Duration_ApplyFirepowerMult && this->Duration > 0 && pInvoker)
@@ -413,7 +414,7 @@ void AttachEffectClass::RefreshDuration(int durationOverride)
 				pArmor = pShieldData->GetArmorType();
 		}
 
-		this->Duration = Math::max(static_cast<int>(this->Duration * GeneralUtils::GetWarheadVersusArmor(this->Type->Duration_ApplyVersus_Warhead, pArmor)), 0);
+		this->Duration = Math::max(MapClass::GetTotalDamage(this->Duration, this->Type->Duration_ApplyVersus_Warhead, pArmor, 0), 0);
 	}
 
 	if (this->Type->Duration_ApplyFirepowerMult && this->Duration > 0 && this->Invoker)

src/New/Entity/AttachEffectClass.h

@@ -98,6 +98,7 @@ struct AttachEffectTechnoProperties
 	bool HasRestrictedArmorMultipliers;
 	bool HasCritModifiers;
 	bool HasExtraWarheads;
+	bool HasFeedbackWeapon;
 
 	AttachEffectTechnoProperties() :
 		FirepowerMultiplier { 1.0 }
@@ -113,5 +114,8 @@ struct AttachEffectTechnoProperties
 		, ReflectDamage { false }
 		, HasOnFireDiscardables { false }
 		, HasRestrictedArmorMultipliers { false }
+		, HasCritModifiers { false }
+		, HasExtraWarheads { false }
+		, HasFeedbackWeapon { false }
 	{ }
 };

src/New/Type/AttachEffectTypeClass.cpp

@@ -129,6 +129,8 @@ void AttachEffectTypeClass::LoadFromINI(CCINIClass* pINI)
 	this->ExtraWarheads_DetonationChances.Read(exINI, pSection, "ExtraWarheads.DetonationChances");
 	this->ExtraWarheads_FullDetonation.Read(exINI, pSection, "ExtraWarheads.FullDetonation");
 
+	this->FeedbackWeapon.Read<true>(exINI, pSection, "FeedbackWeapon");
+
 	this->Tint_Color.Read(exINI, pSection, "Tint.Color");
 	this->Tint_Intensity.Read(exINI, pSection, "Tint.Intensity");
 	this->Tint_VisibleToHouses.Read(exINI, pSection, "Tint.VisibleToHouses");
@@ -207,6 +209,7 @@ void AttachEffectTypeClass::Serialize(T& Stm)
 		.Process(this->ExtraWarheads_DamageOverrides)
 		.Process(this->ExtraWarheads_DetonationChances)
 		.Process(this->ExtraWarheads_FullDetonation)
+		.Process(this->FeedbackWeapon)
 		.Process(this->Tint_Color)
 		.Process(this->Tint_Intensity)
 		.Process(this->Tint_VisibleToHouses)

src/New/Type/AttachEffectTypeClass.h

@@ -70,6 +70,7 @@ class AttachEffectTypeClass final : public Enumerable<AttachEffectTypeClass>
 	ValueableVector<int> ExtraWarheads_DamageOverrides;
 	ValueableVector<double> ExtraWarheads_DetonationChances;
 	ValueableVector<bool> ExtraWarheads_FullDetonation;
+	Valueable<WeaponTypeClass*> FeedbackWeapon;
 	Nullable<ColorStruct> Tint_Color;
 	Valueable<double> Tint_Intensity;
 	Valueable<AffectedHouse> Tint_VisibleToHouses;
@@ -135,6 +136,7 @@ class AttachEffectTypeClass final : public Enumerable<AttachEffectTypeClass>
 		, ExtraWarheads_DamageOverrides {}
 		, ExtraWarheads_DetonationChances {}
 		, ExtraWarheads_FullDetonation {}
+		, FeedbackWeapon {}
 		, Tint_Color {}
 		, Tint_Intensity { 0.0 }
 		, Tint_VisibleToHouses { AffectedHouse::All }