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

tr2/lara/cheat: reset gun status if undrawing weapons #2380

Merged
merged 1 commit into from
Jan 25, 2025

Conversation

lahm86
Copy link
Collaborator

@lahm86 lahm86 commented Jan 25, 2025

Resolves #2376.

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 fixes guns potentially appearing in Lara's hand while entering the fly cheat and the weapon undraw animation is still running.

This fixes guns potentially appearing in Lara's hand while entering the
fly cheat and the weapon undraw animation is still running.

Resolves LostArtefacts#2376.
@lahm86 lahm86 added TRX bug A bug with TRX TR2 labels Jan 25, 2025
@lahm86 lahm86 self-assigned this Jan 25, 2025
@lahm86 lahm86 requested review from a team as code owners January 25, 2025 13:56
@lahm86 lahm86 requested review from rr-, walkawayy and aredfan and removed request for a team January 25, 2025 13:56
Copy link
Collaborator

@rr- rr- left a comment

Choose a reason for hiding this comment

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

Thanks – LGTM and it solves the original issue.
I noticed one more thing, but I don't think we need to solve it as it's really minor – if you time the fly cheat just right, the holsters sound is played twice:

2025-01-25_15-06-02.mp4

@lahm86
Copy link
Collaborator Author

lahm86 commented Jan 25, 2025

I think we could resolve all of these fly cheat/gun issues by enforcing Lara out of the draw/undraw animations, but it would be quite jarring. At least for the most part she will complete putting the gun away neatly. This one looks quite tricky, maybe we'd have to be more thorough in our checks and look at frame numbers.

@rr-
Copy link
Collaborator

rr- commented Jan 25, 2025

I think we could resolve all of these fly cheat/gun issues by enforcing Lara out of the draw/undraw animations, but it would be quite jarring. At least for the most part she will complete putting the gun away neatly. This one looks quite tricky, maybe we'd have to be more thorough in our checks and look at frame numbers.

I don't think it's worth it at the moment – we can raise an issue for this so that it doesn't get lost, but I'd say it's super low priority.

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.

I've checked all the rifles and everything looks good. I also made sure to check the harpoon while Lara is in water for good measure.

Thank you for working on fixing this issue. 👍

@lahm86 lahm86 merged commit dbf75ce into LostArtefacts:develop Jan 25, 2025
7 checks passed
@lahm86 lahm86 deleted the issue-2376-rifle-fly-cheat branch January 25, 2025 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
TR2 TRX bug A bug with TRX
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

TR2X bug: undrawing a rifle type weapon ends up in hand when using the fly cheat
3 participants