[Phobos bug] Map Events 600 Bug Fixes (#1660)

I don't know how to describe it, but the map event 600 is easily
activated when the attached object does not have a shield and is
selected and attacked.

Interestingly, this issue was also present in **Build 30** when it was
originally created.

Author: Fly-Star-him

CREDITS.md

@@ -356,6 +356,7 @@ This page lists all the individual contributions to the project by their author.
   - `Set Force Enemy` Trigger Action
   - Fix the issue where computer players did not search for new enemies after defeating them or forming alliances with them
   - Customize the damage taken when falling from a bridge
+  - `600 The shield of the attached object is broken` bug fix for the triggered event
 - **NetsuNegi**:
   - Forbidding parallel AI queues by type
   - Jumpjet crash speed fix when crashing onto building

docs/Whats-New.md

@@ -398,6 +398,7 @@ Vanilla fixes:
 
 Phobos fixes:
 - Fixed the bug that `AllowAirstrike=no` cannot completely prevent air strikes from being launched against it (by NetsuNegi)
+- `600 The shield of the attached object is broken` bug fix for the triggered event (by FlyStar)
 
 Fixes / interactions with other extensions:
 - Allowed `AuxBuilding` and Ares' `SW.Aux/NegBuildings` to count building upgrades (by Ollerus)

src/Ext/TEvent/Body.cpp

@@ -37,7 +37,9 @@ bool TEventExt::Execute(TEventClass* pThis, int iEvent, HouseClass* pHouse, Obje
 	CDTimerClass* pTimer, bool* isPersitant, TechnoClass* pSource, bool& bHandled)
 {
 	bHandled = true;
-	switch (static_cast<PhobosTriggerEvent>(pThis->EventKind))
+	const auto eventKind = static_cast<PhobosTriggerEvent>(pThis->EventKind);
+
+	switch (eventKind)
 	{
 		// helper struct
 		struct and_with { bool operator()(int a, int b) { return a & b; } };
@@ -117,8 +119,6 @@ bool TEventExt::Execute(TEventClass* pThis, int iEvent, HouseClass* pHouse, Obje
 	case PhobosTriggerEvent::GlobalVariableAndIsTrueGlobalVariable:
 		return TEventExt::VariableCheckBinary<true, true, and_with>(pThis);
 
-	case PhobosTriggerEvent::ShieldBroken:
-		return ShieldClass::ShieldIsBrokenTEvent(pObject);
 	case PhobosTriggerEvent::HouseOwnsTechnoType:
 		return TEventExt::HouseOwnsTechnoTypeTEvent(pThis);
 	case PhobosTriggerEvent::HouseDoesntOwnTechnoType:
@@ -128,6 +128,27 @@ bool TEventExt::Execute(TEventClass* pThis, int iEvent, HouseClass* pHouse, Obje
 	case PhobosTriggerEvent::CellHasAnyTechnoTypeFromList:
 		return TEventExt::CellHasAnyTechnoTypeFromListTEvent(pThis, pObject, pHouse);
 
+	// If it requires an additional object as like mapping events 7 or 48, please fill it in here.
+//	case PhobosTriggerEvent::SomeTriggerAttachedToObject:
+	case PhobosTriggerEvent::ShieldBroken:
+		// They must be the same.
+		if (eventKind == static_cast<PhobosTriggerEvent>(iEvent))
+		{
+			switch (eventKind)
+			{
+			// SomeTriggerAttachedToObject needs to be restricted to situations where ...
+//			case PhobosTriggerEvent::SomeTriggerAttachedToObject:
+//				return ...::ThisAttachedToObjectTEvent(pObject, ...);
+
+			// ShieldBroken needs to be restricted to situations where the shield is being attacked.
+			case PhobosTriggerEvent::ShieldBroken:
+				return ShieldClass::ShieldIsBrokenTEvent(pObject);
+
+			default:
+				break;
+			}
+		}
+
 	default:
 		bHandled = false;
 		return true;