Merge pull request JavascriptBattle#110 from gjtrowbridge/master

feature(local, plan-games): Fix local run, add random map support

Author: gjtrowbridge

game_logic/plan-all-games.js

@@ -1,6 +1,19 @@
 var createGameFromMap = require('./create-game-from-map.js');
 var secrets = require('../secrets.js');
 
+//Helper function for generating random indices
+var randomIndex = function(maxExcl) {
+  return Math.floor(Math.random(Date.now()) * maxExcl);
+};
+
+var pickMap = function(map) {
+  if (Array.isArray(map)) {
+    return map[randomIndex(map.length)];
+  } else {
+    return map;
+  }
+};
+
 //Synchronous, returns an array of all games that need
 //to be run and a lookup for finding user info
 var planAllGames = function(users) {
@@ -10,11 +23,6 @@ var planAllGames = function(users) {
   //Makes it so the passed-in users array is not mutated
   var users = users.slice()
 
-  //Helper function for generating random indices
-  var randomIndex = function(maxExcl) {
-    return Math.floor(Math.random(Date.now()) * maxExcl);
-  };
-
   //Set up game
   var boardSize = 12;
 
@@ -34,8 +42,9 @@ var planAllGames = function(users) {
 
   //Create games
   for (var gameIndex=0; gameIndex<numberOfGames; gameIndex++) {
+    var map = pickMap(secrets.map);
     var game = createGameFromMap(secrets.rootDirectory + 
-        '/game_logic/maps/' + secrets.map + '.txt');
+        '/game_logic/maps/' + map + '.txt');
     game.maxTurn = 1250;
     games.push(game);
 

local-run/run-fake-games-local.js

@@ -73,7 +73,9 @@ var runGame = function() {
   game.date = date;
 
   //Manually set the ID so Mongo doesn't just keep writing to the same document
-  game._id = '0' + '|' + game.turn + '|' + date;
+  // game._id = '0' + '|' + game.turn + '|' + date;
+  game.baseId = '0|' + game.date;
+  game._id = game.baseId + '|' + game.turn.toString();
 
   //Open up the database connection
   var openDatabasePromise = openGameDatabase();
@@ -119,7 +121,7 @@ var runGame = function() {
           game.handleHeroTurn(direction);
 
           //Manually set the ID so Mongo doesn't just keep writing to the same document
-          game._id = '0' + '|' + game.turn + '|' + game.date;
+          game._id = game.baseId + '|' + game.turn.toString();
 
           return resolveGameAndSaveTurnsToDB(game);
         }