X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Ftemplates%2Fscoreboard.mako;h=44068d0f3bf2b956a6d411d3b97326ccb4523b95;hb=56b928c935f3114a3d9c12c2f97c15d45b0f293e;hp=5064bb1244a05d61883a02d484ee78d5a50d575b;hpb=de9c8abb10785f0944ffbb066826e1338dfcf029;p=xonotic%2Fxonstat.git

diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako
index 5064bb1..44068d0 100644
--- a/xonstat/templates/scoreboard.mako
+++ b/xonstat/templates/scoreboard.mako
@@ -1,34 +1,38 @@
-<%def name="scoreboard(game_type_cd, pgstats, show_elo=False)">
-<table  class="table table-bordered table-condensed">
-${scoreboard_header(game_type_cd, pgstats[0])}
+<%def name="scoreboard(game_type_cd, pgstats, show_elo=False, show_latency=False)">
+<table  class="table table-hover table-condensed">
+  ${scoreboard_header(game_type_cd, pgstats[0])}
   <tbody>
   % for pgstat in pgstats:
-    <tr class="${pgstat.team_html_color()}">
-      <td>
+  <tr class="${pgstat.team_html_color()}">
+    <td class="player-nick">
       % if pgstat.player_id > 2:
-        <a href="${request.route_url("player_info", id=pgstat.player_id)}"
-         title="Go to the info page for this player">
+      <a href="${request.route_url("player_info", id=pgstat.player_id)}"
+        title="Go to the info page for this player">
         <span class="nick">${pgstat.nick_html_colors()|n}</span>
-        </a>
+      </a>
       % else:
-        <span class="nick">${pgstat.nick_html_colors()|n}</span>
-      % endif
-      </td>
-      % if pgstat.avg_latency is not None:
-      <td>
-        ${int(round(pgstat.avg_latency))}
-      </td>
+      <span class="nick">${pgstat.nick_html_colors()|n}</span>
       % endif
-      ${scoreboard_row(game_type_cd, pgstat)}
-      <td>${pgstat.score}</td>
-      % if show_elo:
-        % if pgstat.elo_delta is not None:
-        <td>${round(pgstat.elo_delta,2)}</td>
-        % else:
-        <td>-</td>
-        % endif
-      % endif
-    </tr>
+    </td>
+    % 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)}
+    % 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>
 </table>
@@ -36,102 +40,303 @@ ${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':
-    <thead>
-    <tr>
-      <th class="nick">Nick</th>
-      % if pgstat.avg_latency is not None:
-      <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>
+% 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 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
 
 % if game_type_cd == 'ctf':
-    <thead class="ctf ${pgstat.team_html_color()}">
-    <tr>
-      <th class="nick">Nick</th>
-      % if pgstat.avg_latency is not None:
-      <th class="ping">Ping</th>
-      % endif
-      <th class="kills">Kills</th>
-      <th class="captures">Captures</th>
-      <th class="pickups">Pickups</th>
-      <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>
+<thead class="ctf ${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="captures">Captures</th>
+    <th class="pickups">Pickups</th>
+    <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()}">
-    <tr>
-      <th class="nick">Nick</th>
-      % if pgstat.avg_latency is not None:
-      <th class="ping">Ping</th>
-      % endif
-      <th class="kills">Kills</th>
-      <th class="score">Score</th>
-      % if show_elo:
-      <th>Elo Change</th>
-      % endif
-    </tr>
-    </thead>
+% if game_type_cd == 'dom':
+<thead class="dom ${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="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':
-    <thead class="freezetag ${pgstat.team_html_color()}">
-    <tr>
-      <th class="nick">Nick</th>
-      % if pgstat.avg_latency is not None:
-      <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>
+% if game_type_cd in 'ft' 'freezetag':
+<thead class="freezetag ${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="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':
-        <td>${pgstat.kills}</td>
-        <td>${pgstat.deaths}</td>
-        <td>${pgstat.suicides}</td>
+% 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':
+% if pgstat.fastest is not None:
+<td>${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)}</td>
+% else:
+<td>-</td>
+% endif
+<td>${pgstat.deaths}</td>
 % endif
 
 % if game_type_cd == 'ctf':
-        <td>${pgstat.kills}</td>
-        <td>${pgstat.captures}</td>
-        <td>${pgstat.pickups}</td>
-        <td>${pgstat.carrier_frags}</td>
-        <td>${pgstat.returns}</td>
+<td>${pgstat.kills}</td>
+<td>${pgstat.captures}</td>
+<td>${pgstat.pickups}</td>
+<td>${pgstat.carrier_frags}</td>
+<td>${pgstat.returns}</td>
+% endif
+
+% 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 in 'ft' 'freezetag':
+<td>${pgstat.kills}</td>
+<td>${pgstat.deaths}</td>
+<td>${pgstat.revivals}</td>
 % endif
 
-% if game_type_cd == 'ca':
-        <td>${pgstat.kills}</td>
+% if game_type_cd in 'ka' 'keepaway':
+<td>${pgstat.kills}</td>
+<td>${pgstat.deaths}</td>
+<td>${pgstat.pickups}</td>
+
+% if pgstat.time is not None:
+<td>${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)}</td>
+% else:
+<td>-</td>
+% endif
+
+<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_frags}</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>
+
+% if pgstat.fastest is not None:
+<td>${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)}</td>
+% else:
+<td>-</td>
 % endif
 
-% if game_type_cd == 'freezetag':
-        <td>${pgstat.kills}</td>
-        <td>${pgstat.deaths}</td>
-        <td>${pgstat.suicides}</td>
+% if pgstat.time is not None:
+<td>${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)}</td>
+% else:
+<td>-</td>
+% endif
 % endif
+
 </%def>