[Highly Customized] New AdvancedDrive locomotor

CREDITS.md

@@ -430,6 +430,7 @@ This page lists all the individual contributions to the project by their author.
   - Laser, electric bolt and rad beam scatter
   - Fix an issue that laser, electric bolt and rad beam not support `Inviso=true` projectiles with `FlakScatter=true` to scatter
   - Fix an issue that units on the slope tilted at an excessive angle
+  - New Skilled locomotor
 - **Ollerus**:
   - Build limit group enhancement
   - Customizable rocker amplitude

Phobos.vcxproj

@@ -66,6 +66,7 @@
     <ClCompile Include="src\Ext\Trigger\Hooks.cpp" />
     <ClCompile Include="src\Ext\Unit\Hooks.Crushing.cpp" />
     <ClCompile Include="src\Locomotion\TestLocomotionClass.cpp" />
+    <ClCompile Include="src\Locomotion\SkilledLocomotionClass.cpp" />
     <ClCompile Include="src\Misc\Hooks.Gamespeed.cpp" />
     <ClCompile Include="src\Misc\Hooks.Ares.cpp" />
     <ClCompile Include="src\Misc\Hooks.Crates.cpp" />
@@ -212,6 +213,7 @@
     <ClInclude Include="src\Ext\Team\Body.h" />
     <ClInclude Include="src\Ext\TEvent\Body.h" />
     <ClInclude Include="src\Locomotion\TestLocomotionClass.h" />
+    <ClInclude Include="src\Locomotion\SkilledLocomotionClass.h" />
     <ClInclude Include="src\Misc\BlittersFix.h" />
     <ClInclude Include="src\Ext\CaptureManager\Body.h" />
     <ClInclude Include="src\Misc\FlyingStrings.h" />

docs/Miscellanous.md

@@ -78,6 +78,7 @@ SaveVariablesOnScenarioEnd=false    ; boolean
 |Teleport | `{4A582747-9839-11d1-B709-00A024DDAFD1}` |
 |Mech     | `{55D141B8-DB94-11d1-AC98-006008055BB5}` |
 |Ship     | `{2BEA74E1-7CCA-11d3-BE14-00104B62A16C}` |
+|Skilled  | `{4A582751-9839-11d1-B709-00A024DDAFD1}` |
 
 ```{note}
 `Chrono` is not a standard Alias, but since the default behavior of using `Teleport` will be triggered when the value of `Locomotor` is incorrect, the result of the operation will appear as if `Chrono` has taken effect.

docs/New-or-Enhanced-Logics.md

@@ -1698,6 +1698,29 @@ NoQueueUpToEnter=         ; boolean
 NoQueueUpToUnload=        ; boolean
 ```
 
+## Locomotor
+
+### Skilled Locomotor
+
+- `Skilled` locomotor (`{4A582751-9839-11d1-B709-00A024DDAFD1}`) is an improved `Drive` locomotor (`{4A582741-9839-11d1-B709-00A024DDAFD1}`) that can serve as a complete upper level replacement for it.
+- It fixes the issue where `Drive` cannot correctly crush objects during rapid turns.
+- It has smoother uphill and downhill dynamic visual effects.
+- It has the function of driving the unit backwards.
+  - `Skilled.ReverseSpeed` controls the speed ratio when reversing.
+  - `Skilled.FaceTargetRange` controls how close the unit is to its target, allowing reversing.
+  - `Skilled.ConfrontEnemies` controls whether to maitain the frontal movement towards the enemy within the aforementioned distance and no longer automatically selects by the current orientation.
+  - `Skilled.RetreatDuration` controls how long since the unit was last injured, allowing reversing.
+
+In `rulesmd.ini`:
+```ini
+[SOMEVEHICLE]                  ; VehicleType
+Locomotor=Skilled              ; Locomotor
+Skilled.ReverseSpeed=0.85      ; floating point value
+Skilled.FaceTargetRange=16.0   ; floating point value
+Skilled.ConfrontEnemies=true   ; boolean
+Skilled.RetreatDuration=150    ; integer, game frames
+```
+
 ## Terrain
 
 ### Destroy animation & sound

docs/Whats-New.md

@@ -366,6 +366,7 @@ Vanilla fixes:
 - Fixed the bug that `EnterBioReactorSound`, `LeaveBioReactorSound`, `EnterGrinderSound` on technotype does not used (by NetsuNegi)
 - Fixed the bug that harvester dont stop unloading and cannot unload cargos anymore when lifting by `IsLocomotor=yes` warhead (by NetsuNegi)
 - Fixed an issue that units on the slope tilted at an excessive angle (by CrimRecya & NetsuNegi)
+- New Skilled locomotor (by CrimRecya)
 
 Fixes / interactions with other extensions:
 - Allowed `AuxBuilding` and Ares' `SW.Aux/NegBuildings` to count building upgrades (by Ollerus)

src/Ext/Techno/Body.cpp

@@ -582,6 +582,7 @@ void TechnoExt::ExtData::Serialize(T& Stm)
 		.Process(this->FiringObstacleCell)
 		.Process(this->IsDetachingForCloak)
 		.Process(this->BeControlledThreatFrame)
+		.Process(this->LastHurtFrame)
 		.Process(this->LastTargetID)
 		.Process(this->AccumulatedGattlingValue)
 		.Process(this->ShouldUpdateGattlingValue)

src/Ext/Techno/Body.h

@@ -56,6 +56,7 @@ class TechnoExt
 		CellClass* FiringObstacleCell; // Set on firing if there is an obstacle cell between target and techno, used for updating WaveClass target etc.
 		bool IsDetachingForCloak; // Used for checking animation detaching, set to true before calling Detach_All() on techno when this anim is attached to and to false after when cloaking only.
 		int BeControlledThreatFrame;
+		int LastHurtFrame;
 		DWORD LastTargetID;
 		int AccumulatedGattlingValue;
 		bool ShouldUpdateGattlingValue;
@@ -103,6 +104,7 @@ class TechnoExt
 			, FiringObstacleCell {}
 			, IsDetachingForCloak { false }
 			, BeControlledThreatFrame { 0 }
+			, LastHurtFrame { 0 }
 			, LastTargetID { 0xFFFFFFFF }
 			, AccumulatedGattlingValue { 0 }
 			, ShouldUpdateGattlingValue { false }

src/Ext/Techno/Hooks.ReceiveDamage.cpp

@@ -49,7 +49,7 @@ DEFINE_HOOK(0x701900, TechnoClass_ReceiveDamage_Shield, 0x6)
 	}
 
 	// Raise Combat Alert
-	if (pRules->CombatAlert && *args->Damage > 1)
+	if (*args->Damage && (MapClass::GetTotalDamage(*args->Damage, args->WH, pType->Armor, args->DistanceToEpicenter) > 0))
 	{
 		auto raiseCombatAlert = [&]()
 		{
@@ -96,7 +96,12 @@ DEFINE_HOOK(0x701900, TechnoClass_ReceiveDamage_Shield, 0x6)
 			if (index != -1)
 				VoxClass::PlayIndex(index);
 		};
-		raiseCombatAlert();
+
+		if (pRules->CombatAlert)
+			raiseCombatAlert();
+
+		if (pWHExt->CanTargetHouse(pSourceHouse, pThis))
+			pExt->LastHurtFrame = Unsorted::CurrentFrame;
 	}
 
 	// Shield Receive Damage

src/Ext/TechnoType/Body.cpp

@@ -453,6 +453,11 @@ void TechnoTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
 
 	this->RecountBurst.Read(exINI, pSection, "RecountBurst");
 
+	this->Skilled_ReverseSpeed.Read(exINI, pSection, "Skilled.ReverseSpeed");
+	this->Skilled_FaceTargetRange.Read(exINI, pSection, "Skilled.FaceTargetRange");
+	this->Skilled_ConfrontEnemies.Read(exINI, pSection, "Skilled.ConfrontEnemies");
+	this->Skilled_RetreatDuration.Read(exINI, pSection, "Skilled.RetreatDuration");
+
 	this->BuildLimitGroup_Types.Read(exINI, pSection, "BuildLimitGroup.Types");
 	this->BuildLimitGroup_Nums.Read(exINI, pSection, "BuildLimitGroup.Nums");
 	this->BuildLimitGroup_Factor.Read(exINI, pSection, "BuildLimitGroup.Factor");
@@ -884,6 +889,11 @@ void TechnoTypeExt::ExtData::Serialize(T& Stm)
 
 		.Process(this->RecountBurst)
 
+		.Process(this->Skilled_ReverseSpeed)
+		.Process(this->Skilled_FaceTargetRange)
+		.Process(this->Skilled_ConfrontEnemies)
+		.Process(this->Skilled_RetreatDuration)
+
 		.Process(this->BuildLimitGroup_Types)
 		.Process(this->BuildLimitGroup_Nums)
 		.Process(this->BuildLimitGroup_Factor)

src/Ext/TechnoType/Body.h

@@ -227,6 +227,11 @@ class TechnoTypeExt
 
 		Nullable<bool> RecountBurst;
 
+		Valueable<double> Skilled_ReverseSpeed;
+		Valueable<double> Skilled_FaceTargetRange;
+		Valueable<bool> Skilled_ConfrontEnemies;
+		Valueable<int> Skilled_RetreatDuration;
+
 		ValueableVector<TechnoTypeClass*> BuildLimitGroup_Types;
 		ValueableVector<int> BuildLimitGroup_Nums;
 		Valueable<int> BuildLimitGroup_Factor;
@@ -509,6 +514,11 @@ class TechnoTypeExt
 
 			, RecountBurst {}
 
+			, Skilled_ReverseSpeed { 0.85 }
+			, Skilled_FaceTargetRange { 16.0 }
+			, Skilled_ConfrontEnemies { true }
+			, Skilled_RetreatDuration { 150 }
+
 			, BuildLimitGroup_Types {}
 			, BuildLimitGroup_Nums {}
 			, BuildLimitGroup_Factor { 1 }