enne2
/
maze_knight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: enne2:master
Branches Tags
enne2:master
enne2:pyglet
enne2:tk
...
pull from: enne2:tk
Branches Tags
enne2:master
enne2:pyglet
enne2:tk

4 Commits
master ... tk

Author SHA1 Message Date
Matteo Benedetto 8381f8227d Aggiungi funzionalità di caricamento e salvataggio del campo di battaglia
2 years ago
Matteo Benedetto e4fd505405 Aggiornamenti al codice: modifiche ai file Python, aggiunta di file audio e miglioramenti alla GUI.
2 years ago
Matteo Benedetto 06f714dfc1 Add double right-click functionality to canvas
2 years ago
Matteo Benedetto 91dca9c094 Refactor code to improve knight movement and update maze configuration
2 years ago
13 changed files with 180 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 31
      Effects/.gitignore
  2. BIN
      Effects/__pycache__/animated_gif.cpython-311.pyc
  3. BIN
      Effects/__pycache__/order_click.cpython-311.pyc
  4. 31
      Units/.gitignore
  5. BIN
      Units/__pycache__/knight.cpython-311.pyc
  6. 97
      Units/knight.py
  7. BIN
      audio
  8. 1
      booh.json
  9. 83
      main.py
  10. 2
      maze.json
  11. 8
      maze.py
  12. 1
      moh.json
  13. 1
      patan.json

31
Effects/.gitignore vendored
Unescape View File

@ -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

BIN
Effects/__pycache__/animated_gif.cpython-311.pyc
View File

Binary file not shown.

BIN
Effects/__pycache__/order_click.cpython-311.pyc
View File

Binary file not shown.

31
Units/.gitignore vendored
Unescape View File

@ -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

BIN
Units/__pycache__/knight.cpython-311.pyc
View File

Binary file not shown.

97
Units/knight.py
Unescape View File

@ -1,8 +1,5 @@
import tkinter as tk
import os import os
import glob import glob
import time
import random
from Effects.animated_gif import AnimatedGif from Effects.animated_gif import AnimatedGif
from Effects.order_click import OrderClick from Effects.order_click import OrderClick
@ -24,81 +21,53 @@ class Knight:
def ai(self): def ai(self):
screen_x, screen_y = self.engine.iso_transform(*self.position) 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) self.direction = self.engine.get_direction(self.position,self.destination)
if self.partial_move<1: if self.partial_move<1:
screen_x_dest, screen_y_dest = self.engine.iso_transform(*self.destination) screen_x_dest, screen_y_dest = self.engine.iso_transform(*self.destination)
self.partial_move += self.speed 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_x += (screen_x_dest - screen_x) * self.partial_move
screen_y += (screen_y_dest - screen_y) * self.partial_move screen_y += (screen_y_dest - screen_y) * self.partial_move
else: else:
screen_x, screen_y = self.engine.iso_transform(*self.destination) 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 = 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 # 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] neighbors_list = [cell for cell in neighbors_list if self.engine.battlefield[cell[1]][cell[0]].walkable]
if self.engine.battlefield[self.best_next[1]][self.best_next[0]].walkable == False:
old_distance_from_target = self.engine.get_distance(self.destination,self.target) self.best_next = self.engine.get_closest_neighbor(neighbors_list,self.best_next)
old_distance_from_start = self.engine.get_distance(self.destination,self.starting_position) if not self.best_next:
self.target = self.destination
for cell_visited in self.visited: self.best_next = self.destination
if cell_visited in neighbors_list:
neighbors_list.remove(cell_visited)
#self.visited = self.visited[-2:]
self.position = self.destination self.position = self.destination
self.visited.append(self.position) self.destination = self.best_next
self.partial_move = 0
for cell in neighbors_list: self.visited.append(self.destination)
self.engine.effects.append(OrderClick(self.engine.iso_transform(*cell),color="lightblue")) print(self.partial_move)
for cell in self.visited:
self.engine.effects.append(OrderClick(self.engine.iso_transform(*cell),color="red"))
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') 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"

BIN
audio
View File

Binary file not shown.

1
booh.json
View File

File diff suppressed because one or more lines are too long

83
main.py
Unescape View File

@ -7,11 +7,34 @@ import json
from Units.knight import Knight from Units.knight import Knight
from Effects.order_click import OrderClick from Effects.order_click import OrderClick
from tkinter import Menu 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: 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): def __init__(self, width, height, data):
self.width = width self.width = width
self.height = height self.height = height
@ -30,6 +53,8 @@ class IsometricGame:
self.input_lock = False self.input_lock = False
self.window = tk.Tk() self.window = tk.Tk()
self.window.protocol("WM_DELETE_WINDOW", self.on_close)
files = sorted(glob.glob("Tiles/**/*.png", recursive=True)) 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.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)] # 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.window.bind('<KeyRelease>', self.on_key_press)
self.canvas.bind('<Button-1>', self.on_canvas_click) self.canvas.bind('<Button-1>', self.on_canvas_click)
self.canvas.bind('<Button-3>', self.on_canvas_rclick) 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) 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.knight = Knight(self, (1,1))
self.draw_battlefield() 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): def calculate_coordinates(self, event):
if self.input_lock: if self.input_lock:
return return
@ -234,11 +273,21 @@ class IsometricGame:
def on_canvas_click(self, event): def on_canvas_click(self, event):
# calculate the clicked cell's coordinates # calculate the clicked cell's coordinates
cell_x, cell_y = self.inv_iso_transform(event.x, event.y) 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_battlefield()
self.draw_units() 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): def set_tile(self, name, pos):
# Handle option 1 selection # Handle option 1 selection
@ -253,16 +302,11 @@ class IsometricGame:
def on_canvas_rclick(self, event): def on_canvas_rclick(self, event):
# calculate the clicked cell's coordinates # calculate the clicked cell's coordinates
cell_x, cell_y = self.inv_iso_transform(event.x, event.y) cell_x, cell_y = self.inv_iso_transform(event.x, event.y)
print(f'Cell clicked: ({cell_x}, {cell_y})') self.effects.append(OrderClick(self.iso_transform(cell_x, cell_y),color="lightblue"))
x, y = self.iso_transform(cell_x, cell_y)
self.effects.append(OrderClick((x, y), color="light blue"))
if self.knight.target == (cell_x, cell_y): if self.knight.target == (cell_x, cell_y):
return return
if 0 <= cell_x < self.width and 0 <= cell_y < self.height: if 0 <= cell_x < self.width and 0 <= cell_y < self.height:
self.knight.starting_position = self.knight.position self.knight.move_to((cell_x, cell_y))
self.knight.target = (cell_x,cell_y)
self.knight.state = "Walk"
def run(self): def run(self):
self.draw_battlefield() self.draw_battlefield()
@ -273,7 +317,7 @@ class IsometricGame:
#self.draw_battlefield() #self.draw_battlefield()
self.draw_units() self.draw_units()
self.draw_effects() 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: class Cell:
def __init__(self, walkable=False, tile=None, elevation=0, offset=0): def __init__(self, walkable=False, tile=None, elevation=0, offset=0):
@ -286,6 +330,23 @@ class Cell:
if __name__ == "__main__": 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: with open('maze.json', 'r') as file:
data = json.load(file) data = json.load(file)
# data is a boolean matrix, find dmensions # data is a boolean matrix, find dmensions

2
maze.json
Unescape View File

@ -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]]

8
maze.py
Unescape View File

@ -1,4 +1,5 @@
# DFS: Depth First Search # DFS: Depth First Search
import tkinter.filedialog as fd
import random import random
import tkinter as tk import tkinter as tk
import json import json
@ -74,7 +75,8 @@ class MazeGenerator:
y = random.randint(1, self.height - 2) y = random.randint(1, self.height - 2)
self.maze[x][y] = False self.maze[x][y] = False
self.draw_maze() 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) json.dump(self.maze, json_file)
@ -99,5 +101,7 @@ class MazeGenerator:
self.window.mainloop() self.window.mainloop()
# Crea e avvia il generatore di labirinti # 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() generator.run()

1
moh.json
View File

File diff suppressed because one or more lines are too long

1
patan.json
Unescape View File

@ -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]]
Write Preview
Loading…
Cancel
Save