Games: announce joining/leaving of players in continuous games

Author: RussellLVP

data/messages.json

@@ -160,6 +160,8 @@
   "FRIENDS_REMOVED": "@success %s has been removed from your friends list.",
   "FRIENDS_USAGE": "{FFFFFF}Use '/friends add' to add a friend or '/friends remove' to remove one.",
 
+  "GAME_CONTINUOUS_JOINED": "{CCD782}* %s has joined the %s.",
+  "GAME_CONTINUOUS_LEFT": "{CCD782}* %s has left the %s.",
   "GAME_REGISTRATION_ANNOUNCEMENT": "{CCD782}Sign up for the {838F31}%s{CCD782}! Type {838F31}/%s{CCD782} to join for %$.",
   "GAME_REGISTRATION_ANNOUNCEMENT_FREE": "{CCD782}Sign up for the {838F31}%s{CCD782}! Type {838F31}/%s{CCD782} to join.",
   "GAME_REGISTRATION_CREATED": "{CCD782}Please allow for up to {838F31}%d seconds{CCD782} for the game to start.",

javascript/features/games/game_runtime.js

@@ -160,6 +160,21 @@ export class GameRuntime extends GameActivity {
 
         // Formally introduce the |player| to the game.
         await this.game_.onPlayerAdded(player);
+
+        // If the game had already started, we need to immediately spawn the |player| as well and
+        // tell the other players that they have joined the game.
+        if (this.state_ === GameRuntime.kStateRunning) {
+            const gameName = this.description_.nameFn(this.settings_);
+
+            for (const target of this.players_) {
+                if (target === player)
+                    continue;  // no need to inform the |player| about their participation
+
+                target.sendMessage(Message.GAME_CONTINUOUS_JOINED, player.name, gameName);
+            }
+
+            await this.onPlayerSpawn(player);
+        }
     }
 
     // Called when the |player| has to be removed from the game, either because they disconnected,
@@ -180,6 +195,15 @@ export class GameRuntime extends GameActivity {
         // Restore the |player|'s state -- back as if nothing ever happened.
         if (!disconnecting)
             player.restoreState();
+
+        // If the game is continuous, inform the remaining participants (if any) about the |player|
+        // having left. This might influence their decision to stick around.
+        if (this.description_.continuous) {
+            const gameName = this.description_.nameFn(this.settings_);
+
+            for (const target of this.players_)
+                target.sendMessage(Message.GAME_CONTINUOUS_LEFT, player.name, gameName);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------

javascript/features/games/game_runtime.test.js

@@ -467,6 +467,7 @@ describe('GameRuntime', (it, beforeEach) => {
         // (1) The game should start immediately for |gunther|, even though other players are
         // available. This is because it's been marked as a continuous game.
         assert.isTrue(await gunther.issueCommand('/bubblegame'));
+        assert.equal(gunther.messages.length, 1);
 
         assert.isNotNull(manager.getPlayerActivity(gunther));
         assert.equal(
@@ -477,6 +478,12 @@ describe('GameRuntime', (it, beforeEach) => {
         // (2) Have Russell join the game as well. They should be added to the active game, rather
         // than be routed through registration and in a new game instead.
         assert.isTrue(await russell.issueCommand('/bubblegame'));
+        assert.equal(russell.messages.length, 1);
+
+        assert.equal(gunther.messages.length, 2);
+        assert.equal(
+            gunther.messages[1],
+            Message.format(Message.GAME_CONTINUOUS_JOINED, russell.name, 'Bubble'));
 
         assert.isNotNull(manager.getPlayerActivity(russell));
         assert.equal(
@@ -488,6 +495,11 @@ describe('GameRuntime', (it, beforeEach) => {
         // (3) Have Gunther leave the game. Russell should still be playing.
         assert.isTrue(await gunther.issueCommand('/leave'));
 
+        assert.equal(russell.messages.length, 2);
+        assert.equal(
+            russell.messages[1],
+            Message.format(Message.GAME_CONTINUOUS_LEFT, gunther.name, 'Bubble'));
+
         assert.isNull(manager.getPlayerActivity(gunther));
         assert.equal(activePlayers, 1);