X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=b58f9359ff5bdc7bed3bef174cc6119ee7cee0b7;hp=3e6399d19c5aa997a4a9eecfa6912556ce663164;hb=6e3daa0768dafe57ad8f045b8314502316dc7c66;hpb=97bb67ae2b99e3a75e83eec9c6ddcf30db15d896 diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx index 3e6399d..b58f935 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 (