Merged
Conversation
Member
|
The proposed solution in #3510 (comment) sounds good - how come this wasn't implemented? |
Member
Author
Due to the ongoing feature freeze, I want to do this in a separate PR so that the bugfix one doesn’t sit indefinitely just because it adds a new feature. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
In GTA, when you equip a jetpack, the weapon is automatically switched to a pistol, tec-9, or uzi if you have one of these weapons. Otherwise, the weapon is hidden from the player’s hands, but the slot remains unchanged, which causes two issues:
In GTA, when you remove the jetpack, the slot is restored to the one you had before equipping it. For example, if you are holding an AK-47, then equip a jetpack and it switches to an uzi, after removing the jetpack you get the AK-47 back. PR #3573 changed this behavior so that after removing the jetpack, the slot is always reset to 0.
From the GTA code, it appears that Rockstar also intended to include the sawed-off shotgun for jetpack use, but a trivial mistake prevented it from working.
This PR resolves the issues described above.
Motivation
#3510 (comment)
Test plan
See issues: #508, #3659
TL;DR
Checklist