tr1/game-flow: simplify cutscenes music track setup

LostArtefacts · Jan 26, 2025 · bca90a9 · bca90a9
1 parent 262dabd
commit bca90a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/data/tr1/ship/cfg/TR1X_gameflow.json5 b/data/tr1/ship/cfg/TR1X_gameflow.json5
@@ -447,7 +447,7 @@
         // Cut Scene 1
         {
             "path": "data/cut1.phd",
-            "music_track": 0,
+            "music_track": 23,
             "lara_type": "player_1",
             "inherit_injections": false,
             "injections": [
@@ -459,15 +459,14 @@
             "sequence": [
                 {"type": "load_level"},
                 {"type": "set_cutscene_angle", "value": -23312},
-                {"type": "play_music", "music_track": 23},
                 {"type": "play_level"},
             ],
         },
 
         // Cut Scene 2
         {
             "path": "data/cut2.phd",
-            "music_track": 0,
+            "music_track": 25,
             "lara_type": "player_1",
             "inherit_injections": false,
             "injections": [
@@ -479,7 +478,6 @@
             "sequence": [
                 {"type": "load_level"},
                 {"type": "set_cutscene_angle", "value": 16380},
-                {"type": "play_music", "music_track": 25},
                 {"type": "mesh_swap", "object1_id": "player_1", "object2_id": "pistol_anim", "mesh_id": 1},
                 {"type": "mesh_swap", "object1_id": "player_1", "object2_id": "pistol_anim", "mesh_id": 4},
                 {"type": "play_level"},
@@ -489,7 +487,7 @@
         // Cut Scene 3
         {
             "path": "data/cut3.phd",
-            "music_track": 0,
+            "music_track": 24,
             "inherit_injections": false,
             "injections": [
                 "data/injections/cut3_textures.bin",
@@ -500,15 +498,14 @@
                 {"type": "load_level"},
                 {"type": "flip_map"},
                 {"type": "set_cutscene_angle", "value": 16384},
-                {"type": "play_music", "music_track": 24},
                 {"type": "play_level"},
             ],
         },
 
         // Cut Scene 4
         {
             "path": "data/cut4.phd",
-            "music_track": 0,
+            "music_track": 22,
             "draw_distance_fade": 12.0,
             "draw_distance_max": 18.0,
             "lara_type": "player_1",
@@ -523,7 +520,6 @@
             "sequence": [
                 {"type": "load_level"},
                 {"type": "set_cutscene_angle", "value": 16384},
-                {"type": "play_music", "music_track": 22},
                 {"type": "mesh_swap", "object1_id": "player_1", "object2_id": "pistol_anim", "mesh_id": 1},
                 {"type": "mesh_swap", "object1_id": "player_1", "object2_id": "pistol_anim", "mesh_id": 4},
                 {"type": "play_level"},

diff --git a/data/tr1/ship/cfg/TR1X_gameflow_ub.json5 b/data/tr1/ship/cfg/TR1X_gameflow_ub.json5
@@ -131,7 +131,6 @@
 
         // Level 5: Current Position
         {
-            "title": "Current Position",
             "path": "data/current.phd",
             "type": "current",
             "music_track": 0,

diff --git a/docs/tr1/GAMEFLOW.md b/docs/tr1/GAMEFLOW.md
@@ -853,13 +853,12 @@ game will exit to title.
     "cutscenes": [
         {
             "path": "data/bonuscut1.phd",
-            "music_track": 0,
+            "music_track": 23,
             "sequence": [
                 {"type": "load_level"},
                 {"type": "set_cam_x", "value": 36668},
                 {"type": "set_cam_z", "value": 63180},
                 {"type": "set_cutscene_angle", "value": -23312},
-                {"type": "play_music", "music_id": 23},
                 {"type": "play_level"},
             ],
         },