diff --git a/data/tr2/ship/cfg/TR2X_gameflow.json5 b/data/tr2/ship/cfg/TR2X_gameflow.json5 index 2a5a9265a..61c1b49a5 100644 --- a/data/tr2/ship/cfg/TR2X_gameflow.json5 +++ b/data/tr2/ship/cfg/TR2X_gameflow.json5 @@ -19,7 +19,6 @@ "demo_delay": 30, "secret_track": 47, - "level_complete_track": 41, "title": { "path": "data/title.tr2", @@ -53,6 +52,7 @@ {"type": "add_secret_reward", "object_id": "small_medipack"}, {"type": "play_level"}, {"type": "play_cutscene", "cutscene_id": 0}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -68,6 +68,7 @@ "sequence": [ {"type": "add_secret_reward", "object_id": "magnums_ammo", "quantity": 4}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -81,6 +82,7 @@ {"type": "enable_sunset"}, {"type": "add_secret_reward", "object_id": "shotgun_ammo", "quantity": 4}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -95,6 +97,7 @@ {"type": "add_secret_reward", "object_id": "uzis_ammo", "quantity": 4}, {"type": "play_level"}, {"type": "play_cutscene", "cutscene_id": 1}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -115,6 +118,7 @@ {"type": "add_secret_reward", "object_id": "uzis"}, {"type": "add_secret_reward", "object_id": "uzis_ammo", "quantity": 2}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -131,6 +135,7 @@ {"type": "add_secret_reward", "object_id": "uzis_ammo", "quantity": 4}, {"type": "play_level"}, {"type": "play_cutscene", "cutscene_id": 2}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -147,6 +152,7 @@ {"type": "play_fmv", "fmv_id": 4}, {"type": "add_secret_reward", "object_id": "harpoon_gun_ammo", "quantity": 4}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -160,6 +166,7 @@ {"type": "add_secret_reward", "object_id": "grenade_launcher"}, {"type": "add_secret_reward", "object_id": "grenade_launcher_ammo", "quantity": 2}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -176,6 +183,7 @@ "sequence": [ {"type": "add_secret_reward", "object_id": "m16_ammo", "quantity": 4}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -188,6 +196,7 @@ "sequence": [ {"type": "add_secret_reward", "object_id": "grenade_launcher_ammo", "quantity": 4}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -205,6 +214,7 @@ {"type": "give_item", "object_id": "puzzle_4"}, {"type": "add_secret_reward", "object_id": "uzis_ammo", "quantity": 4}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -222,6 +232,7 @@ {"type": "give_item", "object_id": "puzzle_4"}, {"type": "add_secret_reward", "object_id": "m16_ammo", "quantity": 4}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -238,6 +249,7 @@ {"type": "add_secret_reward", "object_id": "grenade_launcher_ammo", "quantity": 2}, {"type": "add_secret_reward", "object_id": "m16_ammo", "quantity": 2}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -254,6 +266,7 @@ "sequence": [ {"type": "add_secret_reward", "object_id": "grenade_launcher_ammo", "quantity": 4}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -272,6 +285,7 @@ {"type": "add_secret_reward", "object_id": "uzis_ammo", "quantity": 8}, {"type": "play_level"}, {"type": "play_cutscene", "cutscene_id": 3}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -289,6 +303,7 @@ {"type": "disable_floor", "height": 9728}, {"type": "add_secret_reward", "object_id": "grenade_launcher_ammo", "quantity": 8}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, ], @@ -305,6 +320,7 @@ "sequence": [ {"type": "set_secret_count", "count": 0}, {"type": "play_level"}, + {"type": "play_music", "music_track": 41}, {"type": "level_stats"}, {"type": "level_complete"}, {"type": "play_fmv", "fmv_id": 7}, diff --git a/src/libtrx/include/libtrx/game/game_flow/types.h b/src/libtrx/include/libtrx/game/game_flow/types.h index bd1f906ec..bc1db81f3 100644 --- a/src/libtrx/include/libtrx/game/game_flow/types.h +++ b/src/libtrx/include/libtrx/game/game_flow/types.h @@ -163,7 +163,6 @@ typedef struct { // music struct { MUSIC_TRACK_ID secret_track; - MUSIC_TRACK_ID level_complete_track; }; #endif diff --git a/src/tr2/game/game_flow/reader.c b/src/tr2/game/game_flow/reader.c index 301351115..065220dec 100644 --- a/src/tr2/game/game_flow/reader.c +++ b/src/tr2/game/game_flow/reader.c @@ -300,8 +300,6 @@ static void M_LoadRoot(JSON_OBJECT *const obj, GAME_FLOW *const gf) // clang-format on gf->secret_track = JSON_ObjectGetInt(obj, "secret_track", MX_INACTIVE); - gf->level_complete_track = - JSON_ObjectGetInt(obj, "level_complete_track", MX_INACTIVE); M_LoadGlobalInjections(obj, gf); } diff --git a/src/tr2/game/game_flow/sequencer.c b/src/tr2/game/game_flow/sequencer.c index c78483a10..ffcc5ffca 100644 --- a/src/tr2/game/game_flow/sequencer.c +++ b/src/tr2/game/game_flow/sequencer.c @@ -175,10 +175,6 @@ GAME_FLOW_COMMAND GF_InterpretSequence( break; } const GAME_FLOW_LEVEL *const current_level = Game_GetCurrentLevel(); - - if (g_GameFlow.level_complete_track != MX_INACTIVE) { - Music_Play(g_GameFlow.level_complete_track, MPM_ALWAYS); - } PHASE *const stats_phase = Phase_Stats_Create((PHASE_STATS_ARGS) { .background_type = BK_OBJECT, .show_final_stats = false, diff --git a/tools/tr2/read_tombpc_script b/tools/tr2/read_tombpc_script index f023217b3..c0d98bb9a 100644 --- a/tools/tr2/read_tombpc_script +++ b/tools/tr2/read_tombpc_script @@ -231,6 +231,7 @@ def transform_script(script: list[int]): yield {"type": "play_level", "cutscene_id": cutscene_id} case GameFlowEvent.LEVEL_COMPLETE: + yield {"type": "play_music", "music_track": 41} yield {"type": "level_stats"} yield {"type": "level_complete"} @@ -329,7 +330,6 @@ def create_trx_game_flow(game_script: GameScript): "demo_delay": game_script.demo_time / 30, "title_track": game_script.title_sound, "secret_track": game_script.secret_sound, - "level_complete_track": 41, **( { "title": {