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

weapon_gauss: Secondary fire improvements

Browse source 
- move around velocity code so it's predicted and simpler, since we can't read gamerules here a simple MP check will do for now @eukara
- make sure we fire immediately if we release secondary fire after first spin cycle, with these changes the gauss should be nearly identical to Half-Life, minus the OP damage @xylemon
This commit is contained in:
Xylemon 2023-04-25 23:51:18 -07:00
parent 4d111ed96e
commit 15e93d619b
1 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/shared/w_gauss.qc
View file

@ -137,28 +137,6 @@ void w_gauss_fire(player pl, int one)
sound(trace_ent, CHAN_ITEM, sprintf("weapons/electro%d.wav", random(0,3)+4), 1, ATTN_NORM); sound(trace_ent, CHAN_ITEM, sprintf("weapons/electro%d.wav", random(0,3)+4), 1, ATTN_NORM);
} }
HLGameRules rules = (HLGameRules) g_grMode;
/* You should not be able to fling yourself in single player */
if (rules.IsMultiplayer() == true) {
if (one) {
return;
} else {
int iForce = (int)rint((bound(5, pl.ammo_gauss_volume, 10) * 20));
/* Apply force */
if (pl.flags & FL_ONGROUND) {
pl.velocity += v_forward * (-iForce * 2);
} else {
pl.velocity += v_forward * (-iForce * 4);
}
}
} else {
if (one) {
return;
}
}
// reflection equation: // reflection equation:
Weapons_MakeVectors(pl); Weapons_MakeVectors(pl);
vecDir = v_forward; vecDir = v_forward;
@ -226,6 +204,18 @@ void w_gauss_release(player pl)
return; return;
} }
/* if multiplayer then always fling the player
* FIXME need a check for coop */
if (serverkeyfloat("sv_playerslots") > 1) {
if (pl.mode_tempstate != GAUSSTATE_IDLE) {
int iForce = (int)rint((bound(5, pl.ammo_gauss_volume, 10) * 20));
Weapons_MakeVectors(pl);
/* Apply force */
pl.velocity += v_forward * (-iForce * 4);
}
}
if (pl.mode_tempstate == GAUSSTATE_REVVINGUP) { if (pl.mode_tempstate == GAUSSTATE_REVVINGUP) {
pl.w_attack_next = 0.0f; pl.w_attack_next = 0.0f;
pl.w_idle_next = 0.5f; pl.w_idle_next = 0.5f;
@ -321,7 +311,7 @@ void w_gauss_secondary(player pl)
if (pl.mode_tempstate == GAUSSTATE_REVVINGUP) { if (pl.mode_tempstate == GAUSSTATE_REVVINGUP) {
Weapons_ViewAnimation(pl, GAUSS_SPIN); Weapons_ViewAnimation(pl, GAUSS_SPIN);
pl.mode_tempstate = GAUSSTATE_FULL; pl.mode_tempstate = GAUSSTATE_FULL;
pl.w_idle_next = 0.5f; pl.w_idle_next = 0.0f; // fire immediately if we let go
pl.w_attack_next = 0.5f; pl.w_attack_next = 0.5f;
} else if (!pl.mode_tempstate) { } else if (!pl.mode_tempstate) {
Weapons_ViewAnimation(pl, GAUSS_SPINUP); Weapons_ViewAnimation(pl, GAUSS_SPINUP);
@ -329,7 +319,7 @@ void w_gauss_secondary(player pl)
#ifdef SERVER #ifdef SERVER
sound(pl, CHAN_WEAPON, "ambience/pulsemachine.wav", 2, ATTN_NORM); sound(pl, CHAN_WEAPON, "ambience/pulsemachine.wav", 2, ATTN_NORM);
#endif #endif
pl.w_idle_next = 0.5f; pl.w_idle_next = 0.5f; // delay if we let go
pl.w_attack_next = 0.5f; pl.w_attack_next = 0.5f;
} }
} }