Skip to content

Commit

Permalink
Fix Flaahgra bomb slot cutscene skip nuance (#47)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrMiguel211
MrMiguel211 authored May 28, 2024
1 parent be8019e commit f5fa46a
Showing 1 changed file with 78 additions and 167 deletions.
245 changes: 78 additions & 167 deletions generated/json_data/skippable_cutscenes.jsonc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7783,12 +7783,6 @@
"state": "ZERO",
"message": "DEACTIVATE"
},
{
"senderId": 2424914, // [Relay] Bomb Slot 1 Destroyed?
"targetId": 2424883, // [SpawnPoint] Spawn point - Destroy Bomb Slot 1
"state": "ZERO",
"message": "SET_TO_ZERO"
},
{
"senderId": 2424914, // [Relay] Bomb Slot 1 Destroyed?
"targetId": 2424872, // [Effect] Bomb Slot Destroyed Effect
Expand Down Expand Up @@ -7855,12 +7849,6 @@
"state": "ZERO",
"message": "STOP_AND_RESET"
},
{
"senderId": 2424917, // [Relay] Bomb Slot 2 Destroyed?
"targetId": 2424968, // [Spawn point] Spawn point - Destroy Bomb Slot 2
"state": "ZERO",
"message": "SET_TO_ZERO"
},
{
"senderId": 2424917, // [Relay] Bomb Slot 2 Destroyed?
"targetId": 2424858, // [BallTrigger] BallTrigger 2
Expand Down Expand Up @@ -7933,12 +7921,6 @@
"state": "ZERO",
"message": "SET_TO_ZERO"
},
{
"senderId": 2424920, // [Relay] Bomb Slot 3 Destroyed?
"targetId": 2424971, // [Spawn point] Spawn point - Destroy Bomb Slot 3
"state": "ZERO",
"message": "SET_TO_ZERO"
},
{
"senderId": 2424920, // [Relay] Bomb Slot 3 Destroyed?
"targetId": 2424972, // [Timer] Reposition Player Timer 3
Expand Down Expand Up @@ -8017,12 +7999,6 @@
"state": "ZERO",
"message": "SET_TO_ZERO"
},
{
"senderId": 2424926, // [Relay] Bomb Slot 4 Destroyed?
"targetId": 2424974, // [Spawn point] Spawn point - Destroy Bomb Slot 4
"state": "ZERO",
"message": "SET_TO_ZERO"
},
{
"senderId": 2424926, // [Relay] Bomb Slot 4 Destroyed?
"targetId": 2424975, // [Timer] Reposition Player Timer
Expand Down Expand Up @@ -8286,102 +8262,6 @@
"message": "DEACTIVATE"
},
//SLOT 4 ENDS HERE//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
{
"senderId": 2424862, // [Flaahgra] Main Flaahgra
"targetId": 2424883, // [SpawnPoint] Spawn point - Destroy Bomb Slot 1
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 2424862, // [Flaahgra] Main Flaahgra
"targetId": 2424968, // [SpawnPoint] Spawn point - Destroy Bomb Slot 2
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 2424862, // [Flaahgra] Main Flaahgra
"targetId": 2424971, // [SpawnPoint] Spawn point - Destroy Bomb Slot 3
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 2424862, // [Flaahgra] Main Flaahgra
"targetId": 2424974, // [SpawnPoint] Spawn point - Destroy Bomb Slot 4
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 5242880, // [Flaahgra] Flaahgra #2
"targetId": 2424883, // [SpawnPoint] Spawn point - Destroy Bomb Slot 1
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 5242880, // [Flaahgra] Flaahgra #2
"targetId": 2424968, // [SpawnPoint] Spawn point - Destroy Bomb Slot 2
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 5242880, // [Flaahgra] Flaahgra #2
"targetId": 2424971, // [SpawnPoint] Spawn point - Destroy Bomb Slot 3
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 5242880, // [Flaahgra] Flaahgra #2
"targetId": 2424974, // [SpawnPoint] Spawn point - Destroy Bomb Slot 4
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 5242881, // [Flaahgra] Flaahgra #3
"targetId": 2424883, // [SpawnPoint] Spawn point - Destroy Bomb Slot 1
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 5242881, // [Flaahgra] Flaahgra #3
"targetId": 2424968, // [SpawnPoint] Spawn point - Destroy Bomb Slot 2
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 5242881, // [Flaahgra] Flaahgra #3
"targetId": 2424971, // [SpawnPoint] Spawn point - Destroy Bomb Slot 3
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 5242881, // [Flaahgra] Flaahgra #3
"targetId": 2424974, // [SpawnPoint] Spawn point - Destroy Bomb Slot 4
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 5242882, // [Flaahgra] Flaahgra #4
"targetId": 2424883, // [SpawnPoint] Spawn point - Destroy Bomb Slot 1
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 5242882, // [Flaahgra] Flaahgra #4
"targetId": 2424968, // [SpawnPoint] Spawn point - Destroy Bomb Slot 2
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 5242882, // [Flaahgra] Flaahgra #4
"targetId": 2424971, // [SpawnPoint] Spawn point - Destroy Bomb Slot 3
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 5242882, // [Flaahgra] Flaahgra #4
"targetId": 2424974, // [SpawnPoint] Spawn point - Destroy Bomb Slot 4
"state": "DEAD",
"message": "DEACTIVATE"
},
{
"senderId": 2434957, // [Relay] Relay-start of cinema
"targetId": 2424866, // [SpecialFunction] SpecialFunction Cinematic Skip Main
Expand Down Expand Up @@ -8472,12 +8352,18 @@
"senderId": 2424865, // [SpecialFunction] SpecialFunction Cinematic Skip
"targetId": 2424862, // [Flaahgra] Main Flaahgra
"state": "ZERO",
"message": "DEACTIVATE"
"message": "DELETED"
},
{
"senderId": 2424865, // [SpecialFunction] SpecialFunction Cinematic Skip
"targetId": 2424862, // [Flaahgra] Main Flaahgra
"state": "ZERO",
"message": "DEACTIVATE"
},
{
"senderId": 2424865, // [SpecialFunction] SpecialFunction Cinematic Skip
"targetId": 5242880, // [Flaahgra] Flaahgra #2
"state": "ZERO",
"message": "DELETED"
},
{
Expand All @@ -8488,7 +8374,7 @@
},
{
"senderId": 2424865, // [SpecialFunction] SpecialFunction Cinematic Skip
"targetId": 5242880, // [Flaahgra] Flaahgra #2
"targetId": 5242881, // [Flaahgra] Flaahgra #3
"state": "ZERO",
"message": "DELETED"
},
Expand All @@ -8500,7 +8386,7 @@
},
{
"senderId": 2424865, // [SpecialFunction] SpecialFunction Cinematic Skip
"targetId": 5242881, // [Flaahgra] Flaahgra #3
"targetId": 5242882, // [Flaahgra] Flaahgra #4
"state": "ZERO",
"message": "DELETED"
},
Expand All @@ -8511,11 +8397,53 @@
"message": "DEACTIVATE"
},
{
"senderId": 2424865, // [SpecialFunction] SpecialFunction Cinematic Skip
"senderId": 2434923, // [Camera] camera4
"targetId": 2424862, // [Flaahgra] Main Flaahgra
"state": "ACTIVE",
"message": "DELETED"
},
{
"senderId": 2434923, // [Camera] camera4
"targetId": 2424862, // [Flaahgra] Main Flaahgra
"state": "ACTIVE",
"message": "DEACTIVATE"
},
{
"senderId": 2434923, // [Camera] camera4
"targetId": 5242880, // [Flaahgra] Flaahgra #2
"state": "ACTIVE",
"message": "DELETED"
},
{
"senderId": 2434923, // [Camera] camera4
"targetId": 5242880, // [Flaahgra] Flaahgra #2
"state": "ACTIVE",
"message": "DEACTIVATE"
},
{
"senderId": 2434923, // [Camera] camera4
"targetId": 5242881, // [Flaahgra] Flaahgra #3
"state": "ACTIVE",
"message": "DELETED"
},
{
"senderId": 2434923, // [Camera] camera4
"targetId": 5242881, // [Flaahgra] Flaahgra #3
"state": "ACTIVE",
"message": "DEACTIVATE"
},
{
"senderId": 2434923, // [Camera] camera4
"targetId": 5242882, // [Flaahgra] Flaahgra #4
"state": "ZERO",
"state": "ACTIVE",
"message": "DELETED"
},
{
"senderId": 2434923, // [Camera] camera4
"targetId": 5242882, // [Flaahgra] Flaahgra #4
"state": "ACTIVE",
"message": "DEACTIVATE"
},
{
"senderId": 2424865, // [SpecialFunction] SpecialFunction Cinematic Skip
"targetId": 2435337, // [SpecialFunction] SpecialFunction Boss Energy Bar
Expand Down Expand Up @@ -8838,55 +8766,23 @@
"triggers": [
{
"id": 2436939, // [Trigger] Reset Faint Time Trigger
"position": [
269.368408,
137.372131,
67.644196
],
"scale": [
5.0,
7.0,
2.5
]
"position": [269.368408, 137.372131, 67.644196],
"scale": [5.0, 7.0, 2.5]
},
{
"id": 2436940, // [Trigger] Reset Faint Time Trigger
"position": [
284.118408,
152.122131,
67.644196
],
"scale": [
7.0,
5.0,
2.5
]
"position": [284.118408, 152.122131, 67.644196],
"scale": [7.0, 5.0, 2.5]
},
{
"id": 2436941, // [Trigger] Reset Faint Time Trigger
"position": [
298.868408,
137.372131,
67.644196
],
"scale": [
5.0,
7.0,
2.5
]
"position": [298.868408, 137.372131, 67.644196],
"scale": [5.0, 7.0, 2.5]
},
{
"id": 2436942, // [Trigger] Reset Faint Time Trigger
"position": [
284.118408,
122.622131,
67.644196
],
"scale": [
7.0,
5.0,
2.5
]
"position": [284.118408, 122.622131, 67.644196],
"scale": [7.0, 5.0, 2.5]
}
],
"relays": [
Expand Down Expand Up @@ -9016,8 +8912,23 @@
"layer": 1
},
{
"id": 2424935, // [Timer] Pre-Floaty Timer
"time": 0.001,
"id": 2424934, // [Timer] Reposition Player Timer 1
"time": 0.98,
"layer": 1
},
{
"id": 2424969, // [Timer] Reposition Player Timer 2
"time": 0.98,
"layer": 1
},
{
"id": 2424972, // [Timer] Reposition Player Timer 3
"time": 0.98,
"layer": 1
},
{
"id": 2424975, // [Timer] Reposition Player Timer 4
"time": 0.98,
"layer": 1
},
{
Expand Down

0 comments on commit f5fa46a

Please sign in to comment.