[Minor] Refactor kick out stuck units (#1816)

- Fixed the ground congestion will cause jumpjets be unable to take off.
- Also fixed the stuck hover units at the entrance of the weapons
factory.

Author: CrimRecya

src/Ext/Building/Body.cpp

@@ -355,19 +355,6 @@ bool BuildingExt::ExtData::HandleInfiltrate(HouseClass* pInfiltratorHouse, int m
 // For unit's weapons factory only
 void BuildingExt::KickOutStuckUnits(BuildingClass* pThis)
 {
-	if (const auto pUnit = abstract_cast<UnitClass*>(pThis->GetNthLink()))
-	{
-		if (pUnit->Locomotor->Destination() == CoordStruct::Empty)
-		{
-			if (const auto pTeam = pUnit->Team)
-				pTeam->LiberateMember(pUnit);
-
-			pThis->SendCommand(RadioCommand::NotifyUnlink, pUnit);
-			pUnit->QueueMission(Mission::Guard, false);
-			return; // one after another
-		}
-	}
-
 	auto buffer = CoordStruct::Empty;
 	pThis->GetExitCoords(&buffer, 0);
 
@@ -393,9 +380,6 @@ void BuildingExt::KickOutStuckUnits(BuildingClass* pThis)
 				if (height < 0 || height > Unsorted::CellHeight)
 					continue;
 
-				if (const auto pTeam = pUnit->Team)
-					pTeam->LiberateMember(pUnit);
-
 				pThis->SendCommand(RadioCommand::RequestLink, pUnit);
 				pThis->QueueMission(Mission::Unload, false);
 				return; // one after another

src/Ext/Building/Hooks.cpp

@@ -204,27 +204,62 @@ DEFINE_HOOK(0x44D455, BuildingClass_Mission_Missile_EMPulseBulletWeapon, 0x8)
 
 #pragma region KickOutStuckUnits
 
-// Kick out stuck units when the factory building is not busy, only factory buildings can enter this hook
-DEFINE_HOOK(0x450248, BuildingClass_UpdateFactory_KickOutStuckUnits, 0x6)
+DEFINE_HOOK(0x44955D, BuildingClass_WeaponFactoryOutsideBusy_WeaponFactoryCell, 0x6)
 {
-	GET(BuildingClass*, pThis, ESI);
+	enum { NotBusy = 0x44969B };
 
-	// This is not a solution to the problem at its root
-	// Currently the root cause of the problem is not located
-	// So the idle weapon factory is asked to search every second for any units that are stuck
-	if (!(Unsorted::CurrentFrame % 15)) // Check every 15 frames for factories
-	{
-		const auto pType = pThis->Type;
+	GET(BuildingClass* const, pThis, ESI);
 
-		if (pType->Factory == AbstractType::UnitType && pType->WeaponsFactory && !pType->Naval && pThis->QueuedMission != Mission::Unload)
-		{
-			const auto mission = pThis->CurrentMission;
+	const auto pLink = pThis->GetNthLink();
+
+	if (!pLink)
+		return NotBusy;
+
+	const auto pLinkType = pLink->GetTechnoType();
+
+	if (pLinkType->JumpJet && pLinkType->BalloonHover)
+		return NotBusy;
+
+	return 0;
+}
+
+// Attempt to kick the stuck unit out again by setting the destination
+DEFINE_HOOK(0x44E202, BuildingClass_Mission_Unload_CheckStuck, 0x6)
+{
+	enum { Waiting = 0x44E267, NextStatus = 0x44E20C};
 
-			if (mission == Mission::Guard && !pThis->InLimbo || mission == Mission::Unload && pThis->MissionStatus == 3) // Unloading but stuck
-				BuildingExt::KickOutStuckUnits(pThis);
+	GET(BuildingClass*, pThis, EBP);
+
+	if (!pThis->IsTether)
+		return NextStatus;
+
+	if (const auto pUnit = abstract_cast<UnitClass*>(pThis->GetNthLink()))
+	{
+		// Detecting movement status
+		if (pUnit->Locomotor->Destination() == CoordStruct::Empty)
+		{
+			// Evacuate the congestion at the entrance
+			reinterpret_cast<void(__thiscall*)(BuildingClass*)>(0x449540)(pThis);
+			const auto pType = pThis->Type;
+			const auto cell = pThis->GetMapCoords() + pType->FoundationOutside[10];
+			const auto door = cell - CellStruct { 1, 0 };
+			const auto pDest = MapClass::Instance.GetCellAt(door);
+
+			// Hover units may stop one cell behind their destination, should forcing them to advance one more cell
+			pUnit->SetDestination((pUnit->Destination != pDest ? pDest : MapClass::Instance.GetCellAt(cell)), true);
 		}
 	}
 
+	return Waiting;
+}
+
+// Check for any stuck units inside after successful unload each time. If there is, kick it out
+DEFINE_HOOK(0x44E260, BuildingClass_Mission_Unload_KickOutStuckUnits, 0x7)
+{
+	GET(BuildingClass*, pThis, EBP);
+
+	BuildingExt::KickOutStuckUnits(pThis);
+
 	return 0;
 }
 

src/Ext/BuildingType/Hooks.cpp

@@ -425,7 +425,7 @@ DEFINE_HOOK(0x73F5A7, UnitClass_IsCellOccupied_UnlimboDirection, 0x8)
 
 	GET(CellClass* const, pCell, EDI);
 
-	return pCell->MapCoords.Y == pType->FoundationOutside[10].Y ? NextObject : ContinueCheck;
+	return pCell->MapCoords.Y == pBuilding->Location.Y / Unsorted::LeptonsPerCell + pType->FoundationOutside[10].Y ? NextObject : ContinueCheck;
 }
 
 #pragma endregion

src/Ext/Techno/Body.cpp

@@ -749,9 +749,9 @@ bool TechnoExt::CannotMove(UnitClass* pThis)
 			landType = LandType::Road;
 		}
 
-		if (movementRestrictedTo != LandType::None &&
-			movementRestrictedTo != landType &&
-			landType != LandType::Tunnel)
+		if (movementRestrictedTo != LandType::None
+			&& movementRestrictedTo != landType
+			&& landType != LandType::Tunnel)
 		{
 			return true;
 		}