X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=game.js;h=de77148aa3ed58888930d4b872da8e0c92a28644;hb=16564f558ee42c3fbc0ca5ee56c91407253747b5;hp=0adf953537b4f8038048a846a2589e87ec64a178;hpb=5c589dc3c8016c2f43174b1cf6de3e934835a142;p=empires-server

diff --git a/game.js b/game.js
index 0adf953..de77148 100644
--- a/game.js
+++ b/game.js
@@ -6,6 +6,7 @@ class Player {
     this.session_id = session_id;
     this.name = name;
     this.connections = [connection];
+    this.team = "";
   }
 
   add_connection(connection) {
@@ -33,6 +34,7 @@ class Player {
     return JSON.stringify({
       id: this.id,
       name: this.name,
+      team: this.team
     });
   }
 }
@@ -43,6 +45,7 @@ class Game {
     this.id = id;
     this.players = [];
     this.next_player_id = 1;
+    this.teams = [];
 
     /* Send a comment to every connected client every 15 seconds. */
     setInterval(() => {this.broadcast_string(":");}, 15000);
@@ -164,22 +167,36 @@ class Game {
 
   handle_player(request, response) {
     const player = this.find_player(request.session);
+    const name = request.body.name;
+    const team = request.body.team;
+    var updated = false;
     if (! player) {
       response.sendStatus(404);
       return;
     }
 
-    if (request.body.name && (player.name !== request.body.name)) {
-      player.name = request.body.name;
+    if (name && (player.name !== name)) {
+      player.name = name;
 
       /* In addition to setting the name within this game's player
        * object, also set the name in the session. */
-      request.session.nickname = player.name;
+      request.session.nickname = name;
       request.session.save();
 
-      this.broadcast_event("player-update", player.info_json());
+      updated = true;
+    }
+
+    if (team !== null && (player.team !== team) &&
+        (team === "" || this.teams.includes(team)))
+    {
+      player.team = team;
+
+      updated = true;
     }
 
+    if (updated)
+      this.broadcast_event("player-update", player.info_json());
+
     response.send("");
   }