From 7ee82cce86354b05e5eb14e4a5ddcb55ea92c55b Mon Sep 17 00:00:00 2001
From: Alexandre <cpge.aboujaib@gmail.com>
Date: Wed, 4 Dec 2024 15:43:39 +0100
Subject: [PATCH] python improvments

---
 audio/wood.mp3                       | Bin 0 -> 5686 bytes
 entrees.txt                          |  42 ++++++++++++---------------
 iachallenge2024_bomberman_tkinter.py |  32 +++++---------------
 3 files changed, 27 insertions(+), 47 deletions(-)
 create mode 100644 audio/wood.mp3

diff --git a/audio/wood.mp3 b/audio/wood.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..bcd273a5e01032b80a3f656a47fcd3bc4f62d1f6
GIT binary patch
literal 5686
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

literal 0
HcmV?d00001

diff --git a/entrees.txt b/entrees.txt
index 711f97b..563e565 100644
--- a/entrees.txt
+++ b/entrees.txt
@@ -1,27 +1,23 @@
-10.0
-3
+180.16800000000111
+2
 13 21
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
-1 3 0 0 2 2 2 2 2 2 2 0 2 0 2 2 2 2 0 5 1 
-1 3 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 5 1 
-1 0 0 2 0 2 2 0 2 2 2 2 0 2 2 2 2 2 2 0 1 
-1 0 1 2 1 2 1 2 1 0 1 2 1 2 1 2 1 2 1 2 1 
-1 2 2 2 0 2 2 2 0 0 2 2 2 2 2 0 2 2 2 2 1 
-1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 0 1 2 1 2 1 
-1 2 2 2 2 0 2 2 2 2 0 2 0 2 2 2 0 2 2 2 1 
-1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 0 1 2 1 2 1 
-1 0 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 0 1 
-1 6 1 0 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 4 1 
-1 6 0 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 0 4 1 
+1 4 4 4 4 4 4 4 0 0 0 6 6 6 6 6 6 6 6 5 1 
+1 3 1 3 1 4 1 4 1 3 1 5 1 6 1 5 1 5 1 5 1 
+1 3 0 3 0 4 6 6 6 3 6 5 6 6 6 6 6 6 5 5 1 
+1 3 1 3 1 4 1 4 1 3 1 6 1 6 1 4 1 4 1 5 1 
+1 3 3 3 3 4 3 3 3 3 3 3 3 3 3 6 6 6 6 6 1 
+1 3 1 3 1 3 1 4 1 3 1 6 1 6 1 4 1 4 1 4 1 
+1 6 6 6 6 6 6 4 6 3 6 6 6 6 6 6 6 6 4 4 1 
+1 3 1 3 1 3 1 6 1 3 1 6 1 6 1 4 1 4 1 4 1 
+1 6 6 3 3 3 3 3 3 3 3 6 3 3 3 4 4 4 4 4 1 
+1 3 1 6 1 6 1 6 1 3 1 6 1 6 1 4 1 4 1 4 1 
+1 6 6 6 6 3 3 6 3 3 3 6 3 6 4 4 4 4 4 4 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
-4
-1 3 1 12.5
-11 18 1 12.5
-1 18 1 12.5
-11 2 1 12.5
-4
-3 1 0 0 0 1 0 0
-9 19 1 0 0 1 0 1
-3 19 2 0 1 1 0 0
-9 1 3 0 0 1 0 0
+0
+4
+3 6 0 0 2 5 2 2
+2 3 1 1 2 4 4 3
+3 8 2 3 1 1 1 1
+3 9 3 1 1 6 2 1
 0
diff --git a/iachallenge2024_bomberman_tkinter.py b/iachallenge2024_bomberman_tkinter.py
index dedcff3..f5684aa 100644
--- a/iachallenge2024_bomberman_tkinter.py
+++ b/iachallenge2024_bomberman_tkinter.py
@@ -342,7 +342,11 @@ def casse(plateau, powerups, i,j):
     if randrange(0,3)==0:
         powerups.append([i,j, randrange(5)])
     return
-    
+
+def play_planks():
+    playsound('./audio/wood.mp3')
+    return
+   
 def execute_evenement(evenements, evenement, plateau, plateauCouleur, bombes, joueurs, powerups, pieges):
     if evenement[E_NATURE]==EVENEMENT_TOUR_JOUEUR:
         temps, nature, indiceJoueur = evenement
@@ -415,8 +419,7 @@ def execute_evenement(evenements, evenement, plateau, plateauCouleur, bombes, jo
             return
         elif plateau[i][j]==PLATEAU_BOIS:
             # Bois : destructible, on détruit
-            '''CTS[CTPTR].start()
-            CTPTR = (CTPTR+1)%12'''
+            (Thread(target=play_planks)).start()
             casse(plateau, powerups, i,j)
             return
         else:
@@ -465,23 +468,6 @@ Y_STEP_CLAIMS = 40
 X_LARGEUR_EMPIRES = 60
 Y_LARGEUR_EMPIRES = 180
 
-'''
-CT1= Thread(target=play_planks)
-CT2= Thread(target=play_planks)
-CT3= Thread(target=play_planks)
-CT4= Thread(target=play_planks)
-CT5= Thread(target=play_planks)
-CT6= Thread(target=play_planks)
-CT7= Thread(target=play_planks)
-CT8= Thread(target=play_planks)
-CT9= Thread(target=play_planks)
-CT10= Thread(target=play_planks)
-CT11= Thread(target=play_planks)
-CT12= Thread(target=play_planks)
-CTS=[CT1, CT2, CT3, CT4, CT5, CT6, CT7, CT8, CT9, CT10, CT11, CT12]
-CTPTR=0
-'''
-
 def decision(programme, indiceJoueur, plateau, plateauCouleur, bombes, joueurs, powerups, instant):
     with open("entrees.txt", "w") as entrees:
         print(instant, file=entrees)
@@ -524,7 +510,7 @@ def simulation(strategies):
             execute_evenement(evenements, evenement, plateau, plateauCouleur, bombes, joueurs, powerups, pieges)
             affiche_plateau(canvas, plateau, plateauCouleur, bombes, joueurs, powerups)
             affiche_infos(canvasInfosJoueurs, joueurs, plateauCouleur)
-            affiche_empires(canvasInfosJoueurs, joueurs, plateauCouleur) # very laggy for some reason
+            affiche_empires(canvasInfosJoueurs, joueurs, plateauCouleur) # very laggy for some reason # not anymore
             temps = int((evenements[0][0]-evenement[0])/3*200)
             if temps != 0:
                 fenetre.after(temps, pas_de_jeu)
@@ -563,9 +549,7 @@ def simulation(strategies):
 
     fenetre.mainloop()
     return 
-    
-def play_planks():
-    playsound('./audio/wood-effect-254997.mp3')
+
 #simulation(["./again"])
 #simulation(["./again", "./again"])
 simulation(["./again", "./again", "./again", "./again"])