// _not_ after an interception, or a self-pass that's not a goal.
// (It must mean we tipped off someone.) We'll count it as a regular one
// for the time being, although it will make hockey assists weird.
- if (keep) {
+ if (keep) { // TODO: keep_pass()?
++p.goals;
++p.callahans;
}
handler = prev_handler = null;
} else if (type === 'catch' || type === 'goal') {
if (handler !== null) {
- if (keep) {
+ if (keep && keep_pass(handler, e['player'], filters)) {
++players[handler].num_throws;
++p.catches;
}
}
- if (keep) ++p.touches;
+ if (keep && keep_pass(handler, e['player'], filters)) ++p.touches;
++touches_this_possession;
if (type === 'goal') {
- if (keep) {
+ if (keep && keep_pass(handler, e['player'], filters)) {
if (prev_handler !== null) {
++players[prev_handler].hockey_assists;
}
handler_got_by_interception = false;
}
} else if (type === 'throwaway') {
- if (keep) {
+ if (keep && keep_pass(e['player'], null, filters)) {
++p.num_throws;
++p.throwaways;
}
handler = prev_handler = null;
} else if (type === 'drop') {
- if (keep) ++p.drops;
+ if (keep && keep_pass(handler, e['player'], filters)) ++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;
+ if (keep && keep_pass(handler, e['player'], filters)) ++p.was_ds;
handler = prev_handler = null;
} else if (type === 'defense') {
if (keep) ++p.defenses;
} else if (type === 'interception') {
- if (keep) {
+ if (keep && keep_pass(null, e['player'], filters)) {
++p.catches;
++p.defenses;
++p.touches;
add_menu_item(filter_div, filterset, menu, 0, 'match', 'Match (any)');
add_menu_item(filter_div, filterset, menu, 1, 'player_any', 'Player on field (any)');
add_menu_item(filter_div, filterset, menu, 2, 'player_all', 'Player on field (all)');
- add_menu_item(filter_div, filterset, menu, 3, 'formation_offense', 'Offense played (any)');
- add_menu_item(filter_div, filterset, menu, 4, 'formation_defense', 'Defense played (any)');
- add_menu_item(filter_div, filterset, menu, 5, 'starting_on', 'Starting on');
- add_menu_item(filter_div, filterset, menu, 6, 'gender_ratio', 'Gender ratio');
+ add_menu_item(filter_div, filterset, menu, 3, 'thrower', 'Thrower (any)');
+ add_menu_item(filter_div, filterset, menu, 4, 'receiver', 'Receiver (any)');
+ add_menu_item(filter_div, filterset, menu, 5, 'formation_offense', 'Offense played (any)');
+ add_menu_item(filter_div, filterset, menu, 6, 'formation_defense', 'Defense played (any)');
+ add_menu_item(filter_div, filterset, menu, 7, 'starting_on', 'Starting on');
+ add_menu_item(filter_div, filterset, menu, 8, 'gender_ratio', 'Gender ratio');
}
function add_menu_item(filter_div, filterset, menu, menu_idx, filter_type, title) {
'id': match['match_id']
});
}
- } else if (filter_type === 'player_any' || filter_type === 'player_all') {
+ } else if (filter_type === 'player_any' || filter_type === 'player_all' || filter_type === 'thrower' || filter_type === 'receiver') {
for (const player of global_json['players']) {
choices.push({
'title': player['name'],
if (common_prefix !== null) {
text += ')';
}
- } else if (filter.type === 'player_any') {
- text = 'Player (any): ';
+ } else if (filter.type === 'player_any' || filter.type === 'thrower' || filter.type === 'receiver') {
+ if (filter.type === 'player_any') {
+ text = 'Player (any): ';
+ } else if (filter.type === 'thrower') {
+ text = 'Thrower (any): ';
+ } else {
+ text = 'Receiver (any): ';
+ }
let sorted_players = Array.from(filter.elements).sort((a, b) => player_pos(a) - player_pos(b));
let first = true;
for (const player_id of sorted_players) {
return pill;
}
+function entire_gender(players) {
+ let gender = null;
+ for (const player_id of players) {
+ if (gender === null) {
+ gender = find_player(player_id).gender;
+ } else if (gender !== find_player(player_id).gender) {
+ return false; // Not all are of the same gender.
+ }
+ }
+ for (const player of global_json['players']) {
+ if (player.gender === gender && !players.has(player.player_id)) {
+ return false; // Not all of this gender are in the group.
+ }
+ }
+ return true;
+}
+
function make_filter_marker(filterset) {
let text = '';
for (const filter of filterset) {
text += desc.substr(common_prefix.length, 3);
}
}
- } else if (filter.type === 'player_any' || filter.type === 'player_all') {
+ } else if (filter.type === 'player_any' || filter.type === 'player_all' || filter.type === 'thrower' || filter.type === 'receiver') {
let sorted_players = Array.from(filter.elements).sort((a, b) => player_pos(a) - player_pos(b));
- for (const player_id of sorted_players) {
- text += find_player(player_id)['name'].substr(0, 3);
+ if (filter.elements.size >= 3 && entire_gender(filter.elements)) {
+ text += find_player(sorted_players[0]).gender;
+ } else {
+ for (const player_id of sorted_players) {
+ text += find_player(player_id)['name'].substr(0, 3);
+ }
}
} else if (filter.type === 'formation_offense' || filter.type === 'formation_defense') {
let sorted_formation_id = Array.from(filter.elements).sort((a, b) => a - b);
} else if (filter.type === 'gender_ratio') {
return filter.elements.has(find_gender_ratio_code(players));
}
+ // NOTE: thrower and receiver uses different state information and applies
+ // to throws only, so will be checked by keep_pass() instead.
return true;
}
return true;
}
+function pass_filter_passes(thrower, receiver, filter) {
+ if (filter.type === 'thrower') {
+ return filter.elements.has(thrower);
+ } else if (filter.type === 'receiver') {
+ return filter.elements.has(receiver);
+ }
+ // The others are tested in keep_event().
+ return true;
+}
+
+function keep_pass(thrower, receiver, filters) {
+ for (const filter of filters) {
+ if (!pass_filter_passes(thrower, receiver, filter)) {
+ return false;
+ }
+ }
+ return true;
+}
+
// Heuristic: If we go at least ten seconds without the possession changing
// or the operator specifying some other formation, we probably play the
// same formation as the last point.