Merge pull request 'Refactoring: typové anotace a úklid' (#23) from refactoring into version/v0.2.0

Reviewed-on: david/kostky#23

main.py

@@ -5,14 +5,14 @@ import re
 import csv
 from collections import Counter
 
-score = 0
-hodnoty = {}
-players = {}
-pointer = ""
-first = ""
-h_bool = True
-aggr = {}
-final_score = 10000
+score: int = 0
+hodnoty: dict[str, int] = {}
+players: dict[str, list[int]] = {}
+pointer: str = ""
+first: str = ""
+h_bool: bool = True
+aggr: dict[str, int] = {}
+final_score: int = 10000
 
 with open("hodnoty.csv", "r") as csv_file:
     csv_reader = csv.reader(csv_file)
@@ -25,18 +25,18 @@ with open("hodnoty.csv", "r") as csv_file:
 
 def throw(count: int) -> str:
     count = int(count)
-    new_throw = []
+    new_throw: list[str] = []
     for dice in range(count):
         new_throw.append(str(randint(1, 6)))
-    new_throw = "".join(new_throw)
-    return new_throw
+    new_throw_str: str = "".join(new_throw)
+    return new_throw_str
 
 def show_throw(throw: str) -> str:
-    throw_temp = []
+    throw_temp: list[str] = []
     for x in throw:
         throw_temp.append(x)
 
-    pretty_list = ", ".join(throw_temp)
+    pretty_list: str = ", ".join(throw_temp)
     pretty_list += "\n"
     for i in range(1, len(throw_temp) + 1):
         pretty_list += "^  "
@@ -45,13 +45,13 @@ def show_throw(throw: str) -> str:
         pretty_list += f"{i}  "
     return pretty_list
 
-def clear():
+def clear() -> None:
     if name == 'nt':
         _ = system('cls')
     else:
         _ = system('clear')
 
-def evaluate(inp: Any, count: int, throw: str) -> tuple:
+def evaluate(inp: Any, count: int, throw: str) -> tuple[Any, ...]:
 
     global h_bool
 
@@ -77,8 +77,7 @@ def evaluate(inp: Any, count: int, throw: str) -> tuple:
     inp = str(inp)
     if re.search(r"^\d+$", inp):
         if len(inp) > count:
-            data = ("msg", "ER01", "Tolika kostkami nemůžete hodit. Zkuste to znovu:", count, throw)
-            return data
+            data: tuple[Any, ...] = ("msg", "ER01", "Tolika kostkami nemůžete hodit. Zkuste to znovu: ", count, throw)
         else:
             for x in inp:
                 x = int(x)
@@ -89,28 +88,28 @@ def evaluate(inp: Any, count: int, throw: str) -> tuple:
                         ran = f"1–{count}"
                     data = ("msg", "ER02", f"Zvolte prosím kostky v platném rozsahu ({ran}): ", count, throw)
                     return data
-            old_throw = []
-            pick = []
+            old_throw: list[str] = []
+            pick: list[str] = []
             for y in range(count):
                 if str(y+1) not in inp:
                     old_throw.append(throw[y])
                 if str(y+1) in inp:
                     pick.append(throw[y])
 
-            old_throw = "".join(old_throw)
+            old_throw_str: str = "".join(old_throw)
             pick.sort()
-            pick = "".join(pick)
+            pick_str: str = "".join(pick)
             
-            new_count = len(old_throw)
+            new_count: int = len(old_throw_str)
 
-            if not eval_score(pick):
+            if not eval_score(pick_str):
                 new_count = count
-                old_throw = throw
+                old_throw_str = throw
             else:
                 h_bool = False
 
-            data = ("count", new_count, old_throw)
-            return data
+            data = ("count", new_count, old_throw_str)
+
     elif inp == "h":
         if h_bool:
             clear()
@@ -119,9 +118,19 @@ def evaluate(inp: Any, count: int, throw: str) -> tuple:
         else:
             h_bool = True
             data = ("count", count, "")
-        return data
+
     elif inp == "k":
         global score
+
+        if score == 0:
+            last_two = players[pointer][-2:]
+            if len(last_two) > 1:
+                last_two_sum = sum(last_two)
+                if last_two_sum == 0:
+                    score = -sum(players[pointer])
+                    clear()
+                    input("Po třech nulových hodech bylo vaše skóre vynulováno.")
+
         players[pointer].append(score)
         aggr[pointer] = sum(players[pointer])
         score = 0
@@ -129,18 +138,22 @@ def evaluate(inp: Any, count: int, throw: str) -> tuple:
         next_player()
         data = ("count", 6, "")
         if pointer == first:
-            winner = check_win()
+            winner: str = check_win()
             if winner:
                 data = ("win", winner, aggr[winner])
-        return data
+
+    elif inp == "exit":
+        data = ("exit",)
+
     else:
         data = ("msg", "ER03", "Zadejte prosím platnou hodnotu:", count, throw)
+
     return data
 
 def check_value(throw: str) -> bool:
-    throw_s = sorted(throw)
-    throw_str = "".join(throw_s)
-    hodnota = False
+    throw_s: list[str] = sorted(throw)
+    throw_str: str = "".join(throw_s)
+    hodnota: bool = False
     for h in hodnoty:
         if h in throw_str:
             hodnota = True
@@ -148,11 +161,11 @@ def check_value(throw: str) -> bool:
 
     return hodnota
 
-def add_players():    
+def add_players() -> None:    
     global pointer, first, final_score
 
     while True:
-        inp = input("Zadejte jméno prvního hráče: ")
+        inp: str = input("Zadejte jméno prvního hráče: ")
         if inp == "":
             print("Jméno nemůže být prázdné.")
         else:
@@ -180,8 +193,8 @@ def add_players():
         inp = input("Zadejte finální skóre (nechte prázdné pro výchozích 10 000): ")
         if inp != "":
             try:
-                inp = int(inp)
-                final_score = inp
+                inp_int: int = int(inp)
+                final_score = inp_int
             except ValueError:
                 print("Zadejte prosím platnou číselnou hodnotu.")
             else:
@@ -190,21 +203,21 @@ def add_players():
             break
 
 def check_win() -> str:
-    over_limit = {}
+    over_limit: dict[str, int] = {}
     for p in aggr:
         if aggr[p] >= final_score:
             over_limit[p] = aggr[p]
 
-    winner = ""
+    winner: str = ""
 
     if over_limit:
-        over_limit_sorted = dict(sorted(over_limit.items(), key=lambda x: x[1], reverse=True))
-        over_limit_sorted_list = []
+        over_limit_sorted: dict[str, int] = dict(sorted(over_limit.items(), key=lambda x: x[1], reverse=True))
+        over_limit_sorted_list: list[tuple[str, int]] = []
         for ols in over_limit_sorted:
             over_limit_sorted_list.append((ols, over_limit_sorted[ols]))
 
 
-        count = Counter(list(over_limit_sorted.values()))
+        count: Counter = Counter(list(over_limit_sorted.values()))
 
         for c in count:
             if count[c] == 1:
@@ -213,16 +226,27 @@ def check_win() -> str:
 
     return winner
 
-def game(data: tuple):
+def game(data: tuple) -> None:
     while True:
         if data[0] == "count":
-            count = data[1]
-            th = data[2]
+            count: int = data[1]
+            th: str = data[2]
             if(th == ""):
                 th = throw(count)
             clear()
-            print(f"Vítězné skóre: {final_score}.")
-            print(f"Na tahu je {pointer} ({aggr[pointer]}).")
+            # print(f"Vítězné skóre: {final_score}.")
+
+            strikes: str = ""
+
+            if len(players[pointer]) > 0: 
+                if players[pointer][-1:][0] == 0:
+                    strikes = "x"
+                    if players[pointer][-2:][0] == 0:
+                        strikes += "x"
+            else:
+                strikes = ""
+
+            print(f"Na tahu je {pointer} ({aggr[pointer]}{strikes}/{final_score}).")
             print(show_throw(th))
             if not check_value(th) and data[2] == "" and count != 0:
                 global score
@@ -232,12 +256,13 @@ def game(data: tuple):
             else:
                 if count == 0:
                     count = 6
-                msg = ("Jakou akci chcete provést?\n"
+                msg: str = ("Jakou akci chcete provést?\n"
                     " - Zadejte kombinaci kostek k ponechání (dojde k jejich vyhodnocení): [pozice kostek] (např. 1 nebo 34 nebo 123456).\n"
                     " - Hodit znovu: [h].\n"
                     f" - Ukončit hod a ponechat si skóre z tohoto hodu ({score}): [k].\n"
+                    " - Ukončit hru: [exit].\n"
                 )
-                inp = input(msg)
+                inp: str = input(msg)
                 data = evaluate(inp, count, th)
 
         elif data[0] == "msg":
@@ -245,7 +270,6 @@ def game(data: tuple):
                 msg = data[2]
                 count = data[3]
                 th = data[4]
-                clear()
                 inp = input(msg)
                 data = evaluate(inp, count, th)
             else:
@@ -254,7 +278,7 @@ def game(data: tuple):
                 break
         
         elif data[0] == "win":
-            winner = data[1]
+            winner: str = data[1]
             score = data[2]
 
             clear()
@@ -262,11 +286,15 @@ def game(data: tuple):
             print("Díky za hru a zase příště.")
             break
 
-def main():
+        elif data[0] == "exit":
+            clear()
+            print("Hra byla předčasně ukončena. Snad se zase brzy uvidíme.")
+            break
+
+def main() -> None:
     clear()
     print("Vítejte ve hře v kostky!")
     add_players()
-    input("Prosím, stiskněte enter pro první hod:")
     data = ("count", 6, "")
     game(data)