fn/dmc
fn/dmc
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Weapons will now auto-switch to the next best available weapon when empty.

Browse source
This commit is contained in:
Marco Cawthorne 2023-04-15 17:21:13 -07:00
parent 1421857601
commit 5280004b1f
Signed by: eukara
GPG key ID: CE2032F0A2882A22
7 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/shared/w_grenadelauncher.qc
View file

@ -147,8 +147,10 @@ w_grenadelauncher_primary(player pl)
{
if (pl.w_attack_next > 0.0)
return;
if (pl.ammo_rockets <= 0)
if (pl.ammo_rockets <= 0) {
Weapons_SwitchBest(pl, 0);
return;
}
/* fire the actual projectile (on the server) */
#ifdef SERVER

4
src/shared/w_lightning.qc
View file

@ -92,8 +92,10 @@ w_lightning_primary(player pl)
{
if (pl.w_attack_next > 0.0)
return;
if (pl.ammo_cells <= 0)
if (pl.ammo_cells <= 0) {
Weapons_SwitchBest(pl, 0);
return;
}
pl.ammo_cells--;

4
src/shared/w_nailgun.qc
View file

@ -91,8 +91,10 @@ w_nailgun_primary(player pl)
{
if (pl.w_attack_next > 0.0)
return;
if (pl.ammo_nails <= 0)
if (pl.ammo_nails <= 0) {
Weapons_SwitchBest(pl, 0);
return;
}
pl.ammo_nails--;

4
src/shared/w_rocketlauncher.qc
View file

@ -92,8 +92,10 @@ w_rocketlauncher_primary(player pl)
{
if (pl.w_attack_next > 0.0)
return;
if (pl.ammo_rockets <= 0)
if (pl.ammo_rockets <= 0) {
Weapons_SwitchBest(pl, 0);
return;
}
/* visual fluff */
Weapons_ViewAnimation(pl, RPG_SHOOT);

4
src/shared/w_shotgun.qc
View file

@ -124,8 +124,10 @@ w_shotgun_primary(player pl)
{
if (pl.w_attack_next > 0.0)
return;
if (pl.ammo_shells <= 0)
if (pl.ammo_shells <= 0) {
Weapons_SwitchBest(pl, 0);
return;
}
#ifdef SERVER
/* Singleplayer is more accurate */

5
src/shared/w_supernailgun.qc
View file

@ -96,6 +96,11 @@ w_supernailgun_primary(player pl)
if (pl.w_attack_next > 0.0f)
return;
if (pl.ammo_nails < 1) {
Weapons_SwitchBest(pl, 0);
return;
}
pl.ammo_nails--;
Weapons_ViewAnimation(pl, SUPERNAIL_SHOOT);
Weapons_ViewPunchAngle(pl, [-2,0,0]);

4
src/shared/w_supershotgun.qc
View file

@ -138,8 +138,10 @@ w_supershotgun_primary(player pl)
if (pl.w_attack_next > 0.0)
return;
if (pl.ammo_shells < 2)
if (pl.ammo_shells < 2) {
Weapons_SwitchBest(pl, 0);
return;
}
/* actual firing */
pl.ammo_shells -= 2;