.github/workflows/build_docker.yml

@@ -10,8 +10,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - platform: win
-          - platform: linux
+          - game_version: tr1
+            platform: win
+          - game_version: tr1
+            platform: linux
+          - game_version: tr2
+            platform: win
+          - game_version: tr2
+            platform: linux
     steps:
       - name: Login to Docker Hub
         uses: docker/login-action@v1
@@ -29,5 +35,5 @@ jobs:
 
       - name: Build Docker image (${{ matrix.platform }})
         run: |
-          just image-${{ matrix.platform }}
-          just push-image-${{ matrix.platform }}
+          just ${{ matrix.game_version }}-image-${{ matrix.platform }}
+          just ${{ matrix.game_version }}-push-image-${{ matrix.platform }}

.github/workflows/job_build_tr1.yml

@@ -3,10 +3,6 @@ name: Build TR1X and the installer
 on:
   workflow_call:
     inputs:
-      platform:
-        type: string
-        description: "Platform to build for"
-        required: true
       target:
         type: string
         description: "Target to build for"
@@ -16,6 +12,15 @@ jobs:
   build:
     name: Build release assets
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - platform: linux
+            just_target: tr1-package-linux ${{ inputs.target }}
+          - platform: win
+            just_target: tr1-package-win-all ${{ inputs.target }}
+          - platform: win-installer
+            just_target: tr1-package-win-installer ${{ inputs.target }}
 
     steps:
       - name: Install dependencies
@@ -32,17 +37,13 @@ jobs:
         name: Prepare variables
         run: echo "version=$(just output-current-version 1)" >> $GITHUB_OUTPUT
 
-      - name: Download large assets
-        if: ${{ inputs.target == 'release' }}
-        run: just download-assets 1
-
-      - name: Package asset (${{ inputs.platform }})
-        run: just tr1-package-${{ inputs.platform }} ${{ inputs.target }}
+      - name: Package asset (${{ matrix.platform }})
+        run: just ${{ matrix.just_target }}
 
       - name: Upload the artifact
         uses: actions/upload-artifact@v4
         with:
-          name: TR1X-${{ steps.vars.outputs.version }}-${{ inputs.platform }}
+          name: TR1X-${{ steps.vars.outputs.version }}-${{ matrix.platform }}
           path: |
             *.zip
             *.exe

.github/workflows/job_build_tr2.yml

@@ -1,12 +1,8 @@
-name: Build TR2X and the installer
+name: Build TR2X
 
 on:
   workflow_call:
     inputs:
-      platform:
-        type: string
-        description: "Platform to build for"
-        required: true
       target:
         type: string
         description: "Target to build for"
@@ -16,6 +12,13 @@ jobs:
   build:
     name: Build release assets
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - platform: linux
+            just_target: tr2-package-linux ${{ inputs.target }}
+          - platform: win
+            just_target: tr2-package-win-all ${{ inputs.target }}
 
     steps:
       - name: Install dependencies
@@ -32,17 +35,13 @@ jobs:
         name: Prepare variables
         run: echo "version=$(just output-current-version 2)" >> $GITHUB_OUTPUT
 
-      - name: Download large assets
-        if: ${{ inputs.target == 'release' }}
-        run: just download-assets 2
-
-      - name: Package asset (${{ inputs.platform }})
-        run: just tr2-package-${{ inputs.platform }} ${{ inputs.target }}
+      - name: Package asset (${{ matrix.platform }})
+        run: just ${{ matrix.just_target }}
 
       - name: Upload the artifact
         uses: actions/upload-artifact@v4
         with:
-          name: TR2X-${{ steps.vars.outputs.version }}-${{ inputs.platform }}
+          name: TR2X-${{ steps.vars.outputs.version }}-${{ matrix.platform }}
           path: |
             *.zip
             *.exe

.github/workflows/pr_builds.yml

@@ -11,52 +11,34 @@ on:
       - '!develop'
 
 jobs:
-  package_tr1_linux:
-    name: TR1 (Linux)
+  package_tr1_multiplatform:
+    name: Build TR1
     uses: ./.github/workflows/job_build_tr1.yml
     with:
-      platform: linux
-      target: debug
-    secrets: inherit
-
-  package_tr1_win:
-    name: TR1 (Windows)
-    uses: ./.github/workflows/job_build_tr1.yml
-    with:
-      platform: win-all
-      target: debug
+      target: 'debug'
     secrets: inherit
 
   package_tr1_mac:
-    name: TR1 (Mac)
+    name: Build TR1
     if: vars.MACOS_ENABLE == 'true'
     uses: ./.github/workflows/job_build_tr1_macos.yml
     with:
-      target: debug
+      target: 'debug'
       let_mac_fail: true
     secrets: inherit
 
-  package_tr2_linux:
-    name: TR2 (Linux)
+  package_tr2_multiplatform:
+    name: Build TR2
     uses: ./.github/workflows/job_build_tr2.yml
     with:
-      platform: linux
-      target: debug
-    secrets: inherit
-
-  package_tr2_win:
-    name: TR2 (Windows)
-    uses: ./.github/workflows/job_build_tr2.yml
-    with:
-      platform: win-all
-      target: debug
+      target: 'debug'
     secrets: inherit
 
   package_tr2_mac:
-      name: TR2 (Mac)
+      name: Build TR2
       if: vars.MACOS_ENABLE == 'true'
       uses: ./.github/workflows/job_build_tr2_macos.yml
       with:
-        target: debug
+        target: 'debug'
         let_mac_fail: true
       secrets: inherit

.github/workflows/prerelease.yml

@@ -9,24 +9,16 @@ on:
     - develop
 
 jobs:
-  package_tr1_linux:
-    name: TR1 (Linux)
+  package_tr1_multiplatform:
+    name: Build TR1
+    if: vars.PRERELEASE_ENABLE == 'true'
     uses: ./.github/workflows/job_build_tr1.yml
     with:
-      platform: linux
-      target: debug
-    secrets: inherit
-
-  package_tr1_win:
-    name: TR1 (Windows)
-    uses: ./.github/workflows/job_build_tr1.yml
-    with:
-      platform: win-all
-      target: debug
+      target: 'debug'
     secrets: inherit
 
   package_tr1_mac:
-    name: TR1 (Mac)
+    name: Build TR1
     if: |
       vars.PRERELEASE_ENABLE == 'true' &&
       vars.MACOS_ENABLE == 'true'
@@ -36,24 +28,16 @@ jobs:
       let_mac_fail: true
     secrets: inherit
 
-  package_tr2_linux:
-    name: TR2 (Linux)
+  package_tr2_multiplatform:
+    name: Build TR2
+    if: vars.PRERELEASE_ENABLE == 'true'
     uses: ./.github/workflows/job_build_tr2.yml
     with:
-      platform: linux
-      target: debug
-    secrets: inherit
-
-  package_tr2_win:
-    name: TR2 (Windows)
-    uses: ./.github/workflows/job_build_tr2.yml
-    with:
-      platform: win-all
-      target: debug
+      target: 'debug'
     secrets: inherit
 
   package_tr2_mac:
-    name: TR2 (Mac)
+    name: Build TR2
     if: |
       vars.PRERELEASE_ENABLE == 'true' &&
       vars.MACOS_ENABLE == 'true'
@@ -64,14 +48,12 @@ jobs:
     secrets: inherit
 
   publish_prerelease:
-    if: always() && (vars.PRERELEASE_ENABLE == 'true')
+    if: vars.PRERELEASE_ENABLE == 'true'
     name: Create a prerelease
     needs:
-      - package_tr1_linux
-      - package_tr1_win
+      - package_tr1_multiplatform
       - package_tr1_mac
-      - package_tr2_linux
-      - package_tr2_win
+      - package_tr2_multiplatform
       - package_tr2_mac
     with:
       draft: false

.github/workflows/release_tr1.yml

@@ -28,51 +28,30 @@ on:
         default: github.ref_name
 
 jobs:
-  package_tr1_linux:
-    name: Build TR1 (Linux)
+  package_multiplatform:
+    name: Build release assets
     if: vars.RELEASE_ENABLE == 'true'
     uses: ./.github/workflows/job_build_tr1.yml
     with:
-      platform: linux
-      target: release
-    secrets: inherit
-
-  package_tr1_win:
-    name: Build TR1 (Windows)
-    if: vars.RELEASE_ENABLE == 'true'
-    uses: ./.github/workflows/job_build_tr1.yml
-    with:
-      platform: win-all
-      target: release
-    secrets: inherit
-
-  package_tr1_win_installer:
-    name: Build TR1 (Windows installer)
-    if: vars.RELEASE_ENABLE == 'true'
-    uses: ./.github/workflows/job_build_tr1.yml
-    with:
-      platform: win-installer
-      target: release
+      target: "release"
     secrets: inherit
 
   package_mac:
-    name: Build TR1 (Mac)
+    name: "Build release assets (mac)"
     if: |
       vars.RELEASE_ENABLE == 'true' &&
       vars.MACOS_ENABLE == 'true'
     uses: ./.github/workflows/job_build_tr1_macos.yml
     with:
-      target: release
+      target: "release"
       let_mac_fail: ${{ inputs.let_mac_fail == true || inputs.let_mac_fail == 'true' }}
     secrets: inherit
 
   publish_release:
-    if: always() && (vars.RELEASE_ENABLE == 'true')
+    if: vars.RELEASE_ENABLE == 'true'
     name: Create a GitHub release
     needs:
-      - package_tr1_linux
-      - package_tr1_win
-      - package_tr1_win_installer
+      - package_multiplatform
       - package_mac
     with:
       draft: ${{ inputs.draft || false }}

.github/workflows/release_tr2.yml

@@ -28,52 +28,30 @@ on:
         default: github.ref_name
 
 jobs:
-  package_tr2_linux:
-    name: Build TR2 (Linux)
+  package_multiplatform:
+    name: Build release assets
     if: vars.RELEASE_ENABLE == 'true'
     uses: ./.github/workflows/job_build_tr2.yml
     with:
-      platform: linux
-      target: release
-    secrets: inherit
-
-  package_tr2_win:
-    name: Build TR2 (Windows)
-    if: vars.RELEASE_ENABLE == 'true'
-    uses: ./.github/workflows/job_build_tr2.yml
-    with:
-      platform: win-all
-      target: release
-    secrets: inherit
-
-  package_tr2_win_installer:
-    name: Build TR2 (Windows installer)
-    if: vars.RELEASE_ENABLE == 'true'
-    uses: ./.github/workflows/job_build_tr2.yml
-    with:
-      platform: win-installer
-      target: release
+      target: "release"
     secrets: inherit
 
   package_mac:
-    name: Build TR2 (Mac)
+    name: "Build release assets (mac)"
     if: |
       vars.RELEASE_ENABLE == 'true' &&
       vars.MACOS_ENABLE == 'true'
     uses: ./.github/workflows/job_build_tr2_macos.yml
     with:
-      target: release
+      target: "release"
       let_mac_fail: ${{ inputs.let_mac_fail == true || inputs.let_mac_fail == 'true' }}
     secrets: inherit
 
   publish_release:
-    if: always() && (vars.RELEASE_ENABLE == 'true')
+    if: vars.RELEASE_ENABLE == 'true'
     name: Create a GitHub release
     needs:
-      - package_tr2_linux
-      - package_tr2_win
-      - package_tr2_win_installer
-      - package_mac
+      - package_multiplatform
     with:
       draft: ${{ inputs.draft || false }}
       prerelease: ${{ inputs.draft || false }}

.gitignore

@@ -35,14 +35,3 @@ Release/
 **/subprojects/dwarfstack-*/
 src/tr1/subprojects/dwarfstack.wrap
 src/tr2/subprojects/dwarfstack.wrap
-
-data/tr1/ship/data/images/
-data/tr2/ship/data/images/
-data/tr2/ship/data/level1.tr2
-data/tr2/ship/data/level2.tr2
-data/tr2/ship/data/level3.tr2
-data/tr2/ship/data/level4.tr2
-data/tr2/ship/data/level5.tr2
-data/tr2/ship/data/main_gm.sfx
-data/tr2/ship/data/title_gm.tr2
-data/tr2/ship/music/

README.md

@@ -123,9 +123,3 @@ Please refer to the [detailed documentation](docs/tr2/).
     further refined our identity by adopting the name TR1X. Meanwhile, TR2Main
     follows a completely separate and unique path, unconnected to our
     development work.
-
-## Credits
-
-- Endless GitHub contributors.
-- TR1 title screen image by Kidd Bowyer. HD assets by goblan and posix.
-- TR2 HD images by Arsunt.

data/tr1/ship/cfg/TR1X_gameflow.json5

@@ -8,10 +8,12 @@
     "savegame_fmt_legacy": "saveati.%d",
     "savegame_fmt_bson": "save_tr1_%02d.dat",
     "demo_delay": 16,
+    "water_color": [0.45, 1.0, 1.0],
+    "draw_distance_fade": 22.0,
+    "draw_distance_max": 30.0,
     "injections": [
         "data/injections/backpack.bin",
         "data/injections/braid.bin",
-        "data/injections/bubbles.bin",
         "data/injections/lara_animations.bin",
         "data/injections/purple_crystal.bin",
         "data/injections/uzi_sfx.bin",
@@ -28,7 +30,7 @@
         "music_track": 2,
         "inherit_injections": false,
         "sequence": [
-            {"type": "display_picture", "path": "data/images/eidos.webp", "legal": true, "display_time": 1, "fade_in_time": 1.0, "fade_out_time": 1.0},
+            {"type": "display_picture", "path": "data/images/eidos.webp", "display_time": 1, "fade_in_time": 1.0, "fade_out_time": 1.0},
             {"type": "play_fmv", "fmv_id": 0},
             {"type": "play_fmv", "fmv_id": 1},
             {"type": "play_fmv", "fmv_id": 2},
@@ -57,7 +59,6 @@
             "injections": [
                 "data/injections/lara_gym_guns.bin",
                 "data/injections/braid.bin",
-                "data/injections/bubbles.bin",
                 "data/injections/gym_textures.bin",
                 "data/injections/lara_animations.bin",
                 "data/injections/uzi_sfx.bin",
@@ -130,6 +131,7 @@
                 {"type": "level_complete"},
             ],
             "injections": [
+                "data/injections/larson_textures.bin",
                 "data/injections/qualopec_fd.bin",
                 "data/injections/qualopec_itemrots.bin",
                 "data/injections/qualopec_textures.bin",
@@ -150,7 +152,6 @@
             "injections": [
                 "data/injections/folly_fd.bin",
                 "data/injections/folly_itemrots.bin",
-                "data/injections/folly_pickup_meshes.bin",
                 "data/injections/folly_textures.bin",
             ],
         },
@@ -246,7 +247,6 @@
                 "data/injections/khamoon_fd.bin",
                 "data/injections/khamoon_mummy.bin",
                 "data/injections/khamoon_textures.bin",
-                "data/injections/panther_sfx.bin",
             ],
         },
 
@@ -266,7 +266,6 @@
                 "data/injections/obelisk_meshfixes.bin",
                 "data/injections/obelisk_skybox.bin",
                 "data/injections/obelisk_textures.bin",
-                "data/injections/panther_sfx.bin",
             ],
         },
 
@@ -302,13 +301,15 @@
                 {"type": "level_complete"},
             ],
             "injections": [
+                "data/injections/cowboy_textures.bin",
+                "data/injections/kold_textures.bin",
                 "data/injections/mines_cameras.bin",
                 "data/injections/mines_fd.bin",
                 "data/injections/mines_itemrots.bin",
                 "data/injections/mines_meshfixes.bin",
                 "data/injections/mines_pushblocks.bin",
                 "data/injections/mines_textures.bin",
-                "data/injections/skate_kid_sfx.bin",
+                "data/injections/skateboardkid_textures.bin"
             ],
             "item_drops": [
                 {"enemy_num": 17, "object_ids": [86]},
@@ -423,7 +424,7 @@
     ],
 
     "cutscenes": [
-        // Cutscene 1
+        // Cut Scene 1
         {
             "path": "data/cut1.phd",
             "music_track": 23,
@@ -442,7 +443,7 @@
             ],
         },
 
-        // Cutscene 2
+        // Cut Scene 2
         {
             "path": "data/cut2.phd",
             "music_track": 25,
@@ -463,7 +464,7 @@
             ],
         },
 
-        // Cutscene 3
+        // Cut Scene 3
         {
             "path": "data/cut3.phd",
             "music_track": 24,
@@ -480,12 +481,12 @@
             ],
         },
 
-        // Cutscene 4
+        // Cut Scene 4
         {
             "path": "data/cut4.phd",
             "music_track": 22,
-            "fog_start": 12.0,
-            "fog_end": 18.0,
+            "draw_distance_fade": 12.0,
+            "draw_distance_max": 18.0,
             "lara_type": "player_1",
             "inherit_injections": false,
             "injections": [
@@ -506,8 +507,8 @@
 
     // FMVs
     "fmvs": [
-        {"path": "fmv/core.avi", "legal": true},
-        {"path": "fmv/escape.avi", "legal": true},
+        {"path": "fmv/core.avi"},
+        {"path": "fmv/escape.avi"},
         {"path": "fmv/cafe.avi"},
         {"path": "fmv/mansion.avi"},
         {"path": "fmv/snow.avi"},

data/tr1/ship/cfg/TR1X_gameflow_demo_pc.json5

@@ -9,15 +9,16 @@
     "savegame_fmt_legacy": "save_demo_pc.%d",
     "savegame_fmt_bson": "save_demo_pc_%02d.dat",
     "demo_delay": 16,
+    "water_color": [0.45, 1.0, 1.0],
+    "draw_distance_fade": 22.0,
+    "draw_distance_max": 30.0,
     "injections": [
         "data/injections/backpack.bin",
         "data/injections/braid.bin",
-        "data/injections/bubbles.bin",
         "data/injections/lara_animations.bin",
         "data/injections/lara_jumping.bin",
         "data/injections/uzi_sfx.bin",
         "data/injections/explosion.bin",
-        "data/injections/font.bin",
         "data/injections/pickup_aid.bin",
     ],
     "enable_tr2_item_drops": false,

data/tr1/ship/cfg/TR1X_gameflow_level.json5

@@ -1,35 +0,0 @@
-{
-    // This file is used to enable the -l argument support.
-
-    "main_menu_picture": "data/images/title.webp",
-    "savegame_fmt_legacy": "save_tmp.%d",
-    "savegame_fmt_bson": "save_tmp_%02d.dat",
-    "demo_delay": 0,
-    "injections": [
-        "data/injections/backpack.bin",
-        "data/injections/braid.bin",
-        "data/injections/bubbles.bin",
-        "data/injections/lara_animations.bin",
-        "data/injections/lara_jumping.bin",
-        "data/injections/uzi_sfx.bin",
-        "data/injections/explosion.bin",
-        "data/injections/font.bin",
-        "data/injections/pickup_aid.bin",
-    ],
-    "enable_tr2_item_drops": false,
-    "convert_dropped_guns": false,
-    "enable_killer_pushblocks": true,
-
-    "levels": [
-        {
-            "path": "PLACEHOLDER",
-            "music_track": 0,
-            "sequence": [
-                {"type": "loop_game"},
-                {"type": "level_stats"},
-                {"type": "level_complete"},
-            ],
-            "injections": [],
-        },
-    ],
-}

data/tr1/ship/cfg/TR1X_gameflow_ub.json5

@@ -8,10 +8,12 @@
     "savegame_fmt_legacy": "saveuba.%d",
     "savegame_fmt_bson": "save_trub_%02d.dat",
     "demo_delay": 16,
+    "water_color": [0.45, 1.0, 1.0],
+    "draw_distance_fade": 22,
+    "draw_distance_max": 30,
     "injections": [
         "data/injections/backpack.bin",
         "data/injections/braid.bin",
-        "data/injections/bubbles.bin",
         "data/injections/lara_animations.bin",
         "data/injections/uzi_sfx.bin",
         "data/injections/explosion.bin",
@@ -34,7 +36,7 @@
             "data/injections/pda_model.bin",
         ],
         "sequence": [
-            {"type": "display_picture", "path": "data/images/eidos.webp", "legal": true, "display_time": 1, "fade_in_time": 1.0, "fade_out_time": 1.0},
+            {"type": "display_picture", "path": "data/images/eidos.webp", "display_time": 1, "fade_in_time": 1.0, "fade_out_time": 1.0},
             {"type": "play_fmv", "fmv_id": 0},
             {"type": "play_fmv", "fmv_id": 1},
             {"type": "exit_to_title"},
@@ -42,7 +44,7 @@
     },
 
     "levels": [
-        // Level 1: Return to Egypt
+        // Level 0: Return to Egypt
         {
             "path": "data/egypt.phd",
             "music_track": 59,
@@ -56,12 +58,11 @@
                 "data/injections/egypt_fd.bin",
                 "data/injections/egypt_meshfixes.bin",
                 "data/injections/egypt_textures.bin",
-                "data/injections/panther_sfx.bin",
             ],
             "unobtainable_kills": 1,
         },
 
-        // Level 2: Temple of the Cat
+        // Level 1: Temple of the Cat
         {
             "path": "data/cat.phd",
             "music_track": 59,
@@ -76,12 +77,11 @@
                 "data/injections/cat_itemrots.bin",
                 "data/injections/cat_meshfixes.bin",
                 "data/injections/cat_textures.bin",
-                "data/injections/panther_sfx.bin",
             ],
             "unobtainable_pickups": 1,
         },
 
-        // Level 3: Atlantean Stronghold
+        // Level 2: Atlantean Stronghold
         {
             "path": "data/end.phd",
             "music_track": 60,
@@ -98,7 +98,7 @@
             "unobtainable_kills": 1,
         },
 
-        // Level 4: The Hive
+        // Level 3: The Hive
         {
             "path": "data/end2.phd",
             "music_track": 60,
@@ -123,8 +123,7 @@
 
         {"type": "dummy"},
 
-        // Level 6: Current Position
-        // This level is necessary to read TombATI's save files.
+        // Level 5: Current Position
         {
             "path": "data/current.phd",
             "type": "current",
@@ -135,7 +134,7 @@
     ],
 
     "fmvs": [
-        {"path": "fmv/core.avi", "legal": true},
-        {"path": "fmv/escape.avi", "legal": true},
+        {"path": "fmv/core.avi"},
+        {"path": "fmv/escape.avi"},
     ],
 }

data/tr1/ship/cfg/TR1X_strings.json5

@@ -149,10 +149,10 @@
     ],
 
     "cutscenes": [
-        {"title": "Cutscene 1"},
-        {"title": "Cutscene 2"},
-        {"title": "Cutscene 3"},
-        {"title": "Cutscene 4"},
+        {"title": "Cut Scene 1"},
+        {"title": "Cut Scene 2"},
+        {"title": "Cut Scene 3"},
+        {"title": "Cut Scene 4"},
     ],
 
     "demos": [
@@ -271,7 +271,7 @@
         "door_8":            {"name": "Door 8"},
         "trapdoor_1":        {"name": "Trapdoor 1"},
         "trapdoor_2":        {"name": "Trapdoor 2"},
-        "trapdoor_3":        {"name": "Trapdoor 3"},
+        "big_trapdoor":      {"name": "Big Trapdoor"},
         "bridge_flat":       {"name": "Bridge Flat"},
         "bridge_tilt_1":     {"name": "Bridge Tilt 1"},
         "bridge_tilt_2":     {"name": "Bridge Tilt 2"},
@@ -341,40 +341,35 @@
     },
 
     "game_strings": {
-        "CONTROLS_BACKEND_CONTROLLER": "Controller",
-        "CONTROLS_BACKEND_KEYBOARD": "Keyboard",
-        "CONTROLS_CUSTOMIZE": "Customize Controls",
-        "CONTROLS_CUSTOM_1": "User Keys 1",
-        "CONTROLS_CUSTOM_2": "User Keys 2",
-        "CONTROLS_CUSTOM_3": "User Keys 3",
-        "CONTROLS_DEFAULT_KEYS": "Default Keys",
-        "CONTROLS_RESET_DEFAULTS": "Reset All: Hold %s",
-        "CONTROLS_UNBIND": "Unbind: Hold %s",
+        "CONTROL_BACKEND_CONTROLLER": "Controller",
+        "CONTROL_BACKEND_KEYBOARD": "Keyboard",
+        "CONTROL_CUSTOMIZE": "Customize Controls",
+        "CONTROL_CUSTOM_1": "User Keys 1",
+        "CONTROL_CUSTOM_2": "User Keys 2",
+        "CONTROL_CUSTOM_3": "User Keys 3",
+        "CONTROL_DEFAULT_KEYS": "Default Keys",
+        "CONTROL_RESET_DEFAULTS": "Reset All: Hold %s",
+        "CONTROL_UNBIND": "Unbind: Hold %s",
         "DETAIL_BILINEAR": "Bilinear",
         "DETAIL_BRIGHTNESS": "Brightness",
+        "DETAIL_DECIMAL_FMT": "%d",
         "DETAIL_FBO_FILTER": "FBO filter",
         "DETAIL_FLOAT_FMT": "%.1f",
-        "DETAIL_FOG_END": "Fog end",
-        "DETAIL_FOG_START": "Fog start",
         "DETAIL_FPS": "FPS",
-        "DETAIL_INTEGER_FMT": "%d",
+        "DETAIL_PERSPECTIVE": "Perspective",
+        "DETAIL_PRETTY_PIXELS": "Pretty pixels",
         "DETAIL_REFLECTIONS": "Reflections",
         "DETAIL_RENDER_MODE": "Render mode",
         "DETAIL_RENDER_MODE_FBO": "Framebuffer",
         "DETAIL_RENDER_MODE_LEGACY": "Window size",
         "DETAIL_RESOLUTION": "Resolution",
         "DETAIL_RESOLUTION_FMT": "%dx%d",
+        "DETAIL_SELECT_DETAIL": "Select Detail",
         "DETAIL_STRING_FMT": "%s",
         "DETAIL_TEXTURE_FILTER": "Texture filter",
-        "DETAIL_TITLE": "Graphic Options",
-        "DETAIL_TRAPEZOID_FILTER": "Trapezoid filter",
         "DETAIL_UI_BAR_SCALE": "UI bar scale",
-        "DETAIL_UI_SCROLL_WRAPAROUND": "UI scroll wrap",
         "DETAIL_UI_TEXT_SCALE": "UI text scale",
         "DETAIL_VSYNC": "VSync",
-        "DETAIL_WATER_COLOR_B": "Water color (B)",
-        "DETAIL_WATER_COLOR_G": "Water color (G)",
-        "DETAIL_WATER_COLOR_R": "Water color (R)",
         "HEADING_GAME_OVER": "GAME OVER",
         "HEADING_INVENTORY": "INVENTORY",
         "HEADING_ITEMS": "ITEMS",
@@ -428,11 +423,7 @@
         "OSD_AMBIGUOUS_INPUT_2": "Ambiguous input: %s and %s",
         "OSD_AMBIGUOUS_INPUT_3": "Ambiguous input: %s, %s, ...",
         "OSD_COMMAND_BAD_INVOCATION": "Invalid invocation: %s",
-        "OSD_COMMAND_BOOL": "on, off",
-        "OSD_COMMAND_DECIMAL": "[decimal]",
-        "OSD_COMMAND_INTEGER": "[integer]",
         "OSD_COMMAND_UNAVAILABLE": "This command is not currently available",
-        "OSD_COMMAND_VALID_VALUES": "Valid values: %s",
         "OSD_COMPLETE_LEVEL": "Level complete!",
         "OSD_CONFIG_OPTION_GET": "%s is currently set to %s",
         "OSD_CONFIG_OPTION_SET": "%s changed to %s",
@@ -472,16 +463,14 @@
         "OSD_LOAD_GAME_FAIL_INVALID_SLOT": "Invalid save slot %d",
         "OSD_LOAD_GAME_FAIL_UNAVAILABLE_SLOT": "Save slot %d is not available",
         "OSD_OBJECT_NOT_FOUND": "Object not found",
+        "OSD_PERSPECTIVE_FILTER_OFF": "Perspective correction: off",
+        "OSD_PERSPECTIVE_FILTER_ON": "Perspective correction: on",
         "OSD_PHOTO_MODE_LAUNCHED": "Entering photo mode, press %s for help",
         "OSD_PLAY_CUTSCENE": "Loading cutscene %d",
         "OSD_PLAY_DEMO": "Loading demo %d",
         "OSD_PLAY_LEVEL": "Loading %s",
         "OSD_PLAY_MUSIC_TRACK": "Playing music track %d",
-        "OSD_POS_LARA_MISSING": "Lara not present",
-        "OSD_POS_LARA_POS_FMT": "Room: %d\nPosition: %.3f, %.3f, %.3f\nRotation: %.3f, %.3f, %.3f",
-        "OSD_POS_LEVEL_FMT": "Level %d",
-        "OSD_POS_LEVEL_FMT_CUTSCENE": "Cutscene %d",
-        "OSD_POS_LEVEL_FMT_DEMO": "Demo %d",
+        "OSD_POS_GET": "Level: %d (%s)  Room: %d\nPosition: %.3f, %.3f, %.3f\nRotation: %.3f,%.3f,%.3f",
         "OSD_POS_SET_ITEM": "Teleported to object: %s",
         "OSD_POS_SET_ITEM_FAIL": "Failed to teleport to object: %s",
         "OSD_POS_SET_POS": "Teleported to position: %.3f %.3f %.3f",
@@ -497,8 +486,6 @@
         "OSD_TEXTURE_FILTER_BILINEAR": "bilinear",
         "OSD_TEXTURE_FILTER_NN": "nearest-neighbor",
         "OSD_TEXTURE_FILTER_SET": "Texture filter set to %s",
-        "OSD_TRAPEZOID_FILTER_OFF": "Trapezoid filter disabled",
-        "OSD_TRAPEZOID_FILTER_ON": "Trapezoid filter enabled",
         "OSD_UI_OFF": "UI disabled",
         "OSD_UI_ON": "UI enabled",
         "OSD_UNKNOWN_COMMAND": "Unknown command: %s",
@@ -535,18 +522,13 @@
         "PHOTO_MODE_ROTATE_PROMPT": "Rotate camera",
         "PHOTO_MODE_SNAP_PROMPT": "Take picture",
         "PHOTO_MODE_TITLE": "Photo Mode",
-        "SOUND_DIALOG_MUSIC": "\\{icon sound} Sound",
-        "SOUND_DIALOG_SOUND": "\\{icon music} Music",
-        "SOUND_DIALOG_TITLE": "Set Volumes",
-        "STATS_AMMO": "AMMO HITS/USED",
+        "SOUND_SET_VOLUMES": "Set Volumes",
         "STATS_BASIC_FMT": "%d",
         "STATS_BONUS_STATISTICS": "Bonus Statistics",
         "STATS_DEATHS": "DEATHS",
         "STATS_DETAIL_FMT": "%d of %d",
-        "STATS_DISTANCE_TRAVELLED": "DISTANCE TRAVELLED",
         "STATS_FINAL_STATISTICS": "Final Statistics",
         "STATS_KILLS": "KILLS",
-        "STATS_MEDIPACKS_USED": "HEALTH PACKS USED",
         "STATS_PICKUPS": "PICKUPS",
         "STATS_SECRETS": "SECRETS",
         "STATS_TIME_TAKEN": "TIME TAKEN",

data/tr1/ship/cfg/TR1X_strings_level.json5

@@ -1 +0,0 @@
-{"levels": [{"title": "Test Level"}]}

data/tr1/ship/cfg/TR1X_strings_ub.json5

@@ -1,6 +1,6 @@
 {
     "levels": [
-        // Level 1: Return to Egypt
+        // Level 0: Return to Egypt
         {
             "title": "Return to Egypt",
             "objects": {
@@ -8,7 +8,7 @@
             },
         },
 
-        // Level 2: Temple of the Cat
+        // Level 1: Temple of the Cat
         {
             "title": "Temple of the Cat",
             "objects": {
@@ -16,22 +16,22 @@
             },
         },
 
-        // Level 3: Atlantean Stronghold
+        // Level 2: Atlantean Stronghold
         {
             "title": "Atlantean Stronghold",
         },
 
-        // Level 4: The Hive
+        // Level 3: The Hive
         {
             "title": "The Hive",
         },
 
-        // Level 5: Title
+        // Level 4: Title
         {
             "title": "Title",
         },
 
-        // Level 6: Current Position
+        // Level 5: Current Position
         {
             "title": "Current Position",
         },