Add cvar to stop -1 scores from world and suicide deaths

g_suicideScorePenalty 1 or 0

Also includes preliminary extra stats

Author: ensiform

code/game/g_combat.c

@@ -322,7 +322,11 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
 
 			if ( attacker == self || G_Q3F_IsAllied( attacker, self ) )
 			{
-				AddScore( attacker, self->r.currentOrigin, -1 );
+				if ( attacker != self || (attacker == self && g_suicideScorePenalty.integer > 0) )
+					AddScore( attacker, self->r.currentOrigin, -1 );
+				if (attacker == self) {
+					self->client->pers.stats.suicides++;
+				}
 
 				// Golliwog: Cheak for teamkills and ban accordingly.
 				if( attacker != self &&
@@ -337,6 +341,8 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
 				// Golliwog.
 			}
 			else {
+				self->client->pers.stats.player_deaths++;
+				attacker->client->pers.stats.enemykills++;
 				G_DeathStats( self->client, attacker->client, meansOfDeath );
 				attacker->client->sess.enemyKill++;
 				AddScore( attacker, self->r.currentOrigin, 1 );
@@ -371,7 +377,9 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
 
 			}
 		} else {
-			AddScore( self, self->r.currentOrigin, -1 );
+			if ( g_suicideScorePenalty.integer > 0 )
+				AddScore( self, self->r.currentOrigin, -1 );
+			self->client->pers.stats.suicides++;
 		}
 
 		// Add team bonuses

code/game/g_cvar.h

@@ -264,6 +264,8 @@ G_CVAR( g_maxNailBombs, "g_maxNailBombs", "1", CVAR_SERVERINFO | CVAR_ARCHIVE, q
 
 G_CVAR( g_maxGasGrens, "g_maxGasGrens", "2", CVAR_SERVERINFO | CVAR_ARCHIVE, qfalse )
 
+G_CVAR( g_suicideScorePenalty, "g_suicideScorePenalty", "1", CVAR_ARCHIVE, qfalse )
+
 #undef G_NULLCVAR
 #undef G_NULLEXTCVAR
 #undef G_EXTCVAR

code/game/g_local.h

@@ -336,7 +336,8 @@ typedef struct {
 	} data [STATS_NUM];
 	gclient_t * lastdamage;
 	int			caps, assists, defends;
-	int			teamkills;
+	int			teamkills, suicides, enemykills, killassists;
+	int			player_deaths; // only deaths when you were killed by an enemy player not suicide or world kills
 } clientStats_t;
 
 #define MAX_IP_LENGTH 48

code/game/g_q3f_mapents.c

@@ -1864,6 +1864,7 @@ void G_Q3F_MapGive( gentity_t *ent, gentity_t *other )
 				level.teamScores[ent->client->sess.sessionTeam] += data->value.d.intdata;
 			}
 			if (ent && data->value.d.intdata > 0) {
+				ent->client->pers.stats.caps++;
 				G_EventLog_Goal(ent);
 			}
 			CalculateRanks();	// Update the score