Plumb a game's ID value down into the base class

[empires-server] / lmno.js

diff --git a/lmno.js b/lmno.js
index 6c85ce878eb9fccb9ca7437b3d481ad3f03cfc84..0fd491a6293bf01672ba7d896ecea16689ce89b5 100644 (file)
--- a/lmno.js
+++ b/lmno.js
@@ -68,11 +68,10 @@ class LMNO {
 
     const engine = engines[engine_name];
 
-    const game = new engine.Game();
+    const game = new engine.Game(id);
 
     this.games[id] = {
       id: id,
-      engine: engine.name,
       game: game
     };
 
@@ -137,7 +136,7 @@ app.get('/[a-zA-Z0-9]{4}', (request, response) => {
       response.sendStatus(404);
       return;
   }
-  response.redirect(301, `/${game.engine}/${game.id}/`);
+  response.redirect(301, `/${game.game.meta.identifier}/${game.id}/`);
 });
 
 /* LMNO middleware to lookup the game. */
@@ -251,7 +250,19 @@ app.get('/admin/', auth_admin, (request, response) => {
 /* Mount sub apps. only _after_ we have done all the middleware we need. */
 for (let key in engines) {
   const engine = engines[key];
-  app.use(`/${engine.name}/[a-zA-Z0-9]{4}/`, engine.router);
+
+  /* Add routes that are common to all games. */
+  engine.router.get('/', (request, response) => {
+    const game = request.game;
+
+    if (! request.session.nickname)
+      response.render('choose-nickname.html', { game_name: game.meta.name });
+    else
+      response.render(`${game.meta.identifier}-game.html`);
+  });
+
+  /* And mount the whole router at the path for the game. */
+  app.use(`/${engine.Game.meta.identifier}/[a-zA-Z0-9]{4}/`, engine.router);
 }
 
 app.listen(4000, function () {