X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Ftemplates%2Fscoreboard.mako;h=88849c6df5e99a26a7b9b854600391d15b6a1730;hb=11652a016fc96d6277604e22f757daaf36e605b7;hp=3304a951ef35d24355ab544078b7aa794101b373;hpb=e6a0eb53121b25782d9d4873d6d7163743ac5e4d;p=xonotic%2Fxonstat.git diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako index 3304a95..88849c6 100644 --- a/xonstat/templates/scoreboard.mako +++ b/xonstat/templates/scoreboard.mako @@ -1,33 +1,38 @@ -<%def name="scoreboard(game_type_cd, pgstats, show_elo=False)"> -
- % if pgstat.player_id > 2: - - ${pgstat.nick_html_colors()|n} - - % else: - ${pgstat.nick_html_colors()|n} + % if show_latency and pgstat.avg_latency is not None: + | + ${int(round(pgstat.avg_latency))} + | + % elif show_latency: +- | % endif + ++ % if pgstat.player_id > 2: + + ${pgstat.nick_html_colors()|n} + + % else: + ${pgstat.nick_html_colors()|n} + % endif | - % if pgstat.avg_latency is not None: -- ${int(round(pgstat.avg_latency))} - | - % else: -- % endif + ${scoreboard_row(game_type_cd, pgstat)} - | ${pgstat.score} | + + % if game_type_cd != 'cts': +${pgstat.score} | + % endif + % if show_elo: % if pgstat.elo_delta is not None: -${round(pgstat.elo_delta,2)} | +${round(pgstat.elo_delta,2)} | % else: -- | +- | % endif % endif|||||
Nick | - % if pgstat.avg_latency is not None: -Ping | - % endif -Kills | -Deaths | -Suicides | -Score | - % if show_elo: +% if game_type_cd == 'as': + +|||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Ping | + % endif +Nick | +Kills | +Deaths | +Suicides | +Objectives | +Score | + % if show_elo:Elo Change | - % endif -|||||||||
Ping | + % endif +Nick | +Kills | +Deaths | +Suicides | +Score | + % if show_elo: +Elo Change | + % endif +||||||||||
Ping | + % endif +Nick | +Kills | +Deaths | +Captured | +Released | +Score | + % if show_elo: +Elo Change | + % endif +|||||||||
Ping | + % endif +Nick | +Fastest Time | +Deaths | +|||||||||||||
Nick | - % if pgstat.avg_latency is not None: -Ping | - % endif -Kills | -Captures | -Pickups | -FCK | -Returns | -Score | - % if show_elo: + +|||||||||
Ping | + % endif +Nick | +Kills | +Caps | +Pickups | +FCK | +Returns | +Score | + % if show_elo:Elo Change | - % endif -||||||||
Nick | - % if pgstat.avg_latency is not None: -Ping | - % endif -Kills | -Score | - % if show_elo: +% if game_type_cd == 'dom': + +|||||||||||||
Ping | + % endif +Nick | +Kills | +Deaths | +Takes | +Ticks | +Score | + % if show_elo:Elo Change | - % endif -|||||||||
Nick | - % if pgstat.avg_latency is not None: -Ping | - % endif -Kills | -Deaths | -Suicides | -Score | - % if show_elo: +% if game_type_cd in 'ft' 'freezetag': + +|||||||||||
Ping | + % endif +Nick | +Kills | +Deaths | +Revivals | +Score | + % if show_elo:Elo Change | - % endif -||||||||||
Ping | + % endif +Nick | +Kills | +Deaths | +Pickups | +BC Time | +BC Kills | +Score | + % if show_elo: +Elo Change | + % endif +||||||||
Ping | + % endif +Nick | +Kills | +Deaths | +Pickups | +Caps | +Losses | +KC Kills | +Score | + % if show_elo: +Elo Change | + % endif +|||||||
Ping | + % endif +Nick | +Goals | +Faults | +Score | + % if show_elo: +Elo Change | + % endif +|||||||||||
Ping | + % endif +Nick | +Laps | +Fastest Lap | +Time | +${pgstat.kills} | -${pgstat.deaths} | -${pgstat.suicides} | +% if game_type_cd == 'as': +${pgstat.kills} | +${pgstat.deaths} | +${pgstat.suicides} | +${pgstat.collects} | +% endif + +% if game_type_cd in 'ca' 'dm' 'duel' 'rune' 'tdm': +${pgstat.kills} | +${pgstat.deaths} | +${pgstat.suicides} | +% endif + +% if game_type_cd == 'cq': +${pgstat.kills} | +${pgstat.deaths} | +${pgstat.captures} | +${pgstat.drops} | +% endif + +% if game_type_cd == 'cts': + % if pgstat.fastest is not None: +${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)} | + % else: +- | + % endif + +${pgstat.deaths} | % endif % if game_type_cd == 'ctf': -${pgstat.kills} | -${pgstat.captures} | -${pgstat.pickups} | -${pgstat.carrier_frags} | -${pgstat.returns} | +${pgstat.kills} | +${pgstat.captures} | +${pgstat.pickups} | +${pgstat.carrier_frags} | +${pgstat.returns} | +% endif + +% if game_type_cd == 'dom': +${pgstat.kills} | +${pgstat.deaths} | +${pgstat.pickups} | +${pgstat.drops} | % endif -% if game_type_cd == 'ca': -${pgstat.kills} | +% if game_type_cd in 'ft' 'freezetag': +${pgstat.kills} | +${pgstat.deaths} | +${pgstat.revivals} | +% endif + +% if game_type_cd in 'ka' 'keepaway': +${pgstat.kills} | +${pgstat.deaths} | +${pgstat.pickups} | + + % if pgstat.time is not None: +${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)} | + % else: +- | + % endif + +${pgstat.carrier_frags} | % endif -% if game_type_cd == 'freezetag': -${pgstat.kills} | -${pgstat.deaths} | -${pgstat.suicides} | +% if game_type_cd == 'kh': +${pgstat.kills} | +${pgstat.deaths} | +${pgstat.pickups} | +${pgstat.captures} | +${pgstat.drops} | +${pgstat.carrier_frags} | % endif + +% if game_type_cd in 'nb' 'nexball': +${pgstat.captures} | +${pgstat.drops} | +% endif + +% if game_type_cd == 'rc': +${pgstat.laps} | + + % if pgstat.fastest is not None: +${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)} | + % else: +- | + % endif + + % if pgstat.time is not None: +${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)} | + % else: +- | + % endif +% endif + %def>