X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Ftemplates%2Fscoreboard.mako;h=88849c6df5e99a26a7b9b854600391d15b6a1730;hb=11652a016fc96d6277604e22f757daaf36e605b7;hp=3bcf31fa4ba8c1a3d3b14f81ec431fa615edbf1e;hpb=6697e5d14f5d14c04369ca92374dfbe857a2f60d;p=xonotic%2Fxonstat.git diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako index 3bcf31f..88849c6 100644 --- a/xonstat/templates/scoreboard.mako +++ b/xonstat/templates/scoreboard.mako @@ -1,35 +1,38 @@ <%def name="scoreboard(game_type_cd, pgstats, show_elo=False, show_latency=False)"> - -${scoreboard_header(game_type_cd, pgstats[0])} +
+ ${scoreboard_header(game_type_cd, pgstats[0])} % for pgstat in pgstats: - % if show_latency and pgstat.avg_latency is not None: - + % elif show_latency: - + % endif + + + ${scoreboard_row(game_type_cd, pgstat)} + % if game_type_cd != 'cts': - + % endif + % if show_elo: % if pgstat.elo_delta is not None: - + % else: - + % endif % endif @@ -41,188 +44,201 @@ ${scoreboard_header(game_type_cd, pgstats[0])} ##### SCOREBOARD HEADER ##### <%def name="scoreboard_header(game_type_cd, pgstat)"> % if game_type_cd == 'as': - - - - % if show_latency: - - % endif - - - - - - % if show_elo: + + + % if show_latency: + + % endif + + + + + + + % if show_elo: - % endif - - + % endif + + % endif % if game_type_cd in 'ca' 'dm' 'duel' 'rune' 'tdm': - - - - % if show_latency: - - % endif - - - - - % if show_elo: - - % endif - - + + + % if show_latency: + + % endif + + + + + + % if show_elo: + + % endif + + % endif % if game_type_cd == 'cq': - - - - % if show_latency: - - % endif - - - - - - % if show_elo: + + + % if show_latency: + + % endif + + + + + + + % if show_elo: - % endif - - + % endif + + % endif % if game_type_cd == 'cts': - - - - % if show_latency: - - % endif - - - - + + + % if show_latency: + + % endif + + + + + % endif % if game_type_cd == 'ctf': - - - - % if show_latency: - - % endif - - - - - - - % if show_elo: + + + % if show_latency: + + % endif + + + + + + + + % if show_elo: - % endif - - + % endif + + % endif % if game_type_cd == 'dom': - - - - % if show_latency: - - % endif - - - - - - % if show_elo: + + + % if show_latency: + + % endif + + + + + + + % if show_elo: - % endif - - + % endif + + % endif % if game_type_cd in 'ft' 'freezetag': - - - - % if show_latency: - - % endif - - - - - % if show_elo: + + + % if show_latency: + + % endif + + + + + + % if show_elo: - % endif - - + % endif + + % endif % if game_type_cd in 'ka' 'keepaway': - - - - % if show_latency: - - % endif - - - - - - % if show_elo: + + + % if show_latency: + + % endif + + + + + + + + % if show_elo: - % endif - - + % endif + + % endif % if game_type_cd == 'kh': - - - - % if show_latency: - - % endif - - - - - - - - - - % if show_elo: - - % endif - - + + + % if show_latency: + + % endif + + + + + + + + + % if show_elo: + + % endif + + % endif % if game_type_cd in 'nb' 'nexball': - - - - % if show_latency: - - % endif - - - - % if show_elo: + + + % if show_latency: + + % endif + + + + + % if show_elo: - % endif - - + % endif + + +% endif + +% if game_type_cd == 'rc': + + + % if show_latency: + + % endif + + + + + + % endif @@ -230,73 +246,98 @@ ${scoreboard_header(game_type_cd, pgstats[0])} ##### SCOREBOARD ROWS ##### <%def name="scoreboard_row(game_type_cd, pgstat)"> % if game_type_cd == 'as': - - - - + + + + % endif % if game_type_cd in 'ca' 'dm' 'duel' 'rune' 'tdm': - - - + + + % endif % if game_type_cd == 'cq': - - - - + + + + % endif % if game_type_cd == 'cts': - - + % if pgstat.fastest is not None: + + % else: + + % endif + + % endif % if game_type_cd == 'ctf': - - - - - + + + + + % endif % if game_type_cd == 'dom': - - - - + + + + % endif % if game_type_cd in 'ft' 'freezetag': - - - + + + % endif % if game_type_cd in 'ka' 'keepaway': - - - - - + + + + + % if pgstat.time is not None: + + % else: + + % endif + + % endif % if game_type_cd == 'kh': - - - - - - - - + + + + + + % endif % if game_type_cd in 'nb' 'nexball': - - + + +% endif + +% if game_type_cd == 'rc': + + + % if pgstat.fastest is not None: + + % else: + + % endif + + % if pgstat.time is not None: + + % else: + + % endif % endif
- % if pgstat.player_id > 2: - - ${pgstat.nick_html_colors()|n} - - % else: - ${pgstat.nick_html_colors()|n} - % endif - - ${int(round(pgstat.avg_latency))} - + ${int(round(pgstat.avg_latency))} + - + % if pgstat.player_id > 2: + + ${pgstat.nick_html_colors()|n} + + % else: + ${pgstat.nick_html_colors()|n} + % endif + ${pgstat.score}${pgstat.score}${round(pgstat.elo_delta,2)}${round(pgstat.elo_delta,2)}--
NickPingKillsDeathsSuicidesObjectivesScore
PingNickKillsDeathsSuicidesObjectivesScoreElo Change
NickPingKillsDeathsSuicidesScoreElo Change
PingNickKillsDeathsSuicidesScoreElo Change
NickPingKillsDeathsCapturedReleasedScore
PingNickKillsDeathsCapturedReleasedScoreElo Change
NickPingFastest TimeDeaths
PingNickFastest TimeDeaths
NickPingKillsCapturesPickupsFCKReturnsScore
PingNickKillsCapsPickupsFCKReturnsScoreElo Change
NickPingKillsDeathsTakesTicksScore
PingNickKillsDeathsTakesTicksScoreElo Change
NickPingKillsDeathsRevivalsScore
PingNickKillsDeathsRevivalsScoreElo Change
NickPingKillsDeathsPickupsBC TimeBC Kills
PingNickKillsDeathsPickupsBC TimeBC KillsScoreElo Change
NickPingKillsDeathsPickupsCapturesLossesPushesDestroysKC KillsScoreElo Change
PingNickKillsDeathsPickupsCapsLossesKC KillsScoreElo Change
NickPingGoalsFaultsScore
PingNickGoalsFaultsScoreElo Change
PingNickLapsFastest LapTime
${pgstat.kills}${pgstat.deaths}${pgstat.suicides}${pgstat.collects}${pgstat.kills}${pgstat.deaths}${pgstat.suicides}${pgstat.collects}${pgstat.kills}${pgstat.deaths}${pgstat.suicides}${pgstat.kills}${pgstat.deaths}${pgstat.suicides}${pgstat.kills}${pgstat.deaths}${pgstat.captures}${pgstat.drops}${pgstat.kills}${pgstat.deaths}${pgstat.captures}${pgstat.drops}${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)}${pgstat.deaths}${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)}-${pgstat.deaths}${pgstat.kills}${pgstat.captures}${pgstat.pickups}${pgstat.carrier_frags}${pgstat.returns}${pgstat.kills}${pgstat.captures}${pgstat.pickups}${pgstat.carrier_frags}${pgstat.returns}${pgstat.kills}${pgstat.deaths}${pgstat.pickups}${pgstat.drops}${pgstat.kills}${pgstat.deaths}${pgstat.pickups}${pgstat.drops}${pgstat.kills}${pgstat.deaths}${pgstat.revivals}${pgstat.kills}${pgstat.deaths}${pgstat.revivals}${pgstat.kills}${pgstat.deaths}${pgstat.pickups}${pgstat.time}${pgstat.fckills}${pgstat.kills}${pgstat.deaths}${pgstat.pickups}${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)}-${pgstat.carrier_frags}${pgstat.kills}${pgstat.deaths}${pgstat.pickups}${pgstat.captures}${pgstat.drops}${pgstat.pushes}${pgstat.destroys}${pgstat.carrier_kills}${pgstat.kills}${pgstat.deaths}${pgstat.pickups}${pgstat.captures}${pgstat.drops}${pgstat.carrier_frags}${pgstat.captures}${pgstat.drops}${pgstat.captures}${pgstat.drops}${pgstat.laps}${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)}-${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)}-