From f36158a2818ac836bf8f3830bbb55c6e3a40349b Mon Sep 17 00:00:00 2001 From: MrMiguel211 <60329473+MrMiguel211@users.noreply.github.com> Date: Tue, 13 Feb 2024 00:48:43 -0700 Subject: [PATCH 1/2] Cutscene Fixes and QoL tweaks --- generated/json_data/qol.jsonc | 86 +++++++++++++++++++ generated/json_data/skippable_cutscenes.jsonc | 22 ++--- 2 files changed, 91 insertions(+), 17 deletions(-) diff --git a/generated/json_data/qol.jsonc b/generated/json_data/qol.jsonc index cbc8c5b0..4c6c9bb1 100644 --- a/generated/json_data/qol.jsonc +++ b/generated/json_data/qol.jsonc @@ -10459,6 +10459,21 @@ "fadeOutTime": 1.5, "audioFileName": "/audio/over-worldL.dsp|/audio/over-worldR.dsp" } + ], + "triggers": [ + { + "id": 983113, // [Trigger] Trigger_DoorOpen + "position": [ + -659.227417, + 310.424774, + -42.451237 + ], + "scale": [ + 10.0, + 20.0, + 10.0 + ] + } ] }, "Root Tunnel": { @@ -12130,7 +12145,63 @@ 460356, // [Trigger] Trigger - Play Music 00c Isogi 460357 // [Trigger] Trigger - Play Music 00c Mines Main ], + "removeConnections": [ + { + "senderId": 459223, // [SpacePirate] SpacePirate-MELEE + "targetId": 460060, // [Counter] Counter - dead Shadow Pirates - kill before upstairs + "state": "DEAD", + "message": "INCREMENT" + }, + { + "senderId": 459224, // [SpacePirate] SpacePirate-MELEE + "targetId": 460060, // [Counter] Counter - dead Shadow Pirates - kill before upstairs + "state": "DEAD", + "message": "INCREMENT" + }, + { + "senderId": 459223, // [SpacePirate] SpacePirate-MELEE + "targetId": 460062, // [Counter] Counter - dead Shadow Pirates - kill upstairs + "state": "DEAD", + "message": "INCREMENT" + }, + { + "senderId": 459224, // [SpacePirate] SpacePirate-MELEE + "targetId": 460062, // [Counter] Counter - dead Shadow Pirates - kill upstairs + "state": "DEAD", + "message": "INCREMENT" + } + ], "addConnections": [ + { + "senderId": 459223, // [SpacePirate] SpacePirate-MELEE + "targetId": 460060, // [Counter] Counter - dead Shadow Pirates - kill before upstairs + "state": "DEATH_RATTLE", + "message": "INCREMENT" + }, + { + "senderId": 459224, // [SpacePirate] SpacePirate-MELEE + "targetId": 460060, // [Counter] Counter - dead Shadow Pirates - kill before upstairs + "state": "DEATH_RATTLE", + "message": "INCREMENT" + }, + { + "senderId": 459223, // [SpacePirate] SpacePirate-MELEE + "targetId": 460062, // [Counter] Counter - dead Shadow Pirates - kill upstairs + "state": "DEATH_RATTLE", + "message": "INCREMENT" + }, + { + "senderId": 459224, // [SpacePirate] SpacePirate-MELEE + "targetId": 460062, // [Counter] Counter - dead Shadow Pirates - kill upstairs + "state": "DEATH_RATTLE", + "message": "INCREMENT" + }, + { + "senderId": 459954, // [Trigger] Trigger -activate trooper + "targetId": 460064, // [Relay] Relay + "state": "ENTERED", + "message": "DEACTIVATE" + }, { "senderId": 458760, // [SpecialFunction] Music Player For Area "targetId": 458762, // [Relay] Mines Music @@ -12206,6 +12277,21 @@ "layer": 1, "active": false } + ], + "triggers": [ + { + "id": 459954, // [Trigger] Trigger -activate trooper + "position": [ + -15.26812, + 20.186085, + 15.073245 + ], + "scale": [ + 16.041, + 4.464, + 11.5 + ] + } ] }, "Missile Station Mines": { diff --git a/generated/json_data/skippable_cutscenes.jsonc b/generated/json_data/skippable_cutscenes.jsonc index 583206a9..d424e78e 100644 --- a/generated/json_data/skippable_cutscenes.jsonc +++ b/generated/json_data/skippable_cutscenes.jsonc @@ -19725,12 +19725,6 @@ "state": "ZERO", "message": "SET_TO_ZERO" }, - { - "senderId": 459956, // [Timer] Timer - alert Trooper - "targetId": 458757, // [Relay] Relay Alert Trooper - "state": "ZERO", - "message": "DEACTIVATE" - }, { "senderId": 458757, // [Relay] Relay Alert Trooper "targetId": 459998, // [Actor] Actor_Grating @@ -19755,12 +19749,6 @@ "state": "ZERO", "message": "SET_TO_ZERO" }, - { - "senderId": 460046, // [Timer] Timer - alert Trooper - "targetId": 458758, // [Relay] Relay Alert Trooper - "state": "ZERO", - "message": "DEACTIVATE" - }, { "senderId": 458758, // [Relay] Relay Alert Trooper "targetId": 460020, // [Actor] Actor_Grating @@ -19774,16 +19762,16 @@ "message": "ALERT" }, { - "senderId": 458756, // [SpecialFunction] SpecialFunction Cinematic Skip - "targetId": 458759, // [Relay] Relay Alert Trooper + "senderId": 458758, // [Relay] Relay Alert Trooper + "targetId": 459958, // [Trigger] Trigger "state": "ZERO", - "message": "SET_TO_ZERO" + "message": "DEACTIVATE" }, { - "senderId": 460046, // [Timer] Timer - alert Trooper + "senderId": 458756, // [SpecialFunction] SpecialFunction Cinematic Skip "targetId": 458759, // [Relay] Relay Alert Trooper "state": "ZERO", - "message": "DEACTIVATE" + "message": "SET_TO_ZERO" }, { "senderId": 458759, // [Relay] Relay Alert Trooper From d6151a35495aedc00a5c2076b428975b69230ade Mon Sep 17 00:00:00 2001 From: MrMiguel211 <60329473+MrMiguel211@users.noreply.github.com> Date: Sun, 18 Feb 2024 15:18:40 -0700 Subject: [PATCH 2/2] Undo cutscene repeat removal, thicken top door trigger in root cave. --- generated/json_data/qol.jsonc | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/generated/json_data/qol.jsonc b/generated/json_data/qol.jsonc index 4c6c9bb1..3ca1ec53 100644 --- a/generated/json_data/qol.jsonc +++ b/generated/json_data/qol.jsonc @@ -10473,6 +10473,19 @@ 20.0, 10.0 ] + }, + { + "id": 983113, // [Trigger] Trigger_DoorOpen + "position": [ + -694.973267, + 339.468536, + 37.531601 + ], + "scale": [ + 20.0, + 10.0, + 8.0 + ] } ] }, @@ -12196,12 +12209,6 @@ "state": "DEATH_RATTLE", "message": "INCREMENT" }, - { - "senderId": 459954, // [Trigger] Trigger -activate trooper - "targetId": 460064, // [Relay] Relay - "state": "ENTERED", - "message": "DEACTIVATE" - }, { "senderId": 458760, // [SpecialFunction] Music Player For Area "targetId": 458762, // [Relay] Mines Music