X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=inline;f=empathy%2Fempathy.jsx;h=c4aafde512166824ab87651015b2dd8fccc5e01e;hb=84dc7d67e5ce98090b7790faab5543e2cf60653e;hp=39461898cf5efd9d7478a2acd68a333c791be74c;hpb=ff43730d806faf03b488ee59c49d576686696d6c;p=lmno.games
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 3946189..c4aafde 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -1,3 +1,5 @@
+const MAX_PROMPT_ITEMS = 20;
+
function undisplay(element) {
element.style.display="none";
}
@@ -55,11 +57,15 @@ 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.reset_game_state();
+
+ 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 => {
@@ -74,6 +80,66 @@ events.addEventListener("start", event => {
window.game.set_active_prompt(prompt);
});
+events.addEventListener("player-answered", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_answered(player);
+});
+
+events.addEventListener("player-answering", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_answering(player);
+});
+
+events.addEventListener("vote-end-answers", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_vote_end_answers(player);
+});
+
+events.addEventListener("unvote-end-answers", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_unvote_end_answers(player);
+});
+
+events.addEventListener("ambiguities", event => {
+ const ambiguities = JSON.parse(event.data);
+
+ window.game.set_ambiguities(ambiguities);
+});
+
+events.addEventListener("player-judged", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_judged(player);
+});
+
+events.addEventListener("player-judging", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_judging(player);
+});
+
+events.addEventListener("vote-end-judging", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_vote_end_judging(player);
+});
+
+events.addEventListener("unvote-end-judging", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_unvote_end_judging(player);
+});
+
+events.addEventListener("scores", event => {
+ const scores = JSON.parse(event.data);
+
+ window.game.set_scores(scores);
+});
+
/*********************************************************
* Game and supporting classes *
*********************************************************/
@@ -115,10 +181,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})` : ""}
))}
@@ -157,11 +225,15 @@ class CategoryRequest extends React.PureComponent {
const category_input = this.category.current;
const category = category_input.value;
- if (/[0-9]/.test(category))
- category_input.setCustomValidity("");
+ const match = category.match(/[0-9]+/);
+ if (match) {
+ const num_items = parseInt(match[0], 10);
+ if (num_items <= MAX_PROMPT_ITEMS)
+ category_input.setCustomValidity("");
+ }
}
- handle_submit(event) {
+ async handle_submit(event) {
const form = event.currentTarget;
const category_input = this.category.current;
const category = category_input.value;
@@ -176,11 +248,29 @@ class CategoryRequest extends React.PureComponent {
return;
}
- fetch_post_json("prompts", {
- items: parseInt(match[0], 10),
+ const num_items = parseInt(match[0], 10);
+
+ if (num_items > MAX_PROMPT_ITEMS) {
+ category_input.setCustomValidity(`Maximum number of items is ${MAX_PROMPT_ITEMS}`);
+ form.reportValidity();
+ return;
+ }
+
+ const response = await fetch_post_json("prompts", {
+ items: num_items,
prompt: category
});
+ 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 category");
+ }
+
form.reset();
}
@@ -291,6 +381,187 @@ const LetsPlay = React.memo(props => {
);
});
+class Ambiguities extends React.PureComponent {
+
+ constructor(props) {
+ super(props);
+
+ const word_sets = props.words.map(word => {
+ const set = new Set();
+ set.add(word);
+ return set;
+ });
+
+ this.state = {
+ word_sets: word_sets,
+ submitted: false,
+ selected: null
+ };
+ }
+
+ async handle_submit() {
+ const response = await fetch_post_json(
+ `judged/${this.props.prompt.id}`,{
+ word_groups: this.state.word_sets.map(set => Array.from(set))
+ }
+ );
+
+ 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 idx = this.state.word_sets.findIndex(s => s.has(word));
+ const set = this.state.word_sets[idx];
+ if (set.size === 1)
+ return;
+ const new_set = new Set([...set].filter(w => w !== word));
+ this.setState({
+ selected: null,
+ word_sets: [...this.state.word_sets.slice(0, idx),
+ new_set,
+ new Set().add(word),
+ ...this.state.word_sets.slice(idx+1)]
+ });
+ } else if (this.state.selected) {
+ /* Click of a second word groups the two together. */
+ const idx1 = this.state.word_sets.findIndex(s => s.has(this.state.selected));
+ const idx2 = this.state.word_sets.findIndex(s => s.has(word));
+ const set1 = this.state.word_sets[idx1];
+ const set2 = this.state.word_sets[idx2];
+ const new_set = new Set([...set2, ...set1]);
+ if (idx1 < idx2) {
+ this.setState({
+ selected: null,
+ word_sets: [...this.state.word_sets.slice(0, idx1),
+ ...this.state.word_sets.slice(idx1 + 1, idx2),
+ new_set,
+ ...this.state.word_sets.slice(idx2 + 1)]
+ });
+ } else {
+ this.setState({
+ selected: null,
+ word_sets: [...this.state.word_sets.slice(0, idx2),
+ new_set,
+ ...this.state.word_sets.slice(idx2 + 1, idx1),
+ ...this.state.word_sets.slice(idx1 + 1)]
+ });
+ }
+ } else {
+ /* First click of a word selects it. */
+ this.setState({
+ selected: word
+ });
+ }
+ }
+
+ render() {
+ if (this.state.submitted)
+ return (
+
+
Submission received
+
+ The following players have completed judging:
+ {[...this.props.players_judged].join(', ')}
+
+
+ Still waiting for the following players:
+
+
+ {Object.entries(this.props.players_judging).map(player => {
+ return (
+
+ {player}
+ {this.props.players_judging[player] ?
+ : null }
+
+ );
+ })}
+
+
fetch_post_json(`end-judging/${this.props.prompt.id}`) }
+ >
+ Move On
+
+ {[...this.props.votes].map(v => {
+ return (
+
+ {v}
+
+ );
+ })}
+
+
+
+
+ );
+
+ 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_sets.map(set => {
+ return (
+
+ {Array.from(set).map(word => {
+ return (
+ this.handle_click(word)}
+ >
+ {word}
+
+ );
+ })}
+
+ );
+ })}
+
+ Click here when done judging:
+ this.handle_submit()}
+ >
+ Send
+
+
+
+ );
+ }
+}
+
class ActivePrompt extends React.PureComponent {
constructor(props) {
@@ -314,7 +585,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);
@@ -336,10 +607,46 @@ class ActivePrompt extends React.PureComponent {
if (this.state.submitted)
return (
-
Answers submitted
+
Submission received
+
+ The following players have submitted their answers:
+ {[...this.props.players_answered].join(', ')}
+
- Please wait for the rest of the players to submit their answers.
+ Still waiting for the following players:
+
+ {Object.entries(this.props.players_answering).map(player => {
+ return (
+
+ {player}
+ {this.props.players_answering[player] ?
+ : null }
+
+ );
+ })}
+
+
fetch_post_json(`end-answers/${this.props.prompt.id}`) }
+ >
+ Move On
+
+ {[...this.props.votes].map(v => {
+ return (
+
+ {v}
+
+ );
+ })}
+
+
+
);
@@ -353,7 +660,7 @@ class ActivePrompt extends React.PureComponent {
{this.props.prompt.prompt}