Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

game: added medic statistics to scores #2232

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

game: added medic statistics to scores #2232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee85a57
game: added medic statistics to scores
MrWaggel Jan 26, 2023
8d9d04a
Merge branch 'etlegacy:master' into master
MrWaggel Jan 26, 2023
87d78fd
game: move var decl at top of the function scope
Aranud Feb 25, 2023
83e61c3
game: update param in doc header
Aranud Feb 25, 2023
ba0e75f
game: fix unwanted team_gibs stat removing
Aranud Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/game/g_items.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,23 +591,30 @@ int Pickup_Weapon(gentity_t *ent, gentity_t *other)
*/
int Pickup_Health(gentity_t *ent, gentity_t *other)
{
int amount = ent->item->quantity;

if (ent->parent && ent->parent->client)
{
other->client->pers.lasthealth_client = ent->parent->s.clientNum;
}

// Calculate health amount picked up
// current + amount > max ?
if (other->health + amount > other->client->ps.stats[STAT_MAX_HEALTH])
{
// amount = max - current
amount = other->client->ps.stats[STAT_MAX_HEALTH] - other->health;
}
other->health += amount;

// if medic isn't giving ammo to self or the enemy, give him some props
if (ent->parent && ent->parent->client && ent->parent->client != other->client && other->client->sess.sessionTeam == ent->parent->client->sess.sessionTeam)
{
G_AddSkillPoints(ent->parent, SK_FIRST_AID, 1.f);
G_DebugAddSkillPoints(ent->parent, SK_FIRST_AID, 1.f, "health pack picked up");
}

other->health += ent->item->quantity;
if (other->health > other->client->ps.stats[STAT_MAX_HEALTH])
{
other->health = other->client->ps.stats[STAT_MAX_HEALTH];
}
G_addStatsMedicHealth(other, ent->parent, amount);
other->client->ps.stats[STAT_HEALTH] = other->health;

#ifdef FEATURE_OMNIBOT
Expand Down
8 changes: 8 additions & 0 deletions src/game/g_local.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,12 @@ typedef struct
int damage_received;
int team_damage_given;
int team_damage_received;
int team_health_given;
int team_health_received;
int enemy_health_given;
int enemy_health_received;
int team_revive_given;
int team_revive_received;
int time_axis;
int time_allies;
int time_played;
Expand Down Expand Up @@ -2482,6 +2488,8 @@ qboolean G_isValidConfig(gentity_t *ent, const char *configname);
void G_ReloadConfig(void);

// g_match.c
void G_addStatsMedicRevive(gentity_t *target, gentity_t *source);
void G_addStatsMedicHealth(gentity_t *target, gentity_t *source, int value);
void G_addStats(gentity_t *targ, gentity_t *attacker, int damage, meansOfDeath_t mod);
void G_addStatsHeadShot(gentity_t *attacker, meansOfDeath_t mod);
int G_checkServerToggle(vmCvar_t *cv);
Expand Down
6 changes: 6 additions & 0 deletions src/game/g_lua.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,12 @@ static const gentity_field_t gclient_fields[] =
_et_gclient_addfield(sess.damage_received, FIELD_INT, 0),
_et_gclient_addfield(sess.team_damage_given, FIELD_INT, 0),
_et_gclient_addfield(sess.team_damage_received, FIELD_INT, 0),
_et_gclient_addfield(sess.team_health_given, FIELD_INT, 0),
_et_gclient_addfield(sess.team_health_received, FIELD_INT, 0),
_et_gclient_addfield(sess.enemy_health_given, FIELD_INT, 0),
_et_gclient_addfield(sess.enemy_health_received, FIELD_INT, 0),
_et_gclient_addfield(sess.team_revive_given, FIELD_INT, 0),
_et_gclient_addfield(sess.team_revive_received, FIELD_INT, 0),
_et_gclient_addfield(sess.time_axis, FIELD_INT, FIELD_FLAG_READONLY),
_et_gclient_addfield(sess.time_allies, FIELD_INT, FIELD_FLAG_READONLY),
_et_gclient_addfield(sess.time_played, FIELD_INT, FIELD_FLAG_READONLY),
Expand Down
121 changes: 111 additions & 10 deletions src/game/g_match.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,60 @@ void G_spawnPrintf(int print_type, int print_time, gentity_t *owner)
ent->think = G_delayPrint;
}

/**
* @brief Adds revive stats to the session
* @param[in,out] target client who got revived
* @param[in,out] source client who revived target
*/
void G_addStatsMedicRevive(gentity_t *target, gentity_t *source)
{
#ifndef DEBUG_STATS
if (g_gamestate.integer != GS_PLAYING)
{
return;
}
#endif
if (!source || !source->client)
{
return;
}

source->client->sess.team_revive_given++;
target->client->sess.team_revive_received++;
}

/**
* @brief Adds amount healing done by medics, from medkits and revives
* @param[in,out] target client who received the health
* @param[in,out] source client who gave the health
* @param[in] value amount of health points
*/
void G_addStatsMedicHealth(gentity_t *target, gentity_t *source, int value)
{
#ifndef DEBUG_STATS
if (g_gamestate.integer != GS_PLAYING)
{
return;
}
#endif
if (!source || !source->client)
{
return;
}

// check if target is from source's team
if (source->client->sess.sessionTeam == target->client->sess.sessionTeam)
{
source->client->sess.team_health_given += value;
target->client->sess.team_health_received += value;
}
else
{
source->client->sess.enemy_health_given += value;
target->client->sess.enemy_health_received += value;
}
}

/**
* @brief G_addStats
* @param[in,out] targ
Expand Down Expand Up @@ -479,6 +533,13 @@ void G_createStatsJson(gentity_t *ent, void *target)
cJSON_AddNumberToObject(tmp2, "self_kills", ent->client->sess.self_kills);
cJSON_AddNumberToObject(tmp2, "team_kills", ent->client->sess.team_kills);
cJSON_AddNumberToObject(tmp2, "team_gibs", ent->client->sess.team_gibs);
Aranud marked this conversation as resolved.
Show resolved Hide resolved
cJSON_AddNumberToObject(tmp2, "team_health_given", ent->client->sess.team_health_given);
cJSON_AddNumberToObject(tmp2, "team_health_received", ent->client->sess.team_health_received);
cJSON_AddNumberToObject(tmp2, "enemy_health_given", ent->client->sess.enemy_health_given);
cJSON_AddNumberToObject(tmp2, "enemy_health_received", ent->client->sess.enemy_health_received);
cJSON_AddNumberToObject(tmp2, "team_revive_given", ent->client->sess.team_revive_given);
cJSON_AddNumberToObject(tmp2, "team_revive_received", ent->client->sess.team_revive_received);

cJSON_AddNumberToObject(tmp2, "play_time", (ent->client->sess.time_axis + ent->client->sess.time_allies) == 0 ? 0 : 100.0 * ent->client->sess.time_played / (ent->client->sess.time_axis + ent->client->sess.time_allies));
}

Expand Down Expand Up @@ -681,6 +742,13 @@ void G_deleteStats(int nClient)
cl->sess.time_allies = 0;
cl->sess.time_played = 0;

cl->sess.team_health_given = 0;
cl->sess.team_health_received = 0;
cl->sess.enemy_health_given = 0;
cl->sess.enemy_health_received = 0;
cl->sess.team_revive_given = 0;
cl->sess.team_revive_received = 0;

#ifdef FEATURE_RATING
// skill rating
cl->sess.mu = MU;
Expand Down Expand Up @@ -753,6 +821,13 @@ void G_parseStatsJson(void *object)
cl->sess.damage_received = Q_ReadIntValueJson(tmp, "damage_received");
cl->sess.team_damage_given = Q_ReadIntValueJson(tmp, "team_damage_given");
cl->sess.team_damage_received = Q_ReadIntValueJson(tmp, "team_damage_received");

cl->sess.team_health_given = Q_ReadIntValueJson(tmp, "team_health_given");
cl->sess.team_health_received = Q_ReadIntValueJson(tmp, "team_health_received");
cl->sess.enemy_health_given = Q_ReadIntValueJson(tmp, "enemy_health_given");
cl->sess.enemy_health_received = Q_ReadIntValueJson(tmp, "enemy_health_received");
cl->sess.team_revive_given = Q_ReadIntValueJson(tmp, "team_revive_given");
cl->sess.team_revive_received = Q_ReadIntValueJson(tmp, "team_revive_received");
}
else
{
Expand All @@ -770,7 +845,7 @@ void G_parseStatsJson(void *object)
void G_printMatchInfo(gentity_t *ent)
{
int i, j, cnt = 0, eff, time_eff;
int tot_timex, tot_timel, tot_timep, tot_kills, tot_deaths, tot_gibs, tot_sk, tot_tk, tot_tg, tot_dg, tot_dr, tot_tdg, tot_tdr, tot_xp;
int tot_timex, tot_timel, tot_timep, tot_kills, tot_deaths, tot_gibs, tot_sk, tot_tk, tot_tg, tot_dg, tot_dr, tot_tdg, tot_tdr, tot_xp, tot_rg, tot_rr, tot_thd, tot_thr, tot_ehd, tot_ehr;
gclient_t *cl;
gentity_t *cl_ent;
char *ref;
Expand Down Expand Up @@ -798,14 +873,20 @@ void G_printMatchInfo(gentity_t *ent)
tot_tdg = 0;
tot_tdr = 0;
tot_xp = 0;
tot_rg = 0; // Revives given
tot_rr = 0; // revives done
tot_thd = 0; // team healing done
tot_thr = 0; // team healing rec
tot_ehd = 0; // enem healing done
tot_ehr = 0; // enem healing rec

CP("sc \"\n\"");
#ifdef FEATURE_RATING
CP("sc \"^7GUID TEAM Player ^1 TmX^$ TmL^7 TmP^7 Kll Dth Gib SK TK TG^7 Eff^2 DG^1 DR^6 TDG^$ TDR^3 Score^8 Rating^5 Delta\n\"");
CP("sc \"^7------------------------------------------------------------------------------------------------------------------------\n\"");
CP("sc \"^7GUID TEAM Player ^1 TmX^$ TmL^7 TmP^7 Kll Dth Gib SK TK TG RG RR^7 Eff^2 DG^1 DR^6 TDG^$ TDR^2 THG^$ THR^1 EHG^2 EHR^3 Score^8 Rating^5 Delta\n\"");
CP("sc \"^7--------------------------------------------------------------------------------------------------------------------------------------------------------\n\"");
#else
CP("sc \"^7GUID TEAM Player ^1 TmX^$ TmL^7 TmP^7 Kll Dth Gib SK TK TG^7 Eff^2 DG^1 DR^6 TDG^$ TDR^3 Score\n\"");
CP("sc \"^7---------------------------------------------------------------------------------------------------------\n\"");
CP("sc \"^7GUID TEAM Player ^1 TmX^$ TmL^7 TmP^7 Kll Dth Gib SK TK TG RG RR^7 Eff^2 DG^1 DR^6 TDG^$ TDR^2 THG^$ THR^1 EHG^2 EHR^3 Score\n\"");
CP("sc \"^7-----------------------------------------------------------------------------------------------------------------------------------------\n\"");
#endif

for (j = 0; j < level.numConnectedClients; j++)
Expand Down Expand Up @@ -846,6 +927,14 @@ void G_printMatchInfo(gentity_t *ent)
tot_dr += cl->sess.damage_received;
tot_tdg += cl->sess.team_damage_given;
tot_tdr += cl->sess.team_damage_received;

tot_rg += cl->sess.team_revive_given;
tot_rr += cl->sess.team_revive_received;
tot_thd += cl->sess.team_health_given;
tot_thr += cl->sess.team_health_received;
tot_ehd += cl->sess.enemy_health_given;
tot_ehr += cl->sess.enemy_health_received;

tot_xp += (g_gametype.integer == GT_WOLF_LMS || g_gametype.integer == GT_WOLF_STOPWATCH) ? cl->ps.persistant[PERS_SCORE] : cl->ps.stats[STAT_XP];

eff = (cl->sess.deaths + cl->sess.kills == 0) ? 0 : 100 * cl->sess.kills / (cl->sess.deaths + cl->sess.kills);
Expand All @@ -866,9 +955,9 @@ void G_printMatchInfo(gentity_t *ent)

cnt++;
#ifdef FEATURE_RATING
trap_SendServerCommand(ent - g_entities, va("sc \"%-9s %-14s %s%-15s^1%4d^$%4d^7%s%4d^3%4d%4d%4d%4d%4d%4d%s%4d^2%6d^1%6d^6%5d^$%5d^3%7d^8%8.2f^5%+7.2f\n\"",
trap_SendServerCommand(ent - g_entities, va("sc \"%-9s %-14s %s%-15s^1%4d^$%4d^7%s%4d^3%4d%4d%4d%4d%4d%4d%4d%4d%s%4d^2%6d^1%6d^6%5d^$%5d^2%6d^$%6d^1%6d^2%6d^3%7d^8%8.2f^5%+7.2f\n\"",
#else
trap_SendServerCommand(ent - g_entities, va("sc \"%-9s %-14s %s%-15s^1%4d^$%4d^7%s%4d^3%4d%4d%4d%4d%4d%4d%s%4d^2%6d^1%6d^6%5d^$%5d^3%7d\n\"",
trap_SendServerCommand(ent - g_entities, va("sc \"%-9s %-14s %s%-15s^1%4d^$%4d^7%s%4d^3%4d%4d%4d%4d%4d%4d%4d%4d%s%4d^2%6d^1%6d^6%5d^$%5d^2%6d^$%6d^1%6d^2%6d^3%7d\n\"",
#endif
guid,
aTeams[i],
Expand All @@ -884,12 +973,18 @@ void G_printMatchInfo(gentity_t *ent)
cl->sess.self_kills,
cl->sess.team_kills,
cl->sess.team_gibs,
cl->sess.team_revive_given,
cl->sess.team_revive_received,
ref,
eff,
cl->sess.damage_given,
cl->sess.damage_received,
cl->sess.team_damage_given,
cl->sess.team_damage_received,
cl->sess.team_health_given,
cl->sess.team_health_received,
cl->sess.enemy_health_given,
cl->sess.enemy_health_received,
(g_gametype.integer == GT_WOLF_LMS || g_gametype.integer == GT_WOLF_STOPWATCH) ? cl->ps.persistant[PERS_SCORE] : cl->ps.stats[STAT_XP]
#ifdef FEATURE_RATING
,
Expand All @@ -908,11 +1003,11 @@ void G_printMatchInfo(gentity_t *ent)
time_eff = (tot_timex + tot_timel == 0) ? 0 : 100 * tot_timep / (tot_timex + tot_timel);

#ifdef FEATURE_RATING
CP("sc \"^7------------------------------------------------------------------------------------------------------------------------\n\"");
CP("sc \"^7--------------------------------------------------------------------------------------------------------------------------------------------------------\n\"");
#else
CP("sc \"^7---------------------------------------------------------------------------------------------------------\n\"");
CP("sc \"^7-----------------------------------------------------------------------------------------------------------------------------------------\n\"");
#endif
trap_SendServerCommand(ent - g_entities, va("sc \"%-9s %-14s ^5%-15s^1%4d^$%4d^5%4d%4d%4d%4d%4d%4d%4d^5%4d^2%6d^1%6d^6%5d^$%5d^3%7d\n\"",
trap_SendServerCommand(ent - g_entities, va("sc \"%-9s %-14s ^5%-15s^1%4d^$%4d^5%4d%4d%4d%4d%4d%4d%4d^5%4d%4d%4d^2%6d^1%6d^6%5d^$%5d^2%6d^$%6d^1%6d^2%6d^3%7d\n\"",
"",
aTeams[i],
"Totals",
Expand All @@ -925,11 +1020,17 @@ void G_printMatchInfo(gentity_t *ent)
tot_sk,
tot_tk,
tot_tg,
tot_rg,
tot_rr,
eff,
tot_dg,
tot_dr,
tot_tdg,
tot_tdr,
tot_thd,
tot_thr,
tot_ehd,
tot_ehr,
tot_xp
));
}
Expand Down
53 changes: 29 additions & 24 deletions src/game/g_session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,30 +332,35 @@ void G_ReadSessionData(gclient_t *client)

root = Q_FSReadJsonFrom(fileName);

client->sess.sessionTeam = Q_ReadIntValueJson(root, "sessionTeam");
client->sess.spectatorTime = Q_ReadIntValueJson(root, "spectatorTime");
client->sess.spectatorState = Q_ReadIntValueJson(root, "spectatorState");
client->sess.spectatorClient = Q_ReadIntValueJson(root, "spectatorClient");
client->sess.playerType = Q_ReadIntValueJson(root, "playerType");
client->sess.playerWeapon = Q_ReadIntValueJson(root, "playerWeapon");
client->sess.playerWeapon2 = Q_ReadIntValueJson(root, "playerWeapon2");
client->sess.latchPlayerType = Q_ReadIntValueJson(root, "latchPlayerType");
client->sess.latchPlayerWeapon = Q_ReadIntValueJson(root, "latchPlayerWeapon");
client->sess.latchPlayerWeapon2 = Q_ReadIntValueJson(root, "latchPlayerWeapon2");
client->sess.referee = Q_ReadIntValueJson(root, "referee");
client->sess.shoutcaster = Q_ReadIntValueJson(root, "shoutcaster");
client->sess.spec_invite = Q_ReadIntValueJson(root, "spec_invite");
client->sess.spec_team = Q_ReadIntValueJson(root, "spec_team");
client->sess.kills = Q_ReadIntValueJson(root, "kills");
client->sess.deaths = Q_ReadIntValueJson(root, "deaths");
client->sess.gibs = Q_ReadIntValueJson(root, "gibs");
client->sess.self_kills = Q_ReadIntValueJson(root, "self_kills");
client->sess.team_kills = Q_ReadIntValueJson(root, "team_kills");
client->sess.team_gibs = Q_ReadIntValueJson(root, "team_gibs");
client->sess.time_axis = Q_ReadIntValueJson(root, "time_axis");
client->sess.time_allies = Q_ReadIntValueJson(root, "time_allies");
client->sess.time_played = Q_ReadIntValueJson(root, "time_played");

client->sess.sessionTeam = Q_ReadIntValueJson(root, "sessionTeam");
client->sess.spectatorTime = Q_ReadIntValueJson(root, "spectatorTime");
client->sess.spectatorState = Q_ReadIntValueJson(root, "spectatorState");
client->sess.spectatorClient = Q_ReadIntValueJson(root, "spectatorClient");
client->sess.playerType = Q_ReadIntValueJson(root, "playerType");
client->sess.playerWeapon = Q_ReadIntValueJson(root, "playerWeapon");
client->sess.playerWeapon2 = Q_ReadIntValueJson(root, "playerWeapon2");
client->sess.latchPlayerType = Q_ReadIntValueJson(root, "latchPlayerType");
client->sess.latchPlayerWeapon = Q_ReadIntValueJson(root, "latchPlayerWeapon");
client->sess.latchPlayerWeapon2 = Q_ReadIntValueJson(root, "latchPlayerWeapon2");
client->sess.referee = Q_ReadIntValueJson(root, "referee");
client->sess.shoutcaster = Q_ReadIntValueJson(root, "shoutcaster");
client->sess.spec_invite = Q_ReadIntValueJson(root, "spec_invite");
client->sess.spec_team = Q_ReadIntValueJson(root, "spec_team");
client->sess.kills = Q_ReadIntValueJson(root, "kills");
client->sess.deaths = Q_ReadIntValueJson(root, "deaths");
client->sess.gibs = Q_ReadIntValueJson(root, "gibs");
client->sess.self_kills = Q_ReadIntValueJson(root, "self_kills");
client->sess.team_kills = Q_ReadIntValueJson(root, "team_kills");
client->sess.team_gibs = Q_ReadIntValueJson(root, "team_gibs");
client->sess.time_axis = Q_ReadIntValueJson(root, "time_axis");
client->sess.time_allies = Q_ReadIntValueJson(root, "time_allies");
client->sess.time_played = Q_ReadIntValueJson(root, "time_played");
client->sess.team_health_given = Q_ReadIntValueJson(root, "team_health_given");
client->sess.team_health_received = Q_ReadIntValueJson(root, "team_health_received");
client->sess.enemy_health_given = Q_ReadIntValueJson(root, "enemy_health_given");
client->sess.enemy_health_received = Q_ReadIntValueJson(root, "enemy_health_received");
client->sess.team_revive_given = Q_ReadIntValueJson(root, "team_revive_given");
client->sess.team_revive_received = Q_ReadIntValueJson(root, "team_revive_received");
#ifdef FEATURE_RATING
{
cJSON *ratingObj = cJSON_GetObjectItem(root, "rating");
Expand Down
Loading