X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ultimate.js;h=2b483e225a68039c41023474d31a88f1122cbb06;hb=06353f8e12183491089ec9352fd9c21ae095f890;hp=32dd2493d539260fd12a2df4e77600e3cdd53bf1;hpb=841bcf0fe711efd796c4c84bcc70f3950820fc7b;p=pkanalytics diff --git a/ultimate.js b/ultimate.js index 32dd249..2b483e2 100644 --- a/ultimate.js +++ b/ultimate.js @@ -11,6 +11,17 @@ fetch('ultimate.json') .then(response => response.json()) .then(response => { global_json = response; process_matches(global_json, global_filters); }); +function format_time(t) +{ + const ms = t % 1000 + ''; + t = Math.floor(t / 1000); + const sec = t % 60 + ''; + t = Math.floor(t / 60); + const min = t % 60 + ''; + const hour = Math.floor(t / 60) + ''; + return hour + ':' + min.padStart(2, '0') + ':' + sec.padStart(2, '0') + '.' + ms.padStart(3, '0'); +} + function attribute_player_time(player, to, from, offense) { let delta_time; if (player.on_field_since > from) { @@ -175,9 +186,9 @@ function process_matches(json, filters) { 'throwaways': 0, 'drops': 0, 'was_ds': 0, + 'stallouts': 0, 'defenses': 0, - 'interceptions': 0, 'points_played': 0, 'playing_time_ms': 0, 'offensive_playing_time_ms': 0, @@ -299,7 +310,7 @@ function process_matches(json, filters) { live_since = t; } else if (type === 'catch' && last_pull_was_ours === null) { // Someone forgot to add the pull, so we'll need to wing it. - console.log('Missing pull on ' + our_score + '\u2013' + their_score + ' in ' + match['description'] + '; pretending to have one.'); + console.log(match['description'] + ' ' + format_time(t) + ': Missing pull on ' + our_score + '\u2013' + their_score + '; pretending to have one.'); live_since = t; last_pull_was_ours = !offense; } else if (type === 'goal' || type === 'their_goal' || type === 'stoppage') { @@ -403,7 +414,7 @@ function process_matches(json, filters) { // Offense/defense management let last_offense = offense; - if (type === 'set_defense' || type === 'goal' || type === 'throwaway' || type === 'drop' || type === 'was_d') { + if (type === 'set_defense' || type === 'goal' || type === 'throwaway' || type === 'drop' || type === 'was_d' || type === 'stallout') { offense = false; } else if (type === 'set_offense' || type === 'their_goal' || type === 'their_throwaway' || type === 'defense' || type === 'interception') { offense = true; @@ -482,6 +493,15 @@ function process_matches(json, filters) { } } + if (type !== 'out' && type !== 'in' && p !== undefined && p.on_field_since === null) { + console.log(match['description'] + ' ' + format_time(t) + ': Event “' + type + '” on subbed-out player ' + p.name); + } + if (type === 'catch' && handler !== null && players[handler].on_field_since === null) { + // The handler subbed out and was replaced with another handler, + // so this wasn't a pass. + handler = null; + } + // Event management if (type === 'catch' || type === 'goal') { if (handler !== null) { @@ -517,6 +537,9 @@ function process_matches(json, filters) { } else if (type === 'drop') { if (keep) ++p.drops; handler = prev_handler = null; + } else if (type === 'stallout') { + if (keep) ++p.stallouts; + handler = prev_handler = null; } else if (type === 'was_d') { if (keep) ++p.was_ds; handler = prev_handler = null; @@ -524,7 +547,7 @@ function process_matches(json, filters) { if (keep) ++p.defenses; } else if (type === 'interception') { if (keep) { - ++p.interceptions; + ++p.catches; ++p.defenses; ++p.touches; } @@ -535,11 +558,11 @@ function process_matches(json, filters) { } else if (type !== 'in' && type !== 'out' && type !== 'pull' && type !== 'their_goal' && type !== 'stoppage' && type !== 'restart' && type !== 'unknown' && type !== 'set_defense' && type !== 'goal' && type !== 'throwaway' && - type !== 'drop' && type !== 'was_d' && type !== 'set_offense' && type !== 'their_goal' && + type !== 'drop' && type !== 'was_d' && type !== 'stallout' && type !== 'set_offense' && type !== 'their_goal' && type !== 'pull' && type !== 'pull_landed' && type !== 'pull_oob' && type !== 'their_pull' && type !== 'their_throwaway' && type !== 'defense' && type !== 'interception' && type !== 'formation_offense' && type !== 'formation_defense') { - console.log("Unknown event:", e); + console.log(format_time(t) + ": Unknown event “" + e + "”"); } if (type === 'goal' || type === 'their_goal') { @@ -742,7 +765,7 @@ function make_table_general(players) { for (const [q,p] of get_sorted_players(players)) { if (q === 'globals') continue; let row = document.createElement('tr'); - let pm = p.goals + p.assists + p.hockey_assists + p.defenses - p.throwaways - p.drops - p.was_ds; + let pm = p.goals + p.assists + p.hockey_assists + p.defenses - p.throwaways - p.drops - p.was_ds - p.stallouts; let soft_pm = p.offensive_soft_plus + p.defensive_soft_plus - p.offensive_soft_minus - p.defensive_soft_minus; let o_efficiency = make_efficiency_ci(p.offensive_points_won, p.offensive_points_completed, z); let d_efficiency = make_efficiency_ci(p.defensive_points_won, p.defensive_points_completed, z); @@ -787,6 +810,7 @@ function make_table_offense(players) { add_th(header, 'Drops'); add_th(header, 'D-ed'); add_th(header, '%OK'); + add_th(header, 'Stalls'); add_th(header, 'Soft +/-', 6); rows.push(header); } @@ -796,6 +820,7 @@ function make_table_offense(players) { let catches = 0; let drops = 0; let was_ds = 0; + let stallouts = 0; for (const [q,p] of get_sorted_players(players)) { if (q === 'globals') continue; let throw_ok = make_binomial_ci(p.num_throws - p.throwaways, p.num_throws, z); @@ -820,6 +845,7 @@ function make_table_offense(players) { add_3cell(row, p.drops); add_3cell(row, p.was_ds); add_3cell_ci(row, catch_ok); + add_3cell(row, p.stallouts); add_3cell(row, '+' + p.offensive_soft_plus); add_3cell(row, '-' + p.offensive_soft_minus); row.dataset.player = q; @@ -830,6 +856,7 @@ function make_table_offense(players) { catches += p.catches; drops += p.drops; was_ds += p.was_ds; + stallouts += p.stallouts; } // Globals. @@ -852,6 +879,7 @@ function make_table_offense(players) { add_3cell(row, drops); add_3cell(row, was_ds); add_3cell_ci(row, catch_ok); + add_3cell(row, stallouts); add_3cell(row, ''); add_3cell(row, ''); rows.push(row); @@ -1445,7 +1473,7 @@ function should_reuse_last_formation(events, t) { if (type === 'their_goal' || type === 'goal' || type === 'set_defense' || type === 'set_offense' || type === 'throwaway' || type === 'their_throwaway' || - type === 'drop' || type === 'defense' || type === 'interception' || + type === 'drop' || type === 'was_d' || type === 'stallout' || type === 'defense' || type === 'interception' || type === 'pull' || type === 'pull_landed' || type === 'pull_oob' || type === 'their_pull' || type === 'formation_offense' || type === 'formation_defense') { return false;