Skip to content

Commit 8a21079

Browse files
committed
edit logic and delet scripts welcome
1 parent a03e013 commit 8a21079

File tree

6 files changed

+24
-36
lines changed

6 files changed

+24
-36
lines changed

brain_games/game_logic.py

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
def start_game(description, question_func, user_name):
1+
from brain_games.cli import welcome_user
2+
3+
def start_game(description, generate_question):
4+
user_name = welcome_user()
25
print(description)
3-
rounds_to_win = 3
4-
for _ in range(rounds_to_win):
5-
question, correct_answer = question_func()
6+
ROUNDS_TO_WIN = 3
7+
8+
for _ in range(ROUNDS_TO_WIN):
9+
question, correct_answer = generate_question()
610
print(f"Question: {question}")
7-
user_answer = input("Your answer: ").strip()
11+
user_answer = input("Your answer: ").strip().lower()
812

9-
if user_answer != str(correct_answer):
13+
if user_answer != correct_answer:
1014
print(
1115
f"'{user_answer}' is wrong answer ;(. "
12-
f"Correct answer was '{correct_answer}'.")
16+
f"Correct answer was '{correct_answer}'."
17+
)
1318
print(f"Let's try again, {user_name}!")
14-
return
15-
16-
print("Correct!")
17-
18-
print(f"Congratulations, {user_name}!")
19+
break
20+
else:
21+
print(f"Congratulations, {user_name}!")

brain_games/scripts/brain_calc.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
from brain_games.cli import welcome_user
21
from brain_games.games.calc import generate_calculation
32
from brain_games.game_logic import start_game
43

54

65
def main():
7-
user_name = welcome_user()
86
start_game(
97
"What is the result of the expression?",
10-
generate_calculation,
11-
user_name
12-
)
8+
generate_calculation
9+
)
1310

1411

1512
if __name__ == "__main__":

brain_games/scripts/brain_even.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
from brain_games.cli import welcome_user
21
from brain_games.games.even import generate_question
32
from brain_games.game_logic import start_game
43

54

65
def main():
7-
user_name = welcome_user()
86
start_game(
97
"Answer \"yes\" if the number is even, otherwise answer \"no\".",
10-
generate_question,
11-
user_name
12-
)
8+
generate_question
9+
)
1310

1411

1512
if __name__ == "__main__":

brain_games/scripts/brain_gcd.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
from brain_games.cli import welcome_user
21
from brain_games.games.gcd import generate_question
32
from brain_games.game_logic import start_game
43

54

65
def main():
7-
user_name = welcome_user()
86
start_game(
97
"Find the greatest common divisor of given numbers.",
10-
generate_question,
11-
user_name
12-
)
8+
generate_question
9+
)
1310

1411

1512
if __name__ == "__main__":

brain_games/scripts/brain_prime.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
from brain_games.cli import welcome_user
21
from brain_games.games.prime import generate_question
32
from brain_games.game_logic import start_game
43

54

65
def main():
7-
user_name = welcome_user()
86
start_game(
97
"Answer \"yes\" if given number is prime. Otherwise answer \"no\".",
10-
generate_question,
11-
user_name
8+
generate_question
129
)
1310

1411

brain_games/scripts/brain_progression.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
from brain_games.cli import welcome_user
21
from brain_games.games.progression import generate_progression
32
from brain_games.game_logic import start_game
43

54

65
def main():
7-
user_name = welcome_user()
86
start_game(
97
"What number is missing in the progression?",
10-
generate_progression,
11-
user_name
12-
)
8+
generate_progression
9+
)
1310

1411

1512
if __name__ == "__main__":

0 commit comments

Comments
 (0)