X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=d7e6f6f63df15514bfcec0758616797c54655fdc;hp=683f92d9318a6afa6628fd238edacccf9f90f183;hb=34fdb156080fd1c5fead664ab06a175884e1efa5;hpb=1896a4e7c03026eb1ef2aa084b55e1434265fd9d diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx index 683f92d..d7e6f6f 100644 --- a/empathy/empathy.jsx +++ b/empathy/empathy.jsx @@ -45,6 +45,12 @@ events.addEventListener("player-enter", event => { window.game.set_other_player_info(info); }); +events.addEventListener("player-exit", event => { + const info = JSON.parse(event.data); + + window.game.remove_player(info); +}); + events.addEventListener("player-update", event => { const info = JSON.parse(event.data); @@ -77,9 +83,15 @@ events.addEventListener("game-state", event => { window.game.set_players_judging(state.players_judging); + window.game.set_judging_idle(state.judging_idle); + window.game.set_end_judging(state.end_judging); window.game.set_scores(state.scores); + + window.game.set_new_game_votes(state.new_game_votes); + + window.game.state_ready(); }); events.addEventListener("prompt", event => { @@ -142,6 +154,12 @@ events.addEventListener("player-judging", event => { window.game.set_player_judging(player); }); +events.addEventListener("judging-idle", event => { + const value = JSON.parse(event.data); + + window.game.set_judging_idle(value); +}); + events.addEventListener("vote-end-judging", event => { const player = JSON.parse(event.data); @@ -160,6 +178,18 @@ events.addEventListener("scores", event => { window.game.set_scores(scores); }); +events.addEventListener("vote-new-game", event => { + const player = JSON.parse(event.data); + + window.game.set_player_vote_new_game(player); +}); + +events.addEventListener("unvote-new-game", event => { + const player = JSON.parse(event.data); + + window.game.set_player_unvote_new_game(player); +}); + /********************************************************* * Game and supporting classes * *********************************************************/ @@ -197,18 +227,23 @@ const PlayerInfo = React.memo(props => { if (! props.player.id) return null; + const all_players = [props.player, ...props.other_players]; + + const sorted_players = all_players.sort((a,b) => { + return b.score - a.score; + }); + + const names_and_scores = sorted_players.map(player => { + if (player.score) + return `${player.name} (${player.score})`; + else + return player.name; + }).join(', '); + return (
- The following players have completed judging: + The following players have completed judging:{' '} {[...this.props.players_judged].join(', ')}
@@ -533,24 +593,7 @@ class Ambiguities extends React.PureComponent { ); })} - + {move_on_button}
- The following players have submitted their answers: + The following players have submitted their answers:{' '} {[...this.props.players_answered].join(', ')}
@@ -775,8 +819,11 @@ class Game extends React.PureComponent { ambiguities: null, players_judged: new Set(), players_judging: {}, + judging_idle: false, end_judging_votes: new Set(), - scores: null + scores: null, + new_game_votes: new Set(), + ready: false }; } @@ -805,6 +852,12 @@ class Game extends React.PureComponent { }); } + remove_player(info) { + this.setState({ + other_players: this.state.other_players.filter(o => o.id !== info.id) + }); + } + reset_game_state() { this.setState({ prompts: [], @@ -816,8 +869,11 @@ class Game extends React.PureComponent { ambiguities: null, players_judged: new Set(), players_judging: {}, + judging_idle: false, end_judging_votes: new Set(), - scores: null + scores: null, + new_game_votes: new Set(), + ready: false }); } @@ -946,6 +1002,12 @@ class Game extends React.PureComponent { }); } + set_judging_idle(value) { + this.setState({ + judging_idle: value + }); + } + set_end_judging(players) { this.setState({ end_judging_votes: new Set(players) @@ -970,6 +1032,30 @@ class Game extends React.PureComponent { }); } + set_new_game_votes(players) { + this.setState({ + new_game_votes: new Set(players) + }); + } + + set_player_vote_new_game(player) { + this.setState({ + new_game_votes: new Set([...this.state.new_game_votes, player]) + }); + } + + set_player_unvote_new_game(player) { + this.setState({ + new_game_votes: new Set([...this.state.new_game_votes].filter(p => p !== player)) + }); + } + + state_ready() { + this.setState({ + ready: true + }); + } + render() { const state = this.state; const players_total = 1 + state.other_players.length; @@ -977,12 +1063,13 @@ class Game extends React.PureComponent { if (state.scores) { return (