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

inventory: set any weapon to default on pickup if unarmed #1445

Merged
merged 2 commits into from
Aug 15, 2024

Conversation

walkawayy
Copy link
Collaborator

Resolves #1443.

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

Description

Set Lara's default weapon to any weapon she picks up when unarmed, not just pistols.

If you want to move this to 4.4 that's fine, but it seems like it's easy to implement and related to the other gun fixes. I thought we could maybe squeeze it in if there's no bugs. I attached a build for @aredfan to test.

default_weapon_v1 TR1X-4.2-47-g49b582f-Windows.zip

@walkawayy walkawayy added Feature New functionality Priority: low labels Aug 15, 2024
@walkawayy walkawayy added this to the 4.3 milestone Aug 15, 2024
@walkawayy walkawayy self-assigned this Aug 15, 2024
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.

Very nice @walkawayy👍

I tested every combination of 4 weapons picked up, then again with 3 weapons w/o pistols, Lara will always end up drawing the first weapon. This PR also addresses Lahm's anomaly where Lara has magnums/uzis visually holstered and instead draws pistols when starting Atlantis (with pistols as primary weapon disabled).

LGTM.

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.

Very nice, thank you for this. We'll squeeze it into 4.3.

CHANGELOG.md Outdated Show resolved Hide resolved
src/game/inventory/inventory_func.c Show resolved Hide resolved
@walkawayy walkawayy merged commit c61471f into LostArtefacts:develop Aug 15, 2024
1 check passed
@walkawayy walkawayy deleted the weapon-pickup-default branch August 30, 2024 15:32
@rr- rr- added the TR1 label Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature New functionality TR1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Set default weapon on pickup
4 participants