X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Ftemplates%2Fscoreboard.mako;h=88849c6df5e99a26a7b9b854600391d15b6a1730;hb=eedc246f8d3fc836c3f939cf7505a3f497bb3241;hp=288e271eb2fb3a02610f191e7563cc11089776d4;hpb=82494f46ae62f9a3d877db0011db6f8c274c8a7a;p=xonotic%2Fxonstat.git diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako old mode 100755 new mode 100644 index 288e271..88849c6 --- a/xonstat/templates/scoreboard.mako +++ b/xonstat/templates/scoreboard.mako @@ -1,21 +1,40 @@ -<%def name="scoreboard(game_type_cd, pgstats)"> - -${scoreboard_header(game_type_cd, pgstats[0])} +<%def name="scoreboard(game_type_cd, pgstats, show_elo=False, show_latency=False)"> +
+ ${scoreboard_header(game_type_cd, pgstats[0])} % for pgstat in pgstats: - + % elif show_latency: + % endif + + - ${scoreboard_row(game_type_cd, pgstat)} - + + ${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 % endfor @@ -24,78 +43,301 @@ ${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': + + + % if show_latency: + + % endif + + + + + + + % if show_elo: + + % endif + + +% endif + +% if game_type_cd in 'ca' 'dm' 'duel' 'rune' 'tdm': + + + % if show_latency: + + % endif + + + + + + % if show_elo: + + % endif + + +% endif + +% if game_type_cd == 'cq': + + + % if show_latency: + + % endif + + + + + + + % if show_elo: + + % endif + + +% endif + +% if game_type_cd == 'cts': + + + % if show_latency: + + % endif + + + + + % endif % if game_type_cd == 'ctf': - - - - - - - - - - - + + + % if show_latency: + + % endif + + + + + + + + % if show_elo: + + % endif + + % endif -% if game_type_cd == 'ca': - - - - - - - +% if game_type_cd == 'dom': + + + % if show_latency: + + % endif + + + + + + + % if show_elo: + + % endif + + % endif -% if game_type_cd == 'freezetag': - - - - - - - - - +% if game_type_cd in 'ft' 'freezetag': + + + % if show_latency: + + % endif + + + + + + % if show_elo: + + % endif + + +% endif + +% if game_type_cd in 'ka' 'keepaway': + + + % if show_latency: + + % endif + + + + + + + + % if show_elo: + + % endif + + % endif + +% if game_type_cd == 'kh': + + + % if show_latency: + + % endif + + + + + + + + + % if show_elo: + + % endif + + +% endif + +% if game_type_cd in 'nb' 'nexball': + + + % if show_latency: + + % endif + + + + + % if show_elo: + + % endif + + +% endif + +% if game_type_cd == 'rc': + + + % if show_latency: + + % endif + + + + + + +% endif + ##### 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': + + + + +% 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 == 'ca': - +% if game_type_cd in 'ft' 'freezetag': + + + % endif -% if game_type_cd == 'freezetag': - - - +% 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} + % if show_latency and pgstat.avg_latency is not None: + + ${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)}-
NickKillsDeathsSuicidesScore
PingNickKillsDeathsSuicidesObjectivesScoreElo Change
PingNickKillsDeathsSuicidesScoreElo Change
PingNickKillsDeathsCapturedReleasedScoreElo Change
PingNickFastest TimeDeaths
NickKillsCapturesPickupsFCKReturnsScore
PingNickKillsCapsPickupsFCKReturnsScoreElo Change
NickKillsScore
PingNickKillsDeathsTakesTicksScoreElo Change
NickKillsDeathsSuicidesScore
PingNickKillsDeathsRevivalsScoreElo Change
PingNickKillsDeathsPickupsBC TimeBC KillsScoreElo Change
PingNickKillsDeathsPickupsCapsLossesKC KillsScoreElo Change
PingNickGoalsFaultsScoreElo Change
PingNickLapsFastest LapTime
${pgstat.kills}${pgstat.deaths}${pgstat.suicides}${pgstat.kills}${pgstat.deaths}${pgstat.suicides}${pgstat.collects}${pgstat.kills}${pgstat.deaths}${pgstat.suicides}${pgstat.kills}${pgstat.deaths}${pgstat.captures}${pgstat.drops}${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.kills}${pgstat.deaths}${pgstat.revivals}${pgstat.kills}${pgstat.deaths}${pgstat.suicides}${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.carrier_frags}${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)}-