project check. Even edition

Author: webDevWay

README.md

@@ -1,4 +1,4 @@
-Welcome to the Brain Games!
+<h1>Welcome to the Brain Games!</h1>
 
 Brain-Even: https://asciinema.org/a/UZBtDobwLPOrNa1r3vp6JYiWS
 

bin/brain-calc

@@ -12,30 +12,6 @@ if (file_exists($autoloadPath1)) {
 } else {
     require_once $autoloadPath2;
 }
-//получим имя пользователя
-/*$userName = getUserName();
-//запуск игры
-checkAnswer($count = 3, $userName, $path="calc");
-//-- Игра - "Калькулятор"
-        case "calc":
-            line('What is the result of the expression?');
-            $operation = ["+", "-", "*"];
-            $thisOperation = $operation[random_int(0, 2)];
-            //-- Перебрать рандомные операторы --
-            switch ($thisOperation) {
-                case "*":
-                    $expectedAnswer = $num * $num2;
-                    break;
 
-                case "+":
-                    $expectedAnswer = $num + $num2;
-                    break;
 
-                case "-":
-                    $expectedAnswer = $num - $num2;
-                    break;
-            }
-            $answer = prompt("Question: {$num} {$thisOperation} {$num2}");
-            $answer = is_string($answer) ? $answer : (int)$answer;
-            break;
-      
+//checkAnswer($count = 3, $userName, $path="calc");

src/Engine.php

@@ -4,13 +4,8 @@
 
 use function cli\line;
 use function cli\prompt;
-use function BrainGames\BrainEven\brainEvenGame;
-use function BrainGames\BrainGcd\getGcd;
-use function BrainGames\BrainProgression\generateProgression;
-use function BrainGames\BrainProgression\hideElement;
-use function BrainGames\BrainPrime\isPrime;
 
-//---Приветствуем пользователя, получаем имя
+    //---Приветствуем пользователя, получаем имя
 function getUserName(): string
 {
     //Приветствуем пользователя
@@ -19,31 +14,37 @@ function getUserName(): string
     line("Hello, %s!", $name);
     //Вернуть полученное имя
     return $name;
+}
+    //---Функция проверки ответов
+function checkAnswer(array $gameParams)
+{
+    $name = getUserName();
+    ["rules" => $rules, 
+    "expectedAnswer" => $expectedAnswer,
+    "questions" => $questions] = $gameParams;
+    line($rules);
+    for($i = 0; $i < count($questions); $i++) {
+        $answer = prompt("Question: {$questions[$i]}");
+        line("Your answer: {$answer}");
+        if ($answer != $expectedAnswer[$i]) {
+            wrongAnswer($name, $answer[$i], $expectedAnswer[$i]);
+            return;
+        } else {
+            line("Correct!");
+        }
+    }
+    trueAnswers($name);
 }
     //---Функция для неверного ответа
-function wrongAnswer(string $name, mixed $answer, mixed $expectedAnswer) {
+function wrongAnswer(string $name, mixed $answer, mixed $expectedAnswer)
+{
     line("{$answer} is wrong answer ;(. Correct answer was '{$expectedAnswer}'.");
     line("Let's try again, %s!", $name);
     return;
 }
     //---Функция для верного ответа
-function trueAnswer(string $name) {
+function trueAnswers(string $name)
+{
     line("Congratulations, %s!", $name);
     return;
-}
-    //---Функция проверки ответов
-function checkAnswer(int $counterAnswers, string $name, mixed $answer, mixed $expectedAnswer)
-{
-    line("Your answer: {$answer}");
-    if ($answer != $expectedAnswer) {
-        wrongAnswer($name, $answer, $expectedAnswer);
-        return $counterAnswers = 3;      
-    } else {
-        line("Correct!");
-        $counterAnswers++;
-        if ($counterAnswers == 3) {
-            trueAnswer($name);
-        }
-    }
-    return $counterAnswers;
 }

src/Games/BrainCalc.php

@@ -1 +1,36 @@
 <?php
+
+namespace BrainGames\BrainEven;
+
+use function cli\line;
+use function cli\prompt;
+use function BrainGames\Engine\getUserName;
+use function BrainGames\Engine\checkAnswer;
+
+//-- Игра - "Калькулятор"
+function brainCalcGame()
+{
+    $userName = getUserName();
+    line('What is the result of the expression?');
+
+    $num = random_int(1, 100);
+    $num2 = random_int(1, 100);
+    $operation = ["+", "-", "*"];
+    $thisOperation = $operation[random_int(0, 2)];
+    //-- Перебрать рандомные операторы --
+    switch ($thisOperation) {
+        case "*":
+            $expectedAnswer = $num * $num2;
+            break;
+
+        case "+":
+            $expectedAnswer = $num + $num2;
+            break;
+
+        case "-":
+            $expectedAnswer = $num - $num2;
+            break;
+    }
+    $answer = prompt("Question: {$num} {$thisOperation} {$num2}");
+    $answer = is_string($answer) ? $answer : (int)$answer;
+}

src/Games/BrainEven.php

@@ -2,29 +2,24 @@
 
 namespace BrainGames\BrainEven;
 
-use function cli\line;
-use function cli\prompt;
-use function BrainGames\Engine\getUserName;
 use function BrainGames\Engine\checkAnswer;
-//функция проверки чётности
-function isEven(int $num) : string 
-{
-    return $num % 2 === 0 ? "yes" : "no";
-}
+
 //-- Игра - "Проверка на чётность"
 function brainEvenGame(int $count = 3): void
 {    
-    //получим имя пользователя
-    $userName = getUserName();
-    line('Answer "yes" if the number is even, otherwise answer "no".');
-      
-    $counterAnswers = 0;
-
-    while ($counterAnswers < $count) {
+    $gameParams = [];
+    $gameParams["rules"] = 'Answer "yes" if the number is even, otherwise answer "no".';
+          
+    for ($counterAnswers = 0; $counterAnswers < $count; $counterAnswers++) {
         $num = random_int(1, 100);
-        $answer = prompt("Question: {$num}");
-        $expectedAnswer = isEven($num);
-        //--Функция проверки ответов
-        $counterAnswers = checkAnswer($counterAnswers, $userName, $answer, $expectedAnswer);
+        $gameParams["expectedAnswer"][] = isEven($num) ? "yes" : "no";
+        $gameParams["questions"][] = $num;
     }
+    //--Функция проверки ответов
+    $counterAnswers = checkAnswer($gameParams);
+}
+    //--- Функция проверки на чётность
+function isEven(int $num) : string
+{
+    return $num % 2 === 0;
 }

src/Games/BrainPrime.php

@@ -2,6 +2,9 @@
 
 namespace BrainGames\BrainPrime;
 
+use function BrainGames\Engine\getUserName;
+use function BrainGames\Engine\checkAnswer;
+
 //-- Проверка на простое число
 function isPrime(int $number): bool
 {