Bug fix in default value setting (caused by empty string).

Author: Itangalo

200-helpersGeneral.gs

@@ -481,6 +481,18 @@ function getHighestProperty(obj) {
  * Internally used helper functions.
  */
 
+/**
+ * Combines default values and overwrite values, bypassing problems with empty strings.
+ */
+function applyDefaults(defaults, overwrites) {
+  let result = {};
+  Object.assign(result, defaults);
+  Object.assign(result, overwrites);
+  for (let i in defaults)
+    if (result[i] === '') result[i] = defaults[i];
+  return result;
+}
+
 /**
  * Processes arguments object into an array, skipping the number of specified first items.
  */

classes/110-Deck.gs

@@ -19,9 +19,9 @@ class Deck {
    *  - resolver (string): Name of method in modules[module].resolvers.cards. Called from card.resolver().
    */
   constructor(deckData, cardDataArray = false) {
-    // Add default settings.
-    Object.assign(this, global.defaults.deck);
-    // Build basic data and verify required properties.
+    // Add default settings, overwrite with provided data.
+    Object.assign(this, applyDefaults(global.defaults.deck, deckData));
+    // Verify that an ID is present.
     Object.assign(this, deckData);
     if (this.id === undefined)
       throw('Decks must have an id property set.');

classes/120-Track.gs

@@ -23,10 +23,9 @@
  */
 class Track {
   constructor(trackData, spacesDataArray = false) {
-    // Add default settings.
-    Object.assign(this, global.defaults.track);
-    // Build basic data and verify required properties.
-    Object.assign(this, trackData);
+    // Add default settings, overwrite with provided data.
+    let o = Object.assign(this, applyDefaults(global.defaults.track, trackData));
+    // Verify that an ID is present.
     if (this.id === undefined)
       throw('Tracks must have an id property set.');
 
@@ -46,7 +45,6 @@ class Track {
         this.constructSpace(s);
       }
     }
-
     // Build a graph of how the spaces connect, if advanced movement is used.
     if (this.gridMovement)
       this.buildGraph();
@@ -55,7 +53,6 @@ class Track {
     this.spaceMapping = {};
     for (let i in this.spaces)
       this.spaceMapping[this.spaces[i].id] = i;
-
     // Object used to track where on the track pawns are or are going.
     this.pawnIndices = {};
   }

classes/130-Market.gs

@@ -31,10 +31,9 @@
 // @TODO: Consider a way to track agents' increase/decrease in resources when buying.
 class Market {
   constructor(marketData, goodsDataArray = false) {
-    // Add default settings.
-    Object.assign(this, global.defaults.market);
-    // Build basic data and verify required properties.
-    Object.assign(this, marketData);
+    // Add default settings, overwrite with provided data.
+    Object.assign(this, applyDefaults(global.defaults.market, marketData));
+    // Verify that an ID is present.
     if (this.id === undefined)
       throw('Markets must have an id property set.');
 
@@ -303,8 +302,7 @@ class Goods {
     if (!market instanceof Market)
       throw('Goods must be added to a proper market.');
     // Add default settings, overwrite with provided data.
-    Object.assign(this, global.defaults.goods);
-    Object.assign(this, goodsData);
+    Object.assign(this, applyDefaults(global.defaults.goods, goodsData));
 
     if (this.id === undefined)
       throw('Goods must have an id property set.');

classes/140-DiceRoll.gs

@@ -27,7 +27,7 @@ class DiceRoll {
   }
 
   /**
-   * Treats die results as if only the n first dice are present, until
+   * Treats dice results as if only the n first dice are present, until
    * 'unlock' function is called.
    * @return The DiceRoll object.
    */
@@ -88,8 +88,8 @@ class DiceRoll {
   }
 
   /**
-   * Returns an array of all straighst in the dice results, optionally only counting
-   * results between 'lowest' and 'highest'. Result is on the form [[1, 2], [5, 6]].
+   * Returns an array of all straights in the dice results, optionally only counting
+   * results between 'lowest' and 'highest'. Return is on the form [[1, 2], [5, 6]].
    */
   getStraights(lowest, highest) {
     return getStraights(this.result, lowest, highest);
@@ -106,11 +106,11 @@ class DiceRoll {
   /**
    * Returns the highest number of equal dice with value above 'threshold'.
    */
-  countEquals(threshold = Number.NEGATIVE_INFINITY) {
+  getHighestFrequency(threshold = false) {
     let distribution = getFrequencies(this.result);
     let max = 0;
     for (let i in distribution) {
-      if (i >= threshold && distribution[i] > max)
+      if (distribution[i] > max && (threshold === false || i >= threshold))
         max = distribution[i];
     }
     return max;

tests/300-tests.gs

@@ -395,7 +395,12 @@ tests.diceRoll.theLot = function() {
   d.result = [1, 2, 3, 4, 4];
   if (d.sum() != 14)
     return 'Dice sum does not work correctly.';
-  if (d.countEquals(4) != 2)
-    return 'countEquals does not work correctly.';
+  d.result = [1, 1, 1, 2, 3, 4, 4, 'a', 'a', 'a', 'a'];
+  if (d.getHighestFrequency() != 4)
+    return 'countEquals does not count non-numeric results.';
+  if (d.getHighestFrequency(0) != 3)
+    return 'countEquals does not exclude non-numeric results when a threshold is set.';
+  if (d.getHighestFrequency(4) != 2)
+    return 'countEquals does not apply threshold correctly.';
 
 }