OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Small cleanup. More credits.

Browse source
This commit is contained in:
Mari the Deer 2023-09-24 23:35:48 +02:00
commit fbf3e9fee3
7 changed files with 9 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

21
zscript/items/swwm_ammoitems.zsc
View file

@ -14,8 +14,6 @@ Class RedShell : SWWMAmmo
Ammo.BackpackAmount 4;
Ammo.BackpackMaxAmount 160;
Ammo.DropAmount 2;
+FLOATBOB;
FloatBobStrength 0.25;
Accuracy 50;
}
States
@ -99,9 +97,6 @@ Class GoldShell : SWWMAmmo
Ammo.BackpackAmount 0;
Ammo.BackpackMaxAmount 7;
Ammo.DropAmount 1;
+FLOATBOB;
+DONTGIB; // don't crush these, they're valuable
FloatBobStrength 0.25;
}
States
{
@ -128,9 +123,7 @@ Class EvisceratorShell : SWWMAmmo
Ammo.BackpackAmount 3;
Ammo.BackpackMaxAmount 60;
Ammo.DropAmount 1;
+FLOATBOB;
+SWWMAMMO.USEPICKUPMSG;
FloatBobStrength 0.25;
Accuracy 60;
}
override void ModifyDropAmount( int dropamount )
@ -187,8 +180,6 @@ Class HellblazerMissiles : SWWMAmmo
Ammo.BackpackAmount 3;
Ammo.BackpackMaxAmount 90;
Ammo.DropAmount 1;
+FLOATBOB;
FloatBobStrength 0.25;
Accuracy 70;
}
override void ModifyDropAmount( int dropamount )
@ -243,8 +234,6 @@ Class SparkUnit : SWWMAmmo
Ammo.BackpackAmount 1;
Ammo.BackpackMaxAmount 24;
Ammo.DropAmount 1;
+FLOATBOB;
FloatBobStrength 0.25;
Accuracy 70;
}
States
@ -279,8 +268,6 @@ Class SilverBulletAmmo : SWWMAmmo
Ammo.BackpackMaxAmount 9;
Ammo.DropAmount 1;
SWWMAmmo.MagAmmoType "SilverBullets";
+FLOATBOB;
FloatBobStrength 0.25;
Accuracy 75;
}
States
@ -302,8 +289,6 @@ Class SilverBullets : MagAmmo
MagAmmo.ClipSize 5;
MagAmmo.BackpackAmount 2;
Inventory.MaxAmount 5;
+FLOATBOB;
FloatBobStrength 0.25;
}
States
{
@ -344,8 +329,6 @@ Class CandyGunAmmo : SWWMAmmo
Ammo.BackpackMaxAmount 4;
Ammo.DropAmount 1;
SWWMAmmo.MagAmmoType "CandyGunBullets";
+FLOATBOB;
FloatBobStrength 0.25;
Accuracy 90;
}
States
@ -367,8 +350,6 @@ Class CandyGunBullets : MagAmmo
MagAmmo.ClipSize 7;
MagAmmo.BackpackAmount 1;
Inventory.MaxAmount 7;
+FLOATBOB;
FloatBobStrength 0.25;
}
States
{
@ -462,8 +443,6 @@ Class YnykronAmmo : SWWMAmmo
Ammo.BackpackAmount 0;
Ammo.BackpackMaxAmount 3;
Ammo.DropAmount 1;
+FLOATBOB;
FloatBobStrength 0.25;
}
States
{

4
zscript/items/swwm_baseammo.zsc
View file

@ -268,6 +268,8 @@ Class SWWMAmmo : Ammo
+INVENTORY.IGNORESKILL;
+DONTGIB;
Inventory.PickupFlash "SWWMPickupFlash";
+FLOATBOB;
FloatBobStrength 0.25;
}
}
@ -298,6 +300,8 @@ Class MagAmmo : Inventory abstract
Inventory.PickupSound "misc/bullet_pkup";
Inventory.Amount 1;
Inventory.PickupFlash "SWWMPickupFlash";
+FLOATBOB;
FloatBobStrength 0.25;
}
virtual Class<MagAmmo> GetParentMagAmmo()