Skip to content

Commit 180734b

Browse files
committed
final ifx
1 parent 628243b commit 180734b

File tree

6 files changed

+13
-31
lines changed

6 files changed

+13
-31
lines changed

src/gameUtils.js

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import readlineSync from 'readline-sync';
22
import greeting from '../index.js';
33

4-
const playGame = (gameDescription, generateQuestion, generateIncorrectMessage, roundsCount = 3) => {
4+
const playGame = (gameDescription, generateQuestion, roundsCount = 3) => {
55
// Приветсвие и описание
66
const userName = greeting();
77
console.log(gameDescription);
@@ -13,25 +13,16 @@ const playGame = (gameDescription, generateQuestion, generateIncorrectMessage, r
1313
// Получаем ответ
1414
const userAnswer = readlineSync.question('Your answer: ');
1515
// Сравниваем ответы
16-
if (userAnswer === String(correctAnswer)) {
17-
console.log('Correct!');
18-
} else {
19-
// Завершение игры при неправильном ответе
20-
// сообщшение имеет 3 варианта, в зависимости от игры, не 1
21-
// у even и prime оно немного другое :(
22-
const incorrectMessage = generateIncorrectMessage(
23-
userAnswer,
24-
String(correctAnswer),
25-
userName,
26-
);
16+
if (userAnswer !== String(correctAnswer)) {
17+
const incorrectMessage = `'${userAnswer}' is wrong answer ;(. Correct answer was '${correctAnswer}'.\nLet's try again, ${userName}!`;
2718
console.log(incorrectMessage);
28-
break;
29-
}
30-
// Если это последний раунд, поздравляем пользователя
31-
if (round === roundsCount - 1) {
32-
console.log(`Congratulations, ${userName}!`);
19+
return;
3320
}
21+
console.log('Correct!');
3422
}
23+
console.log(`Congratulations, ${userName}!`);
3524
};
3625

3726
export default playGame;
27+
28+

src/games/brain-calc.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ const generateQuestion = () => {
3939
// Задаем сообшения
4040
const gameDescription = 'What is the result of the expression?';
4141

42-
const generateIncorrectMessageEvenOdd = (userAnswer, correctAnswer, userName) => `'${userAnswer}' is wrong answer ;(. Correct answer was '${correctAnswer}'.\nLet's try again, ${userName}!`;
43-
4442
// Запускаем игру
4543
const playGameCalc = () => {
46-
playGame(gameDescription, generateQuestion, generateIncorrectMessageEvenOdd);
44+
playGame(gameDescription, generateQuestion);
4745
};
4846

4947
export default playGameCalc;

src/games/brain-even.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ const generateQuestion = () => {
1414
// Задаем сообшения
1515
const gameDescription = 'Answer "yes" if the number is even, otherwise answer "no".';
1616

17-
const generateIncorrectMessageEvenOdd = (userAnswer, correctAnswer, userName) => `Answer "${userAnswer}" if the number is even, otherwise answer "${correctAnswer}".\nLet's try again, ${userName}!`;
1817

1918
// Запускаем игру
2019
const playGameEven = () => {
21-
playGame(gameDescription, generateQuestion, generateIncorrectMessageEvenOdd);
20+
playGame(gameDescription, generateQuestion);
2221
};
2322

2423
export default playGameEven;

src/games/brain-gcd.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ const generateQuestion = () => {
2626
// Задаем сообшения
2727
const gameDescription = 'Find the greatest common divisor of given numbers.';
2828

29-
const generateIncorrectMessageEvenOdd = (userAnswer, correctAnswer, userName) => `'${userAnswer}' is wrong answer ;(. Correct answer was '${correctAnswer}'.\nLet's try again, ${userName}!`;
30-
3129
// Запускаем игру
3230
const playGameGcd = () => {
33-
playGame(gameDescription, generateQuestion, generateIncorrectMessageEvenOdd);
31+
playGame(gameDescription, generateQuestion);
3432
};
3533

3634
export default playGameGcd;

src/games/brain-prime.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ const generateQuestion = () => {
2626
// Задаем сообшения
2727
const gameDescription = 'Answer "yes" if given number is prime. Otherwise answer "no".';
2828

29-
const generateIncorrectMessageEvenOdd = (userAnswer, correctAnswer, userName) => `Answer "${userAnswer}" if the number is prime, otherwise answer "${correctAnswer}".\nLet's try again, ${userName}!`;
30-
3129
// Запускаем игру
3230
const playGamePrime = () => {
33-
playGame(gameDescription, generateQuestion, generateIncorrectMessageEvenOdd);
31+
playGame(gameDescription, generateQuestion);
3432
};
3533

3634
export default playGamePrime;

src/games/brain-progression.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ const generateQuestion = () => {
2929
// Задаем сообшения
3030
const gameDescription = 'What number is missing in the progression?';
3131

32-
const generateIncorrectMessageEvenOdd = (userAnswer, correctAnswer, userName) => `'${userAnswer}' is wrong answer ;(. Correct answer was '${correctAnswer}'.\nLet's try again, ${userName}!`;
33-
3432
// Запускаем игру
3533
const playGameProgression = () => {
36-
playGame(gameDescription, generateQuestion, generateIncorrectMessageEvenOdd);
34+
playGame(gameDescription, generateQuestion);
3735
};
3836

3937
export default playGameProgression;

0 commit comments

Comments
 (0)