game: Now machine gun weapon acts like finger blast attack. Apply radius collision to rocket and beam projectiles, beam projectile can collide other entities. Add Weapon_BFPBeamTrace to detect the beam collisions. Tweak Bullet_Fire, ShotgunPellet and Weapon_LightningFire. Refactor divideBallKiCharged to kiChargePoints. Remove s_quadFactor on G_DivideProjectile_Fire and unused NUM_NAILSHOTS macro from Q3TA

Author: LegendaryGuard

source/game/g_active.c

@@ -1072,8 +1072,8 @@ void ClientThink_real( gentity_t *ent ) {
 		// BFP - Short-Range Teleport (Zanzoken)
 		ZanzokenHandling( ent, ucmd );
 
-		// BFP - Charged points for ki dividing ball
-		client->divideBallKiCharged = client->ps.stats[STAT_KI_ATTACK_CHARGE];
+		// BFP - Charged points for beam and ki dividing ball
+		client->kiChargePoints = client->ps.stats[STAT_KI_ATTACK_CHARGE];
 
 		// BFP - Hit stun melee delay time
 		if ( client->hitStunMeleeDelayTime > 0 

source/game/g_local.h

@@ -353,8 +353,8 @@ struct gclient_s {
 	int			zanzokenDelay;
 	int			zanzokenLastUsed;
 
-	// BFP - Charged points for ki dividing ball
-	int			divideBallKiCharged;
+	// BFP - Ki charge points from STAT_KI_ATTACK_CHARGE
+	int			kiChargePoints;
 
 	char		*areabits;
 };

source/game/g_missile.c

@@ -31,15 +31,8 @@ G_DivideProjectile_Fire
 */
 static void G_DivideProjectile_Fire( gentity_t *ent, vec3_t start, vec3_t dir ) {
 	gentity_t	*m;
-	float s_quadFactor = 1;
-
-	if ( ent->client->ps.powerups[PW_QUAD] ) {
-		s_quadFactor = g_quadfactor.value;
-	}
 
 	m = fire_plasma( ent, start, dir );
-	m->damage *= s_quadFactor;
-	m->splashDamage *= s_quadFactor;
 	m->enabledivide = qtrue; // handle divided ki ball, otherwise crashes (in DLL/SO)
 
 //	VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta );	// "real" physics
@@ -53,7 +46,7 @@ G_HandleDivideKiBall
 static void G_HandleDivideKiBall( gentity_t *ent, gclient_t *client ) { // BFP - WP_PLASMAGUN would be that dividing ball, when pressing the attack key again, divides by the number of balls depending on the ki attack charge points had
 	vec3_t	dir, angles;
 	int		i;
-	int		chargePoints = client->divideBallKiCharged;
+	int		chargePoints = client->kiChargePoints;
 	int		projectiles_to_spawn = 0;
 	int		yawAdjustments[6] = {
 		// if charge attack is 2:
@@ -533,16 +526,18 @@ void G_RunMissile( gentity_t *ent ) {
 		// if just died, then stop
 		if ( client->ps.pm_type == PM_DEAD ) {
 			G_BFPBeamStop( ent );
+			return;
 		}
 
 		if ( tr.surfaceFlags & SURF_NOIMPACT ) {
 			G_BFPBeamStop( ent );
+			return;
 		}
 
 		if ( tr.fraction != 1 ) {
 			G_BFPBeamStop( ent );
+			return;
 		}
-		return;
 	}
 
 	if ( tr.fraction != 1 ) {
@@ -711,6 +706,8 @@ fire_rocket
 */
 gentity_t *fire_rocket (gentity_t *self, vec3_t start, vec3_t dir) {
 	gentity_t	*bolt;
+	// BFP - Projectile radius
+	float		radius = 20;
 
 	VectorNormalize (dir);
 
@@ -738,6 +735,10 @@ gentity_t *fire_rocket (gentity_t *self, vec3_t start, vec3_t dir) {
 	SnapVector( bolt->s.pos.trDelta );			// save net bandwidth
 	VectorCopy (start, bolt->r.currentOrigin);
 
+	// BFP - Collision radius
+	VectorSet( bolt->r.mins, -radius, -radius, -radius );
+	VectorSet( bolt->r.maxs, radius, radius, radius );
+
 	return bolt;
 }
 // BFP - no hook
@@ -786,6 +787,8 @@ fire_bfpbeam
 */
 gentity_t *fire_bfpbeam (gentity_t *self, vec3_t start, vec3_t dir) {
 	gentity_t	*beam;
+	// BFP - Projectile radius
+	float		radius = 30;
 
 	VectorNormalize( dir );
 
@@ -798,7 +801,8 @@ gentity_t *fire_bfpbeam (gentity_t *self, vec3_t start, vec3_t dir) {
 	beam->s.weapon = WP_GRAPPLING_HOOK;
 	beam->r.ownerNum = self->s.number;
 	beam->methodOfDeath = MOD_KI_ATTACK;
-	beam->clipmask = MASK_SHOT;
+	// BFP - Beams should collide with other entities including other beams
+	beam->clipmask = MASK_SHOT | CONTENTS_BODY;
 	beam->parent = self;
 	beam->target_ent = NULL;
 
@@ -807,13 +811,19 @@ gentity_t *fire_bfpbeam (gentity_t *self, vec3_t start, vec3_t dir) {
 	beam->splashRadius = 120;
 	beam->splashMethodOfDeath = MOD_KI_ATTACK;
 
+	beam->speed = 2000;
+
 	beam->s.pos.trType = TR_LINEAR;
 	beam->s.pos.trTime = level.time - MISSILE_PRESTEP_TIME;		// move a bit on the very first frame
 	beam->s.otherEntityNum = self->s.number; // use to match beam in client
 	VectorCopy( start, beam->s.pos.trBase );
-	VectorScale( dir, 800, beam->s.pos.trDelta );
+	VectorScale( dir, beam->speed, beam->s.pos.trDelta );	// speed
 	SnapVector( beam->s.pos.trDelta );			// save net bandwidth
 	VectorCopy( start, beam->r.currentOrigin );
 
+	// BFP - Collision radius
+	VectorSet( beam->r.mins, -radius, -radius, -radius );
+	VectorSet( beam->r.maxs, radius, radius, radius );
+
 	return beam;
 }