RealLaunch

Author: Coronia

docs/New-or-Enhanced-Logics.md

@@ -57,6 +57,7 @@ This page describes all the engine features that are either new and introduced b
     - `Crit.AllowWarheads` can be used to list only Warheads that can benefit from this critical hit chance multiplier and `Crit.DisallowWarheads` weapons that are not allowed to, respectively.
   - `RevengeWeapon` can be used to temporarily grant the specified weapon as a [revenge weapon](#revenge-weapon) for the attached object.
     - `RevengeWeapon.AffectsHouses` customizes which houses can trigger the revenge weapon.
+    - If `RevengeWeapon.RealLaunch` set to true, the weapon will be fired through a real projectile from the TechnoType to the killer.
   - `ReflectDamage` can be set to true to have any positive damage dealt to the object the effect is attached to be reflected back to the attacker. `ReflectDamage.Warhead` determines which Warhead is used to deal the damage, defaults to `[CombatDamage] -> C4Warhead`. If `ReflectDamage.Warhead.Detonate` is set to true, the Warhead is fully detonated instead of used to simply deal damage. `ReflectDamage.Chance` determines the chance of reflection. `ReflectDamage.Multiplier` is a multiplier to the damage received and then reflected back, while `ReflectDamage.Override` directly overrides the damage. Already reflected damage cannot be further reflected back.
     - Warheads can prevent reflect damage from occuring by setting `SuppressReflectDamage` to true. `SuppressReflectDamage.Types` can control which AttachEffectTypes' reflect damage is suppressed, if none are listed then all of them are suppressed. `SuppressReflectDamage.Groups` does the same thing but for all AttachEffectTypes in the listed groups.
   - `DisableWeapons` can be used to disable ability to fire any and all weapons.
@@ -146,6 +147,7 @@ Crit.AllowWarheads=                                ; List of WarheadTypes
 Crit.DisallowWarheads=                             ; List of WarheadTypes
 RevengeWeapon=                                     ; WeaponType
 RevengeWeapon.AffectsHouses=all                    ; List of Affected House Enumeration (none|owner/self|allies/ally|team|enemies/enemy|all)
+RevengeWeapon.RealLaunch=false                     ; boolean
 ReflectDamage=false                                ; boolean
 ReflectDamage.Warhead=                             ; WarheadType
 ReflectDamage.Warhead.Detonate=false               ; WarheadType
@@ -1681,6 +1683,7 @@ RecountBurst=       ; boolean
 
 - Similar to `DeathWeapon` in that it is fired after a TechnoType is killed, but with the difference that it will be fired on whoever dealt the damage that killed the TechnoType. If TechnoType died of sources other than direct damage dealt by another TechnoType, `RevengeWeapon` will not be fired.
   - `RevengeWeapon.AffectsHouses` can be used to filter which houses the damage that killed the TechnoType is allowed to come from to fire the weapon.
+  - If `RevengeWeapon.RealLaunch` set to true, the weapon will be fired through a real projectile from the TechnoType to the killer.
   - It is possible to grant revenge weapons through [attached effects](#attached-effects) as well.
   - If a Warhead has `SuppressRevengeWeapons` set to true, it will not trigger revenge weapons. `SuppressRevengeWeapons.Types` can be used to list WeaponTypes affected by this, if none are listed all WeaponTypes are affected.
 
@@ -1689,6 +1692,7 @@ In `rulesmd.ini`:
 [SOMETECHNO]                    ; TechnoType
 RevengeWeapon=                  ; WeaponType
 RevengeWeapon.AffectsHouses=all ; List of Affected House Enumeration (none|owner/self|allies/ally|team|enemies/enemy|all)
+RevengeWeapon.RealLaunch=false  ; boolean
 
 [SOMEWARHEAD]                   ; WarheadType
 SuppressRevengeWeapons=false    ; boolean
@@ -2022,7 +2026,7 @@ While this feature can provide better performance than a large `CellSpread` valu
 ### Fire weapon when Warhead kills something
 
 - `KillWeapon` will be fired at the target TechnoType's location once it's killed by this Warhead.
-- `KillWeapon.OnFirer` will be fired at the attacker's location once the target TechnoType is killed by this Warhead. If the source of this Warhead is not another TechnoType, `KillWeapon.OnFirer` will not be fired.
+- `KillWeapon.OnFirer` will be fired at the attacker's location once the target TechnoType is killed by this Warhead. If the source of this Warhead is not another TechnoType, `KillWeapon.OnFirer` will not be fired. If `KillWeapon.OnFirer.RealLaunch` set to true, the weapon will be fired through a real projectile from the TechnoType to the killer.
 - `KillWeapon.AffectsHouses` / `KillWeapon.OnFirer.AffectsHouses` and `KillWeapon.Affects` / `KillWeapon.OnFirer.Affects` can be used to filter which houses targets can belong to and which types of targets are be considered valid for `KillWeapon` and `KillWeapon.OnFirer` respectively.
   - If the source of this Warhead is not another TechnoType, `KillWeapon` will be fired regardless of the target's house or type.
 - If a TechnoType has `SuppressKillWeapons` set to true, it will not trigger `KillWeapon` or `KillWeapon.OnFirer` upon being killed. `SuppressKillWeapons.Types` can be used to list WeaponTypes affected by this, if none are listed all WeaponTypes are affected.
@@ -2036,6 +2040,7 @@ KillWeapon.AffectsHouses=all          ; List of Affected House Enumeration (none
 KillWeapon.OnFirer.AffectsHouses=all  ; List of Affected House Enumeration (none|owner/self|allies/ally|team|enemies/enemy|all)
 KillWeapon.Affects=all                ; List of Affected Target Enumeration (none|aircraft|buildings|infantry|units|all)
 KillWeapon.OnFirer.Affects=all        ; List of Affected Target Enumeration (none|aircraft|buildings|infantry|units|all)
+KillWeapon.OnFirer.RealLaunch=false   ; boolean
 
 [SOMETECHNO]                          ; TechnoType
 SuppressKillWeapons=false             ; boolean

src/Ext/Techno/WeaponHelpers.cpp

@@ -1,7 +1,9 @@
 #include "Body.h"
 
 #include <OverlayTypeClass.h>
+#include <BulletClass.h>
 
+#include <Ext/Bullet/Body.h>
 #include <Ext/WeaponType/Body.h>
 #include <Ext/WarheadType/Body.h>
 #include <Utilities/EnumFunctions.h>
@@ -219,7 +221,24 @@ void TechnoExt::ApplyKillWeapon(TechnoClass* pThis, TechnoClass* pSource, Warhea
 		&& EnumFunctions::IsTechnoEligible(pThis, pWHExt->KillWeapon_OnFirer_Affects))
 	{
 		if (!pTypeExt->SuppressKillWeapons || (hasFilters && !pTypeExt->SuppressKillWeapons_Types.Contains(pWHExt->KillWeapon_OnFirer)))
-			WeaponTypeExt::DetonateAt(pWHExt->KillWeapon_OnFirer, pSource, pSource);
+		{
+			if (pWHExt->KillWeapon_OnFirer_RealLaunch)
+			{
+				auto const pWeapon = pWHExt->KillWeapon_OnFirer;
+
+				if (BulletClass* pBullet = pWeapon->Projectile->CreateBullet(pSource, pSource,
+					pWeapon->Damage, pWeapon->Warhead, pWeapon->Speed, pWeapon->Bright))
+				{
+					pBullet->WeaponType = pWeapon;
+					pBullet->MoveTo(pSource->Location, BulletVelocity::Empty);
+					BulletExt::ExtMap.Find(pBullet)->FirerHouse = pSource->Owner;
+				}
+			}
+			else
+			{
+				WeaponTypeExt::DetonateAt(pWHExt->KillWeapon_OnFirer, pSource, pSource);
+			}
+		}
 	}
 }
 
@@ -233,7 +252,24 @@ void TechnoExt::ApplyRevengeWeapon(TechnoClass* pThis, TechnoClass* pSource, War
 	if (pTypeExt->RevengeWeapon && EnumFunctions::CanTargetHouse(pTypeExt->RevengeWeapon_AffectsHouses, pThis->Owner, pSource->Owner))
 	{
 		if (!pWHExt->SuppressRevengeWeapons || (hasFilters && !pWHExt->SuppressRevengeWeapons_Types.Contains(pTypeExt->RevengeWeapon)))
-			WeaponTypeExt::DetonateAt(pTypeExt->RevengeWeapon, pSource, pThis);
+		{
+			if (pTypeExt->RevengeWeapon_RealLaunch)
+			{
+				auto const pWeapon = pTypeExt->RevengeWeapon;
+
+				if (BulletClass* pBullet = pWeapon->Projectile->CreateBullet(pSource, pThis,
+					pWeapon->Damage, pWeapon->Warhead, pWeapon->Speed, pWeapon->Bright))
+				{
+					pBullet->WeaponType = pWeapon;
+					pBullet->MoveTo(pSource->Location, BulletVelocity::Empty);
+					BulletExt::ExtMap.Find(pBullet)->FirerHouse = pThis->Owner;
+				}
+			}
+			else
+			{
+				WeaponTypeExt::DetonateAt(pTypeExt->RevengeWeapon, pSource, pThis);
+			}
+		}
 	}
 
 	for (auto& attachEffect : pExt->AttachedEffects)
@@ -250,7 +286,24 @@ void TechnoExt::ApplyRevengeWeapon(TechnoClass* pThis, TechnoClass* pSource, War
 			continue;
 
 		if (EnumFunctions::CanTargetHouse(pType->RevengeWeapon_AffectsHouses, pThis->Owner, pSource->Owner))
-			WeaponTypeExt::DetonateAt(pType->RevengeWeapon, pSource, pThis);
+		{
+			if (pType->RevengeWeapon_RealLaunch)
+			{
+				auto const pWeapon = pType->RevengeWeapon;
+
+				if (BulletClass* pBullet = pWeapon->Projectile->CreateBullet(pSource, pThis,
+					pWeapon->Damage, pWeapon->Warhead, pWeapon->Speed, pWeapon->Bright))
+				{
+					pBullet->WeaponType = pWeapon;
+					pBullet->MoveTo(pSource->Location, BulletVelocity::Empty);
+					BulletExt::ExtMap.Find(pBullet)->FirerHouse = pThis->Owner;
+				}
+			}
+			else
+			{
+				WeaponTypeExt::DetonateAt(pType->RevengeWeapon, pSource, pThis);
+			}
+		}
 	}
 }
 

src/Ext/TechnoType/Body.cpp

@@ -469,6 +469,7 @@ void TechnoTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
 
 	this->RevengeWeapon.Read<true>(exINI, pSection, "RevengeWeapon");
 	this->RevengeWeapon_AffectsHouses.Read(exINI, pSection, "RevengeWeapon.AffectsHouses");
+	this->RevengeWeapon_RealLaunch.Read(exINI, pSection, "RevengeWeapon.RealLaunch");
 
 	this->RecountBurst.Read(exINI, pSection, "RecountBurst");
 
@@ -934,6 +935,7 @@ void TechnoTypeExt::ExtData::Serialize(T& Stm)
 
 		.Process(this->RevengeWeapon)
 		.Process(this->RevengeWeapon_AffectsHouses)
+		.Process(this->RevengeWeapon_RealLaunch)
 
 		.Process(this->AttachEffects)
 

src/Ext/TechnoType/Body.h

@@ -242,6 +242,7 @@ class TechnoTypeExt
 
 		Valueable<WeaponTypeClass*> RevengeWeapon;
 		Valueable<AffectedHouse> RevengeWeapon_AffectsHouses;
+		Valueable<bool> RevengeWeapon_RealLaunch;
 
 		AEAttachInfoTypeClass AttachEffects;
 
@@ -559,6 +560,7 @@ class TechnoTypeExt
 
 			, RevengeWeapon {}
 			, RevengeWeapon_AffectsHouses { AffectedHouse::All }
+			, RevengeWeapon_RealLaunch { false }
 
 			, AttachEffects {}
 

src/Ext/WarheadType/Body.cpp

@@ -290,6 +290,7 @@ void WarheadTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
 	this->KillWeapon_OnFirer_AffectsHouses.Read(exINI, pSection, "KillWeapon.OnFirer.AffectsHouses");
 	this->KillWeapon_Affects.Read(exINI, pSection, "KillWeapon.Affects");
 	this->KillWeapon_OnFirer_Affects.Read(exINI, pSection, "KillWeapon.OnFirer.Affects");
+	this->KillWeapon_OnFirer_RealLaunch.Read(exINI, pSection, "KillWeapon.OnFirer.RealLaunch");
 
   	this->ElectricAssaultLevel.Read(exINI, pSection, "ElectricAssaultLevel");
 
@@ -543,6 +544,7 @@ void WarheadTypeExt::ExtData::Serialize(T& Stm)
 		.Process(this->KillWeapon_OnFirer_AffectsHouses)
 		.Process(this->KillWeapon_Affects)
 		.Process(this->KillWeapon_OnFirer_Affects)
+		.Process(this->KillWeapon_OnFirer_RealLaunch)
 
     	.Process(this->ElectricAssaultLevel)
 

src/Ext/WarheadType/Body.h

@@ -172,6 +172,7 @@ class WarheadTypeExt
 		Valueable<AffectedHouse> KillWeapon_OnFirer_AffectsHouses;
 		Valueable<AffectedTarget> KillWeapon_Affects;
 		Valueable<AffectedTarget> KillWeapon_OnFirer_Affects;
+		Valueable<bool> KillWeapon_OnFirer_RealLaunch;
 
     	Valueable<int> ElectricAssaultLevel;
 
@@ -376,6 +377,7 @@ class WarheadTypeExt
 			, KillWeapon_OnFirer_AffectsHouses { AffectedHouse::All }
 			, KillWeapon_Affects { AffectedTarget::All }
 			, KillWeapon_OnFirer_Affects { AffectedTarget::All }
+			, KillWeapon_OnFirer_RealLaunch { false }
 		{ }
 
 		void ApplyConvert(HouseClass* pHouse, TechnoClass* pTarget);

src/New/Type/AttachEffectTypeClass.cpp

@@ -158,6 +158,7 @@ void AttachEffectTypeClass::LoadFromINI(CCINIClass* pINI)
 
 	this->RevengeWeapon.Read<true>(exINI, pSection, "RevengeWeapon");
 	this->RevengeWeapon_AffectsHouses.Read(exINI, pSection, "RevengeWeapon.AffectsHouses");
+	this->RevengeWeapon_RealLaunch.Read(exINI, pSection, "RevengeWeapon.RealLaunch");
 
 	this->ReflectDamage.Read(exINI, pSection, "ReflectDamage");
 	this->ReflectDamage_Warhead.Read(exINI, pSection, "ReflectDamage.Warhead");
@@ -232,6 +233,7 @@ void AttachEffectTypeClass::Serialize(T& Stm)
 		.Process(this->Crit_DisallowWarheads)
 		.Process(this->RevengeWeapon)
 		.Process(this->RevengeWeapon_AffectsHouses)
+		.Process(this->RevengeWeapon_RealLaunch)
 		.Process(this->ReflectDamage)
 		.Process(this->ReflectDamage_Warhead)
 		.Process(this->ReflectDamage_Warhead_Detonate)

src/New/Type/AttachEffectTypeClass.h

@@ -93,6 +93,7 @@ class AttachEffectTypeClass final : public Enumerable<AttachEffectTypeClass>
 	ValueableVector<WarheadTypeClass*> Crit_DisallowWarheads;
 	Valueable<WeaponTypeClass*> RevengeWeapon;
 	Valueable<AffectedHouse> RevengeWeapon_AffectsHouses;
+	Valueable<bool> RevengeWeapon_RealLaunch;
 	Valueable<bool> ReflectDamage;
 	Nullable<WarheadTypeClass*> ReflectDamage_Warhead;
 	Valueable<bool> ReflectDamage_Warhead_Detonate;
@@ -159,6 +160,7 @@ class AttachEffectTypeClass final : public Enumerable<AttachEffectTypeClass>
 		, Crit_DisallowWarheads {}
 		, RevengeWeapon {}
 		, RevengeWeapon_AffectsHouses { AffectedHouse::All }
+		, RevengeWeapon_RealLaunch { false }
 		, ReflectDamage { false }
 		, ReflectDamage_Warhead {}
 		, ReflectDamage_Warhead_Detonate { false }