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

Various fixes and changes #12 #19

Merged
merged 2 commits into from
Jan 24, 2024
Merged

Various fixes and changes #12 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79d49fa
Various fixes and changes
MrMiguel211 Jan 24, 2024
42df31c
Kindness
MrMiguel211 Jan 24, 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
89 changes: 76 additions & 13 deletions generated/json_data/qol.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3842,9 +3842,9 @@
},
{
"senderId": 600482, // [Relay] Relay
"targetId": 779889, // [Relay] SENDER - Change Music
"targetId": 779889, // [Switch] SENDER - Active Music
"state": "ZERO",
"message": "SET_TO_ZERO"
"message": "OPEN"
},
{
"senderId": 600482, // [Relay] Relay
Expand Down Expand Up @@ -4192,6 +4192,11 @@
"startImmediately": true
}
],
"switches": [
{
"id": 779889 // [Switch] SENDER - Active Music
}
],
"relays": [
{
"id": 689878 // [Relay] Chozo Music
Expand All @@ -4207,9 +4212,6 @@
{
"id": 779878, // [Relay] Ghosts Music
"active": false
},
{
"id": 779889 // [Relay] SENDER - Change Music
}
]
},
Expand All @@ -4226,15 +4228,21 @@
},
{
"senderId": 262174, // [SpecialFunction] Music Player For Area
"targetId": 262185, // [StreamedAudio] StreamedAudio - Ruins Soto B SW
"targetId": 779889, // [Switch] RECEIVER - Active Music
"state": "ENTERED",
"message": "SET_TO_ZERO"
},
{
"senderId": 779889, // [Switch] RECEIVER - Active Music
"targetId": 262185, // [StreamedAudio] StreamedAudio - Ruins Soto B SW
"state": "CLOSED",
"message": "PLAY"
},
{
"senderId": 779889, // [Relay] RECEIVER - Change Music
"targetId": 262174, // [SpecialFunction] Music Player For Area
"state": "ZERO",
"message": "DEACTIVATE"
"senderId": 779889, // [Switch] RECEIVER - Active Music
"targetId": 592594, // [StreamedAudio] StreamedAudio - Ruins Samus SW
"state": "OPEN",
"message": "PLAY"
}
],
"specialFunctions": [
Expand All @@ -4243,10 +4251,9 @@
"type": "PlayerInAreaRelay"
}
],
"relays": [
"switches": [
{
"id": 779889, // [Relay] RECEIVER - Change
"layer": 1
"id": 779889 // [Switch] RECEIVER - Change Music
}
],
"streamedAudios": [
Expand All @@ -4258,6 +4265,14 @@
"fadeInTime": 0.01,
"audioFileName": "/audio/Ruins-soto-BL.dsp|/audio/Ruins-soto-BR.dsp"
},
{
"id": 592594, // [StreamedAudio] StreamedAudio - Ruins Samus SW
"layer": 1,
"volume": 70,
"isMusic": true,
"fadeInTime": 0.01,
"audioFileName": "/audio/rui_samusL.dsp|/audio/rui_samusR.dsp"
},
{
"id": 262184, // [StreamedAudio] StreamedAudio - Ruins Samus SW
"layer": 2,
Expand Down Expand Up @@ -7753,6 +7768,54 @@
"state": "ZERO",
"message": "DEACTIVATE"
},
{
"senderId": 1310728, // [Timer] 1st Pass Check
"targetId": 1311451, // [SpacePirate] SpacePirate
"state": "ZERO",
"message": "DEACTIVATE"
},
{
"senderId": 1310728, // [Timer] 1st Pass Check
"targetId": 1311288, // [SpacePirate] SpacePirate
"state": "ZERO",
"message": "DEACTIVATE"
},
{
"senderId": 1310728, // [Timer] 1st Pass Check
"targetId": 1310773, // [SpacePirate] SpacePirate
"state": "ZERO",
"message": "DEACTIVATE"
},
{
"senderId": 1310728, // [Timer] 1st Pass Check
"targetId": 1311061, // [SpacePirate] SpacePirate
"state": "ZERO",
"message": "DEACTIVATE"
},
{
"senderId": 1311461, // [Trigger] Trigger
"targetId": 1311451, // [SpacePirate] SpacePirate
"state": "ENTERED",
"message": "ACTIVATE"
},
{
"senderId": 1311461, // [Trigger] Trigger
"targetId": 1311288, // [SpacePirate] SpacePirate
"state": "ENTERED",
"message": "ACTIVATE"
},
{
"senderId": 1311461, // [Trigger] Trigger
"targetId": 1310773, // [SpacePirate] SpacePirate
"state": "ENTERED",
"message": "ACTIVATE"
},
{
"senderId": 1311461, // [Trigger] Trigger
"targetId": 1311061, // [SpacePirate] SpacePirate
"state": "ENTERED",
"message": "ACTIVATE"
},
{
"senderId": 1310728, // [Timer] 1st Pass Check
"targetId": 1310734, // [Relay] Pirate Battle Music
Expand Down
Loading
Loading