X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=90bf0fd360829299facce85a1e3593c3a82db63a;hb=3259884cd8389a4467d8abc160b2eb64eb215323;hp=6e98b327be7ceea20096c3a4e5eb56f3d95c3f0d;hpb=5fb4dec0d3dc03696ec2d00788d2d657a23b8bd1;p=lmno.games
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 6e98b32..90bf0fd 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -48,7 +48,7 @@ events.addEventListener("player-enter", event => {
events.addEventListener("player-exit", event => {
const info = JSON.parse(event.data);
- window.game.remove_player(info);
+ window.game.disable_player(info);
});
events.addEventListener("player-update", event => {
@@ -227,23 +227,43 @@ const PlayerInfo = React.memo(props => {
if (! props.player.id)
return null;
- const all_players = [props.player, ...props.other_players];
+ const all_players = [{...props.player, active:true}, ...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 a new array with the separator interspersed between
+ * each element of the array passed in as the argument.
+ */
+ function intersperse(arr, sep) {
+ return arr.reduce((acc, val) => [...acc, sep, val], []).slice(1);
+ }
+
+ let names_and_scores = sorted_players.map(player => {
+ if (player.score) {
+ return (
+
+ {player.name} ({player.score})
+
+ );
+ } else {
+ if (player.active)
+ return player.name;
+ else
+ return null;
+ }
+ }).filter(component => component != null);
+
+ names_and_scores = intersperse(names_and_scores, ", ");
return (
Players:
- {names_and_scores}
+ {names_and_scores}
);
});
@@ -433,14 +453,34 @@ const PromptOptions = React.memo(props => {
const LetsPlay = React.memo(props => {
- const quorum = Math.round((props.num_players + 1) / 2);
+ const quorum = Math.max(0, props.num_players - props.prompts.length);
const max_votes = props.prompts.reduce(
(max_so_far, v) => Math.max(max_so_far, v.votes.length), 0);
- if (max_votes < quorum)
- return null;
+ if (max_votes < quorum) {
+ let text = `Before we play, we should collect a bit
+ more information about what category would
+ be interesting for this group. So, either
+ type a new category option above, or else`;
+ if (props.prompts.length) {
+ if (props.prompts.length > 1)
+ text += " vote on some of the categories below.";
+ else
+ text += " vote on the category below.";
+ } else {
+ text += " wait for others to submit, and then vote on them below.";
+ }
- const candidates = props.prompts.filter(p => p.votes.length >= quorum);
+ return (
+
+ );
+ }
+
+ const candidates = props.prompts.filter(p => p.votes.length >= max_votes);
const index = Math.floor(Math.random() * candidates.length);
const winner = candidates[index];
@@ -675,11 +715,16 @@ class Ambiguities extends React.PureComponent {
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,
+ Click/tap on each pair of answers that should be scored as equivalent,
+ (or click a word twice to split it out from a group). Remember,
what goes around comes around, so it's best to be generous when
judging.
+
+ Also, for an especially fun or witty answer, you can give kudos
+ by clicking the star on the right. You may only do this for one
+ word/group.
+
{this.props.prompt.prompt}
{this.state.word_sets.map(set => {
return (
@@ -705,9 +750,15 @@ class Ambiguities extends React.PureComponent {
}
onClick={(event) => {
event.stopPropagation();
- this.setState({
- starred: set
- });
+ if (this.state.starred === set) {
+ this.setState({
+ starred: null
+ });
+ } else {
+ this.setState({
+ starred: set
+ });
+ }
}}
>
{this.state.starred === set ?
@@ -957,9 +1008,16 @@ class Game extends React.PureComponent {
});
}
- remove_player(info) {
+ disable_player(info) {
+ const idx = this.state.other_players.findIndex(o => o.id === info.id);
+ if (idx < 0)
+ return;
+
+ const other_players_copy = [...this.state.other_players];
+ other_players_copy[idx].active = false;
+
this.setState({
- other_players: this.state.other_players.filter(o => o.id !== info.id)
+ other_players: other_players_copy
});
}
@@ -1198,10 +1256,11 @@ class Game extends React.PureComponent {
render() {
const state = this.state;
- const players_total = 1 + state.other_players.length;
if (state.scores) {
+ const players_total = state.players_answered.size;
+
let perfect_score = 0;
for (let i = 0;
i < state.active_prompt.items &&
@@ -1225,11 +1284,15 @@ class Game extends React.PureComponent {
if (score.score === state.active_prompt.items) {
quirkster =
Quirkster!;
}
+ let kudos_slam = null;
+ if (score.kudos > 0 && score.kudos >= players_total - 1) {
+ kudos_slam =
Kudos Slam!;
+ }
return (
{score.players.join("/")}: {score.score}
{score.kudos ? `, ${'â
'.repeat(score.kudos)}` : ""}
- {perfect} {quirkster}
+ {' '}{perfect} {quirkster} {kudos_slam}
);
})}
@@ -1237,11 +1300,20 @@ class Game extends React.PureComponent {
Words submitted
{state.scores.words.map(word => {
+ let great_minds = null;
+ if (word.kudos.length && word.players.length > 1) {
+ great_minds = Great Minds!;
+ }
+ let kudos_slam = null;
+ if (word.kudos.length > 0 && word.kudos.length >= players_total - 1) {
+ kudos_slam = Kudos Slam!;
+ }
return (
-
{word.word} ({word.players.length}
{word.kudos.length ? `, ${'â
'.repeat(word.kudos.length)}` : ""}
): {word.players.join(', ')}
+ {' '}{great_minds}{kudos_slam}
);
})}
@@ -1310,15 +1382,15 @@ class Game extends React.PureComponent {
,
+ p.active).length}
+ prompts={state.prompts}
+ />,
,
-
];
}