OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Goddamn Sabreclaws and their stupid ammo drops.

Browse source
This commit is contained in:
Mari the Deer 2020-08-06 23:52:50 +02:00
commit 8d4e6f82df
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
language.version
View file

@ -1,2 +1,2 @@
[default]
SWWM_MODVER="\chSWWM \cwGZ\c- r458 (Thu 6 Aug 23:34:48 CEST 2020)";
SWWM_MODVER="\chSWWM \cwGZ\c- r459 (Thu 6 Aug 23:52:50 CEST 2020)";

31
zscript/swwm_ammo.zsc
View file

@ -253,11 +253,11 @@ Class MagAmmo : Inventory abstract
while ( amt > 0 )
{
// drop full mag if possible
if ( amt >= pammo.Amount )
if ( amt >= ClipSize )
{
last = DoDrop(ParentAmmo);
amt -= pammo.Amount;
Amount -= pammo.Amount;
amt -= ClipSize;
Amount -= ClipSize;
continue;
}
// drop individual bullets
@ -904,11 +904,6 @@ Class SilverBulletAmmo : Ammo
+FLOATBOB;
FloatBobStrength 0.25;
}
override void ModifyDropAmount( int dropamount )
{
Super.ModifyDropAmount(dropamount);
Amount = min(Amount,1);
}
States
{
Spawn:
@ -934,11 +929,6 @@ Class SilverBulletAmmo2 : Ammo
+FLOATBOB;
FloatBobStrength 0.25;
}
override void ModifyDropAmount( int dropamount )
{
Super.ModifyDropAmount(dropamount);
Amount = min(Amount,1);
}
States
{
Spawn:
@ -963,6 +953,11 @@ Class SilverBullets : MagAmmo
+FLOATBOB;
FloatBobStrength 0.25;
}
override void ModifyDropAmount( int dropamount )
{
Super.ModifyDropAmount(dropamount);
Amount = min(Random[ShellDrop](1,MaxAmount),Amount);
}
States
{
Spawn:
@ -986,6 +981,11 @@ Class SilverBullets2 : MagAmmo
+FLOATBOB;
FloatBobStrength 0.25;
}
override void ModifyDropAmount( int dropamount )
{
Super.ModifyDropAmount(dropamount);
Amount = min(Random[ShellDrop](1,MaxAmount),Amount);
}
States
{
Spawn:
@ -1039,6 +1039,11 @@ Class CandyGunBullets : MagAmmo
+FLOATBOB;
FloatBobStrength 0.25;
}
override void ModifyDropAmount( int dropamount )
{
Super.ModifyDropAmount(dropamount);
Amount = min(Random[ShellDrop](1,MaxAmount),Amount);
}
States
{
Spawn: