AttachmentUnit improvement - Selection and Flash

docs/New-or-Enhanced-Logics.md

@@ -214,6 +214,7 @@ InheritCommands=true                      ; boolean
 InheritCommands.StopCommand=true          ; boolean
 InheritCommands.DeployCommand=true        ; boolean
 LowSelectionPriority=true                 ; boolean, whether the child is low priority while attached
+PassSelection=true                        ; boolean, whether the child selection propagates to parent
 TransparentToMouse=false                  ; boolean, can't click on attached techno if set
 YSortPosition=default                     ; Attachment YSort position enumeration - default|underparent|overparent
 InheritDestruction=true                   ; boolean

src/Ext/Techno/Hooks.Misc.cpp

@@ -721,16 +721,20 @@ DEFINE_HOOK_AGAIN(0x5F4718, ObjectClass_Select, 0x7)
 DEFINE_HOOK(0x5F46AE, ObjectClass_Select, 0x7)
 {
 	GET(ObjectClass*, pThis, ESI);
-
 	pThis->IsSelected = true;
 
-	if (!Phobos::Config::ShowFlashOnSelecting)
-		return 0;
+	if (Phobos::Config::ShowFlashOnSelecting)
+	{
+		const int duration = RulesExt::Global()->SelectionFlashDuration;
 
-	auto const duration = RulesExt::Global()->SelectionFlashDuration;
+		if (duration > 0)
+		{
+			const auto pFlashTarget = abstract_cast<TechnoClass*>(pThis);
 
-	if (duration > 0 && pThis->GetOwningHouse()->IsControlledByCurrentPlayer())
-		pThis->Flash(duration);
+			if (pFlashTarget && pFlashTarget->Owner->IsControlledByCurrentPlayer())
+				pFlashTarget->Flash(duration);
+		}
+	}
 
 	return 0;
 }

src/Ext/Techno/Hooks.TechnoAttachment.cpp

@@ -462,6 +462,53 @@ DEFINE_FUNCTION_JUMP(VTABLE, 0x7EB0D4, TechnoClass_IsSurfaced);
 
 #pragma endregion
 
+#pragma region Select & Flash
+
+bool __fastcall TechnoClass_Select(TechnoClass* pThis)
+{
+	const auto pExt = TechnoExt::ExtMap.Find(pThis);
+	const auto pAttachment = pExt->ParentAttachment;
+	return pAttachment && pAttachment->GetType()->PassSelection
+		? pAttachment->Parent->Select()
+		: pThis->TechnoClass::Select();
+}
+DEFINE_FUNCTION_JUMP(VTABLE, 0x7F5DBC, TechnoClass_Select) // UnitClass
+DEFINE_FUNCTION_JUMP(VTABLE, 0x7EB1A4, TechnoClass_Select) // InfantryClass
+DEFINE_FUNCTION_JUMP(VTABLE, 0x7E4008, TechnoClass_Select) // BuildingClass
+DEFINE_FUNCTION_JUMP(VTABLE, 0x7E23F0, TechnoClass_Select) // AircraftClass
+
+void __fastcall TechnoClass_Flash(TechnoClass* pThis, void*, int duration)
+{
+	const auto pExt = TechnoExt::ExtMap.Find(pThis);
+
+	for (const auto& pAttachment : pExt->ChildAttachments)
+	{
+		if (pAttachment->GetType()->InheritStateEffects && pAttachment->Child)
+			pAttachment->Child->Flash(duration);
+	}
+
+	return pThis->TechnoClass::Flash(duration);
+}
+DEFINE_FUNCTION_JUMP(VTABLE, 0x7F5DB8, TechnoClass_Flash) // UnitClass
+DEFINE_FUNCTION_JUMP(VTABLE, 0x7EB1A0, TechnoClass_Flash) // InfantryClass
+DEFINE_FUNCTION_JUMP(VTABLE, 0x7E23EC, TechnoClass_Flash) // AircraftClass
+
+void __fastcall BuildingClass_Flash(BuildingClass* pThis, void*, int duration)
+{
+	const auto pExt = TechnoExt::ExtMap.Find(pThis);
+
+	for (const auto& pAttachment : pExt->ChildAttachments)
+	{
+		if (pAttachment->GetType()->InheritStateEffects && pAttachment->Child)
+			pAttachment->Child->Flash(duration);
+	}
+
+	return pThis->BuildingClass::Flash(duration);
+}
+DEFINE_FUNCTION_JUMP(VTABLE, 0x7E4004, BuildingClass_Flash) // BuildingClass
+
+#pragma endregion
+
 DEFINE_HOOK(0x6CC763, SuperClass_Place_ChronoWarp_SkipChildren, 0x6)
 {
 	enum { Skip = 0x6CCCCA, Continue = 0 };

src/New/Entity/AttachmentClass.cpp

@@ -129,7 +129,7 @@ void AttachmentClass::AI()
 			this->Child->unknown_280 = this->Parent->unknown_280; // sth related to teleport
 			this->Child->BeingWarpedOut = this->Parent->BeingWarpedOut;
 			this->Child->Deactivated = this->Parent->Deactivated;
-			this->Child->Flash(this->Parent->Flashing.DurationRemaining);
+			//this->Child->Flash(this->Parent->Flashing.DurationRemaining);
 
 			this->Child->IronCurtainTimer = this->Parent->IronCurtainTimer;
 			this->Child->IdleActionTimer = this->Parent->IdleActionTimer;

src/New/Type/AttachmentTypeClass.cpp

@@ -24,6 +24,7 @@ void AttachmentTypeClass::LoadFromINI(CCINIClass* pINI)
 	this->InheritHeightStatus.Read(exINI, section, "InheritHeightStatus");
 	this->OccupiesCell.Read(exINI, section, "OccupiesCell");
 	this->LowSelectionPriority.Read(exINI, section, "LowSelectionPriority");
+	this->PassSelection.Read(exINI, section, "PassSelection");
 	this->TransparentToMouse.Read(exINI, section, "TransparentToMouse");
 	this->YSortPosition.Read(exINI, section, "YSortPosition");
 	this->DestructionWeapon_Child.Read(exINI, section, "DestructionWeapon.Child");
@@ -47,6 +48,7 @@ void AttachmentTypeClass::Serialize(T& Stm)
 		.Process(this->InheritHeightStatus)
 		.Process(this->OccupiesCell)
 		.Process(this->LowSelectionPriority)
+		.Process(this->PassSelection)
 		.Process(this->TransparentToMouse)
 		.Process(this->YSortPosition)
 		.Process(this->DestructionWeapon_Child)

src/New/Type/AttachmentTypeClass.h

@@ -20,6 +20,7 @@ class AttachmentTypeClass final : public Enumerable<AttachmentTypeClass>
 	Valueable<bool> InheritHeightStatus;
 	Valueable<bool> OccupiesCell;
 	Valueable<bool> LowSelectionPriority;
+	Valueable<bool> PassSelection;
 	Valueable<bool> TransparentToMouse;
 	Valueable<AttachmentYSortPosition> YSortPosition;
 	Nullable<WeaponTypeClass*> DestructionWeapon_Child;
@@ -39,6 +40,7 @@ class AttachmentTypeClass final : public Enumerable<AttachmentTypeClass>
 		, InheritDestruction { true }
 		, InheritHeightStatus { true }
 		, LowSelectionPriority { true }
+		, PassSelection { true }
 		, TransparentToMouse { false }
 		, YSortPosition { AttachmentYSortPosition::Default }
 		, DestructionWeapon_Child { }