OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

More deathmatch stuff.

Browse source
This commit is contained in:
Mari the Deer 2021-06-16 20:31:35 +02:00
commit 3dd2b45f2a
14 changed files with 64 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zscript/weapons/swwm_baseweapon.zsc
View file

@ -199,7 +199,7 @@ Class SWWMWeapon : Weapon abstract
{
if ( SWWMWeapon(item).PickupForAmmoSWWM(self) )
item.bPickupGood = true;
if ( (Amount+item.Amount > MaxAmount) && (item.Stamina > 0) )
if ( !deathmatch && (Amount+item.Amount > MaxAmount) && (item.Stamina > 0) )
{
// sell excess
int sellprice = item.Stamina/2;

2
zscript/weapons/swwm_splode.zsc
View file

@ -48,7 +48,7 @@ Class ExplodiumGun : SWWMWeapon
return true;
if ( (item.GetClass() == 'ExplodiumGun') && !item.ShouldStay() )
{
if ( (Amount+item.Amount > MaxAmount) && (Stamina > 0) )
if ( !deathmatch && (Amount+item.Amount > MaxAmount) && (Stamina > 0) )
{
// sell excess
int sellprice = int(Stamina*.5);

2
zscript/weapons/swwm_tastytreat.zsc
View file

@ -21,7 +21,7 @@ Class CandyGun : SWWMWeapon
[ammoget, spareget] = CandyGun(item).PickupForAmmoAndSpares(self);
if ( ammoget || spareget )
item.bPickupGood = true;
if ( !spareget )
if ( !deathmatch && !spareget )
{
// sell excess
int sellprice = item.Stamina/2;