chenges 2-nd check

Author: ttehasi

brain_games/games/brain_calc.py

@@ -1,11 +1,15 @@
-import brain_games.sample
+from brain_games.sample import samples
+import random
 
 
 CON_ANSWER = 'What is the result of the expression?'
 
 
-def type_brain_calc(first_number, sec_number, arithmetic_operation):
+def type_brain_calc():
     correct_answer = ''
+    first_number = random.randint(1, 25)
+    sec_number = random.randint(1, 25)
+    arithmetic_operation = random.choice(['+', '-', '*'])
     match arithmetic_operation:
         case '+':
             correct_answer = first_number + sec_number
@@ -18,7 +22,8 @@ def type_brain_calc(first_number, sec_number, arithmetic_operation):
 
 
 def main():
-    brain_games.sample.samples('brain-calc', CON_ANSWER)
+    samples(CON_ANSWER, type_brain_calc(),
+            type_brain_calc(), type_brain_calc())
 
 
 if __name__ == '__main__':

brain_games/games/brain_even.py

@@ -1,17 +1,20 @@
-import brain_games.sample
+from brain_games.sample import samples
+import random
 
 
 CON_ANSWER = 'Answer "yes" if the number is even, otherwise answer "no".'
 
 
-def type_brain_even(first_number):
+def type_brain_even():
+    first_number = random.randint(1, 50)
     corr_ans = 'yes' if first_number % 2 == 0 else 'no'
     return (corr_ans,
             f'Question: {first_number}')
 
 
 def main():
-    brain_games.sample.samples('brain-even', CON_ANSWER)
+    samples(CON_ANSWER, type_brain_even(),
+            type_brain_even(), type_brain_even())
 
 
 if __name__ == '__main__':

brain_games/games/brain_gcd.py

@@ -1,10 +1,13 @@
 from brain_games.sample import samples
+import random
 
 
 CON_ANSWER = 'Find the greatest common divisor of given numbers.'
 
 
-def type_brain_gcd(frs_num, sec_num):
+def type_brain_gcd():
+    frs_num = random.randint(1, 50)
+    sec_num = random.randint(1, 50)
     re = []
     max_num = max(frs_num, sec_num)
     for i in range(1, max_num + 1):
@@ -15,7 +18,8 @@ def type_brain_gcd(frs_num, sec_num):
 
 
 def main():
-    samples('brain-gcd', CON_ANSWER)
+    samples(CON_ANSWER, type_brain_gcd(),
+            type_brain_gcd(), type_brain_gcd())
 
 
 if __name__ == '__main__':

brain_games/games/brain_prime.py

@@ -1,10 +1,12 @@
 from brain_games.sample import samples
+import random
 
 
 CON_ANSWER = 'Answer "yes" if given number is prime. Otherwise answer "no".'
 
 
-def type_brain_prime(num):
+def type_brain_prime():
+    num = random.randint(1, 50)
     re = []
     for i in range(1, num + 1):
         if num % i == 0:
@@ -15,7 +17,8 @@ def type_brain_prime(num):
 
 
 def main():
-    samples('brain-prime', CON_ANSWER)
+    samples(CON_ANSWER, type_brain_prime(),
+            type_brain_prime(), type_brain_prime())
 
 
 if __name__ == '__main__':

brain_games/games/brain_progression.py

@@ -5,7 +5,8 @@
 CON_ANSWER = 'What number is missing in the progression?'
 
 
-def type_brain_progression(first_num):
+def type_brain_progression():
+    first_num = random.randint(1, 50)
     re = []
     range_progressing = random.randint(5, 10)
     sec_num = random.randint(1, 5)
@@ -22,7 +23,8 @@ def type_brain_progression(first_num):
 
 
 def main():
-    samples('brain-progression', CON_ANSWER)
+    samples(CON_ANSWER, type_brain_progression(),
+            type_brain_progression(), type_brain_progression())
 
 
 if __name__ == '__main__':

brain_games/sample.py

@@ -1,52 +1,17 @@
 import prompt
-import random
-# import brain_games.scripts.games.brain_calc
-# import brain_games.scripts.games.brain_even
-# import brain_games.scripts.games.brain_gcd
 
 
 NUMBERS_OF_ATTEMPTS = 3
 
 
-def samples(type_game, condition_answer):
+def samples(condition_answer, answ_and_qest, answ_and_qest2, answ_and_qest3):
     print('Welcome to the Brain Games!')
     name = prompt.string('May I have your name? ')
     print(f'Hello, {name}!')
     number_of_successful_attempts = 0
     print(condition_answer)
+    correct_answer, question = answ_and_qest
     for _ in range(NUMBERS_OF_ATTEMPTS):
-        first_number = random.randint(1, 50)
-        second_number = random.randint(1, 50)
-        match type_game:
-            case 'brain-even':
-                import brain_games.scripts.games.brain_even
-                correct_answer, question = (
-                    brain_games.scripts.games.
-                    brain_even.type_brain_even(first_number))
-            case 'brain-calc':
-                import brain_games.scripts.games.brain_calc
-                first_number = random.randint(1, 25)
-                second_number = random.randint(1, 25)
-                arithmetic_operation = random.choice(['+', '-', '*'])
-                correct_answer, question = (
-                    brain_games.scripts.games.
-                    brain_calc.type_brain_calc(first_number, second_number,
-                                               arithmetic_operation))
-            case 'brain-gcd':
-                import brain_games.scripts.games.brain_gcd
-                correct_answer, question = (
-                    brain_games.scripts.games.
-                    brain_gcd.type_brain_gcd(first_number, second_number))
-            case 'brain-progression':
-                import brain_games.scripts.games.brain_progression
-                correct_answer, question = (
-                    brain_games.scripts.games.
-                    brain_progression.type_brain_progression(first_number))
-            case 'brain-prime':
-                import brain_games.scripts.games.brain_prime
-                correct_answer, question = (
-                    brain_games.scripts.games.
-                    brain_prime.type_brain_prime(first_number))
         print(question)
         answer = input('Your answer: ')
         if answer == str(correct_answer):
@@ -57,5 +22,7 @@ def samples(type_game, condition_answer):
                   f" '{correct_answer}'\n"
                   f"Let's try again, {name}!")
             break
+        correct_answer, question = answ_and_qest3\
+            if number_of_successful_attempts == 2 else answ_and_qest2
     if number_of_successful_attempts == NUMBERS_OF_ATTEMPTS:
         print(f'Congratulations, {name}!')

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hexlet-code"
-version = "0.5.8"
+version = "0.5.9"
 description = "Учебный проект из 6 команд"
 authors = ["ttehasi <[email protected]>"]
 readme = "README.md"
@@ -24,9 +24,9 @@ build-backend = "poetry.core.masonry.api"
 
 
 [tool.poetry.scripts]
-brain-games = "brain_games.scripts.games.brain_games:main"
-brain-even = "brain_games.scripts.games.brain_even:main"
-brain-calc = "brain_games.scripts.games.brain_calc:main"
-brain-gcd = "brain_games.scripts.games.brain_gcd:main"
-brain-progression = "brain_games.scripts.games.brain_progression:main"
-brain-prime = "brain_games.scripts.games.brain_prime:main"
+brain-games = "brain_games.games.brain_games:main"
+brain-even = "brain_games.games.brain_even:main"
+brain-calc = "brain_games.games.brain_calc:main"
+brain-gcd = "brain_games.games.brain_gcd:main"
+brain-progression = "brain_games.games.brain_progression:main"
+brain-prime = "brain_games.games.brain_prime:main"