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

Grenades falling through floor, dropped weapon mechanics #545

Open
wants to merge 10 commits into
base: master
Choose a base branch
from

Conversation

AdamTadeusz
Copy link
Contributor

Description

Grenades don't fall through the floor, picked up grenades can be used, grenades are only picked up if missing a grenade of that type, weapons dropped on death fall from their attachment point and inherit parent velocity and force of damage that led to death

Toolchain

  • Windows MSVC VS2022

Linked Issues

@AdamTadeusz AdamTadeusz marked this pull request as draft August 5, 2024 14:04
@AdamTadeusz AdamTadeusz marked this pull request as ready for review August 5, 2024 16:22
@AdamTadeusz AdamTadeusz requested a review from a team August 5, 2024 16:22
@AdamTadeusz AdamTadeusz mentioned this pull request Aug 5, 2024
@AdamTadeusz AdamTadeusz modified the milestone: Parity Sep 9, 2024
mp/src/game/shared/weapon_parse.cpp Outdated Show resolved Hide resolved
mp/src/game/server/neo/neo_player.cpp Outdated Show resolved Hide resolved
@AdamTadeusz AdamTadeusz marked this pull request as draft September 13, 2024 09:50
@AdamTadeusz AdamTadeusz marked this pull request as ready for review September 13, 2024 10:10
@nullsystem nullsystem self-requested a review September 14, 2024 12:05
@nullsystem
Copy link
Collaborator

@AdamTadeusz Odd, it seems like the grenades had to be shot at first before they can be picked up? Can't just simply walk over it.

Comment on lines +1780 to +1781
// If attack button was held down when player died, drop a live grenade. NEOTODO (Adam) Add delay between pressing an attack button and the pin being fully pulled out. If pin not out when dead do not drop a live grenade
if (GetActiveWeapon() == pNeoWeapon && pNeoWeapon->GetNeoWepBits() & NEO_WEP_FRAG_GRENADE) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is not parity, so it should probably go behind a cvar at a minimum.

@nullsystem nullsystem added the Minor release priority Pull request is a priority for the next minor release label Sep 18, 2024
@nullsystem nullsystem added this to the v8.1-prealpha milestone Sep 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Minor release priority Pull request is a priority for the next minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Picking up Grenades and Detpack
3 participants