X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=8c7b9170d8c0b0dbb29ae05f6765d36c1c17ee52;hp=2aec434654cf26d7bc5078298ab89f5d3739ce9d;hb=9dd0ab6d60e81d39f1a66f4a53fd3a19bd51ffe9;hpb=a3d68ced6e2f65187e4fc076a488715a777b8a62 diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx index 2aec434..8c7b917 100644 --- a/empathy/empathy.jsx +++ b/empathy/empathy.jsx @@ -55,11 +55,13 @@ events.addEventListener("player-update", event => { events.addEventListener("game-state", event => { const state = JSON.parse(event.data); - for (let prompt of state.prompts) { - window.game.add_or_update_prompt(prompt); - } + window.game.set_prompts(state.prompts); window.game.set_active_prompt(state.active_prompt); + + window.game.set_scores(state.scores); + + window.game.set_ambiguities(state.ambiguities); }); events.addEventListener("prompt", event => { @@ -80,6 +82,24 @@ events.addEventListener("answered", event => { window.game.set_players_answered(players_answered); }); +events.addEventListener("ambiguities", event => { + const ambiguities = JSON.parse(event.data); + + window.game.set_ambiguities(ambiguities); +}); + +events.addEventListener("judged", event => { + const players_judged = JSON.parse(event.data); + + window.game.set_players_judged(players_judged); +}); + +events.addEventListener("scores", event => { + const scores = JSON.parse(event.data); + + window.game.set_scores(scores); +}); + /********************************************************* * Game and supporting classes * *********************************************************/ @@ -121,10 +141,12 @@ const PlayerInfo = React.memo(props => {
Players: {props.player.name} + {props.player.score > 0 ? ` (${props.player.score})` : ""} {props.other_players.map(other => ( {", "} {other.name} + {other.score > 0 ? ` (${other.score})` : ""} ))}
@@ -297,6 +319,139 @@ const LetsPlay = React.memo(props => { ); }); +class Ambiguities extends React.PureComponent { + + constructor(props) { + super(props); + + this.state = { + word_groups: props.words.map(word => [word]), + submitted: false, + selected: null + }; + } + + async handle_submit() { + const response = await fetch_post_json( + `judging/${this.props.prompt.id}`,{ + word_groups: this.state.word_groups + } + ); + + if (response.status === 200) { + const result = await response.json(); + if (! result.valid) { + add_message("danger", result.message); + return; + } + } else { + add_message("danger", "An error occurred submitting your answers"); + return; + } + + this.setState({ + submitted: true + }); + } + + handle_click(word) { + if (this.state.selected == word) { + /* Second click on same word removes the word from the group. */ + const new_groups = this.state.word_groups.filter( + group => (! group.includes(this.state.selected)) || (group.length > 1)).map( + group => { + return group.filter(w => w !== this.state.selected); + } + ); + this.setState({ + selected: null, + word_groups: [...new_groups, [word]] + }); + } else if (this.state.selected) { + /* Click of a second word groups the two together. */ + const new_groups = this.state.word_groups.filter( + group => (! group.includes(word)) || (group.length > 1)).map( + group => { + if (group.includes(this.state.selected)) { + if (! group.includes(word)) + return [...group, word]; + else + return group; + } else { + return group.filter(w => w !== word); + } + } + ); + this.setState({ + selected: null, + word_groups: new_groups + }); + } else { + /* First click of a word selects it. */ + this.setState({ + selected: word + }); + } + } + + render() { + if (this.state.submitted) + return ( +
+

{this.props.players_judged}/ + {this.props.players_total} players have responded

+

+ Please wait for the rest of the players to complete judging. +

+
+ ); + + const btn_class = "ambiguity-button"; + const btn_selected_class = btn_class + " selected"; + + return ( +
+

Judging Answers

+

+ Click on each pair of answers that should be scored as equivalent, + (and click any word twice to split it out from a group). Remember, + what goes around comes around, so it's best to be generous when + judging. +

+ {this.state.word_groups.map(word_group => { + return ( +
+ {word_group.map(word => { + return ( + + ); + })} +
+ ); + })} +

+ Click here when done judging:
+ +

+
+ ); + } +} + class ActivePrompt extends React.PureComponent { constructor(props) { @@ -320,7 +475,7 @@ class ActivePrompt extends React.PureComponent { const response = await fetch_post_json(`answer/${this.props.prompt.id}`, { answers: this.answers.map(r => r.current.value) }); - if (response.status == 200) { + if (response.status === 200) { const result = await response.json(); if (! result.valid) { add_message("danger", result.message); @@ -360,7 +515,7 @@ class ActivePrompt extends React.PureComponent {

{this.props.prompt.prompt}

- {Array(this.props.prompt.items).fill(null).map((whocares,i) => { + {[...Array(this.props.prompt.items)].map((whocares,i) => { return (
p.id === prompt.id); @@ -453,10 +616,75 @@ class Game extends React.PureComponent { }); } + set_ambiguities(ambiguities) { + this.setState({ + ambiguities: ambiguities + }); + } + + set_players_judged(players_judged) { + this.setState({ + players_judged: players_judged + }); + } + + set_scores(scores) { + this.setState({ + scores: scores + }); + } + render() { const state = this.state; const players_total = 1 + state.other_players.length; + if (state.scores) { + return ( +
+

Scores

+
    + {state.scores.scores.map(score => { + return ( +
  • + {score.player}: {score.score} +
  • + ); + })} +
+

Words submitted

+
    + {state.scores.words.map(word => { + return ( +
  • + {word.word}: + {word.players.map(p => { + return ( + {p}{" "} + ); + })} +
  • + ); + })} +
+ +
+ ); + } + + if (state.ambiguities){ + return ; + } + if (state.active_prompt) { return