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

Merge pull request #2 from preston-thompson/master

Browse source 
Nailgun fixes, class selection fix
This commit is contained in:
Marco Cawthorne 2022-12-31 13:46:27 -08:00 committed by GitHub
commit 5312044640
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
install_patches.sh Normal file → Executable file
View file

1
src/client/vgui_chooseteam.qc
View file

@ -28,6 +28,7 @@ void
VGUI_TeamJoin(float i) VGUI_TeamJoin(float i)
{ {
sendevent("TeamJoin", "f", i); sendevent("TeamJoin", "f", i);
winCTTeam.Hide();
} }
void void

15
src/shared/w_nailgun.qc
View file

@ -33,6 +33,7 @@ w_nailgun_precache(void)
precache_model("models/w_nailgun.mdl"); precache_model("models/w_nailgun.mdl");
precache_model("models/p_nailgun.mdl"); precache_model("models/p_nailgun.mdl");
precache_model("models/nail.mdl"); precache_model("models/nail.mdl");
Sound_Precache("weapon_nailgun.fire");
} }
void void
@ -75,18 +76,25 @@ void
w_nailgun_shootnail(player pl) w_nailgun_shootnail(player pl)
{ {
static void w_rpg_shootrocket_touch(void) { static void w_rpg_shootrocket_touch(void) {
#ifndef CLIENT
/* impact per bullet */
if (trace_ent.iBleeds == 0) {
DecalGroups_Place("Impact.BigShot", trace_endpos + (v_forward * -2));
SurfData_Impact(trace_ent, trace_surfaceflagsi, trace_endpos, trace_plane_normal);
}
#endif
remove(self); remove(self);
} }
Weapons_MakeVectors(pl); Weapons_MakeVectors(pl);
entity p = spawn(); entity p = spawn();
setmodel(p, "models/nail.mdl"); setmodel(p, "models/nail.mdl");
setorigin(p, Weapons_GetCameraPos(pl) + (v_forward * 8)); setorigin(p, Weapons_GetCameraPos(pl) + (v_forward * 14) + (v_up * -4) + (v_right * 2));
p.owner = self; p.owner = self;
p.movetype = MOVETYPE_FLYMISSILE; p.movetype = MOVETYPE_FLYMISSILE;
p.solid = SOLID_BBOX; p.solid = SOLID_BBOX;
p.gravity = 0.5f; p.gravity = 0.5f;
p.velocity = (v_forward * 1000); p.velocity = (v_forward * 1000) + (v_up * 4) + (v_right * -2);
p.angles = vectoangles(p.velocity); p.angles = vectoangles(p.velocity);
p.touch = w_rpg_shootrocket_touch; p.touch = w_rpg_shootrocket_touch;
p.think = Util_Destroy; p.think = Util_Destroy;
@ -114,6 +122,9 @@ w_nailgun_primary(player pl)
} }
Weapons_ViewAnimation(pl, NAILGUN_SHOOT2); Weapons_ViewAnimation(pl, NAILGUN_SHOOT2);
Weapons_ViewPunchAngle(pl, [-1,0,0]); Weapons_ViewPunchAngle(pl, [-1,0,0]);
#ifndef CLIENT
Sound_Play(pl, CHAN_WEAPON, "weapon_nailgun.fire");
#endif
pl.w_attack_next = 0.1f; pl.w_attack_next = 0.1f;
break; break;
case AUTO_EMPTY: case AUTO_EMPTY:

5
zpak001.pk3dir/sound/weapons_tfc.sndshd
View file

@ -18,6 +18,11 @@ weapon_sbs.reload
sample weapons/reload3.wav sample weapons/reload3.wav
} }
weapon_nailgun.fire
{
sample weapons/airgun_1.wav
}
engineer.build engineer.build
{ {
sample weapons/building.wav sample weapons/building.wav