From f4c94d3f8a97de8207c11858184c6168957480ee Mon Sep 17 00:00:00 2001 From: Fly-Star <100747645+a851903106@users.noreply.github.com> Date: Sun, 16 Nov 2025 21:27:13 +0800 Subject: [PATCH 1/4] Update Hooks.cpp --- src/Ext/TEvent/Hooks.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/Ext/TEvent/Hooks.cpp b/src/Ext/TEvent/Hooks.cpp index 1fddc8ef26..3ad83e04e8 100644 --- a/src/Ext/TEvent/Hooks.cpp +++ b/src/Ext/TEvent/Hooks.cpp @@ -72,6 +72,23 @@ DEFINE_HOOK(0x726577, TEventClass_Persistable, 0x7) return 0x72657E; } +DEFINE_HOOK(0x71F9C0, TEventClass_GetStateB_SpyEvent, 0x6) +{ + enum { ReturnFalse = 0x71F9DA }; + + GET(TEventClass* const, pThis, ECX); + + switch (pThis->EventKind) + { + case TriggerEvent::SpiedBy: + case TriggerEvent::SpyAsHouse: + case TriggerEvent::SpyAsInfantry: + return ReturnFalse; + default: + return 0; + } +} + DEFINE_HOOK_AGAIN(0x71ED5E, TriggerClass_SpyAsInfantryOrHouse, 0x8) // SpyAsHouse DEFINE_HOOK(0x71ECE1, TriggerClass_SpyAsInfantryOrHouse, 0x8) // SpyAsInfantry { From 0b727166499caae315663094f2dcca2de14ee00d Mon Sep 17 00:00:00 2001 From: Fly-Star <100747645+a851903106@users.noreply.github.com> Date: Sun, 16 Nov 2025 21:39:27 +0800 Subject: [PATCH 2/4] Update Whats-New.md --- docs/Whats-New.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Whats-New.md b/docs/Whats-New.md index 5b1410894a..15f56f6b56 100644 --- a/docs/Whats-New.md +++ b/docs/Whats-New.md @@ -495,6 +495,7 @@ Vanilla fixes: - Fixed an issue where some effects pointing to a unit were not properly cleared when the unit changed its owner (by TaranDahl) - Allow Reveal Crate to take effect when picking up by another player controlled house in campaign (by Trsdy) - Fixed an issue where the vanilla script ignores jumpjets. (by TaranDahl) +- Fixed the issue where trigger conditions 2, 53, and 54 would take effect unconditionally after being activated in persistent type triggers (by FlyStar) Phobos fixes: - Fixed the bug that `AllowAirstrike=no` cannot completely prevent air strikes from being launched against it (by NetsuNegi) From 34c3ba91a4ad2d92cf0163877ba33c74b5a007a3 Mon Sep 17 00:00:00 2001 From: Fly-Star <100747645+a851903106@users.noreply.github.com> Date: Sun, 16 Nov 2025 21:44:44 +0800 Subject: [PATCH 3/4] Update Whats-New.md --- docs/Whats-New.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Whats-New.md b/docs/Whats-New.md index 15f56f6b56..a788aee990 100644 --- a/docs/Whats-New.md +++ b/docs/Whats-New.md @@ -495,7 +495,7 @@ Vanilla fixes: - Fixed an issue where some effects pointing to a unit were not properly cleared when the unit changed its owner (by TaranDahl) - Allow Reveal Crate to take effect when picking up by another player controlled house in campaign (by Trsdy) - Fixed an issue where the vanilla script ignores jumpjets. (by TaranDahl) -- Fixed the issue where trigger conditions 2, 53, and 54 would take effect unconditionally after being activated in persistent type triggers (by FlyStar) +- Fixed the issue where trigger events 2, 53 and 54 in persistent type triggering could be activated unconditionally after activation (by FlyStar) Phobos fixes: - Fixed the bug that `AllowAirstrike=no` cannot completely prevent air strikes from being launched against it (by NetsuNegi) From a2adf98f0d935eaf59b22a3a4c71d71cd0db7182 Mon Sep 17 00:00:00 2001 From: Fly-Star <100747645+a851903106@users.noreply.github.com> Date: Sun, 16 Nov 2025 21:46:18 +0800 Subject: [PATCH 4/4] Update Whats-New.md --- docs/Whats-New.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Whats-New.md b/docs/Whats-New.md index a788aee990..98c3fd1969 100644 --- a/docs/Whats-New.md +++ b/docs/Whats-New.md @@ -495,7 +495,7 @@ Vanilla fixes: - Fixed an issue where some effects pointing to a unit were not properly cleared when the unit changed its owner (by TaranDahl) - Allow Reveal Crate to take effect when picking up by another player controlled house in campaign (by Trsdy) - Fixed an issue where the vanilla script ignores jumpjets. (by TaranDahl) -- Fixed the issue where trigger events 2, 53 and 54 in persistent type triggering could be activated unconditionally after activation (by FlyStar) +- Fixed the issue where trigger events 2, 53 and 54 in persistent type triggers would be activated unconditionally after activation (by FlyStar) Phobos fixes: - Fixed the bug that `AllowAirstrike=no` cannot completely prevent air strikes from being launched against it (by NetsuNegi)