feat(entity, map, main): add type hints, improve loading messages, and enhance map speed control

Author: Tracks12

core/entity.py

@@ -28,7 +28,7 @@ def __loadJSON(self) -> bool: # Chargement des entités depuis le dossier "entit
 		except(Exception):
 			return(False)
 
-	def __build(self, coord) -> dict[str, str]: # Build with relative position
+	def __build(self, coord: tuple[int]) -> dict[str, str]: # Build with relative position
 		entities = dict[str, str](self.__entities)
 
 		for name in entities:
@@ -41,5 +41,5 @@ def __build(self, coord) -> dict[str, str]: # Build with relative position
 	def getEntitiesName(self) -> list[str]:
 		return([ str(e) for e in self.__entities ])
 
-	def get(self, name, coord = (5, 5)) -> str: # Récupération d'une entité
+	def get(self, name: str, coord: tuple[int] = (5, 5)) -> str: # Récupération d'une entité
 		return(self.__build(coord)[name])

core/map.py

@@ -50,7 +50,7 @@ def __init__(self, mapName: str = "world"): # Fichier de chargement par défaut:
 		self.__cells		= int(self.__dims[0]*self.__dims[1])
 		self.__map			= list[list[int]]([])
 		self.__iterations	= int(0)
-		self.__sleep		= float(.03)
+		self.__sleep		= float(.0625)
 		self.mapName		= str(mapName)
 		self.loaded			= bool(self.__loadJSON())
 		self.helper			= bool(True)
@@ -79,7 +79,8 @@ def __saveJSON(self) -> bool: # Sauvegarde dans un fichier
 			return(False)
 
 	def __decreaseSpeed(self) -> None:
-		self.__sleep *= 2
+		if(self.__sleep < 2):
+			self.__sleep *= 2
 
 	def __increaseSpeed(self) -> None:
 		if(self.__sleep > .001):
@@ -117,7 +118,7 @@ def __update(self) -> None: # Mise à jour de la map
 
 		self.__map = map
 
-	def addCells(self, cells) -> bool: # Ajout de cellule(s) active(s)
+	def addCells(self, cells: list[tuple[int]]) -> bool: # Ajout de cellule(s) active(s)
 		for cell in cells:
 			self.__map[int(cell[0])-1][int(cell[1])-1] = 1
 
@@ -139,15 +140,13 @@ def display(self) -> bool: # Affichage de la map avec/sans les statistiques
 		if(bool(self.helper)):
 			_ = int(12)
 			help = (
-				f"{Colors.yellow}{'Space':<{_}}{Colors.end}: {'Pause/Resume':<{13}}",
-				f"{Colors.yellow}{'Up/Down':<{_}}{Colors.end}: {'Speed up/Slow down':<{19}}",
-				f"{Colors.red}{'Esc':<{_}}{Colors.end}: {'Exit':<{5}}",
-			)[::-1]
+				f"{Colors.red}{'Esc (Q)':<{_}}{Colors.end}: {'Exit':<{5}}",
+				f"{Colors.yellow}{'Space (P)':<{_}}{Colors.end}: {'Pause/Resume':<{13}}",
+				f"{Colors.yellow}{'(U)p/(D)own':<{_}}{Colors.end}: {'Speed up/Slow down':<{19}}"
+			)
 
 		for i, line in enumerate(self.__map):
-			row = ""
-			for value in line:
-				row += f'{f"{Colors.green}O" if(value) else f"{Colors.cyan}."}{Colors.end} '
+			row = "".join([ f"{f'{Colors.green}O' if(v) else f'{Colors.cyan}.'}{Colors.end} " for v in line ])
 
 			if(bool(self.stats) and (i < len(stats))): # Affichage des statistiques
 				row += f" {stats[i]}"
@@ -159,9 +158,9 @@ def display(self) -> bool: # Affichage de la map avec/sans les statistiques
 
 		return(True)
 
-	def initMap(self, x, y) -> bool: # Initialisation de la map dans l'objet
-		self.__map		= list(self.__makeMap((int(x), int(y))))
-		self.__dims		= tuple((int(x), int(y)))
+	def initMap(self, x: int, y: int) -> bool: # Initialisation de la map dans l'objet
+		self.__map		= list[list[int]](self.__makeMap((int(x), int(y))))
+		self.__dims		= tuple[int]((int(x), int(y)))
 		self.__cells	= int(self.__dims[0]*self.__dims[1])
 
 		return(self.__saveJSON())
@@ -176,7 +175,7 @@ def reset(self) -> bool: # Reset complet de toute la map
 	def start(self) -> bool: # Lancement du jeu
 		if(SYSTEM == "Windows"):
 			_keyPressed	= [ False ]
-			_hook		= on_press(lambda e:self.__onKeyPress(_keyPressed))
+			_hook		= on_press(lambda _:self.__onKeyPress(_keyPressed))
 
 		shell(CMD_CLEAR)
 
@@ -224,7 +223,7 @@ def start(self) -> bool: # Lancement du jeu
 							self.__decreaseSpeed()
 
 		except(KeyboardInterrupt):
-			self.__label(f"STOP", Colors.red)
+			self.__label(f"STOPPED", Colors.red)
 
 			if(self.__saveJSON()):
 				print(f"{Icons.succ}{self.mapName.capitalize()}{' saved !':<{self.__dims[1]-len(self.mapName)}}")

main.py

@@ -1,7 +1,8 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
-from os import system as shell
+from os import listdir, system as shell
+from os.path import abspath, dirname
 from sys import argv, version_info
 
 # Importation des dépendances internes
@@ -26,6 +27,7 @@ def errMsg() -> bool:
 			(("-A", "--add-entity"), "<mapName> <type> <x> <y>"),
 			(("-d", "--display"), "<mapName>"),
 			(("-n", "--new"), "<mapName> <x> <y>"),
+			(("-l", "--list"), ""),
 			(("-r", "--reset"), "<mapName>"),
 			(("-s", "--start"), "<mapName>"),
 			(("-h", "--help"), ""),
@@ -36,6 +38,7 @@ def errMsg() -> bool:
 			"Insert an entity",
 			"Display the saved map",
 			"Create a new map",
+			"List all saved map",
 			"Reset a map",
 			"Play a map\n",
 			"Display the help menu",
@@ -55,9 +58,19 @@ def errMsg() -> bool:
 	elif(argv[1] in args["prefix"][-1][0]):
 		print(" conwayGameOfLife.py 2.3 - Florian Cardinal\n")
 
+	elif(argv[1] in args["prefix"][4][0]):
+		saves = [ s.split(".")[0] for s in listdir(f"{abspath(dirname(__file__))}/saves/") ]
+
+		output = [ "Saved map:\n" ]
+		for i, save in enumerate(saves, 1):
+			output.append(f" {' '*(2-len(str(i)))}{i}. {save}")
+
+		print("\n".join(output), end="\n"*2)
+
 	if(
 		not (argv[1] in args["prefix"][-2][0])
 		and not (argv[1] in args["prefix"][-1][0])
+		and not (argv[1] in args["prefix"][4][0])
 	):
 		try:
 			map = Map(str(argv[2]))
@@ -126,7 +139,7 @@ def errMsg() -> bool:
 				print(f"{Icons.warn}Specify the <x> and <y> dimensions")
 				return(False)
 
-		elif(argv[1] in args["prefix"][4][0]):
+		elif(argv[1] in args["prefix"][5][0]):
 			if(map.loaded):
 				map.reset()
 				shell(CMD_CLEAR)
@@ -135,7 +148,7 @@ def errMsg() -> bool:
 			else:
 				return(errMsg())
 
-		elif(argv[1] in args["prefix"][5][0]):
+		elif(argv[1] in args["prefix"][6][0]):
 			if(map.loaded):
 				map.start()
 
@@ -145,6 +158,14 @@ def errMsg() -> bool:
 	return(True)
 
 def main() -> bool: # Fonction principale de l'execution du programme
+	saves = [ s.split(".")[0] for s in listdir(f"{abspath(dirname(__file__))}/saves/") ]
+
+	output = [ "Saved map:\n" ]
+	for i, save in enumerate(saves, 1):
+		output.append(f" {' '*(2-len(str(i)))}{i}. {save}")
+
+	print("\n".join(output), end="\n"*2)
+
 	map = Map(str(input(f"Enter a map name to load: {Colors.green}")))
 	print(Colors.end)