final ifx

Author: elrbkn

src/gameUtils.js

@@ -1,7 +1,7 @@
 import readlineSync from 'readline-sync';
 import greeting from '../index.js';
 
-const playGame = (gameDescription, generateQuestion, generateIncorrectMessage, roundsCount = 3) => {
+const playGame = (gameDescription, generateQuestion, roundsCount = 3) => {
   // Приветсвие и описание
   const userName = greeting();
   console.log(gameDescription);
@@ -13,25 +13,16 @@ const playGame = (gameDescription, generateQuestion, generateIncorrectMessage, r
     // Получаем ответ
     const userAnswer = readlineSync.question('Your answer: ');
     // Сравниваем ответы
-    if (userAnswer === String(correctAnswer)) {
-      console.log('Correct!');
-    } else {
-      // Завершение игры при неправильном ответе
-      // сообщшение имеет 3 варианта, в зависимости от игры, не 1
-      // у even и prime оно немного другое :(
-      const incorrectMessage = generateIncorrectMessage(
-        userAnswer,
-        String(correctAnswer),
-        userName,
-      );
+    if (userAnswer !== String(correctAnswer)) {
+      const incorrectMessage = `'${userAnswer}' is wrong answer ;(. Correct answer was '${correctAnswer}'.\nLet's try again, ${userName}!`;
       console.log(incorrectMessage);
-      break;
-    }
-    // Если это последний раунд, поздравляем пользователя
-    if (round === roundsCount - 1) {
-      console.log(`Congratulations, ${userName}!`);
+      return;
     }
+    console.log('Correct!');
   }
+  console.log(`Congratulations, ${userName}!`);
 };
 
 export default playGame;
+
+

src/games/brain-calc.js

@@ -39,11 +39,9 @@ const generateQuestion = () => {
 // Задаем сообшения
 const gameDescription = 'What is the result of the expression?';
 
-const generateIncorrectMessageEvenOdd = (userAnswer, correctAnswer, userName) => `'${userAnswer}' is wrong answer ;(. Correct answer was '${correctAnswer}'.\nLet's try again, ${userName}!`;
-
 // Запускаем игру
 const playGameCalc = () => {
-  playGame(gameDescription, generateQuestion, generateIncorrectMessageEvenOdd);
+  playGame(gameDescription, generateQuestion);
 };
 
 export default playGameCalc;

src/games/brain-even.js

@@ -14,11 +14,10 @@ const generateQuestion = () => {
 // Задаем сообшения
 const gameDescription = 'Answer "yes" if the number is even, otherwise answer "no".';
 
-const generateIncorrectMessageEvenOdd = (userAnswer, correctAnswer, userName) => `Answer "${userAnswer}" if the number is even, otherwise answer "${correctAnswer}".\nLet's try again, ${userName}!`;
 
 // Запускаем игру
 const playGameEven = () => {
-  playGame(gameDescription, generateQuestion, generateIncorrectMessageEvenOdd);
+  playGame(gameDescription, generateQuestion);
 };
 
 export default playGameEven;

src/games/brain-gcd.js

@@ -26,11 +26,9 @@ const generateQuestion = () => {
 // Задаем сообшения
 const gameDescription = 'Find the greatest common divisor of given numbers.';
 
-const generateIncorrectMessageEvenOdd = (userAnswer, correctAnswer, userName) => `'${userAnswer}' is wrong answer ;(. Correct answer was '${correctAnswer}'.\nLet's try again, ${userName}!`;
-
 // Запускаем игру
 const playGameGcd = () => {
-  playGame(gameDescription, generateQuestion, generateIncorrectMessageEvenOdd);
+  playGame(gameDescription, generateQuestion);
 };
 
 export default playGameGcd;

src/games/brain-prime.js

@@ -26,11 +26,9 @@ const generateQuestion = () => {
 // Задаем сообшения
 const gameDescription = 'Answer "yes" if given number is prime. Otherwise answer "no".';
 
-const generateIncorrectMessageEvenOdd = (userAnswer, correctAnswer, userName) => `Answer "${userAnswer}" if the number is prime, otherwise answer "${correctAnswer}".\nLet's try again, ${userName}!`;
-
 // Запускаем игру
 const playGamePrime = () => {
-  playGame(gameDescription, generateQuestion, generateIncorrectMessageEvenOdd);
+  playGame(gameDescription, generateQuestion);
 };
 
 export default playGamePrime;

src/games/brain-progression.js

@@ -29,11 +29,9 @@ const generateQuestion = () => {
 // Задаем сообшения
 const gameDescription = 'What number is missing in the progression?';
 
-const generateIncorrectMessageEvenOdd = (userAnswer, correctAnswer, userName) => `'${userAnswer}' is wrong answer ;(. Correct answer was '${correctAnswer}'.\nLet's try again, ${userName}!`;
-
 // Запускаем игру
 const playGameProgression = () => {
-  playGame(gameDescription, generateQuestion, generateIncorrectMessageEvenOdd);
+  playGame(gameDescription, generateQuestion);
 };
 
 export default playGameProgression;