Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wave Pirates fix and QoL tweaks #22

Merged
merged 2 commits into from
Mar 8, 2024
Merged

Wave Pirates fix and QoL tweaks #22

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f36158a
Cutscene Fixes and QoL tweaks
MrMiguel211 Feb 13, 2024
d6151a3
Undo cutscene repeat removal, thicken top door trigger in root cave.
MrMiguel211 Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 86 additions & 0 deletions generated/json_data/qol.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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": {
Expand Down
22 changes: 5 additions & 17 deletions generated/json_data/skippable_cutscenes.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading