From cdfb5942c1100a0a7d1c4d7726db0f6d450be2a8 Mon Sep 17 00:00:00 2001 From: lahm86 <33758420+lahm86@users.noreply.github.com> Date: Sun, 27 Apr 2025 12:45:08 +0100 Subject: [PATCH] tr2/data: fix Living Quarters flame deactivation Resolves #2851. --- data/tr2/ship/cfg/TR2X_gameflow.json5 | 1 + data/tr2/ship/data/injections/living_fd.bin | Bin 0 -> 127 bytes docs/tr2/CHANGELOG.md | 1 + docs/tr2/README.md | 1 + 4 files changed, 3 insertions(+) create mode 100644 data/tr2/ship/data/injections/living_fd.bin diff --git a/data/tr2/ship/cfg/TR2X_gameflow.json5 b/data/tr2/ship/cfg/TR2X_gameflow.json5 index 5cfda3031..38a4c9665 100644 --- a/data/tr2/ship/cfg/TR2X_gameflow.json5 +++ b/data/tr2/ship/cfg/TR2X_gameflow.json5 @@ -217,6 +217,7 @@ ], "injections": [ "data/injections/living_deck_goon_sfx.bin", + "data/injections/living_fd.bin", "data/injections/living_pickup_meshes.bin", "data/injections/seaweed_collision.bin", ], diff --git a/data/tr2/ship/data/injections/living_fd.bin b/data/tr2/ship/data/injections/living_fd.bin new file mode 100644 index 0000000000000000000000000000000000000000..d23df437d3ff8dccc1d527bc4a5f1c28b9e06221 GIT binary patch literal 127 zcmWFuitu7&U|?WjU|^WQz`&5rz`#&3$F%1(?;!&Lm;1;3rpRwpQd!U-Bk0a2v!H#- zL@gz)#VS??k1f`G`BLV-xb(neo6>7Z1(V*lwfF0#1%6nsxigAypJ5qG&~l-Z{D$v- j=Wbq^^}F5ihq?aZIejhNmB$@3y_>&2|H^JF!~PWj7L7C@ literal 0 HcmV?d00001 diff --git a/docs/tr2/CHANGELOG.md b/docs/tr2/CHANGELOG.md index 56eae237f..a7e9c6255 100644 --- a/docs/tr2/CHANGELOG.md +++ b/docs/tr2/CHANGELOG.md @@ -3,6 +3,7 @@ - added a `--help` CLI option (may not output anything on Windows machines – OS bug) - changed the sound dialog appearance (repositioned, added text labels and arrows) - fixed Lara being killed if she enters the void in a level that uses the `disable_floor` sequence in the game flow (#2874, regression from 0.10) +- fixed flame emitter 23 in room 6 not being deactivated when the lever in room 1 is used (#2851) ## [1.0.2](https://github.com/LostArtefacts/TRX/compare/tr2-1.0.1...tr2-1.0.2) - 2025-04-26 - changed The Golden Mask strings to default to the OG strings file for the main tables (#2847) diff --git a/docs/tr2/README.md b/docs/tr2/README.md index 54d53df6a..4916baac5 100644 --- a/docs/tr2/README.md +++ b/docs/tr2/README.md @@ -221,6 +221,7 @@ However, you can easily download them manually from these urls: - fixed the following floor data issues: - **Opera House**: fixed the trigger under item 203 to trigger it rather than item 204 - **Wreck of the Maria Doria**: fixed room 98 not having water + - **Living Quarters** - fixed flame emitter 23 in room 6 not being deactivated when the lever in room 1 is used - **The Deck**: fixed invalid portals between rooms 17 and 104, which could result in Lara seeing enemies in disconnected rooms - **Tibetan Foothills**: added missing triggers for the drawbridge in room 96 (after the flipmap) - **Catacombs of the Talion**: changed some music triggers to pads near the first yeti, and added missing triggers and ladder in room 116 (after the flipmap)