New CVars: `mp_weapondrop` and `mp_ammodrop` and fixes by dystopm · Pull Request #840 · rehlds/ReGameDLL_CS

dystopm · 2023-07-02T20:07:34Z

Added cvar mp_weapondrop which controls behaviour on weapon drop after death. You can choose between (0) do not drop anything after death, (1) drop your heaviest weapon (default behaviour), (2) drop your active weapon or (3) drop all your weapons. It works independently of mp_nadedrops cvar (and it's also an extension of it)
Added cvar mp_ammodrop which controls behaviour of ammo packing on weapon boxes drop. You can choose between (0) keep ammo on player always, (1) drop ammo on weaponbox only after death and (2) drop ammo on every weaponbox you drop either death or manual drop.
Fix: Ammo resetting inside CreateWeaponBox; ammo was not getting reset if packAmmo = true, no matter if weapon is not considered "exhaustible"
Fix: CanDrop used inside PackDeadPlayerItems in case modders want to make a weapon undroppable.
Code related: PackPlayerItem now returns the entity created.
Changed usage of constants meaning (GR_PLR_DROP_GUN_* inside DeadPlayerWeapons) and added an extra.

Related to/fixes close #520 #620 #758 #821
Tested, work as intended

PS: Cvar's names/description corrections are welcome

StevenKal · 2023-07-03T09:08:05Z

Nice!
But maybe dropping "all weapons" when "GR_PLR_DROP_GUN_ALL" is set could be added (all primary & secondary).
And keep "GR_PLR_DROP_GUN_ACTIVE" for only active weapon on death (if, it is a primary or secondary, however, get & drop best weapon). But a new rule like "GR_PLR_DROP_GUN_BEST" could also be welcomed.
Or, make "GR_PLR_DROP_GUN_ACTIVE" drops best primary/secondary weapon (default behavior), but this does not really match to the rule name...
So, questionable.

wopox1337

Code style fixes

regamedll/dlls/multiplay_gamerules.cpp

regamedll/dlls/player.cpp

Co-authored-by: Sergey Shorokhov <[email protected]>

regamedll/dlls/player.cpp

dystopm · 2023-07-03T18:07:34Z

Nice! But maybe dropping "all weapons" when "GR_PLR_DROP_GUN_ALL" is set could be added (all primary & secondary). And keep "GR_PLR_DROP_GUN_ACTIVE" for only active weapon on death (if, it is a primary or secondary, however, get & drop best weapon). But a new rule like "GR_PLR_DROP_GUN_BEST" could also be welcomed. Or, make "GR_PLR_DROP_GUN_ACTIVE" drops best primary/secondary weapon (default behavior), but this does not really match to the rule name... So, questionable.

I've been thinking on a nice way to implement that. Thing is: drop weapons separately guided by player angles (left to right, depending on how many weapons player will drop) or drop weapons in forward, each one further forward than the last (easy implementation, just store them into an array and apply an scalar to their current velocity since all are going forward) - will take a look and then test

Co-authored-by: Sergey Shorokhov <[email protected]>

dystopm · 2023-07-04T04:08:36Z

Added new behaviour: mp_weapondrop 3 (as @StevenKal requested) will ensure players drop all their weapons (primary and secondary) after death. It basically uses the same pattern but every box created has more velocity than its predecessor. Depending on physics, players can stand still, be on mid air or just running fast, and that will affect weapons drop spreading.

Used sv_cheats 1 and impulse 255 for testing purposes only, because in legit scenarios players can have at least 2 weapons.

Credits to @metita for his help in test scenarios.

regamedll/dlls/multiplay_gamerules.cpp

wopox1337 · 2023-07-10T09:46:41Z

regamedll/dlls/player.cpp

@@ -1386,78 +1395,130 @@ void PackPlayerNade(CBasePlayer *pPlayer, CBasePlayerItem *pItem, bool packAmmo)
 void CBasePlayer::PackDeadPlayerItems()


The CBasePlayer::PackDeadPlayerItems() function looks terrible (it's not because of your PR). It needs refactoring (later), for the logic is hard to track. 😞

@wopox1337 yeah you're right, I just tried to stick to the original code but indeed it is certainly bad coded

* First implementation * Update player.cpp * Apply suggestions from code review Co-authored-by: Sergey Shorokhov <[email protected]> * Improve readability * Improve readability x2 Co-authored-by: Sergey Shorokhov <[email protected]> * Tabulation tip * Compile error resolved * Add mp_weapondrop 3: drop all weapons --------- Co-authored-by: Sergey Shorokhov <[email protected]>

dystopm added 2 commits July 1, 2023 22:11

First implementation

5ebe523

Update player.cpp

e4052d9

wopox1337 requested review from s1lentq and wopox1337 July 3, 2023 17:03

wopox1337 assigned wopox1337 and dystopm and unassigned wopox1337 Jul 3, 2023

wopox1337 added the Type: 🚀 enhancement Improvement or addition of a new feature. label Jul 3, 2023

wopox1337 requested changes Jul 3, 2023

View reviewed changes

regamedll/dlls/player.cpp Outdated Show resolved Hide resolved

dystopm and others added 2 commits July 3, 2023 13:54

Apply suggestions from code review

b5456a7

Co-authored-by: Sergey Shorokhov <[email protected]>

Improve readability

2615870

wopox1337 reviewed Jul 3, 2023

View reviewed changes

regamedll/dlls/player.cpp Outdated Show resolved Hide resolved

dystopm and others added 3 commits July 3, 2023 14:08

Improve readability x2

01208e4

Co-authored-by: Sergey Shorokhov <[email protected]>

Tabulation tip

b7a8ec9

Compile error resolved

d285035

dystopm requested a review from wopox1337 July 3, 2023 19:11

Add mp_weapondrop 3: drop all weapons

4d2a1c9

wopox1337 requested changes Jul 6, 2023

View reviewed changes

regamedll/dlls/multiplay_gamerules.cpp Show resolved Hide resolved

dystopm requested a review from wopox1337 July 7, 2023 17:48

wopox1337 changed the title ~~New CVars: mp_weapondrop and mp_ammodrop~~ New CVars: mp_weapondrop and mp_ammodrop and fixes Jul 10, 2023

wopox1337 approved these changes Jul 10, 2023

View reviewed changes

wopox1337 reviewed Jul 10, 2023

View reviewed changes

wopox1337 approved these changes Jul 10, 2023

View reviewed changes

wopox1337 merged commit 8ddda26 into rehlds:master Jul 10, 2023

dystopm mentioned this pull request Jul 10, 2023

Fix Ammo on drop gun #821

Closed

dystopm deleted the new-mp-cvars branch October 11, 2023 15:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

New CVars: `mp_weapondrop` and `mp_ammodrop` and fixes#840

New CVars: `mp_weapondrop` and `mp_ammodrop` and fixes#840
wopox1337 merged 8 commits intorehlds:masterfrom
dystopm:new-mp-cvars

dystopm commented Jul 2, 2023 •

edited by wopox1337

Loading

Uh oh!

StevenKal commented Jul 3, 2023 •

edited

Loading

Uh oh!

wopox1337 left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dystopm commented Jul 3, 2023

Uh oh!

dystopm commented Jul 4, 2023 •

edited

Loading

Uh oh!

Uh oh!

wopox1337 Jul 10, 2023 •

edited

Loading

Uh oh!

dystopm Jul 10, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -1386,78 +1395,130 @@ void PackPlayerNade(CBasePlayer pPlayer, CBasePlayerItem pItem, bool packAmmo)
		void CBasePlayer::PackDeadPlayerItems()

Uh oh!

Conversation

dystopm commented Jul 2, 2023 • edited by wopox1337 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

StevenKal commented Jul 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wopox1337 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dystopm commented Jul 3, 2023

Uh oh!

dystopm commented Jul 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

wopox1337 Jul 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dystopm Jul 10, 2023

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dystopm commented Jul 2, 2023 •

edited by wopox1337

Loading

StevenKal commented Jul 3, 2023 •

edited

Loading

dystopm commented Jul 4, 2023 •

edited

Loading

wopox1337 Jul 10, 2023 •

edited

Loading