Add race support to the scoreboard.

[xonotic/xonstat.git] / xonstat / templates / scoreboard.mako

diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako
index 1ce98e8908ba391e55c855372efc4969175dd3ff..e2433056284ce0e8d113d50d3d9e3f938f84cf5c 100644 (file)
--- a/xonstat/templates/scoreboard.mako
+++ b/xonstat/templates/scoreboard.mako
@@ -1,4 +1,4 @@
-<%def name="scoreboard(game_type_cd, pgstats)">
+<%def name="scoreboard(game_type_cd, pgstats, show_elo=False, show_latency=False)">
 <table  class="table table-bordered table-condensed">
 ${scoreboard_header(game_type_cd, pgstats[0])}
   <tbody>
@@ -14,13 +14,24 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
         <span class="nick">${pgstat.nick_html_colors()|n}</span>
       % endif
       </td>
-      % if pgstat.avg_latency is not None:
+      % if show_latency and pgstat.avg_latency is not None:
       <td>
         ${int(round(pgstat.avg_latency))}
       </td>
+      % elif show_latency:
+      <td></td>
       % endif
-    ${scoreboard_row(game_type_cd, pgstat)}
+      ${scoreboard_row(game_type_cd, pgstat)}
+      % if game_type_cd != 'cts':
       <td>${pgstat.score}</td>
+      % endif
+      % if show_elo:
+        % if pgstat.elo_delta is not None:
+        <td>${round(pgstat.elo_delta,2)}</td>
+        % else:
+        <td>-</td>
+        % endif
+      % endif
     </tr>
   % endfor
   </tbody>
@@ -29,17 +40,71 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
 
 ##### SCOREBOARD HEADER #####
 <%def name="scoreboard_header(game_type_cd, pgstat)">
-% if game_type_cd == 'dm' or game_type_cd == 'tdm' or game_type_cd == 'duel':
+% if game_type_cd == 'as':
+    <thead>
+    <tr>
+      <th class="nick">Nick</th>
+      % if show_latency:
+      <th class="ping">Ping</th>
+      % endif
+      <th class="kills">Kills</th>
+      <th class="deaths">Deaths</th>
+      <th class="suicides">Suicides</th>
+      <th class="objectives">Objectives</th>
+      <th class="score">Score</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
+    </tr>
+    </thead>
+% endif
+
+% if game_type_cd in 'ca' 'dm' 'duel' 'rune' 'tdm':
     <thead>
     <tr>
       <th class="nick">Nick</th>
-      % if pgstat.avg_latency is not None:
+      % if show_latency:
       <th class="ping">Ping</th>
       % endif
       <th class="kills">Kills</th>
       <th class="deaths">Deaths</th>
       <th class="suicides">Suicides</th>
       <th class="score">Score</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
+    </tr>
+    </thead>
+% endif
+
+% if game_type_cd == 'cq':
+    <thead>
+    <tr>
+      <th class="nick">Nick</th>
+      % if show_latency:
+      <th class="ping">Ping</th>
+      % endif
+      <th class="kills">Kills</th>
+      <th class="deaths">Deaths</th>
+      <th class="captured">Captured</th>
+      <th class="released">Released</th>
+      <th class="score">Score</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
+    </tr>
+    </thead>
+% endif
+
+% if game_type_cd == 'cts':
+    <thead>
+    <tr>
+      <th class="nick">Nick</th>
+      % if show_latency:
+      <th class="ping">Ping</th>
+      % endif
+      <th class="fastest">Fastest Time</th>
+      <th class="deaths">Deaths</th>
     </tr>
     </thead>
 % endif
@@ -48,7 +113,7 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
     <thead class="ctf ${pgstat.team_html_color()}">
     <tr>
       <th class="nick">Nick</th>
-      % if pgstat.avg_latency is not None:
+      % if show_latency:
       <th class="ping">Ping</th>
       % endif
       <th class="kills">Kills</th>
@@ -57,47 +122,152 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
       <th class="fck" title="Flag Carrier Kill">FCK</th>
       <th class="returns">Returns</th>
       <th class="score">Score</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
     </tr>
     </thead>
 % endif
 
-% if game_type_cd == 'ca':
-    <thead class="ca ${pgstat.team_html_color()}">
+% if game_type_cd == 'dom':
+    <thead class="dom ${pgstat.team_html_color()}">
     <tr>
       <th class="nick">Nick</th>
-      % if pgstat.avg_latency is not None:
+      % if show_latency:
       <th class="ping">Ping</th>
       % endif
       <th class="kills">Kills</th>
+      <th class="deaths">Deaths</th>
+      <th class="takes">Takes</th>
+      <th class="ticks">Ticks</th>
       <th class="score">Score</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
     </tr>
     </thead>
 % endif
 
-% if game_type_cd == 'freezetag':
+% if game_type_cd in 'ft' 'freezetag':
     <thead class="freezetag ${pgstat.team_html_color()}">
     <tr>
       <th class="nick">Nick</th>
-      % if pgstat.avg_latency is not None:
+      % if show_latency:
       <th class="ping">Ping</th>
       % endif
       <th class="kills">Kills</th>
       <th class="deaths">Deaths</th>
-      <th class="suicides">Suicides</th>
+      <th class="revivals">Revivals</th>
+      <th class="score">Score</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
+    </tr>
+    </thead>
+% endif
+
+% if game_type_cd in 'ka' 'keepaway':
+    <thead>
+    <tr>
+      <th class="nick">Nick</th>
+      % if show_latency:
+      <th class="ping">Ping</th>
+      % endif
+      <th class="kills">Kills</th>
+      <th class="deaths">Deaths</th>
+      <th class="pickups">Pickups</th>
+      <th class="bctime">BC Time</th>
+      <th class="bckills">BC Kills</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
+    </tr>
+    </thead>
+% endif
+
+% if game_type_cd == 'kh':
+    <thead class="kh ${pgstat.team_html_color()}">
+    <tr>
+      <th class="nick">Nick</th>
+      % if show_latency:
+      <th class="ping">Ping</th>
+      % endif
+      <th class="kills">Kills</th>
+      <th class="deaths">Deaths</th>
+      <th class="pickups">Pickups</th>
+      <th class="caps">Captures</th>
+      <th class="losses">Losses</th>
+      <th class="pushes">Pushes</th>
+      <th class="destroys">Destroys</th>
+      <th class="kckills">KC Kills</th>
       <th class="score">Score</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
     </tr>
     </thead>
 % endif
+
+% if game_type_cd in 'nb' 'nexball':
+    <thead class="nb ${pgstat.team_html_color()}">
+    <tr>
+      <th class="nick">Nick</th>
+      % if show_latency:
+      <th class="ping">Ping</th>
+      % endif
+      <th class="goals">Goals</th>
+      <th class="faults">Faults</th>
+      <th class="score">Score</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
+    </tr>
+    </thead>
+% endif
+
+% if game_type_cd == 'rc':
+    <thead>
+    <tr>
+      <th class="nick">Nick</th>
+      % if show_latency:
+      <th class="ping">Ping</th>
+      % endif
+      <th class="laps">Laps</th>
+      <th class="fastest">Fastest Lap</th>
+      <th class="time">Time</th>
+    </tr>
+    </thead>
+% endif
+
 </%def>
 
 ##### SCOREBOARD ROWS #####
 <%def name="scoreboard_row(game_type_cd, pgstat)">
-% if game_type_cd == 'dm' or game_type_cd == 'tdm' or game_type_cd == 'duel':
+% if game_type_cd == 'as':
+        <td>${pgstat.kills}</td>
+        <td>${pgstat.deaths}</td>
+        <td>${pgstat.suicides}</td>
+        <td>${pgstat.collects}</td>
+% endif
+
+% if game_type_cd in 'ca' 'dm' 'duel' 'rune' 'tdm':
         <td>${pgstat.kills}</td>
         <td>${pgstat.deaths}</td>
         <td>${pgstat.suicides}</td>
 % endif
 
+% if game_type_cd == 'cq':
+        <td>${pgstat.kills}</td>
+        <td>${pgstat.deaths}</td>
+        <td>${pgstat.captures}</td>
+        <td>${pgstat.drops}</td>
+% endif
+
+% if game_type_cd == 'cts':
+        <td>${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)}</td>
+        <td>${pgstat.deaths}</td>
+% endif
+
 % if game_type_cd == 'ctf':
         <td>${pgstat.kills}</td>
         <td>${pgstat.captures}</td>
@@ -106,13 +276,47 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
         <td>${pgstat.returns}</td>
 % endif
 
-% if game_type_cd == 'ca':
+% if game_type_cd == 'dom':
         <td>${pgstat.kills}</td>
+        <td>${pgstat.deaths}</td>
+        <td>${pgstat.pickups}</td>
+        <td>${pgstat.drops}</td>
 % endif
 
-% if game_type_cd == 'freezetag':
+% if game_type_cd in 'ft' 'freezetag':
         <td>${pgstat.kills}</td>
         <td>${pgstat.deaths}</td>
-        <td>${pgstat.suicides}</td>
+        <td>${pgstat.revivals}</td>
 % endif
+
+% if game_type_cd in 'ka' 'keepaway':
+        <td>${pgstat.kills}</td>
+        <td>${pgstat.deaths}</td>
+        <td>${pgstat.pickups}</td>
+        <td>${pgstat.time}</td>
+        <td>${pgstat.fckills}</td>
+% endif
+
+% if game_type_cd == 'kh':
+        <td>${pgstat.kills}</td>
+        <td>${pgstat.deaths}</td>
+        <td>${pgstat.pickups}</td>
+        <td>${pgstat.captures}</td>
+        <td>${pgstat.drops}</td>
+        <td>${pgstat.pushes}</td>
+        <td>${pgstat.destroys}</td>
+        <td>${pgstat.carrier_kills}</td>
+% endif
+
+% if game_type_cd in 'nb' 'nexball':
+        <td>${pgstat.captures}</td>
+        <td>${pgstat.drops}</td>
+% endif
+
+% if game_type_cd == 'rc':
+        <td>${pgstat.laps}</td>
+        <td>${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)}</td>
+        <td>${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)}</td>
+% endif
+
 </%def>