Merge branch 'develop' into BalloonHoverPathingFix

TaranDahl · TaranDahl · commit 8a79fa4a446b · 2025-05-09T17:40:31.000+08:00
diff --git a/CREDITS.md b/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
diff --git a/docs/New-or-Enhanced-Logics.md b/docs/New-or-Enhanced-Logics.md
@@ -1661,7 +1661,7 @@ CombatAlert.Suppress=                  ; boolean
 
 ### Recount burst index
 
-- You can now make technos recount their current burst index when they have changed the firing weapon or have maintained for a period of time without any targets. Defaults to `[General] -> RecountBurst`, which defaults to false.
+- You can now make technos recount their current burst index when they have changed the firing weapon or have maintained for a period of time without any targets (take the larger value of last firing weapon's `ROF` and 30 frames). Defaults to `[General] -> RecountBurst`, which defaults to false.
 
 In `rulesmd.ini`:
 ```ini
diff --git a/docs/Whats-New.md b/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)
diff --git a/docs/locale/zh_CN/LC_MESSAGES/New-or-Enhanced-Logics.po b/docs/locale/zh_CN/LC_MESSAGES/New-or-Enhanced-Logics.po
@@ -6310,7 +6310,7 @@ msgid ""
 "without any targets. Defaults to `[General] -> RecountBurst`, which "
 "defaults to false."
 msgstr ""
-"现在你可以让单位在更换了开火武器或一段时间内没有目标的情况下重置当前的连发索引。默认为 `[General] -> "
+"现在你可以让单位在更换了开火武器或一段时间内没有目标（取上一次发射武器的 `ROF` 与 30 帧的较大值）的情况下重置当前的连发索引。默认为 `[General] -> "
 "RecountBurst`，其默认为 false。"
 
 #: ../../New-or-Enhanced-Logics.md:1669
diff --git a/src/Ext/TEvent/Body.cpp b/src/Ext/TEvent/Body.cpp
@@ -33,12 +33,18 @@ void TEventExt::ExtData::SaveToStream(PhobosStreamWriter& Stm)
 	this->Serialize(Stm);
 }
 
-bool TEventExt::Execute(TEventClass* pThis, int iEvent, HouseClass* pHouse, ObjectClass* pObject,
-	CDTimerClass* pTimer, bool* isPersitant, TechnoClass* pSource, bool& bHandled)
+std::optional<bool> TEventExt::Execute(TEventClass* pThis, int iEvent, HouseClass* pHouse,
+	ObjectClass* pObject, CDTimerClass* pTimer, bool* isPersitant, TechnoClass* pSource)
 {
-	bHandled = true;
-	switch (static_cast<PhobosTriggerEvent>(pThis->EventKind))
+	const auto eventKind = static_cast<PhobosTriggerEvent>(pThis->EventKind);
+
+	// They must be the same, but for other triggers to take effect normally, this cannot be judged outside case.
+	auto isSameEvent = [&]() { return eventKind == static_cast<PhobosTriggerEvent>(iEvent); };
+
+	switch (eventKind)
 	{
+	// The triggering conditions that need to be checked at any time are written here
+
 		// helper struct
 		struct and_with { bool operator()(int a, int b) { return a & b; } };
 
@@ -117,8 +123,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,9 +132,20 @@ 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.
+
+	// SomeTriggerAttachedToObject needs to be restricted to situations where ...
+//	case PhobosTriggerEvent::SomeTriggerAttachedToObject:
+//		return isSameEvent() && ...::ThisAttachedToObjectTEvent(pObject, ...);
+
+	// ShieldBroken needs to be restricted to situations where the shield is being attacked.
+	case PhobosTriggerEvent::ShieldBroken:
+		return isSameEvent() && ShieldClass::ShieldIsBrokenTEvent(pObject);
+
+
 	default:
-		bHandled = false;
-		return true;
+		return std::nullopt;
 	};
 }
 
diff --git a/src/Ext/TEvent/Body.h b/src/Ext/TEvent/Body.h
@@ -2,9 +2,10 @@
 
 #include <Utilities/Container.h>
 #include <Utilities/Template.h>
-
 #include <Helpers/Template.h>
 
+#include <optional>
+
 #include <TEventClass.h>
 
 class HouseClass;
@@ -82,8 +83,8 @@ class TEventExt
 		void Serialize(T& Stm);
 	};
 
-	static bool Execute(TEventClass* pThis, int iEvent, HouseClass* pHouse, ObjectClass* pObject,
-					CDTimerClass* pTimer, bool* isPersitant, TechnoClass* pSource, bool& bHandled);
+	static std::optional<bool> Execute(TEventClass* pThis, int iEvent, HouseClass* pHouse,
+		ObjectClass* pObject, CDTimerClass* pTimer, bool* isPersitant, TechnoClass* pSource);
 
 	template<bool IsGlobal, typename _Pr>
 	static bool VariableCheck(TEventClass* pThis);
diff --git a/src/Ext/TEvent/Hooks.cpp b/src/Ext/TEvent/Hooks.cpp
@@ -20,11 +20,13 @@ DEFINE_HOOK(0x71E940, TEventClass_Execute, 0x5)
 	GET_STACK(bool*, isPersitant, 0x14);
 	GET_STACK(TechnoClass*, pSource, 0x18);
 
-	bool handled;
+	const auto result = TEventExt::Execute(pThis, iEvent, pHouse, pObject, pTimer, isPersitant, pSource);
 
-	R->AL(TEventExt::Execute(pThis, iEvent, pHouse, pObject, pTimer, isPersitant, pSource, handled));
+	if (!result.has_value())
+		return 0;
 
-	return handled ? 0x71EA2D : 0;
+	R->AL(result.value());
+	return 0x71EA2D;
 }
 
 DEFINE_HOOK(0x7271F9, TEventClass_GetFlags, 0x5)
diff --git a/src/Ext/Techno/Hooks.Airstrike.cpp b/src/Ext/Techno/Hooks.Airstrike.cpp
@@ -17,6 +17,7 @@ DEFINE_HOOK(0x6F348F, TechnoClass_WhatWeaponShouldIUse_Airstrike, 0x7)
 		return Primary;
 
 	GET(WarheadTypeClass*, pSecondaryWH, ECX);
+
 	const auto pWHExt = WarheadTypeExt::ExtMap.Find(pSecondaryWH);
 
 	if (!EnumFunctions::IsTechnoEligible(pTargetTechno, pWHExt->AirstrikeTargets))
@@ -27,10 +28,12 @@ DEFINE_HOOK(0x6F348F, TechnoClass_WhatWeaponShouldIUse_Airstrike, 0x7)
 	if (pTargetTechno->AbstractFlags & AbstractFlags::Foot)
 	{
 		const auto pTargetTypeExt = TechnoTypeExt::ExtMap.Find(pTargetType);
+
 		return pTargetTypeExt->AllowAirstrike.Get(true) ? Secondary : Primary;
 	}
 
 	const auto pTargetTypeExt = TechnoTypeExt::ExtMap.Find(pTargetType);
+
 	return pTargetTypeExt->AllowAirstrike.Get(static_cast<BuildingTypeClass*>(pTargetType)->CanC4) && (!pTargetType->ResourceDestination || !pTargetType->ResourceGatherer) ? Secondary : Primary;
 }
 
@@ -40,8 +43,8 @@ DEFINE_HOOK(0x41D97B, AirstrikeClass_Fire_SetAirstrike, 0x7)
 
 	GET(AirstrikeClass*, pThis, EDI);
 	GET(TechnoClass*, pTarget, ESI);
-	const auto pTargetExt = TechnoExt::ExtMap.Find(pTarget);
-	pTargetExt->AirstrikeTargetingMe = pThis;
+
+	TechnoExt::ExtMap.Find(pTarget)->AirstrikeTargetingMe = pThis;
 	pTarget->StartAirstrikeTimer(100000);
 
 	return pTarget->WhatAmI() == AbstractType::Building ? ContinueIn : Skip;
@@ -70,8 +73,8 @@ DEFINE_HOOK(0x41DAA4, AirstrikeClass_ResetTarget_ResetForOldTarget, 0xA)
 	enum { SkipGameCode = 0x41DAAE };
 
 	GET(TechnoClass*, pTargetTechno, EDI);
-	const auto pTargetExt = TechnoExt::ExtMap.Find(pTargetTechno);
-	pTargetExt->AirstrikeTargetingMe = nullptr;
+
+	TechnoExt::ExtMap.Find(pTargetTechno)->AirstrikeTargetingMe = nullptr;
 
 	return SkipGameCode;
 }
@@ -82,8 +85,8 @@ DEFINE_HOOK(0x41DAD4, AirstrikeClass_ResetTarget_ResetForNewTarget, 0x6)
 
 	GET(AirstrikeClass*, pThis, EBP);
 	GET(TechnoClass*, pTargetTechno, ESI);
-	const auto pTargetExt = TechnoExt::ExtMap.Find(pTargetTechno);
-	pTargetExt->AirstrikeTargetingMe = pThis;
+
+	TechnoExt::ExtMap.Find(pTargetTechno)->AirstrikeTargetingMe = pThis;
 
 	return SkipGameCode;
 }
@@ -111,8 +114,7 @@ DEFINE_HOOK(0x41DBD4, AirstrikeClass_Stop_ResetForTarget, 0x7)
 			}
 		}
 
-		const auto pTargetExt = TechnoExt::ExtMap.Find(pTargetTechno);
-		pTargetExt->AirstrikeTargetingMe = pLastTargetingMe;
+		TechnoExt::ExtMap.Find(pTargetTechno)->AirstrikeTargetingMe = pLastTargetingMe;
 
 		if (!pLastTargetingMe && Game::IsActive)
 			pTarget->Mark(MarkType::Change);
@@ -127,8 +129,8 @@ DEFINE_HOOK(0x41D604, AirstrikeClass_PointerGotInvalid_ResetForTarget, 0x6)
 
 	GET(ObjectClass*, pTarget, EAX);
 
-	if (const auto pTargetTechno = abstract_cast<TechnoClass*>(pTarget))
-		TechnoExt::ExtMap.Find(pTargetTechno)->AirstrikeTargetingMe = nullptr;
+	if (const auto pTargetTechnoExt = TechnoExt::ExtMap.Find(abstract_cast<TechnoClass*>(pTarget)))
+		pTargetTechnoExt->AirstrikeTargetingMe = nullptr;
 
 	return SkipGameCode;
 }
@@ -138,6 +140,7 @@ DEFINE_HOOK(0x65E97F, HouseClass_CreateAirstrike_SetTaretForUnit, 0x6)
 	enum { SkipGameCode = 0x65E992 };
 
 	GET_STACK(AirstrikeClass*, pThis, STACK_OFFSET(0x38, 0x1C));
+
 	const auto pOwner = pThis->Owner;
 
 	if (!pOwner || !pOwner->Target)
@@ -146,7 +149,9 @@ DEFINE_HOOK(0x65E97F, HouseClass_CreateAirstrike_SetTaretForUnit, 0x6)
 	if (const auto pTarget = abstract_cast<TechnoClass*>(pOwner->Target))
 	{
 		GET(AircraftClass*, pFirer, ESI);
+
 		pFirer->SetTarget(pTarget);
+
 		return SkipGameCode;
 	}
 
@@ -166,6 +171,7 @@ DEFINE_HOOK(0x51EAE0, TechnoClass_WhatAction_AllowAirstrike, 0x7)
 		if (const auto pBuilding = abstract_cast<BuildingClass*>(pTechno))
 		{
 			const auto pBuildingType = pBuilding->Type;
+
 			return pTypeExt->AllowAirstrike.Get(pBuildingType->CanC4) && !pBuildingType->InvisibleInGame ? CanAirstrike : Cannot;
 		}
 		else
@@ -181,9 +187,9 @@ DEFINE_HOOK(0x70782D, TechnoClass_PointerGotInvalid_Airstrike, 0x6)
 {
 	GET(TechnoClass*, pThis, ESI);
 	GET(AbstractClass*, pAbstract, EBP);
-	const auto pExt = TechnoExt::ExtMap.Find(pThis);
 
-	AnnounceInvalidPointer(pExt->AirstrikeTargetingMe, pAbstract);
+	if (const auto pExt = TechnoExt::ExtMap.Find(pThis)) // It's necessary
+		AnnounceInvalidPointer(pExt->AirstrikeTargetingMe, pAbstract);
 
 	return 0;
 }
@@ -195,19 +201,17 @@ DEFINE_HOOK(0x70E92F, TechnoClass_UpdateAirstrikeTint, 0x5)
 	enum { ContinueIn = 0x70E96E, Skip = 0x70EC9F };
 
 	GET(TechnoClass*, pThis, ESI);
-	const auto pExt = TechnoExt::ExtMap.Find(pThis);
 
-	return pExt->AirstrikeTargetingMe ? ContinueIn : Skip;
+	return TechnoExt::ExtMap.Find(pThis)->AirstrikeTargetingMe ? ContinueIn : Skip;
 }
 
 DEFINE_HOOK(0x43FDD6, BuildingClass_AI_Airstrike, 0x6)
 {
 	enum { SkipGameCode = 0x43FDF1 };
 
 	GET(BuildingClass*, pThis, ESI);
-	const auto pExt = TechnoExt::ExtMap.Find(pThis);
 
-	if (pExt->AirstrikeTargetingMe)
+	if (TechnoExt::ExtMap.Find(pThis)->AirstrikeTargetingMe)
 		pThis->Mark(MarkType::Change);
 
 	return SkipGameCode;
@@ -218,59 +222,53 @@ DEFINE_HOOK(0x43F9E0, BuildingClass_Mark_Airstrike, 0x6)
 	enum { ContinueTintIntensity = 0x43FA0F, NonAirstrike = 0x43FA19 };
 
 	GET(BuildingClass*, pThis, EDI);
-	const auto pExt = TechnoExt::ExtMap.Find(pThis);
 
-	return pExt->AirstrikeTargetingMe ? ContinueTintIntensity : NonAirstrike;
+	return TechnoExt::ExtMap.Find(pThis)->AirstrikeTargetingMe ? ContinueTintIntensity : NonAirstrike;
 }
 
 DEFINE_HOOK(0x448DF1, BuildingClass_SetOwningHouse_Airstrike, 0x6)
 {
 	enum { ContinueTintIntensity = 0x448E0D, NonAirstrike = 0x448E17 };
 
 	GET(BuildingClass*, pThis, ESI);
-	const auto pExt = TechnoExt::ExtMap.Find(pThis);
 
-	return pExt->AirstrikeTargetingMe ? ContinueTintIntensity : NonAirstrike;
+	return TechnoExt::ExtMap.Find(pThis)->AirstrikeTargetingMe ? ContinueTintIntensity : NonAirstrike;
 }
 
 DEFINE_HOOK(0x451ABC, BuildingClass_PlayAnim_Airstrike, 0x6)
 {
 	enum { ContinueTintIntensity = 0x451AEB, NonAirstrike = 0x451AF5 };
 
 	GET(BuildingClass*, pThis, ESI);
-	const auto pExt = TechnoExt::ExtMap.Find(pThis);
 
-	return pExt->AirstrikeTargetingMe ? ContinueTintIntensity : NonAirstrike;
+	return TechnoExt::ExtMap.Find(pThis)->AirstrikeTargetingMe ? ContinueTintIntensity : NonAirstrike;
 }
 
 DEFINE_HOOK(0x452041, BuildingClass_452000_Airstrike, 0x6)
 {
 	enum { ContinueTintIntensity = 0x452070, NonAirstrike = 0x45207A };
 
 	GET(BuildingClass*, pThis, ESI);
-	const auto pExt = TechnoExt::ExtMap.Find(pThis);
 
-	return pExt->AirstrikeTargetingMe ? ContinueTintIntensity : NonAirstrike;
+	return TechnoExt::ExtMap.Find(pThis)->AirstrikeTargetingMe ? ContinueTintIntensity : NonAirstrike;
 }
 
 DEFINE_HOOK(0x456E5A, BuildingClass_Flash_Airstrike, 0x6)
 {
 	enum { ContinueTintIntensity = 0x456E89, NonAirstrike = 0x456E93 };
 
 	GET(BuildingClass*, pThis, ESI);
-	const auto pExt = TechnoExt::ExtMap.Find(pThis);
 
-	return pExt->AirstrikeTargetingMe ? ContinueTintIntensity : NonAirstrike;
+	return TechnoExt::ExtMap.Find(pThis)->AirstrikeTargetingMe ? ContinueTintIntensity : NonAirstrike;
 }
 
 DEFINE_HOOK(0x456FD3, BuildingClass_GetEffectTintIntensity_Airstrike, 0x6)
 {
 	enum { ContinueTintIntensity = 0x457002, NonAirstrike = 0x45700F };
 
 	GET(BuildingClass*, pThis, ESI);
-	const auto pExt = TechnoExt::ExtMap.Find(pThis);
 
-	return pExt->AirstrikeTargetingMe ? ContinueTintIntensity : NonAirstrike;
+	return TechnoExt::ExtMap.Find(pThis)->AirstrikeTargetingMe ? ContinueTintIntensity : NonAirstrike;
 }
 
 #pragma endregion
diff --git a/src/Ext/Techno/Hooks.ReceiveDamage.cpp b/src/Ext/Techno/Hooks.ReceiveDamage.cpp
