Merge pull request #3 from skedwards88/update-word-logic

update word logic
skedwards88 · May 26, 2024 · a27afc1 · a27afc1
2 parents f15c50c + e057a7e
commit a27afc1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
   "homepage": "https://github.com/skedwards88/gribbles#readme",
   "dependencies": {
     "@skedwards88/word_lists": "latest",
-    "@skedwards88/word_logic": "^2.0.7",
+    "@skedwards88/word_logic": "^4.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "seedrandom": "3.0.5"

diff --git a/src/logic/gameInit.js b/src/logic/gameInit.js
@@ -27,9 +27,11 @@ function getPlayableLetters({gridSize, minWordLength, easyMode, seed}) {
   while (!foundPlayableLetters) {
     letters = getLetters(gridSize, pseudoRandomGenerator);
     allWords = findAllWords({
-      grid: letters,
-      minWordLength: minWordLength,
-      easyMode: easyMode,
+      letters,
+      numColumns: Math.sqrt(letters.length),
+      numRows: Math.sqrt(letters.length),
+      minWordLength,
+      easyMode,
       trie,
     });
     if (allWords.length > minWords) {

diff --git a/src/logic/gameReducer.js b/src/logic/gameReducer.js
@@ -30,7 +30,8 @@ export function gameReducer(currentGameState, payload) {
           currentGameState.playedIndexes.length - 1
         ],
       indexB: payload.letterIndex,
-      gridSize: Math.sqrt(currentGameState.letters.length),
+      numColumns: Math.sqrt(currentGameState.letters.length),
+      numRows: Math.sqrt(currentGameState.letters.length),
     });
     if (!isNeighboring) {
       return currentGameState;