@april-cs-npm/arcade-core 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@april-cs-npm/arcade-core",
-  "version": "1.0.0",
+  "version": "1.0.1",
   
   "description": "npm package for the 2048 logic: move, spawn, hasMoves, score",
   "main": "src/index.js",

package/src/move.js

@@ -1,30 +1,31 @@
 function mergeRow(row) {
-  // STEP 1: keep only the non-zero numbers
   const nums = row.filter((n) => n !== 0);
 
-  // STEP 2: merge equal neighbours once
   const merged = [];
+  let points = 0;              // track points earned in this row
   let i = 0;
   while (i < nums.length) {
     if (nums[i] === nums[i + 1]) {
-      merged.push(nums[i] + nums[i + 1]);
-      i += 2;   // skip both so they can't merge again
+      const sum = nums[i] + nums[i + 1];
+      merged.push(sum);
+      points += sum; // add the points earned from this merge
+      i += 2;
     } else {
       merged.push(nums[i]);
       i += 1;
     }
   }
 
-  // STEP 3: pad with zeros until it's 4 long again
   while (merged.length < 4) {
     merged.push(0);
   }
 
-  return merged;
+  return { row: merged, points };   // return both the new row and the points earned
 }
 
 function slideLeft(board) {
-  return board.map((row) => mergeRow(row));
+  // for each row, merge it and return the new row (ignore points here)
+  return board.map((row) => mergeRow(row).row);
 }
 
 

package/src/score.js

@@ -1,25 +1,7 @@
-import { transpose } from './move.js';
+import { mergeRow, transpose } from './move.js';  
 
-// points earned by merges in a single row when it slides left
-function rowScore(row) {
-  const nums = row.filter((n) => n !== 0);
-  let points = 0;
-  let i = 0;
-  while (i < nums.length) {
-    if (nums[i] === nums[i + 1]) {
-      points += nums[i] + nums[i + 1];   // a merge happened: add the NEW tile's value
-      i += 2;
-    } else {
-      i += 1;
-    }
-  }
-  return points;
-}
-
-// total points a move would earn in the given direction
+// Calculate the total score for a given board and direction
 function score(board, direction) {
-  // reshape the board so `direction` points LEFT, the same way move() does,
-  // then sum rowScore across all rows.
   let rows;
   switch (direction) {
     case 'left':
@@ -38,13 +20,12 @@ function score(board, direction) {
       throw new Error(`Invalid direction: ${direction}`);
   }
 
-  // add up the score from every row
   let total = 0;
   for (const row of rows) {
-    total += rowScore(row);
+    total +=  mergeRow(row).points; // add the points for this row
   }
   return total;
 }
 
-
 export { score };
+