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.

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

tr1/data: fix underwater lever animation #2417

Merged
merged 1 commit into from
Jan 31, 2025

Conversation

lahm86
Copy link
Collaborator

@lahm86 lahm86 commented Jan 31, 2025

Resolves #2416.

Checklist

  • I have read the coding conventions
  • I have added a changelog entry about what my pull request accomplishes, or it is an internal change
  • I have added a readme entry about my new feature or OG bug fix, or it is a different change

Description

This adds a "hands-free" command at the end of Lara's underwater lever animation, which is in line with TR2. It prevents issues after using an underwater lever followed by entering the wading state. The additional check in Lara's state control also matches TR2, which is one that we missed before.

Test level below. If you pull the lever and then try to climb the block at the starting position, or draw guns, it will fail on the current release.
level1.zip

This adds a "hands-free" command at the end of Lara's underwater lever
animation, which is in line with TR2. It prevents issues after using an
underwater lever followed by entering the wading state. The additional
check in Lara's state control also matches TR2, which is one that we
missed before.

Resolves LostArtefacts#2416.
@lahm86 lahm86 added TRX bug A bug with TRX Data Requires injecting content / files that are not a part of the original game TR1 labels Jan 31, 2025
@lahm86 lahm86 self-assigned this Jan 31, 2025
@lahm86 lahm86 requested review from a team as code owners January 31, 2025 19:21
@lahm86 lahm86 requested review from rr-, walkawayy and aredfan and removed request for a team January 31, 2025 19:21
@lahm86
Copy link
Collaborator Author

lahm86 commented Jan 31, 2025

Copy link
Collaborator

@aredfan aredfan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@lahm86 lahm86 merged commit 3a5fe66 into LostArtefacts:develop Jan 31, 2025
8 checks passed
@lahm86 lahm86 deleted the issue-2416-fix-wading-softlock branch January 31, 2025 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Data Requires injecting content / files that are not a part of the original game TR1 TRX bug A bug with TRX
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

TR1X - Underwater Switch Bug
3 participants