Skip to content

Commit

Permalink
game-flow: support string-based object ids
Browse files Browse the repository at this point in the history
  • Loading branch information
@rr-
rr- committed Jan 24, 2025
1 parent 30ce68e commit dd6b949
Show file tree
Hide file tree
Showing 5 changed files with 150 additions and 103 deletions.
16 changes: 8 additions & 8 deletions data/tr1/ship/cfg/TR1X_gameflow.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@
{"type": "play_fmv", "fmv_id": 8},
{"type": "loading_screen", "path": "data/images/atlantis.webp"},
{"type": "load_level"},
{"type": "give_item", "object_id": 84, "quantity": 1},
{"type": "give_item", "object_id": "pistols", "quantity": 1},
{"type": "setup_bacon_lara", "anchor_room": 10},
{"type": "play_level"},
{"type": "play_fmv", "fmv_id": 9},
Expand Down Expand Up @@ -378,7 +378,7 @@
"path": "data/cut1.phd",
"type": "cutscene",
"music_track": 0,
"lara_type": 77,
"lara_type": "player_1",
"inherit_injections": false,
"injections": [
"data/injections/backpack_cut.bin",
Expand All @@ -401,7 +401,7 @@
"path": "data/cut2.phd",
"type": "cutscene",
"music_track": 0,
"lara_type": 77,
"lara_type": "player_1",
"inherit_injections": false,
"injections": [
"data/injections/backpack_cut.bin",
Expand All @@ -413,8 +413,8 @@
{"type": "load_level"},
{"type": "set_cutscene_angle", "value": 16380},
{"type": "play_synced_audio", "audio_id": 25},
{"type": "mesh_swap", "object1_id": 77, "object2_id": 1, "mesh_id": 1},
{"type": "mesh_swap", "object1_id": 77, "object2_id": 1, "mesh_id": 4},
{"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"},
{"type": "level_stats", "level_id": 9},
{"type": "exit_to_level", "level_id": 10},
Expand Down Expand Up @@ -449,7 +449,7 @@
"music_track": 0,
"draw_distance_fade": 12.0,
"draw_distance_max": 18.0,
"lara_type": 77,
"lara_type": "player_1",
"inherit_injections": false,
"injections": [
"data/injections/backpack_cut.bin",
Expand All @@ -462,8 +462,8 @@
{"type": "load_level"},
{"type": "set_cutscene_angle", "value": 16384},
{"type": "play_synced_audio", "audio_id": 22},
{"type": "mesh_swap", "object1_id": 77, "object2_id": 1, "mesh_id": 1},
{"type": "mesh_swap", "object1_id": 77, "object2_id": 1, "mesh_id": 4},
{"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"},
{"type": "level_stats", "level_id": 14},
{"type": "exit_to_level", "level_id": 15},
Expand Down
60 changes: 30 additions & 30 deletions data/tr2/ship/cfg/TR2X_gameflow.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
"music_track": 33,
"sequence": [
{"type": "play_fmv", "fmv_id": 2},
{"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": "add_secret_reward", "object_id": "grenade_launcher"},
{"type": "add_secret_reward", "object_id": "grenade_launcher_ammo", "quantity": 2},
{"type": "add_secret_reward", "object_id": "small_medipack"},
{"type": "play_level"},
{"type": "play_cutscene", "cutscene_id": 0},
{"type": "level_complete"},
Expand All @@ -66,7 +66,7 @@
"path": "data/boat.tr2",
"music_track": -1,
"sequence": [
{"type": "add_secret_reward", "item": "magnums_ammo", "qty": 4},
{"type": "add_secret_reward", "object_id": "magnums_ammo", "quantity": 4},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand All @@ -78,7 +78,7 @@
"music_track": -1,
"sequence": [
{"type": "enable_sunset"},
{"type": "add_secret_reward", "item": "shotgun_ammo", "qty": 4},
{"type": "add_secret_reward", "object_id": "shotgun_ammo", "quantity": 4},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand All @@ -89,8 +89,8 @@
"path": "data/opera.tr2",
"music_track": 31,
"sequence": [
{"type": "add_secret_reward", "item": "uzis"},
{"type": "add_secret_reward", "item": "uzis_ammo", "qty": 4},
{"type": "add_secret_reward", "object_id": "uzis"},
{"type": "add_secret_reward", "object_id": "uzis_ammo", "quantity": 4},
{"type": "play_level"},
{"type": "play_cutscene", "cutscene_id": 1},
{"type": "level_complete"},
Expand All @@ -109,8 +109,8 @@
{"type": "play_fmv", "fmv_id": 3},
{"type": "set_lara_start_anim", "anim": 8},
{"type": "remove_weapons"},
{"type": "add_secret_reward", "item": "uzis"},
{"type": "add_secret_reward", "item": "uzis_ammo", "qty": 2},
{"type": "add_secret_reward", "object_id": "uzis"},
{"type": "add_secret_reward", "object_id": "uzis_ammo", "quantity": 2},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand All @@ -124,7 +124,7 @@
"path": "data/platform.tr2",
"music_track": 58,
"sequence": [
{"type": "add_secret_reward", "item": "uzis_ammo", "qty": 4},
{"type": "add_secret_reward", "object_id": "uzis_ammo", "quantity": 4},
{"type": "play_level"},
{"type": "play_cutscene", "cutscene_id": 2},
{"type": "level_complete"},
Expand All @@ -140,7 +140,7 @@
"music_track": 34,
"sequence": [
{"type": "play_fmv", "fmv_id": 4},
{"type": "add_secret_reward", "item": "harpoon_gun_ammo", "qty": 4},
{"type": "add_secret_reward", "object_id": "harpoon_gun_ammo", "quantity": 4},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand All @@ -151,8 +151,8 @@
"path": "data/keel.tr2",
"music_track": 31,
"sequence": [
{"type": "add_secret_reward", "item": "grenade_launcher"},
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 2},
{"type": "add_secret_reward", "object_id": "grenade_launcher"},
{"type": "add_secret_reward", "object_id": "grenade_launcher_ammo", "quantity": 2},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand All @@ -167,7 +167,7 @@
"path": "data/living.tr2",
"music_track": 34,
"sequence": [
{"type": "add_secret_reward", "item": "m16_ammo", "qty": 4},
{"type": "add_secret_reward", "object_id": "m16_ammo", "quantity": 4},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand All @@ -178,7 +178,7 @@
"path": "data/deck.tr2",
"music_track": 31,
"sequence": [
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 4},
{"type": "add_secret_reward", "object_id": "grenade_launcher_ammo", "quantity": 4},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand All @@ -193,8 +193,8 @@
"music_track": 33,
"sequence": [
{"type": "play_fmv", "fmv_id": 5},
{"type": "give_item", "item": "puzzle_4"},
{"type": "add_secret_reward", "item": "uzis_ammo", "qty": 4},
{"type": "give_item", "object_id": "puzzle_4"},
{"type": "add_secret_reward", "object_id": "uzis_ammo", "quantity": 4},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand All @@ -209,8 +209,8 @@
"path": "data/monastry.tr2",
"music_track": -1,
"sequence": [
{"type": "give_item", "item": "puzzle_4"},
{"type": "add_secret_reward", "item": "m16_ammo", "qty": 4},
{"type": "give_item", "object_id": "puzzle_4"},
{"type": "add_secret_reward", "object_id": "m16_ammo", "quantity": 4},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand All @@ -224,8 +224,8 @@
"path": "data/catacomb.tr2",
"music_track": 31,
"sequence": [
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 2},
{"type": "add_secret_reward", "item": "m16_ammo", "qty": 2},
{"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": "level_complete"},
],
Expand All @@ -240,7 +240,7 @@
"path": "data/icecave.tr2",
"music_track": 31,
"sequence": [
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 4},
{"type": "add_secret_reward", "object_id": "grenade_launcher_ammo", "quantity": 4},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand All @@ -256,7 +256,7 @@
"music_track": 59,
"sequence": [
{"type": "play_fmv", "fmv_id": 6},
{"type": "add_secret_reward", "item": "uzis_ammo", "qty": 8},
{"type": "add_secret_reward", "object_id": "uzis_ammo", "quantity": 8},
{"type": "play_level"},
{"type": "play_cutscene", "cutscene_id": 3},
{"type": "level_complete"},
Expand All @@ -273,7 +273,7 @@
"music_track": 59,
"sequence": [
{"type": "disable_floor", "height": 9728},
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 8},
{"type": "add_secret_reward", "object_id": "grenade_launcher_ammo", "quantity": 8},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand Down Expand Up @@ -301,7 +301,7 @@
"music_track": -1,
"sequence": [
{"type": "set_secret_count", "count": 0},
{"type": "give_item", "item": "key_1"},
{"type": "give_item", "object_id": "key_1"},
{"type": "set_lara_start_anim", "anim": 9},
{"type": "remove_weapons"},
{"type": "remove_ammo"},
Expand All @@ -320,7 +320,7 @@
"path": "data/boat.tr2",
"music_track": -1,
"sequence": [
{"type": "add_secret_reward", "item": "magnums_ammo", "qty": 4},
{"type": "add_secret_reward", "object_id": "magnums_ammo", "quantity": 4},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand All @@ -331,8 +331,8 @@
"path": "data/keel.tr2",
"music_track": 31,
"sequence": [
{"type": "add_secret_reward", "item": "grenade_launcher"},
{"type": "add_secret_reward", "item": "grenade_launcher_ammo", "qty": 2},
{"type": "add_secret_reward", "object_id": "grenade_launcher"},
{"type": "add_secret_reward", "object_id": "grenade_launcher_ammo", "quantity": 2},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand All @@ -347,8 +347,8 @@
"path": "data/skidoo.tr2",
"music_track": 33,
"sequence": [
{"type": "give_item", "item": "puzzle_4"},
{"type": "add_secret_reward", "item": "uzis_ammo", "qty": 4},
{"type": "give_item", "object_id": "puzzle_4"},
{"type": "add_secret_reward", "object_id": "uzis_ammo", "quantity": 4},
{"type": "play_level"},
{"type": "level_complete"},
],
Expand Down
6 changes: 3 additions & 3 deletions docs/tr1/GAMEFLOW.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ Following are each of the properties available within a level.
<td>
<code>lara_type</code>
</td>
<td>Integer</td>
<td>Integer / string</td>
<td>No</td>
<td colspan="2">
Used only in cutscene levels to link the braid (if enabled) to the
Expand Down Expand Up @@ -562,7 +562,7 @@ default gameflow for examples.
<td>
<code>object_id</code>
</td>
<td>Integer</td>
<td>Integer / String</td>
<td rowspan="2">
Adds the specified item and quantity to Lara's inventory. If used, this
must appear <em>after</em> the <code>load_level</code> sequence.
Expand Down Expand Up @@ -929,7 +929,7 @@ This translates as follows.
<td>
<code>object_ids</code>
</td>
<td>Integer array</td>
<td>Integer / string array</td>
<td>
A list of item <em>types</em> to drop. These items will spawn dynamically
and do not need to be added to the level file. Duplicate IDs are permitted
Expand Down
Loading

0 comments on commit dd6b949

Please sign in to comment.