Revert vanilla behavior changed by e359a87 and b0cd1e0 (#1938)

e359a87

b0cd1e0

Author: TaranDahl

src/Ext/Building/Hooks.Selling.cpp

@@ -44,7 +44,8 @@ bool __forceinline BuildingExt::CanUndeployOnSell(BuildingClass* pThis)
 	}
 
 	// Move ArchiveTarget check outside Conyard check to allow generic Unsellable=no buildings to be sold
-	return pThis->ArchiveTarget;
+	const auto pTypeExt = BuildingTypeExt::ExtMap.Find(pType);
+	return pTypeExt->UndeploysInto_Sellable ? pThis->ArchiveTarget != nullptr : true;
 }
 
 // Skip SessionClass::IsCampaign() checks, where inlined not exactly the function above but sth similar

src/Ext/BuildingType/Body.cpp

@@ -245,6 +245,7 @@ void BuildingTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
 	}
 
 	this->Refinery_UseStorage.Read(exINI, pSection, "Refinery.UseStorage");
+	this->UndeploysInto_Sellable.Read(exINI, pSection, "UndeploysInto.Sellable");
 
 	// PlacementPreview
 	{
@@ -338,6 +339,7 @@ void BuildingTypeExt::ExtData::Serialize(T& Stm)
 		.Process(this->BuildingRepairedSound)
 		.Process(this->Refinery_UseNormalActiveAnim)
 		.Process(this->HasPowerUpAnim)
+		.Process(this->UndeploysInto_Sellable)
 
 		// Ares 0.A
 		.Process(this->RubbleIntact)

src/Ext/BuildingType/Body.h

@@ -99,6 +99,8 @@ class BuildingTypeExt
 
 		ValueableVector<bool> HasPowerUpAnim;
 
+		Valueable<bool> UndeploysInto_Sellable;
+
 		// Ares 0.A
 		Valueable<BuildingTypeClass*> RubbleIntact;
 		Valueable<bool> RubbleIntactRemove;
@@ -165,6 +167,7 @@ class BuildingTypeExt
 			, BuildingRepairedSound {}
 			, Refinery_UseNormalActiveAnim { false }
 			, HasPowerUpAnim {}
+			, UndeploysInto_Sellable { false }
 
 			// Ares 0.A
 			, RubbleIntact { nullptr }

src/Ext/Unit/Hooks.DeploysInto.cpp

@@ -96,8 +96,9 @@ DEFINE_HOOK(0x44A03C, BuildingClass_Mi_Selling_Transfer, 0x6)
 	TechnoExt::SyncInvulnerability(pStructure, pUnit);
 	AttachEffectClass::TransferAttachedEffects(pStructure, pUnit);
 
-	pUnit->QueueMission(Mission::Hunt, true);
-	//Why?
+	// This line will break the bahavior of UnDeploysInto buildings. However, it might serve a purpose that no one knows yet
+	// Comment out the line instead of removing it for now, so we can turn to it if something related goes wrong in the future
+	// pUnit->QueueMission(Mission::Hunt, true);
 	return 0;
 }