diff --git a/.gitignore b/.gitignore index 98e0d03..5fa9c68 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ *.filters *.plg *.opt +*.opensdf .vs/ debug/ debugaxp/ diff --git a/game/g_weapon.c b/game/g_weapon.c index 2db7e20..46d07a4 100644 --- a/game/g_weapon.c +++ b/game/g_weapon.c @@ -678,8 +678,9 @@ void fire_freon (edict_t *self, vec3_t start, vec3_t dir, int damage, int speed, AngleVectors (dir, forward, right, up); - VectorMA (dir, -0.1, right, dir); - VectorMA (dir, 0.07, up, dir); + //BC 6-14-2020 remove the offset so it aim more toward center crosshair. + //VectorMA (dir, -0.1, right, dir); + //VectorMA (dir, 0.07, up, dir); VectorMA (dir, crandom() * 0.04, right, dir); @@ -718,7 +719,7 @@ void fire_freon (edict_t *self, vec3_t start, vec3_t dir, int damage, int speed, bolt->owner = self; bolt->touch = freon_touch; - bolt->nextthink = level.time + 0.16; + bolt->nextthink = level.time + 0.25; //BC 6-14-2020 this determines how long the freon stays alive. The longer it stays alive, the farther it goes. Original: 0.16 bolt->think = G_FreeEdict; bolt->dmg = 1; bolt->classname = "bolt"; diff --git a/game/p_weapon.c b/game/p_weapon.c index 76bb05a..c738594 100644 --- a/game/p_weapon.c +++ b/game/p_weapon.c @@ -1719,12 +1719,14 @@ void weapon_shotgun_fire (edict_t *ent, qboolean altfire) - + viewing = LookingAt(ent,0,intersect,&range); if(viewing && viewing->classname ) { - if(!stricmp(viewing->classname,"item_freezable") && range <= 21) + //gi.dprintf("viewlook range: %f\n", range); + + if(!stricmp(viewing->classname,"item_freezable") && range <= 40) //BC 6-14-2020 This is the hammer hit range. Was: 21 T_Damage (viewing, ent, ent, forward, viewing->s.origin, vec3_origin, 1/*dmg*/, 40/*kick*/, 0, MOD_HIT ); }