X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=game.js;h=86a0e70b96f311dc2133898e679c1afa619406a7;hb=325a886a5d84c42c67e7075c734b74619d383ea2;hp=24e36adbc4106db5df835ddcfcc3ea403f575988;hpb=76232144e294f384cde30933687de514fd90584a;p=lmno-server

diff --git a/game.js b/game.js
index 24e36ad..86a0e70 100644
--- a/game.js
+++ b/game.js
@@ -1,3 +1,5 @@
+const no_team = { name: "" };
+
 /* A single player can have multiple connections, (think, multiple
  * browser windows with a common session cookie). */
 class Player {
@@ -6,7 +8,7 @@ class Player {
     this.session_id = session_id;
     this.name = name;
     this.connections = [connection];
-    this.team = "";
+    this.team = no_team;
   }
 
   add_connection(connection) {
@@ -34,7 +36,8 @@ class Player {
     return JSON.stringify({
       id: this.id,
       name: this.name,
-      team: this.team
+      team: this.team.name,
+      score: this.score
     });
   }
 }
@@ -48,7 +51,7 @@ class Game {
     this.next_player_id = 1;
     this.teams = [];
     this.state = {
-      team_to_play: ""
+      team_to_play: no_team
     };
     this.first_move = true;
 
@@ -94,7 +97,7 @@ class Game {
       }
 
       /* Cannot move if you are not on a team. */
-      if (player.team === "")
+      if (player.team === no_team)
       {
         return { legal: false,
                  message: "You must be on a team to take a turn" };
@@ -115,7 +118,7 @@ class Game {
    * Return true if assignment made, false otherwise. */
   assign_player_to_team_perhaps(player, team)
   {
-    if (player.team !== "")
+    if (player.team !== no_team)
       return false;
 
     player.team = team;
@@ -138,7 +141,7 @@ class Game {
 
       /* Yes, start at 1 to skip teams[0] which we just assigned. */
       for (let i = 1; i < this.teams.length; i++) {
-        const other = this.players.find(p => p !== player && p.team === "");
+        const other = this.players.find(p => (p !== player) && (p.team === no_team));
         if (!other)
           return;
         this.assign_player_to_team_perhaps(other, this.teams[i]);
@@ -156,7 +159,20 @@ class Game {
 
     /* No existing player. Add a new one. */
     const id = this.next_player_id;
-    const player = new Player(id, session.id, session.nickname, connection);
+    let nickname = session.nickname;
+    if (nickname === "")
+      nickname = "Guest";
+    const nickname_orig = nickname;
+
+    /* Ensure we don't have a name collision with a previous player. */
+    let unique_suffix = 1;
+    while (this.players.find(player => player.name === nickname))
+    {
+      nickname = `${nickname_orig}${unique_suffix.toString().padStart(2, '0')}`;
+      unique_suffix++;
+    }
+
+    const player = new Player(id, session.id, nickname, connection);
 
     /* Broadcast before adding player to list (to avoid announcing the
      * new player to itself). */
@@ -167,6 +183,19 @@ class Game {
     this.players_by_session[session.id] = player;
     this.next_player_id++;
 
+    /* After adding the player to the list, and if we are already past
+     * the first move, assign this player to the first team that
+     * doesn't already have a player assigned (if any). */
+    if (! this.first_move) {
+      const have_players = Array(this.teams.length).fill(false);
+      this.players.forEach(p => {
+        if (p.team.id !== undefined)
+          have_players[p.team.id] = true;
+      });
+      const first_empty = have_players.findIndex(i => i === false);
+      this.assign_player_to_team_perhaps(player, this.teams[first_empty]);
+    }
+
     return player;
   }
 
@@ -196,6 +225,10 @@ class Game {
     this.broadcast_string(`event: ${type}\ndata: ${data}\n`);
   }
 
+  broadcast_event_object(type, obj) {
+    this.broadcast_event(type, JSON.stringify(obj));
+  }
+
   handle_events(request, response) {
     /* These headers will keep the connection open so we can stream events. */
     const headers = {
@@ -223,6 +256,11 @@ class Game {
     /* And the player-info event. */
     response.write(`event: player-info\ndata: ${player.info_json()}\n\n`);
 
+    /* As well as player-enter events for all existing players. */
+    this.players.filter(p => p !== player).forEach(p => {
+      response.write(`event: player-enter\ndata: ${p.info_json()}\n\n`);
+    });
+
     /* Finally, if this game class has a "state" property, stream that
      * current state to the client. */
     if (this.state) {
@@ -234,7 +272,7 @@ class Game {
   handle_player(request, response) {
     const player = this.players_by_session[request.session.id];
     const name = request.body.name;
-    const team = request.body.team;
+    const team_name = request.body.team;
     var updated = false;
     if (! player) {
       response.sendStatus(404);
@@ -252,12 +290,18 @@ class Game {
       updated = true;
     }
 
-    if (team !== null && (player.team !== team) &&
-        (team === "" || this.teams.includes(team)))
+    if (team_name !== null && (player.team.name !== team_name))
     {
-      player.team = team;
-
-      updated = true;
+      if (team_name === "") {
+        player.team = no_team;
+        updated = true;
+      } else {
+        const index = this.teams.findIndex(t => t.name === team_name);
+        if (index >= 0) {
+          player.team = this.teams[index];
+          updated = true;
+        }
+      }
     }
 
     if (updated)
@@ -267,7 +311,7 @@ class Game {
   }
 
   broadcast_move(move) {
-    this.broadcast_event("move", move);
+    this.broadcast_event("move", JSON.stringify(move));
   }
 
 }