Fix misc TR1/2 issues #856
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lahm86
force-pushed
the
issue-841-nextup
branch
2 times, most recently
from
ac59cc4 to
946fbd1
Compare
rr-
approved these changes
Sep 26, 2025
Fixes a secret in Bartoli's Hideout that relies on a specific enemy. Adds a few more secret locations to Golden Mask.
Ensures flipmap 3 is switched off after leaving that area.
Resolves level_complete sequence being missing from Great Pyramid in combined mode.
Allocates specific rooms for skidoo drivers in Golden Mask when the player chooses default difficulty.
If Lara's misc anim set has been replaced in Lost Valley, the mauled outfit can't be used for Lara, so this adds a check to ensure the meshes are of the expected type before copying into Lara's default meshes.
Adds some further restrictions to room 11 in Furnace of the Gods. Enemies will always face the walls in default difficulty mode, and tankier types will be limited to one each. In unrestricted mode, specific enemies will only be rotated if the option to move awkward ones is enabled.
Updates logos following testing efforts. Refactors landmark import slightly. This needs future tidying up.
As conditional environment mods run after the normal ones (with a reload of the mapping) switching textures for UK Box is lost. This was resulting in the imported dragon room in Floating Islands looking incorrect.
Alters the end of Ice Palace if the chicken isn't there so that the enemy drops a puzzle 4 item rather than puzzle 1. Avoids being able to use the other puzzle 1 item.
lahm86
force-pushed
the
issue-841-nextup
branch
from
946fbd1 to
fbcb7ec
Compare
Assigns relocation points for eels in Golden Mask if player chooses to move awkward enemies. Also removes duplicated locations between black and yellow moray eels, and instead assigns dynamically at runtime.
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #841.
Checklist
Description
Further fixes for issues found during 1.11.0 testing, commits are marked up with the details.