Merge pull request #67 from Itangalo/1.2

1.2

Author: Itangalo

000-simulation.gs

@@ -25,8 +25,9 @@ function simulate(iterations = false, mod = false) {
   if (mod !== false)
     module = mod;
 
+  let extraArguments = parseArguments(arguments, 2);
   log('Starting to build initial data.', 'system');
-  let gameStateSeed = modules[module].buildInitialData();
+  let gameStateSeed = modules[module].buildInitialData(...extraArguments);
   log('Initial data complete.', 'system');
 
   /**
@@ -70,23 +71,23 @@ function simulate(iterations = false, mod = false) {
     }
 
     // Make any customized additional processing of the game state.
-    modules[module].preIteration();
+    modules[module].preIteration(...extraArguments);
 
     /**
      * Play the game until it is over.
      */
     gameState.round = 0;
     log('Starting first round in iteration ' + iteration, 'system');
-    while (!modules[module].gameOver()) {
+    while (!modules[module].gameOver(...extraArguments)) {
       gameState.round++;
       // Call the function carrying out the actual actions in a round.
-      modules[module].playRound();
+      modules[module].playRound(...extraArguments);
     }
 
     /**
      * Process data that should be stored for statistics.
      */
-    results.push(modules[module].buildStatistics());
+    results.push(modules[module].buildStatistics(...extraArguments));
   }
 
   /**

200-helpersGeneral.gs

@@ -176,83 +176,6 @@ function shuffle(array) {
   return array;
 }
 
-/**
- * Returns first object in an array matching property:value or false if no match is found.
- * 
- * @param property: The property name to search in, or an array of property names if multiple
- *    property:values pairs should be matched.
- * @param value: The value to match, or an array of values if multiple property:value pairs
- *    should be matched.
- * @param {boolean} remove: Whether to also remove the object from the array. Defaults to true.
- */
-function pickFromObjectArray(objectArray, property, value, remove = true) {
-  if (objectArray.length == 0)
-    return false;
-  // Turn single-value search criteria into arrays.
-  if (typeof property != 'object')
-    property = [property];
-  if (typeof value != 'object')
-    value = [value];
-  if (property.length != value.length)
-    throw('The number of values to search for must match the number of properties.');
-
-  // Find the first matching object.
-  for (let i in objectArray) {
-    let match = true;
-    for (let j in property) {
-      if (objectArray[i][property[j]] != value[j])
-        match = false;
-    }
-    if (match) {
-      if (remove)
-        return objectArray.splice(i, 1)[0];
-      else
-        return objectArray[i];
-    }
-  }
-  return false;
-}
-
-/**
- * Returns an array with all objects matching property:value in the search array.
- * 
- * @param property: The property name to search in, or an array of property names if multiple
- *    property:values pairs should be matched.
- * @param value: The value to match, or an array of values if multiple property:value pairs
- *    should be matched.
- * @param {boolean} remove: Whether to also remove the objects from the array. Defaults to true.
- */
-function pickAllFromObjectArray(objectArray, property, value, remove = true) {
-  let result = [];
-  if (objectArray.length == 0)
-    return result;
-  // Turn single-value search criteria into arrays.
-  if (typeof property != 'object')
-    property = [property];
-  if (typeof value != 'object')
-    value = [value];
-  if (property.length != value.length)
-    throw('The number of values to search for must match the number of properties.');
-
-  // Find matching objects.
-  for (let i = 0; i < objectArray.length; i++) {
-    let match = true;
-    for (let j in property) {
-      if (objectArray[i][property[j]] != value[j])
-        match = false;
-    }
-    if (match) {
-      if (remove) {
-        result.push(objectArray.splice(i, 1));
-        i--; // The indices are shifted, so we move back one step.
-      }
-      else
-        result.push(objectArray[i]);
-    }
-  }
-  return result;
-}
-
 // Returns how many times 'value' occurs in 'array'.
 function getFrequency(array, value) {
   let frequency = 0;
@@ -389,7 +312,7 @@ function isIterable(obj) {
 function getAgentById(id) {
   if (!gameState.agents)
     return false;
-  return pickFromObjectArray(gameState.agents, 'id', id, false);
+  return new ObjectFilter({id: id}).findFirstInArray(gameState.agents);
 }
 
 // Selects a and returns a random element from an array. If the array consists of
@@ -532,22 +455,18 @@ function compareObjects(o1, o2) {
  * @param {string} type: The type of object: cards, spaces or goods.
  * @param {string} method: The name of the resolver method.
  */
-function callResolver(type, method) {
+function callResolver(method) {
   if (!method)
     return false;
 
   if (!modules[module].resolvers) {
     log('Active module does not have any resolvers.', 'error');
     return false;
   }
-  if (!modules[module].resolvers[type]) {
-    log('Active module does not have any resolvers for ' + type + '.', 'error');
-    return false;
-  }
-  if (!modules[module].resolvers[type][method]) {
-    log('Active module does not have a resolver ' + method + ' for ' + type + '.', 'error');
+  if (!modules[module].resolvers[method]) {
+    log('Active module does not have a resolver ' + method + '.', 'error');
     return false;
   }
 
-  return modules[module].resolvers[type][method](...parseArguments(arguments, 2));
+  return modules[module].resolvers[type][method](...parseArguments(arguments, 1));
 }

classes/100-Agent.gs

@@ -5,7 +5,7 @@
  * special properties:
  *    - id: The unique id for the agent. Required.
  *    - strategy: Any strategy used by the agent, and called from
- *      agent.consultStragety(method, arguments...). Methods must be
+ *      agent.consultStrategy(method, arguments...). Methods must be
  *      added to agentStrategies[module].
  *      
  */

classes/110-Deck.gs

@@ -16,7 +16,7 @@ class Deck {
    *
    * @param {Array} cardDataArray: An array of objects which will be used to create cards.
    * Optional. Special properties used for cards:
-   *  - resolver (string): Name of method in modules[module].resolvers.cards. Called from card.resolver().
+   *  - resolver (string): Name of method in modules[module].resolvers. Called from card.resolver().
    */
   constructor(deckData, cardDataArray = false) {
     // Add default settings, overwrite with provided data.
@@ -124,26 +124,37 @@ class Deck {
   }
 
   /**
-   * Picks the first card found matching property:value, or false if none is found.
-   * If multiple property:value pairs should be matched, provide them as arrays.
+   * Returns the first card found matching property:value, or false if none is found.
+   * The card is removed from the deck.
+   * 
+   * For more complex conditions, see ObjectFilter.
    */
   pick(property, value) {
-    let result = pickAllFromObjectArray(this.cards, property, value);
-    if (!result)
+    let condition = {};
+    condition[property] = value;
+    let output = new ObjectFilter(condition).removeFromArray(this.cards, 1);
+    if (output.length) {
       log('Could not find any card where ' + property + ' is ' + value + ' in deck ' + this.id + '.', 'notice');
-    return result;
+      return false;
+    }
+    return output[0];
   }
 
   /**
-   * Picks all cards matching property:value, returned in an array (can be empty).
-   * If multiple property:value pairs should be matched, provide them as arrays.
+   * Returns all cards matching property:value in an array (which could be empty).
+   * The cards are removed from the deck.
+   * 
+   * For more complex conditions, see ObjectFilter.
    */
   pickAll(property, value) {
-    return pickAllFromObjectArray(this.cards, property, value);
+    let condition = {};
+    condition[property] = value;
+    return new ObjectFilter(condition).removeFromArray(this.cards);
   }
 
   /**
    * Counts how many cards matching property:value are in the deck.
+   * For more complex conditions, see ObjectFilter.
    */
   countOccurances(property, value) {
     let occurances = 0;
@@ -188,8 +199,8 @@ class Deck {
 
   /**
    * Picks the first card found matching property:value from the display, or false if none is found.
-   * If multiple property:value pairs should be matched, provide them as arrays.
    * If no property or value is provided, the first card in the display will be returned.
+   * For more complex conditions, see ObjectFilter.
    */
   pickFromDisplay(property, value) {
     // If no property is provided, take the first card.
@@ -202,7 +213,10 @@ class Deck {
       c = this.display.shift();
     }
     else {
-      c = pickFromObjectArray(this.display, property, value);
+      let condition = {};
+      condition[property] = value;
+      c = new ObjectFilter(condition).removeFirstFromArray(this.display);
+
       if (!c)
         log('Could not find any card where ' + property + ' is ' + value + ' in display of deck ' + this.id + '.', 'error');
     }
@@ -246,9 +260,9 @@ class Card {
   /**
    * Calls any resolver set for the card. Any arguments will be sent to the resolver.
    * The card needs to have a the property 'resolver' set and a corresponding
-   * method must be placed in modules[module].resolvers.cards.
+   * method must be placed in modules[module].resolvers.
    */
   resolve() {
-    return callResolver('cards', this.resolver, ...arguments);
+    return callResolver(this.resolver, ...arguments);
   }
 }