X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=3869b3a249f12ff169a62e7dca85a789c4beb2da;hp=9b37d0753f3f2839b4fb0e53c8966ff26f34b364;hb=533300fbcbfec8c219901cbde2d9c6f336939f97;hpb=0e96dcd31acbae3c82d430db85da5be398e88264
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 9b37d07..3869b3a 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -569,6 +569,28 @@ class Ambiguities extends React.PureComponent {
);
}
+ let still_waiting = null;
+ if (Object.keys(this.props.players_judging).length) {
+ still_waiting = [
+
+ Still waiting for the following players:
+
,
+
+ {Object.keys(this.props.players_judging).map(player => {
+ return (
+ -
+ {player}
+ {this.props.players_judging[player] ?
+ : null }
+
+ );
+ })}
+
+ ];
+ }
+
if (this.props.players_judged.has(this.props.player.name)) {
return (
@@ -577,22 +599,7 @@ class Ambiguities extends React.PureComponent {
The following players have completed judging:{' '}
{[...this.props.players_judged].join(', ')}
-
- Still waiting for the following players:
-
-
- {Object.keys(this.props.players_judging).map(player => {
- return (
- -
- {player}
- {this.props.players_judging[player] ?
- : null }
-
- );
- })}
-
+ {still_waiting}
{move_on_button}
@@ -611,6 +618,7 @@ class Ambiguities extends React.PureComponent {
what goes around comes around, so it's best to be generous when
judging.
+ {this.props.prompt.prompt}
{this.state.word_sets.map(set => {
return (
+ Still waiting for the following players:
+ ,
+
+ {Object.keys(this.props.players_answering).map(player => {
+ return (
+ -
+ {player}
+ {this.props.players_answering[player] ?
+ : null }
+
+ );
+ })}
+
+ ];
+ }
+
if (this.props.players_answered.has(this.props.player.name)) {
return (
@@ -739,22 +769,7 @@ class ActivePrompt extends React.PureComponent {
The following players have submitted their answers:{' '}
{[...this.props.players_answered].join(', ')}
-
- Still waiting for the following players:
-
-
- {Object.keys(this.props.players_answering).map(player => {
- return (
- -
- {player}
- {this.props.players_answering[player] ?
- : null }
-
- );
- })}
-
+ {still_waiting}
{move_on_button}
@@ -767,7 +782,8 @@ class ActivePrompt extends React.PureComponent {
Remember, you're trying to match your answers with
what the other players submit.
- Give {this.props.prompt.items} answers for the following prompt:
+ Give {this.props.prompt.items} answer
+ {this.props.prompt.items > 1 ? 's' : ''} for the following prompt:
{this.props.prompt.prompt}