[General Purpose] New trajectory system

CREDITS.md

@@ -525,6 +525,10 @@ This page lists all the individual contributions to the project by their author.
   - Burst without delay
   - Fix an issue that if the garrison unload occupants when there is no open space around it would result in the disappearance of the occupants
   - Fix an issue where Ares' `Convert.Deploy` triggers repeatedly when the unit is turning or moving
+  - New Missile trajectory
+  - New Engrave trajectory
+  - New Tracing trajectory
+  - New trajectory system with general functions
 - **Ollerus**:
   - Build limit group enhancement
   - Customizable rocker amplitude

Phobos.vcxproj

@@ -57,10 +57,17 @@
     <ClCompile Include="src\Ext\Anim\Hooks.cpp" />
     <ClCompile Include="src\Ext\Anim\Hooks.AnimCreateUnit.cpp" />
     <ClCompile Include="src\Ext\Bullet\Hooks.DetonateLogics.cpp" />
-    <ClCompile Include="src\Ext\Bullet\Trajectories\BombardTrajectory.cpp" />
+    <ClCompile Include="src\Ext\Bullet\Trajectories\AdditionalWeapons.cpp" />
+    <ClCompile Include="src\Ext\Bullet\Trajectories\AdditionalWarheads.cpp" />
     <ClCompile Include="src\Ext\Bullet\Trajectories\PhobosTrajectory.cpp" />
-    <ClCompile Include="src\Ext\Bullet\Trajectories\StraightTrajectory.cpp" />
-    <ClCompile Include="src\Ext\Bullet\Trajectories\ParabolaTrajectory.cpp" />
+    <ClCompile Include="src\Ext\Bullet\Trajectories\PhobosActualTrajectory.cpp" />
+    <ClCompile Include="src\Ext\Bullet\Trajectories\PhobosVirtualTrajectory.cpp" />
+    <ClCompile Include="src\Ext\Bullet\Trajectories\ActualTrajectories\StraightTrajectory.cpp" />
+    <ClCompile Include="src\Ext\Bullet\Trajectories\ActualTrajectories\BombardTrajectory.cpp" />
+    <ClCompile Include="src\Ext\Bullet\Trajectories\ActualTrajectories\MissileTrajectory.cpp" />
+    <ClCompile Include="src\Ext\Bullet\Trajectories\VirtualTrajectories\EngraveTrajectory.cpp" />
+    <ClCompile Include="src\Ext\Bullet\Trajectories\ActualTrajectories\ParabolaTrajectory.cpp" />
+    <ClCompile Include="src\Ext\Bullet\Trajectories\VirtualTrajectories\TracingTrajectory.cpp" />
     <ClCompile Include="src\Ext\CaptureManager\Hooks.cpp" />
     <ClCompile Include="src\Ext\CaptureManager\Body.cpp" />
     <ClCompile Include="src\Ext\OverlayType\Body.cpp" />
@@ -235,10 +242,15 @@
     <ClInclude Include="src\Commands\ToggleDesignatorRange.h" />
     <ClInclude Include="src\Commands\ToggleDigitalDisplay.h" />
     <ClInclude Include="src\Commands\SaveVariablesToFile.h" />
-    <ClInclude Include="src\Ext\Bullet\Trajectories\BombardTrajectory.h" />
     <ClInclude Include="src\Ext\Bullet\Trajectories\PhobosTrajectory.h" />
-    <ClInclude Include="src\Ext\Bullet\Trajectories\StraightTrajectory.h" />
-    <ClInclude Include="src\Ext\Bullet\Trajectories\ParabolaTrajectory.h" />
+    <ClInclude Include="src\Ext\Bullet\Trajectories\PhobosActualTrajectory.h" />
+    <ClInclude Include="src\Ext\Bullet\Trajectories\PhobosVirtualTrajectory.h" />
+    <ClInclude Include="src\Ext\Bullet\Trajectories\ActualTrajectories\StraightTrajectory.h" />
+    <ClInclude Include="src\Ext\Bullet\Trajectories\ActualTrajectories\BombardTrajectory.h" />
+    <ClInclude Include="src\Ext\Bullet\Trajectories\ActualTrajectories\MissileTrajectory.h" />
+    <ClInclude Include="src\Ext\Bullet\Trajectories\VirtualTrajectories\EngraveTrajectory.h" />
+    <ClInclude Include="src\Ext\Bullet\Trajectories\ActualTrajectories\ParabolaTrajectory.h" />
+    <ClInclude Include="src\Ext\Bullet\Trajectories\VirtualTrajectories\TracingTrajectory.h" />
     <ClInclude Include="src\Ext\OverlayType\Body.h" />
     <ClInclude Include="src\Ext\ParticleType\Body.h" />
     <ClInclude Include="src\Ext\Sidebar\Body.h" />

docs/Whats-New.md

@@ -41,6 +41,8 @@ You can use the migration utility (can be found on [Phobos supplementaries repo]
 - `AnimList.ShowOnZeroDamage` has been renamed to `CreateAnimsOnZeroDamage` to make it more clear it applies to both `AnimList` and splash animations.
 - INI inclusion and inheritance are now turned off by default and need to be turned on via command line flags `-Include` and `-Inheritance`.
 - `Level=true` projectiles no longer attempt to do reposition against targets that are behind non-water tiles by default. Use `SubjectToLand=true` to re-enable this behaviour.
+- Aircraft's weapon with `Trajectory` projectile will no longer make `Strafing` default to true.
+- `Trajectory.Straight.TargetSnapDistance` and other similar keys have been renamed to some more universal name like `Trajectory.TargetSnapDistance`. You can view detailed content in [Projectile trajectories](New-or-Enhanced-Logics.md#Projectile-trajectories).
 
 #### From 0.3
 
@@ -425,6 +427,10 @@ New:
 - [Damaged aircraft image changes](New-or-Enhanced-Logics.md#damaged-aircraft-image-changes) (by Fryone)
 - [Additional attached animation position customizations](Fixed-or-Improved-Logics.md#attached-animation-position-customization) (by Starkku)
 - Use `SkipCrushSlowdown=true` to avoid the bug related to `Accelerates=true` and `MovementZone=CrushAll` (by TaranDahl)
+- New Missile trajectory (by CrimRecya)
+- New Engrave trajectory (by CrimRecya)
+- New Tracing trajectory (by CrimRecya)
+- New trajectory system with general functions (by CrimRecya)
 
 Vanilla fixes:
 - Fixed sidebar not updating queued unit numbers when adding or removing units when the production is on hold (by CrimRecya)

src/Ext/Bullet/Body.cpp

@@ -13,6 +13,23 @@
 
 BulletExt::ExtContainer BulletExt::ExtMap;
 
+BulletExt::ExtData::~ExtData()
+{
+	if (const auto pTraj = this->Trajectory.get())
+	{
+		if (pTraj->GroupIndex != -1)
+		{
+			if (const auto pMap = pTraj->TrajectoryGroup)
+			{
+				auto& groupData = (*pMap)[this->TypeExtData->OwnerObject()->UniqueID];
+				auto& vec = groupData.Bullets;
+				vec.erase(std::remove(vec.begin(), vec.end(), this->OwnerObject()->UniqueID), vec.end());
+				groupData.ShouldUpdate = true;
+			}
+		}
+	}
+}
+
 void BulletExt::ExtData::InterceptBullet(TechnoClass* pSource, BulletClass* pInterceptor)
 {
 	const auto pThis = this->OwnerObject();
@@ -151,12 +168,13 @@ inline void BulletExt::SimulatedFiringAnim(BulletClass* pBullet, HouseClass* pHo
 	if (animCounts <= 0)
 		return;
 
+	const auto pTraj = BulletExt::ExtMap.Find(pBullet)->Trajectory.get();
+	const auto velocityRadian = pTraj ? Math::atan2(pTraj->MovingVelocity.Y , pTraj->MovingVelocity.X) : Math::atan2(pBullet->Velocity.Y , pBullet->Velocity.X);
 	const auto pFirer = pBullet->Owner;
 	const auto pAnimType = pWeapon->Anim[(animCounts % 8 == 0) // Have direction
-		? (static_cast<int>((Math::atan2(pBullet->Velocity.Y , pBullet->Velocity.X) / Math::TwoPi + 1.5) * animCounts - (animCounts / 8) + 0.5) % animCounts) // Calculate direction
+		? (static_cast<int>((velocityRadian / Math::TwoPi + 1.5) * animCounts - (animCounts / 8) + 0.5) % animCounts) // Calculate direction
 		: ScenarioClass::Instance->Random.RandomRanged(0 , animCounts - 1)]; // Simple random;
 /*
-	const auto velocityRadian = Math::atan2(pBullet->Velocity.Y , pBullet->Velocity.X);
 	const auto ratioOfRotateAngle = velocityRadian / Math::TwoPi;
 	const auto correctRatioOfRotateAngle = ratioOfRotateAngle + 1.5; // Correct the Y-axis in reverse and ensure that the ratio is a positive number
 	const auto animIndex = correctRatioOfRotateAngle * animCounts;
@@ -413,7 +431,8 @@ void BulletExt::ExtData::Serialize(T& Stm)
 		.Process(this->DamageNumberOffset)
 		.Process(this->ParabombFallRate)
 
-		.Process(this->Trajectory) // Keep this shit at last
+		.Process(this->Trajectory)
+		.Process(this->DispersedTrajectory)
 		;
 }
 

src/Ext/Bullet/Body.h

@@ -32,6 +32,7 @@ class BulletExt
 		int ParabombFallRate;
 
 		TrajectoryPointer Trajectory;
+		bool DispersedTrajectory;
 
 		ExtData(BulletClass* OwnerObject) : Extension<BulletClass>(OwnerObject)
 			, TypeExtData { nullptr }
@@ -41,13 +42,15 @@ class BulletExt
 			, InterceptedStatus { InterceptedStatus::None }
 			, DetonateOnInterception { true }
 			, LaserTrails {}
-			, Trajectory { nullptr }
 			, SnappedToTarget { false }
 			, DamageNumberOffset { INT32_MIN }
 			, ParabombFallRate { 0 }
+
+			, Trajectory { nullptr }
+			, DispersedTrajectory { false }
 		{ }
 
-		virtual ~ExtData() = default;
+		virtual ~ExtData() override;
 
 		virtual void InvalidatePointer(void* ptr, bool bRemoved) override { }
 

src/Ext/Bullet/Hooks.DetonateLogics.cpp

@@ -16,13 +16,19 @@ DEFINE_HOOK(0x4690D4, BulletClass_Logics_NewChecks, 0x6)
 {
 	enum { SkipShaking = 0x469130, GoToExtras = 0x469AA4 };
 
-	GET(BulletClass*, pBullet, ESI);
+	GET(BulletClass*, pThis, ESI);
 	GET(WarheadTypeClass*, pWarhead, EAX);
 	GET_BASE(CoordStruct*, pCoords, 0x8);
 
+	if (const auto pTraj = BulletExt::ExtMap.Find(pThis)->Trajectory.get())
+	{
+		if (!pTraj->ShouldDetonate)
+			return GoToExtras;
+	}
+
 	auto const pExt = WarheadTypeExt::ExtMap.Find(pWarhead);
 
-	if (auto const pTarget = abstract_cast<TechnoClass*>(pBullet->Target))
+	if (auto const pTarget = abstract_cast<TechnoClass*>(pThis->Target))
 	{
 		// Check if the WH should affect the techno target or skip it
 		if (!pExt->IsHealthInThreshold(pTarget) || (!pExt->AffectsNeutral && pTarget->Owner->IsNeutral()))

src/Ext/Bullet/Hooks.cpp

@@ -35,6 +35,8 @@ namespace BulletAITemp
 
 DEFINE_HOOK(0x4666F7, BulletClass_AI, 0x6)
 {
+	enum { Detonate = 0x467E53 };
+
 	GET(BulletClass*, pThis, EBP);
 
 	const auto pBulletExt = BulletExt::ExtMap.Find(pThis);
@@ -81,8 +83,13 @@ DEFINE_HOOK(0x4666F7, BulletClass_AI, 0x6)
 
 	//Because the laser trails will be drawn before the calculation of changing the velocity direction in each frame.
 	//This will cause the laser trails to be drawn in the wrong position too early, resulting in a visual appearance resembling a "bouncing".
-	//Let trajectories draw their own laser trails after the Trajectory's OnAI() to avoid predicting incorrect positions or pass through targets.
-	if (!pBulletExt->Trajectory && pBulletExt->LaserTrails.size())
+	//Let trajectories draw their own laser trails after the Trajectory's OnEarlyUpdate() to avoid predicting incorrect positions or pass through targets.
+	if (const auto pTraj = pBulletExt->Trajectory.get())
+	{
+		if (pTraj->OnEarlyUpdate() && !pThis->SpawnNextAnim)
+			return Detonate;
+	}
+	else if (pBulletExt->LaserTrails.size())
 	{
 		const CoordStruct location = pThis->GetCoords();
 		const BulletVelocity& velocity = pThis->Velocity;
@@ -105,7 +112,6 @@ DEFINE_HOOK(0x4666F7, BulletClass_AI, 0x6)
 
 			pTrail->Update(drawnCoords);
 		}
-
 	}
 
 	if (pThis->HasParachute)
@@ -332,7 +338,10 @@ constexpr bool CheckTrajectoryCanNotAlwaysSnap(const TrajectoryFlag flag)
 	return flag != TrajectoryFlag::Invalid;
 /*	return flag == TrajectoryFlag::Straight
 		|| flag == TrajectoryFlag::Bombard
-		|| flag == TrajectoryFlag::Parabola;*/
+		|| flag == TrajectoryFlag::Missile
+		|| flag == TrajectoryFlag::Engrave
+		|| flag == TrajectoryFlag::Parabola
+		|| flag == TrajectoryFlag::Tracing;*/
 }
 
 DEFINE_HOOK(0x467CCA, BulletClass_AI_TargetSnapChecks, 0x6)