Aggiungi funzionalità di caricamento e salvataggio del campo di battaglia

Effects/.gitignore

@@ -0,0 +1,31 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+dist/
+build/
+*.egg-info/
+
+# Virtual environments
+venv/
+env/
+.env/
+
+# IDE specific files
+.idea/
+.vscode/
+
+# Compiled Python files
+*.pyc
+
+# Logs
+*.log
+
+# OS generated files
+.DS_Store
+Thumbs.db

Units/.gitignore

@@ -0,0 +1,31 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+dist/
+build/
+*.egg-info/
+
+# Virtual environments
+venv/
+env/
+.env/
+
+# IDE specific files
+.idea/
+.vscode/
+
+# Compiled Python files
+*.pyc
+
+# Logs
+*.log
+
+# OS generated files
+.DS_Store
+Thumbs.db

Units/knight.py

@@ -1,8 +1,5 @@
-import tkinter as tk
 import os
 import glob
-import time
-import random
 
 from Effects.animated_gif import AnimatedGif
 from Effects.order_click import OrderClick
@@ -24,81 +21,53 @@ class Knight:
 
     def ai(self):
         screen_x, screen_y = self.engine.iso_transform(*self.position)
-        if  self.position != self.target:
+        if  self.position == self.target:
+            self.visited = [self.target]
+            self.position = self.target
+            self.starting_position = self.target
+            self.destination = self.target
+            self.state = "Idle"
+            self.partial_move = 1
+        else:
             self.direction = self.engine.get_direction(self.position,self.destination)
             if self.partial_move<1:
                 screen_x_dest, screen_y_dest = self.engine.iso_transform(*self.destination)
                 self.partial_move += self.speed
+                if self.partial_move > 1:
+                    self.partial_move = 1
                 screen_x += (screen_x_dest - screen_x) * self.partial_move
                 screen_y += (screen_y_dest - screen_y) * self.partial_move
             else:
                 screen_x, screen_y = self.engine.iso_transform(*self.destination)
-                
+                self.visited = self.visited[-4:]
                 neighbors_list = self.engine.find_neighbors(self.destination) # Get the neighbors of the destination cell
+                neighbors_list = [cell for cell in neighbors_list if cell not in self.visited]
                 
                 # Remove any neighbors that are not walkable
+                self.best_next = self.engine.get_closest_neighbor(neighbors_list,self.target)
+                #if best next is not walkable, find the closest walkable cell to best next
                 neighbors_list = [cell for cell in neighbors_list if self.engine.battlefield[cell[1]][cell[0]].walkable]
-
-                old_distance_from_target = self.engine.get_distance(self.destination,self.target)
-                old_distance_from_start = self.engine.get_distance(self.destination,self.starting_position)
-
-                for cell_visited in self.visited:
-                    if cell_visited in neighbors_list:
-                        neighbors_list.remove(cell_visited)
-
-                #self.visited = self.visited[-2:]
+                if self.engine.battlefield[self.best_next[1]][self.best_next[0]].walkable == False:
+                    self.best_next = self.engine.get_closest_neighbor(neighbors_list,self.best_next)
+                if not self.best_next:
+                    self.target = self.destination
+                    self.best_next = self.destination
                 self.position = self.destination
-                self.visited.append(self.position)
-
-                for cell in neighbors_list:
-                   self.engine.effects.append(OrderClick(self.engine.iso_transform(*cell),color="lightblue"))
-                for cell in self.visited:
-                   self.engine.effects.append(OrderClick(self.engine.iso_transform(*cell),color="red"))
+                self.destination = self.best_next
+                self.partial_move = 0
+                self.visited.append(self.destination)
+            print(self.partial_move)
 
-                if not neighbors_list:
-                    print("No neighbors")
-                    #neighbors_list.append(self.visited)
-                    #self.target = self.position
-                    self.destination = None
 
-                else:
-                    self.destination = self.engine.get_closest_neighbor(neighbors_list,self.target)
-                    new_distance_from_target = self.engine.get_distance(self.destination,self.target)
-                    new_distance_from_start = self.engine.get_distance(self.destination,self.starting_position)
-                    if new_distance_from_target >= old_distance_from_target or new_distance_from_start < old_distance_from_start:
-                        print(f"{time.time()} - No progress")
-                        new_neighbors_list = []
-                        for neighbor in neighbors_list:
-                            neighbor_neighbors_list = self.engine.find_neighbors(neighbor)
-                            for neighbor_neighbor in neighbor_neighbors_list:
-                            # consider only the neighbors of the neighbors that are walkable
-                                if not self.engine.battlefield[neighbor_neighbor[1]][neighbor_neighbor[0]].walkable:
-                                    if neighbor_neighbor not in self.visited:
-                                        # if the neighbor of the neighbor is not walkable and has not been visited, add it to the list of visited cells
-                                        new_neighbors_list.append(neighbor)
-                                        break
-                        # scegli uhn vicino casualmente come destinaziione  
-                        
-                        self.destination = new_neighbors_list[random.randint(0,len(new_neighbors_list)-1)]
-
-                if self.destination:                 
-                    self.engine.effects.append(OrderClick(self.engine.iso_transform(*self.destination),color="purple"))
-                    self.partial_move = 0
-                    if  self.position != self.target:
-                        self.direction = self.engine.get_direction(self.position,self.destination)
-                else:
-                    print("No destination")
-                    self.visited = [self.position]
-                    self.destination = self.position
-                    #self.target = self.position
-                    self.engine.effects.append(OrderClick(self.engine.iso_transform(*self.destination),color="brown"))
-
-        else:
-            self.visited = [self.target]
-            self.position = self.target
-            self.starting_position = self.target
-            self.destination = self.target
-            self.state = "Idle"
-            self.partial_move = 1
         gif = self.animation.get(f'Knight_{self.state}_dir{self.direction}.gif')
-        return gif, screen_x, screen_y
+        return gif, screen_x, screen_y
+
+    def move_to(self, target):
+        self.speed = .05
+        self.target = target
+        self.state = "Walk"
+    
+    def run_to(self, target):
+        self.speed = .13
+        self.target = target
+        self.state = "Run"

main.py

@@ -7,11 +7,34 @@ import json
 from Units.knight import Knight
 from Effects.order_click import OrderClick
 from tkinter import Menu
+import yt_dlp
+import os
 
+from pydub import AudioSegment
 
+import subprocess
+import threading
+import asyncio
+import sys
+from tkinter import filedialog
 
-    
 class IsometricGame:
+    def load_battlefield(self):
+        file_path = filedialog.askopenfilename()
+        if file_path:
+            with open(file_path, 'r') as file:
+                data = json.load(file)
+            width = len(data[0])
+            height = len(data)
+            self.battlefield = [[Cell(walkable=not data[y][x], tile=self.tiles["landscapeTiles_067"] if not data[y][x] else self.tiles["landscapeTiles_066"]) for x in range(width)] for y in range(height)]
+            self.width = width
+            self.height = height
+            self.draw_battlefield()
+    def save_battlefield(self):
+        filename = filedialog.asksaveasfilename(defaultextension=".json")
+        with open(filename, 'w') as json_file:
+            json.dump([[not cell.walkable for cell in row] for row in self.battlefield], json_file)
+        
     def __init__(self, width, height, data):
         self.width = width
         self.height = height
@@ -30,6 +53,8 @@ class IsometricGame:
         self.input_lock = False
 
         self.window = tk.Tk()
+        self.window.protocol("WM_DELETE_WINDOW", self.on_close)
+
         files = sorted(glob.glob("Tiles/**/*.png", recursive=True))
         self.tiles = {os.path.splitext(os.path.basename(file))[0]: tk.PhotoImage(file=file) for file in files}
         # self.battlefield = [[Cell(walkable = True, tile=self.tiles["landscapeTiles_067"] ) for x in range(self.width)] for y in range(self.height)]
@@ -45,12 +70,26 @@ class IsometricGame:
         self.window.bind('<KeyRelease>', self.on_key_press)
         self.canvas.bind('<Button-1>', self.on_canvas_click)
         self.canvas.bind('<Button-3>', self.on_canvas_rclick)
+        self.canvas.bind('<Double-Button-3>', self.on_canvas_double_rclick)
         self.canvas.bind('<Motion>', self.calculate_coordinates)
 
+        menubar = tk.Menu(self.window, tearoff=0)
+        menubar.add_command(label="Carica campo di battaglia", command=self.load_battlefield)
+        menubar.add_command(label="Salva campo di battaglia", command=self.save_battlefield)
+        menubar.add_command(label="Chiudi", command=self.on_close)
+        self.window.config(menu=menubar)
+
 
         self.knight = Knight(self, (1,1))
         self.draw_battlefield()
-        
+
+    def on_close(self):
+        print("Chiusura")
+
+        self.window.quit()  # Chiude la finestra
+        self.window.destroy()  # Distrugge l'oggetto finestra
+        sys.exit()  # Termina l'esecuzione del programma
+
     def calculate_coordinates(self, event):
         if self.input_lock:
             return
@@ -72,7 +111,7 @@ class IsometricGame:
         elif delta_x == -1 and delta_y == 0:
             return 3  # Ovest
         elif delta_x == -1 and delta_y == -1:
-            return 4  # Nord-Ovest
+            return 4  # Nord-Ovest 
         elif delta_x == 0 and delta_y == -1:
             return 5  # Nord
         elif delta_x == 1 and delta_y == -1:
@@ -234,11 +273,21 @@ class IsometricGame:
     def on_canvas_click(self, event):
         # calculate the clicked cell's coordinates
         cell_x, cell_y = self.inv_iso_transform(event.x, event.y)
-        self.battlefield[cell_y][cell_x].walkable ^= True
+        cell=self.battlefield[cell_y][cell_x]
+        cell.walkable ^= True
+        cell.tile = self.tiles["landscapeTiles_067"] if cell.walkable else self.tiles["landscapeTiles_066"]
         self.draw_battlefield()
         self.draw_units()
 
-            
+    def on_canvas_double_rclick(self, event):
+        print("Double right click")
+        # calculate the clicked cell's coordinates
+        cell_x, cell_y = self.inv_iso_transform(event.x, event.y)
+        self.effects.append(OrderClick(self.iso_transform(cell_x, cell_y),color="lightblue"))
+        if self.knight.target == (cell_x, cell_y) and self.knight.state == "Run":
+            return
+        if 0 <= cell_x < self.width and 0 <= cell_y < self.height:
+            self.knight.run_to((cell_x, cell_y))
 
     def set_tile(self, name, pos):
         # Handle option 1 selection
@@ -253,16 +302,11 @@ class IsometricGame:
     def on_canvas_rclick(self, event):
         # calculate the clicked cell's coordinates
         cell_x, cell_y = self.inv_iso_transform(event.x, event.y)
-        print(f'Cell clicked: ({cell_x}, {cell_y})')
-        x, y = self.iso_transform(cell_x, cell_y)
-        self.effects.append(OrderClick((x, y), color="light blue"))
+        self.effects.append(OrderClick(self.iso_transform(cell_x, cell_y),color="lightblue"))
         if self.knight.target == (cell_x, cell_y):
             return
-
         if 0 <= cell_x < self.width and 0 <= cell_y < self.height:
-            self.knight.starting_position = self.knight.position
-            self.knight.target = (cell_x,cell_y)
-            self.knight.state = "Walk"
+            self.knight.move_to((cell_x, cell_y))
 
     def run(self):
         self.draw_battlefield()
@@ -273,7 +317,7 @@ class IsometricGame:
         #self.draw_battlefield()
         self.draw_units()
         self.draw_effects()
-        self.window.after(75, self.update)  # Call again after 100 ms
+        self.window.after(50, self.update)  # Call again after 100 ms
 
 class Cell:
     def __init__(self, walkable=False, tile=None, elevation=0, offset=0):
@@ -286,6 +330,23 @@ class Cell:
 
 
 if __name__ == "__main__":
+    output_filename = "audio"
+
+    # use ytdb for download audio from youtube video with lower posible quality using output_filename as filename
+    ydl_opts = {
+        'format': '140',
+        'outtmpl': output_filename,
+    }
+
+
+    if not os.path.exists(output_filename):
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+            ydl.download(['https://www.youtube.com/watch?v=-IQZEk-oaYU'])
+    # play the audio asynchrounously
+    audio = AudioSegment.from_file(output_filename)
+    
+    playb = subprocess.Popen(["ffplay", "-nodisp", "-autoexit", output_filename], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
     with open('maze.json', 'r') as file:
         data = json.load(file)
     # data is a boolean matrix, find dmensions

maze.json

@@ -1 +1 @@
-[[true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true], [true, false, false, false, false, false, true, false, false, false, false, false, true, false, false, false, true, false, false, false, true], [true, true, true, true, false, false, false, true, true, false, false, false, true, false, false, false, true, true, true, false, true], [true, false, false, false, false, false, true, false, false, false, true, false, true, false, true, false, true, false, false, false, true], [true, false, true, false, true, true, true, false, true, true, true, false, true, false, true, false, true, false, true, true, true], [true, false, false, false, true, false, false, false, true, false, true, false, true, false, true, false, true, false, false, false, true], [true, false, true, true, true, false, true, true, true, false, true, false, true, false, true, false, true, true, false, false, true], [true, false, true, false, false, false, true, false, false, false, false, false, true, false, true, false, false, false, true, false, true], [true, false, true, false, true, false, true, true, true, false, true, false, false, false, false, false, true, false, true, false, true], [true, false, true, false, true, false, false, false, true, false, true, false, true, false, false, false, false, false, true, false, true], [true, false, true, false, true, true, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true], [true, false, true, false, false, false, true, false, false, false, true, false, false, false, true, false, false, false, false, false, true], [true, false, true, true, true, true, true, false, true, false, true, true, true, true, true, false, false, true, true, false, true], [true, false, false, false, false, false, true, false, true, false, false, false, false, false, true, false, true, false, false, false, true], [true, false, true, false, true, false, true, false, true, true, false, true, true, false, true, false, true, true, true, true, true], [true, false, false, false, false, false, false, false, true, false, false, false, true, false, true, false, false, false, false, false, true], [true, false, true, false, true, true, true, true, true, false, false, false, true, false, true, true, true, true, false, false, true], [true, false, true, false, false, false, false, false, false, false, true, false, true, false, false, false, false, false, false, false, true], [true, false, true, true, true, true, true, false, true, false, true, true, true, true, true, false, false, false, true, false, true], [true, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, true, false, true], [true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true]]
+[[true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true], [true, false, false, false, false, false, true, false, false, false, false, false, true, false, false, false, false, false, false, false, true], [true, false, false, true, true, false, true, true, true, false, true, false, true, true, true, true, true, false, true, true, true], [true, false, false, false, false, false, false, false, false, false, true, false, true, false, false, false, true, false, false, false, true], [true, false, false, false, true, true, true, true, false, true, true, false, true, false, true, false, true, true, true, false, true], [true, false, true, false, false, false, false, false, true, false, false, false, true, false, false, false, false, false, true, false, true], [true, false, true, true, true, true, true, false, true, false, true, true, true, false, true, true, true, false, true, false, true], [true, false, false, false, false, false, false, false, false, false, false, false, true, false, true, false, false, false, true, false, true], [true, false, true, false, true, true, true, false, true, true, false, false, true, false, true, false, true, true, true, false, true], [true, false, false, false, true, false, false, false, false, false, true, false, false, false, true, false, true, false, false, false, true], [true, true, false, false, true, false, true, true, true, false, true, false, false, false, true, false, true, false, true, true, true], [true, false, false, false, true, false, false, false, true, false, false, false, true, false, false, false, true, false, false, false, true], [true, false, false, true, true, true, true, false, true, true, true, false, true, false, true, true, true, false, true, false, true], [true, false, true, false, false, false, false, false, true, false, false, false, true, false, false, false, true, false, true, false, true], [true, true, false, false, true, true, true, true, true, false, true, false, true, true, true, false, true, false, true, false, true], [true, false, false, false, true, false, false, false, false, false, true, false, true, false, false, false, true, false, true, false, true], [true, false, false, true, true, false, true, false, true, false, true, false, false, false, true, true, false, true, true, false, true], [true, false, true, false, false, false, true, false, false, false, true, false, true, false, false, false, true, false, false, false, true], [true, false, true, false, true, false, true, false, true, true, true, true, true, true, true, false, true, false, true, true, true], [true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, true], [true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true]]

maze.py

@@ -1,4 +1,5 @@
 # DFS: Depth First Search
+import tkinter.filedialog as fd
 import random
 import tkinter as tk
 import json
@@ -74,7 +75,8 @@ class MazeGenerator:
                 y = random.randint(1, self.height - 2)
                 self.maze[x][y] = False
             self.draw_maze()
-            with open('maze.json', 'w') as json_file:
+            filename = fd.asksaveasfilename(defaultextension=".json")
+            with open(filename, 'w') as json_file:
                 json.dump(self.maze, json_file) 
 
 
@@ -99,5 +101,7 @@ class MazeGenerator:
         self.window.mainloop()
 
 # Crea e avvia il generatore di labirinti
-generator = MazeGenerator(20, 20)
+width = input("Inserisci la larghezza del labirinto: ")
+height = input("Inserisci l'altezza del labirinto: ")
+generator = MazeGenerator(int(width), int(height))
 generator.run()

patan.json

@@ -0,0 +1 @@
+[[true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true], [true, false, false, false, false, false, true, false, true, false, false, false, false, false, false, false, false, false, true, false, true], [true, true, true, false, true, false, true, false, true, false, false, true, true, true, true, false, true, false, true, false, true], [true, false, false, false, true, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, true], [true, false, true, false, true, false, true, true, true, false, true, false, true, true, true, true, true, true, true, false, true], [true, false, true, false, true, false, true, false, false, false, true, false, false, false, true, false, false, false, false, false, true], [true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, true, true, false, true], [true, false, false, false, true, false, false, false, true, false, true, false, true, false, false, false, false, false, false, false, true], [true, true, true, false, true, true, true, true, true, false, true, false, true, false, true, false, true, true, true, true, true], [true, false, false, false, false, false, false, false, true, false, true, false, true, false, true, false, false, false, false, false, true], [true, false, true, false, true, true, true, true, true, false, true, true, true, false, true, true, true, true, true, true, true], [true, false, true, false, true, false, false, false, true, false, true, false, false, false, true, false, false, false, false, false, true], [true, false, true, true, true, false, true, false, true, false, true, false, false, true, true, false, true, true, true, false, true], [true, false, true, false, false, false, true, false, true, false, true, false, false, false, true, false, false, false, true, false, true], [true, false, true, false, true, true, false, false, true, false, true, true, true, false, true, true, true, false, true, false, true], [true, false, true, false, true, false, true, false, true, false, false, false, true, false, false, false, false, false, true, false, true], [true, false, true, false, true, false, true, false, true, true, true, false, true, true, true, true, true, true, false, false, true], [true, false, true, false, false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, true], [true, false, true, true, true, false, true, false, true, false, false, true, false, true, true, false, true, false, true, false, true], [true, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, true, false, true], [true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true]]