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

Game flow rework (pt 3) #2364

Merged
merged 6 commits into from
Jan 24, 2025
Merged

Game flow rework (pt 3) #2364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
35e1191
game-flow: refactor cutscenes
rr- Jan 23, 2025
3bf082b
tr2/levels: tidy api locations
rr- Jan 23, 2025
66f8d7c
tr2/game-flow: use dedicated 'music' key
rr- Jan 23, 2025
40aee6d
tr2/level: use GAME_FLOW_LEVEL internally
rr- Jan 23, 2025
c67ca2e
tr2/game-flow: make demos use its own numbers
rr- Jan 23, 2025
efa3d90
tr2/game-flow: make cutscenes run their sequences
rr- Jan 23, 2025
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
90 changes: 53 additions & 37 deletions data/tr2/ship/cfg/TR2X_gameflow.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
"single_level": -1,

"demo_delay": 30,
"title_track": 64,
"secret_track": 47,
"level_complete_track": 41,
"game_complete_track": 52,

"title": {
"path": "data/title.tr2",
"music_track": 64,
"sequence": [
{"type": "display_picture", "path": "data/legal.pcx"},
{"type": "play_fmv", "fmv_num": 0},
Expand All @@ -35,25 +36,23 @@
// 0. Lara's Home
{
"path": "data/assault.tr2",
"music_track": -1,
"sequence": [
{"type": "set_secret_count", "count": 0},
{"type": "set_music_track", "music_track": 0},
{"type": "play_level"},
],
},

// 1. The Great Wall
{
"path": "data/wall.tr2",
"music_track": 33,
"sequence": [
{"type": "play_fmv", "fmv_num": 2},
{"type": "set_music_track", "music_track": 33},
{"type": "add_secret_reward", "item": "grenade_launcher"},
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 2},
{"type": "add_secret_reward", "item": "small_medipack"},
{"type": "play_level"},
{"type": "set_music_track", "music_track": 3},
{"type": "set_cutscene_angle", "angle": 0},
{"type": "play_cutscene", "cutscene_num": 0},
{"type": "level_complete"},
],
Expand All @@ -65,8 +64,8 @@
// 2. Venice
{
"path": "data/boat.tr2",
"music_track": -1,
"sequence": [
{"type": "set_music_track", "music_track": 0},
{"type": "add_secret_reward", "item": "magnums_ammo", "qty": 4},
{"type": "play_level"},
{"type": "level_complete"},
Expand All @@ -76,8 +75,8 @@
// 3. Bartoli's Hideout
{
"path": "data/venice.tr2",
"music_track": -1,
"sequence": [
{"type": "set_music_track", "music_track": 0},
{"type": "enable_sunset"},
{"type": "add_secret_reward", "item": "shotgun_ammo", "qty": 4},
{"type": "play_level"},
Expand All @@ -88,12 +87,11 @@
// 4. Opera House
{
"path": "data/opera.tr2",
"music_track": 31,
"sequence": [
{"type": "set_music_track", "music_track": 31},
{"type": "add_secret_reward", "item": "uzis"},
{"type": "add_secret_reward", "item": "uzis_ammo", "qty": 4},
{"type": "play_level"},
{"type": "set_music_track", "music_track": 4},
{"type": "play_cutscene", "cutscene_num": 1},
{"type": "level_complete"},
],
Expand All @@ -106,9 +104,9 @@
// 5. Offshore Rig
{
"path": "data/rig.tr2",
"music_track": 58,
"sequence": [
{"type": "play_fmv", "fmv_num": 3},
{"type": "set_music_track", "music_track": 58},
{"type": "set_lara_start_anim", "anim": 8},
{"type": "remove_weapons"},
{"type": "add_secret_reward", "item": "uzis"},
Expand All @@ -124,11 +122,10 @@
// 6. Diving Area
{
"path": "data/platform.tr2",
"music_track": 58,
"sequence": [
{"type": "set_music_track", "music_track": 58},
{"type": "add_secret_reward", "item": "uzis_ammo", "qty": 4},
{"type": "play_level"},
{"type": "set_music_track", "music_track": 5},
{"type": "play_cutscene", "cutscene_num": 2},
{"type": "level_complete"},
],
Expand All @@ -140,9 +137,9 @@
// 7. 40 Fathoms
{
"path": "data/unwater.tr2",
"music_track": 34,
"sequence": [
{"type": "play_fmv", "fmv_num": 4},
{"type": "set_music_track", "music_track": 34},
{"type": "add_secret_reward", "item": "harpoon_gun_ammo", "qty": 4},
{"type": "play_level"},
{"type": "level_complete"},
Expand All @@ -152,8 +149,8 @@
// 8. Wreck of the Maria Doria
{
"path": "data/keel.tr2",
"music_track": 31,
"sequence": [
{"type": "set_music_track", "music_track": 31},
{"type": "add_secret_reward", "item": "grenade_launcher"},
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 2},
{"type": "play_level"},
Expand All @@ -168,8 +165,8 @@
// 9. Living Quarters
{
"path": "data/living.tr2",
"music_track": 34,
"sequence": [
{"type": "set_music_track", "music_track": 34},
{"type": "add_secret_reward", "item": "m16_ammo", "qty": 4},
{"type": "play_level"},
{"type": "level_complete"},
Expand All @@ -179,8 +176,8 @@
// 10. The Deck
{
"path": "data/deck.tr2",
"music_track": 31,
"sequence": [
{"type": "set_music_track", "music_track": 31},
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 4},
{"type": "play_level"},
{"type": "level_complete"},
Expand All @@ -193,9 +190,9 @@
// 11. Tibetan Foothills
{
"path": "data/skidoo.tr2",
"music_track": 33,
"sequence": [
{"type": "play_fmv", "fmv_num": 5},
{"type": "set_music_track", "music_track": 33},
{"type": "give_item", "item": "puzzle_4"},
{"type": "add_secret_reward", "item": "uzis_ammo", "qty": 4},
{"type": "play_level"},
Expand All @@ -210,8 +207,8 @@
// 12. Barkhang Monastery
{
"path": "data/monastry.tr2",
"music_track": -1,
"sequence": [
{"type": "set_music_track", "music_track": 0},
{"type": "give_item", "item": "puzzle_4"},
{"type": "add_secret_reward", "item": "m16_ammo", "qty": 4},
{"type": "play_level"},
Expand All @@ -225,8 +222,8 @@
// 13. Catacombs of the Talion
{
"path": "data/catacomb.tr2",
"music_track": 31,
"sequence": [
{"type": "set_music_track", "music_track": 31},
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 2},
{"type": "add_secret_reward", "item": "m16_ammo", "qty": 2},
{"type": "play_level"},
Expand All @@ -241,8 +238,8 @@
// 14. Ice Palace
{
"path": "data/icecave.tr2",
"music_track": 31,
"sequence": [
{"type": "set_music_track", "music_track": 31},
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 4},
{"type": "play_level"},
{"type": "level_complete"},
Expand All @@ -256,13 +253,11 @@
// 15. Temple of Xian
{
"path": "data/emprtomb.tr2",
"music_track": 59,
"sequence": [
{"type": "play_fmv", "fmv_num": 6},
{"type": "set_music_track", "music_track": 59},
{"type": "add_secret_reward", "item": "uzis_ammo", "qty": 8},
{"type": "play_level"},
{"type": "set_music_track", "music_track": 30},
{"type": "set_cutscene_angle", "angle": 0},
{"type": "play_cutscene", "cutscene_num": 3},
{"type": "level_complete"},
],
Expand All @@ -275,8 +270,8 @@
// 16. Floating Islands
{
"path": "data/floating.tr2",
"music_track": 59,
"sequence": [
{"type": "set_music_track", "music_track": 59},
{"type": "disable_floor", "height": 9728},
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 8},
{"type": "play_level"},
Expand All @@ -291,9 +286,9 @@
// 17. The Dragon's Lair
{
"path": "data/xian.tr2",
"music_track": 59,
"sequence": [
{"type": "set_secret_count", "count": 0},
{"type": "set_music_track", "music_track": 59},
{"type": "play_level"},
{"type": "level_complete"},
{"type": "play_fmv", "fmv_num": 7},
Expand All @@ -303,15 +298,14 @@
// 18. Home Sweet Home
{
"path": "data/house.tr2",
"music_track": -1,
"sequence": [
{"type": "set_secret_count", "count": 0},
{"type": "give_item", "item": "key_1"},
{"type": "set_lara_start_anim", "anim": 9},
{"type": "set_music_track", "music_track": 0},
{"type": "remove_weapons"},
{"type": "remove_ammo"},
{"type": "play_level"},
{"type": "set_music_track", "music_track": 52},
{"type": "game_complete"},
],
"injections": [
Expand All @@ -324,22 +318,22 @@
// 0. Venice
{
"path": "data/boat.tr2",
"music_track": -1,
"sequence": [
{"type": "set_music_track", "music_track": 0},
{"type": "add_secret_reward", "item": "magnums_ammo", "qty": 4},
{"type": "play_level", "level_num": 2},
{"type": "play_level"},
{"type": "level_complete"},
],
},

// 1. Wreck of the Maria Doria
{
"path": "data/keel.tr2",
"music_track": 31,
"sequence": [
{"type": "set_music_track", "music_track": 31},
{"type": "add_secret_reward", "item": "grenade_launcher"},
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 2},
{"type": "play_level", "level_num": 8},
{"type": "play_level"},
{"type": "level_complete"},
],
"injections": [
Expand All @@ -351,11 +345,11 @@
// 2. Tibetan Foothills
{
"path": "data/skidoo.tr2",
"music_track": 33,
"sequence": [
{"type": "set_music_track", "music_track": 33},
{"type": "give_item", "item": "puzzle_4"},
{"type": "add_secret_reward", "item": "uzis_ammo", "qty": 4},
{"type": "play_level", "level_num": 11},
{"type": "play_level"},
{"type": "level_complete"},
],
"injections": [
Expand All @@ -366,10 +360,32 @@
],

"cutscenes": [
{"path": "data/cut1.tr2"},
{"path": "data/cut2.tr2"},
{"path": "data/cut3.tr2"},
{"path": "data/cut4.tr2"},
{
"path": "data/cut1.tr2",
"music_track": 3,
"sequence": [
{"type": "set_cutscene_angle", "angle": 0},
{"type": "play_level"},
],
},
{
"path": "data/cut2.tr2",
"music_track": 4,
"sequence": [{"type": "play_level"}],
},
{
"path": "data/cut3.tr2",
"music_track": 5,
"sequence": [{"type": "play_level"}],
},
{
"path": "data/cut4.tr2",
"music_track": 30,
"sequence": [
{"type": "set_cutscene_angle", "angle": 0},
{"type": "play_level"},
],
},
],

"fmvs": [
Expand Down
25 changes: 25 additions & 0 deletions src/libtrx/game/game_flow/sequencer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,28 @@ GAME_FLOW_COMMAND GF_ShowInventoryKeys(const GAME_OBJECT_ID receptacle_type_id)
}
return GF_ShowInventory(INV_KEYS_MODE);
}

GAME_FLOW_COMMAND GF_RunDemo(const int32_t demo_num)
{
PHASE *const demo_phase = Phase_Demo_Create(demo_num);
const GAME_FLOW_COMMAND gf_cmd = PhaseExecutor_Run(demo_phase);
Phase_Demo_Destroy(demo_phase);
return gf_cmd;
}

GAME_FLOW_COMMAND GF_RunCutscene(const int32_t cutscene_num)
{
PHASE *const cutscene_phase = Phase_Cutscene_Create(cutscene_num);
const GAME_FLOW_COMMAND gf_cmd = PhaseExecutor_Run(cutscene_phase);
Phase_Cutscene_Destroy(cutscene_phase);
return gf_cmd;
}

GAME_FLOW_COMMAND GF_RunGame(
const int32_t level_num, const GAME_FLOW_LEVEL_TYPE level_type)
{
PHASE *const phase = Phase_Game_Create(level_num, level_type);
const GAME_FLOW_COMMAND gf_cmd = PhaseExecutor_Run(phase);
Phase_Game_Destroy(phase);
return gf_cmd;
}
4 changes: 4 additions & 0 deletions src/libtrx/include/libtrx/game/game_flow/sequencer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ GAME_FLOW_COMMAND GF_EnterPhotoMode(void);
GAME_FLOW_COMMAND GF_PauseGame(void);
GAME_FLOW_COMMAND GF_ShowInventory(INVENTORY_MODE inv_mode);
GAME_FLOW_COMMAND GF_ShowInventoryKeys(GAME_OBJECT_ID receptacle_type_id);
GAME_FLOW_COMMAND GF_RunDemo(int32_t demo_num);
GAME_FLOW_COMMAND GF_RunCutscene(int32_t cutscene_num);
GAME_FLOW_COMMAND GF_RunGame(
int32_t level_num, GAME_FLOW_LEVEL_TYPE level_type);
Loading
Loading