From aaeb0d77527e4ed846020c7abf9f84e23c83d619 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 31 Jan 2022 23:33:13 +0100 Subject: [PATCH] fix matrix algo --- game.js | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/game.js b/game.js index fb0d4e0..55b29ad 100644 --- a/game.js +++ b/game.js @@ -60,17 +60,34 @@ class Game { result.push(3) } else { if (this.expectedWord.indexOf(triedLetter) > -1) { - const numberOfTriedLetterInExpectedWord = this.expectedWord.split(triedLetter).length - 1 - const cuttedTriedWord = this.triedWords[u].substr(0, x + 1) - const numberOfTriedLetterInCuttedWord = cuttedTriedWord.split(triedLetter).length - 1 + let totalOk = 0 + let totalToTry = 0 - if (numberOfTriedLetterInCuttedWord > numberOfTriedLetterInExpectedWord) { + for (let i = 0; i < this.expectedWord.length; i++) { + if (this.expectedWord.charAt(i) === triedLetter) { + totalToTry++ + + if (this.expectedWord.charAt(i) === this.triedWords[u].charAt(i)) { + totalOk++ + } + } + } + + if (totalToTry === totalOk) { result.push(1) } else { - result.push(2) + const numberOfTriedLetterInExpectedWord = this.expectedWord.split(triedLetter).length - 1 + const cuttedTriedWord = this.triedWords[u].substr(0, x + 1) + const numberOfTriedLetterInCuttedWord = cuttedTriedWord.split(triedLetter).length - 1 + + if (numberOfTriedLetterInCuttedWord > numberOfTriedLetterInExpectedWord) { + result.push(1) + } else { + result.push(2) + } } } else { - result.push(1) + result.push(0) } } }