[BugFix]Drive/Jumpjet/Ship/Teleport locomotor did not power on when it is un-piggybacked bugfix

CREDITS.md

@@ -368,6 +368,7 @@ This page lists all the individual contributions to the project by their author.
   - Skirmish AI "sell all buildings and set all technos to hunt" behavior dehardcode
   - Skirmish AI "gather when MCV deploy" behavior dehardcode
   - Global value of `RepairBaseNodes`
+- **tyuah8** - Drive/Jumpjet/Ship/Teleport locomotor did not power on when it is un-piggybacked bugfix
 - **Ares developers**
   - YRpp and Syringe which are used, save/load, project foundation and generally useful code from Ares
   - unfinished RadTypes code

docs/Fixed-or-Improved-Logics.md

@@ -171,6 +171,7 @@ This page describes all ingame logics that are fixed or improved in Phobos witho
 - Animations with `MakeInfantry` and `UseNormalLight=false` that are drawn in unit palette will now have cell lighting changes applied on them.
 - Removed 0 damage effect on jumpjet infantries from `InfDeath=9` warhead.
 - Fixed Nuke & Dominator Level lighting not applying to AircraftTypes.
+- Drive/Jumpjet/Ship/Teleport locomotor did not power on when it is un-piggybacked bugfix
 
 ## Fixes / interactions with other extensions
 

docs/Whats-New.md

@@ -530,6 +530,7 @@ Vanilla fixes:
 - Animations with `MakeInfantry` and `UseNormalLight=false` that are drawn in unit palette will now have cell lighting changes applied on them (by Starkku)
 - Fixed Nuke & Dominator Level lighting not applying to AircraftTypes (by Starkku)
 - Removed the 0 damage effect from `InfDeath=9` warheads to in-air infantries (by Trsdy)
+- Drive/Jumpjet/Ship/Teleport locomotor did not power on when it is un-piggybacked bugfix (by tyuah8)
 
 Phobos fixes:
 - Fixed a few errors of calling for superweapon launch by `LaunchSW` or building infiltration (by Trsdy)

src/Misc/Hooks.Ares.cpp

@@ -1,5 +1,6 @@
 #include <BuildingClass.h>
 #include <FootClass.h>
+
 #include <Utilities/Macro.h>
 
 // In vanilla YR, game destroys building animations directly by calling constructor.

src/Misc/Hooks.BugFixes.cpp

@@ -968,3 +968,45 @@ DEFINE_HOOK(0x5B11DD, MechLocomotionClass_ProcessMoving_SlowdownDistance, 0x9)
 }
 
 DEFINE_JUMP(LJMP, 0x517FF5, 0x518016); // Warhead with InfDeath=9 versus infantry in air
+
+#pragma region End_Piggyback PowerOn
+// Auther: tyuah8
+static void End_Piggyback_PowerOn(ILocomotion* loco)
+{
+	const auto pLoco = static_cast<LocomotionClass*>(loco);
+	const auto pLinkedTo = pLoco->LinkedTo;
+
+	if (!pLinkedTo->Deactivated && !pLinkedTo->IsUnderEMP())
+		pLoco->Power_On();
+	else
+		pLoco->Power_Off();
+}
+
+DEFINE_HOOK(0x4AF94D, DriveLocomotionClass__End_Piggyback__PowerOn, 0x7)
+{
+	GET(ILocomotion*, loco, EAX);
+	End_Piggyback_PowerOn(loco);
+	return 0;
+}
+
+DEFINE_HOOK(0x54DADC, JumpjetLocomotionClass__End_Piggyback__PowerOn, 0x5)
+{
+	GET(ILocomotion*, loco, EAX);
+	End_Piggyback_PowerOn(loco);
+	return 0;
+}
+
+DEFINE_HOOK(0x69F05D, ShipLocomotionClass__End_Piggyback__PowerOn, 0x7)
+{
+	GET(ILocomotion*, loco, EAX);
+	End_Piggyback_PowerOn(loco);
+	return 0;
+}
+
+DEFINE_HOOK(0x719F17, TeleportLocomotionClass__End_Piggyback__PowerOn, 0x5)
+{
+	GET(ILocomotion*, loco, ECX);
+	End_Piggyback_PowerOn(loco);
+	return 0;
+}
+#pragma endregion