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

Customizable r_tracker flag stats. #268

Closed
wants to merge 1 commit into from
Closed

Customizable r_tracker flag stats. #268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 55 additions & 12 deletions engine/client/fragstats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ typedef struct {

static void TrackerCallback(struct cvar_s *var, char *oldvalue);
static cvar_t r_tracker_frags = CVARD("r_tracker_frags", "0", "0: like vanilla quake\n1: shows only your kills/deaths\n2: shows all kills\n");
static cvar_t r_tracker_flags = CVARD("r_tracker_flags", "1", "0: no flag events\n1: log everytime flag is taken, captured or dropped\n2: also log the number of times\n3: also log total\n");
static cvar_t r_tracker_time = CVARCD("r_tracker_time", "4", TrackerCallback, "how long it takes for r_tracker messages to start fading\n");
static cvar_t r_tracker_fadetime = CVARCD("r_tracker_fadetime", "1", TrackerCallback, "how long it takes for r_tracker messages to fully fade once they start fading\n");
static cvar_t r_tracker_x = CVARCD("r_tracker_x", "0.5", TrackerCallback, "left position of the r_tracker messages, as a fraction of the screen's width, eg 0.5\n");
Expand Down Expand Up @@ -322,6 +323,56 @@ void Stats_FragMessage(int p1, int wid, int p2, qboolean teamkill)
Con_PrintCon(tracker, message, tracker->parseflags);
}

void Stats_FlagMessage(fragfilemsgtypes_t type, int is_self, int p1, int count, int total)
{
char message[512];
console_t *tracker;

const char *c = S_COLOR_WHITE;
const char *fc = !stricmp(cl.players[p1].team, "red") ? S_COLOR_BLUE : S_COLOR_RED;
const char *fn = !stricmp(cl.players[p1].team, "red") ? "blue" : "red";
const char *action, *actions, *name;

if (!r_tracker_flags.ival || cls.demoseeking || p1 < 0)
return;

name = is_self ? "You've" : cl.players[p1].name;

switch (type)
{
case ff_flagcaps:
action = "captured";
actions = "captures";
break;
case ff_flagdrops:
action = "dropped";
actions = "drops";
break;
case ff_flagtouch:
action = "grabbed";
actions = "grabs";
break;
default:
return;
}

if (r_tracker_flags.ival == 1)
Q_snprintfz(message, sizeof(message), "%s%s %s the %s%s%s flag!\n", c, name, action, fc, fn, c);
else if (r_tracker_flags.ival == 2)
Q_snprintfz(message, sizeof(message), "%s%s %s the %s%s%s flag!\nflag %s: %d\n", c, name, action, fc, fn, c, actions, count);
else if (r_tracker_flags.ival >= 3)
Q_snprintfz(message, sizeof(message), "%s%s %s the %s%s%s flag!\nflag %s: %d (%d)\n", c, name, action, fc, fn, c, actions, count, total);

tracker = Con_FindConsole("tracker");
if (!tracker)
{
tracker = Con_Create("tracker", CONF_HIDDEN|CONF_NOTIFY|CONF_NOTIFY_BOTTOM);
Tracker_Update(tracker);
}

Con_PrintCon(tracker, message, tracker->parseflags);
}

void Stats_Evaluate(fragfilemsgtypes_t mt, int wid, int p1, int p2)
{
qboolean u1;
Expand Down Expand Up @@ -424,30 +475,21 @@ void Stats_Evaluate(fragfilemsgtypes_t mt, int wid, int p1, int p2)
fragstats.clienttotals[p1].grabs++;
fragstats.totaltouches++;

if (u1 && p1 >= 0)
{
Stats_Message("You grabbed the flag\nflag grabs: %i (%i)\n", fragstats.clienttotals[p1].grabs, fragstats.totaltouches);
}
Stats_FlagMessage(ff_flagtouch, u1, p1, fragstats.clienttotals[p1].grabs, fragstats.totaltouches);
Copy link
Contributor Author

@dsvensson dsvensson Aug 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I realize now that this is a behavioral change as Stats_Message is a different target. The u1 case ought to be left intact, and the u1 part of Stats_FlagMessage ought to be removed, and this would be else if (p1 >= 0) or separate if (p1 >= 0) instead.

break;
case ff_flagcaps:
if (p1 >= 0)
fragstats.clienttotals[p1].caps++;
fragstats.totalcaps++;

if (u1 && p1 >= 0)
{
Stats_Message("You captured the flag\nflag captures: %i (%i)\n", fragstats.clienttotals[p1].caps, fragstats.totalcaps);
}
Stats_FlagMessage(ff_flagcaps, u1, p1, fragstats.clienttotals[p1].caps, fragstats.totalcaps);
break;
case ff_flagdrops:
if (p1 >= 0)
fragstats.clienttotals[p1].drops++;
fragstats.totaldrops++;

if (u1 && p1 >= 0)
{
Stats_Message("You dropped the flag\nflag drops: %i (%i)\n", fragstats.clienttotals[p1].drops, fragstats.totaldrops);
}
Stats_FlagMessage(ff_flagdrops, u1, p1, fragstats.clienttotals[p1].drops, fragstats.totaldrops);
break;

//p1 died, p2 killed
Expand Down Expand Up @@ -630,6 +672,7 @@ void Stats_Clear(void)
void Stats_Init(void)
{
Cvar_Register(&r_tracker_frags, NULL);
Cvar_Register(&r_tracker_flags, NULL);
Cvar_Register(&r_tracker_time, NULL);
Cvar_Register(&r_tracker_fadetime, NULL);
Cvar_Register(&r_tracker_x, NULL);
Expand Down
Loading