v0.18

Sauvegarde du 26/04/2020

main.pyw

@@ -5,12 +5,15 @@ import pickle
 import json
 import random
 import math
+import time
 from PIL import Image, ImageTk
 
 ########## constante ###########
 PATH_MODULE = "./module/"
 PATH_ASSETS = "./assets/"
+PATH_HISTORY = "./history/"
 
+if not(os.path.exists(PATH_HISTORY)): os.makedirs(PATH_HISTORY)
 ######## initialisation ########
 Fen = Tk()
 Fen.resizable(width = False, height = False)
@@ -36,6 +39,7 @@ class AppClass(): # Classe du "moteur" du jeu
 			"Lancer" : self.start,
 			"Option" : self.settings,
 			"Mode Infini": self.start_infinity_mode,
+			"Historique": self.history,
 			"Reinit. Option.": self.confirm_reinit_option,
 			"Quitter" : self.leave,
 		} # On créer un dictionnaire qui associe toute les options proposé à leur fonction respective.
@@ -66,6 +70,12 @@ class AppClass(): # Classe du "moteur" du jeu
 
 
 	def start(self):
+		if not(self.InfinityMode):
+			self.seed = random.randint(-10**10, 10**10) # On défini la seed afin de pouvoir la sauvegarder pour l'historique.
+			self.mode = "Classique"
+			self.start_time = time.time()
+			self.mod_des = 0
+
 		classModule["simon"].bind(UpCmd = "pass", DownCmd = "pass", LeftCmd = "pass", RightCmd = "pass")
 		self.Life = self.config["Vie"]["Value"] # On initialise le nombre de vie comme indiqué dans les paramètres
 
@@ -77,10 +87,155 @@ class AppClass(): # Classe du "moteur" du jeu
 		# Démmaré un chrono
 
 	def start_infinity_mode(self):
+		self.seed = random.randint(-10**10, 10**10)
+		self.mode = "Infinity"
+		self.start_time = time.time()
+		self.mod_des = 0
+
 		self.InfinityMode = True
 		self.start()
 
 
+	def history(self, selected = 0): # Menu des fichiers .history
+		ListFileHistory = list(reversed(os.listdir(PATH_HISTORY)))
+		if len(ListFileHistory) == 0:
+			self.MainMenu(selected = 3)
+			return 0
+
+		selected_name = ListFileHistory[selected]
+
+		selected_name_show = selected_name.replace(" ", "\n").replace(".history", "") # On l'affiche sur deux lignes et on retire l'extension
+		selected_name_show = [c for c in selected_name_show] # On converti le texte en liste de caractère
+		selected_name_show.insert(2, "/") # séparation jour / mois
+		selected_name_show.insert(5, "/") # séparation mois / année
+		selected_name_show.insert(13, ":") # séparation heure / minute
+		selected_name_show.insert(16, ":") # séparation minute / seconde
+		selected_name_show = "".join(selected_name_show)
+
+		prefix = "< "
+		suffix = " >"
+
+		if selected == 0:
+			func_up = "pass" # Si on est à la première option, ne fait rien
+			prefix = "  "
+
+		else: func_up = lambda: self.history(selected = selected - 1) # sinon, remonte
+
+		if selected == len(ListFileHistory) - 1:
+			func_down = "pass" # Si on est à la dernière option, ne fait rien
+			suffix = "  "
+
+		else: func_down = lambda: self.history(selected = selected + 1) # sinon, descend
+
+		classModule["display"].write(prefix + selected_name_show + suffix) # On affiche le texte sur l'écran
+
+		func_right = lambda: self.history_show(selected_name = selected_name) # Renvoie la fonction associé à l'option selectionné
+		func_left = lambda: self.MainMenu(selected = 3)
+
+		classModule["simon"].bind(UpCmd = func_up, DownCmd = func_down, LeftCmd = func_left, RightCmd = func_right)
+
+
+	def history_show(self, selected = 0, selected_name = None): # Menu pour afficher le contenu des fichiers .history
+		with open(PATH_HISTORY + selected_name, "rb") as File:
+			StatHistory = pickle.load(File)
+
+		StatHistoryKeys = list(StatHistory.keys())
+
+		StatName = StatHistoryKeys[selected]
+		StatData = StatHistory[StatName]
+
+		prefix = "< "
+		suffix = " >"
+
+		if selected == 0:
+			func_up = "pass" # Si on est à la première option, ne fait rien
+			prefix = "  "
+
+		else: func_up = lambda: self.history_show(selected = selected - 1, selected_name = selected_name) # sinon, remonte
+
+		if selected == len(StatHistory) - 1:
+			func_down = "pass" # Si on est à la dernière option, ne fait rien
+			suffix = "  "
+
+
+		else: func_down = lambda: self.history_show(selected = selected + 1, selected_name = selected_name) # sinon, descend
+
+		if StatName == "Paramètre": classModule["display"].write(prefix + StatName + "\n" + "Droite pour voir" + suffix)
+		else: classModule["display"].write(prefix + StatName + "\n" + str(StatData) + suffix) # On affiche le texte sur l'écran
+
+		if StatName == "Paramètre": func_right = lambda: self.history_show_settings(selected = 0, selected_name = selected_name) # func_right = lambda: self.modif_settings(selected_name = selected_name) # Renvoie la fonction associé à l'option selectionné
+		elif StatName == "Archiver": func_right = lambda: self.SwitchArchive(selected = selected, selected_name = selected_name)
+		elif StatName == "Effacer": func_right = lambda: self.confirm_delete_history(selected_name = selected_name)
+		else: func_right = "pass"
+
+		ListFileHistory = list(reversed(os.listdir(PATH_HISTORY)))
+		func_left = lambda: self.history(selected = ListFileHistory.index(selected_name))
+
+		classModule["simon"].bind(UpCmd = func_up, DownCmd = func_down, LeftCmd = func_left, RightCmd = func_right)
+
+
+	def confirm_delete_history(self, selected_name):
+		classModule["display"].write("Êtes-vous sur de\nvouloir effacer ?")
+
+		with open(PATH_HISTORY + selected_name, "rb") as File:
+			StatHistory = pickle.load(File)
+
+		cancel = lambda: self.history_show(selected = list(StatHistory.keys()).index("Effacer"))
+		confirm = lambda: self.delete_history(selected_name = selected_name)
+		classModule["simon"].bind(UpCmd = cancel, DownCmd = cancel, LeftCmd = cancel, RightCmd = confirm)
+
+
+	def delete_history(self, selected_name):
+		os.remove(PATH_HISTORY + selected_name)
+		self.history()
+
+
+	def SwitchArchive(self, selected, selected_name):
+		with open(PATH_HISTORY + selected_name, "rb") as File:
+			StatHistory = pickle.load(File)
+
+		if StatHistory["Archiver"] == "Oui": StatHistory["Archiver"] = "Non"
+		else: StatHistory["Archiver"] = "Oui"
+
+		with open(PATH_HISTORY + selected_name, "wb") as File:
+			pickle.dump(StatHistory, File)
+
+		self.history_show(selected = selected, selected_name = selected_name)
+
+
+	def history_show_settings(self, selected = 0, selected_name = None): # Afficher les paramètres lors d'une partie stocké dans l'historique
+		with open(PATH_HISTORY + selected_name, "rb") as File:
+			StatHistory = pickle.load(File)
+
+		StatHistorySettings = StatHistory["Paramètre"]
+		StatHistorySettingsKeys = list(StatHistorySettings.keys())
+		StatSettingsName = StatHistorySettingsKeys[selected]
+		StatSettingsData = StatHistorySettings[StatSettingsName]["Value"]
+
+		prefix = "< "
+		suffix = " >"
+
+		if selected == 0:
+			func_up = "pass" # Si on est à la première option, ne fait rien
+			prefix = "  "
+
+		else: func_up = lambda: self.history_show_settings(selected = selected - 1, selected_name = selected_name) # sinon, remonte
+
+		if selected == len(StatHistorySettings) - 1: # Pour éviter que _Protected s'affiche
+			func_down = "pass" # Si on est à la dernière option, ne fait rien
+			suffix = "  "
+
+		else: func_down = lambda: self.history_show_settings(selected = selected + 1, selected_name = selected_name) # sinon, descend
+
+		classModule["display"].write(prefix + StatSettingsName + "\n" + str(StatSettingsData) + suffix) # On affiche le texte sur l'écran
+
+		func_right = lambda: "pass"
+		func_left = lambda: self.history_show(selected = list(StatHistory.keys()).index("Paramètre"), selected_name = selected_name)
+
+		classModule["simon"].bind(UpCmd = func_up, DownCmd = func_down, LeftCmd = func_left, RightCmd = func_right)
+
+
+
 
 	def settings(self, selected = 0):
 		 # On créer un dictionnaire qui associe toute les options proposé à leur fonction respective.
@@ -159,7 +314,7 @@ class AppClass(): # Classe du "moteur" du jeu
 
 	def confirm_reinit_option(self):
 		classModule["display"].write("Êtes-vous sur de\nvouloir réinitialiser ?")
-		cancel = lambda: self.MainMenu(selected = 2)
+		cancel = lambda: self.MainMenu(selected = 4)
 		confirm = lambda: self.reinit_option(mainmenu_return = True)
 		classModule["simon"].bind(UpCmd = cancel, DownCmd = cancel, LeftCmd = cancel, RightCmd = confirm)
 

module/button.py

@@ -74,6 +74,7 @@ class button():
 
         if not(_Stop):
             self.defuse = True
+            self.big_but.config(command = "pass")
             classModule["display"].checkDefuse()
 
         else:

module/display.py

@@ -61,6 +61,7 @@ class display():
 
     def checkDefuse(self):
         self.time += App.config["Bonus de temps"]["Value"]
+        App.mod_des += 1
 
         _Stop = 0
         for module in classModule:
@@ -69,6 +70,7 @@ class display():
 
         if _Stop <= App.config["Module négli."]["Value"]: # Si tout les modules sont désamorcé
             self.write(random.choice(["GG", "Bravo", "Félicitation"]))
+            self.Win = "Gagné"
             self.reset_all()
 
         else:
@@ -90,6 +92,7 @@ class display():
 
         self.InitInfinity = False
         App.InfinityMode = False
+        self.Win = "Perdu"
         self.reset_all()
 
 
@@ -103,10 +106,42 @@ class display():
             Fen.after_cancel(self.chrono_event) # On désactive le chrono
             self.label.config(foreground = "black", background = "SystemButtonFace")
 
+            duration = time.time() - App.start_time
+            duration_min, duration_sec = duration // 60, duration % 60
+
+            with open(PATH_HISTORY + time.strftime("%d%m%Y %H%M%S") + ".history", "wb") as File:
+
+                pickle.dump({
+                "Seed": App.seed,
+                "Mode": App.mode,
+                "Partie": self.Win,
+                "Durée": "%02i:%02i" % (duration_min, duration_sec),
+                "Mod. Des.": App.mod_des,
+                "Mod. Des. / min.": round(App.mod_des / (duration / 60), 1),
+                "Paramètre": App.config,
+                "Archiver": "Non",
+                "Effacer": ""
+                }, File)
+
+
+
+            ListFileHistory = os.listdir(PATH_HISTORY)
+            Max_file_save = App.config["Max. Score sauv."]["Value"]
+
+            if len(ListFileHistory) > Max_file_save:
+                for file in ListFileHistory:
+
+                    with open(PATH_HISTORY + file, "rb") as File: StatHistory = pickle.load(File)
+                    if StatHistory["Archiver"] == "Non":
+                        os.remove(PATH_HISTORY + file)
+                        break
+
             Fen.after(7500, lambda: App.MainMenu()) # On laisse le joueur devant le message de victoire / défaite pendant 7.5 secondes
 
+
         else: # Si l'on est en mode infini
             self.InitInfinity = True # On a déjà fini le jeu une fois
             Fen.after(1000, App.start) # On relance le jeu
 
+
 classModule["display"] = display()

module/wire.py

@@ -101,7 +101,7 @@ class wire():
 
             if type(self.rules[Difficulty][wire][lit_wire]) == str: # Si la condition est un texte (donc du type LED StatutDeLaLED):
                 condition = self.rules[Difficulty][wire][lit_wire].split(" ")
-                if self.dico_wire[wire]["CUT"] != (self.dico_wire[condition[0]]["LIT"] != condition[1]): # Si la règle n'est pas respecté
+                if self.dico_wire[wire]["CUT"] != (self.dico_wire[condition[0]]["LIT"] == condition[1]): # Si la règle n'est pas respecté
                     self.wire_errorTotal += 1
 
             else: