Refactor knight.py and main.py
This commit is contained in:
@@ -0,0 +1,62 @@
|
||||
import tkinter as tk
|
||||
import os
|
||||
import glob
|
||||
import time
|
||||
import random
|
||||
|
||||
from Effects.animated_gif import AnimatedGif
|
||||
from Effects.order_click import OrderClick
|
||||
|
||||
class Unit:
|
||||
def __init__(self, engine, position=(0,0)):
|
||||
self.engine = engine
|
||||
self.position = position
|
||||
self.target = position
|
||||
self.destination = position
|
||||
gifs = glob.glob("assets/Hound/**/*.gif", recursive=True)
|
||||
self.animation = {os.path.basename(gif): AnimatedGif(gif) for gif in gifs}
|
||||
self.state = "Walk"
|
||||
self.speed = .025 # This is now the delay between updates in seconds
|
||||
self.partial_move = 0
|
||||
self.direction = 2
|
||||
self.visited = [self.position]
|
||||
self.starting_position = (position)
|
||||
self.already_tried = []
|
||||
|
||||
def move(self, target):
|
||||
pass
|
||||
|
||||
|
||||
def ai(self):
|
||||
screen_x, screen_y = self.engine.iso_transform(*self.position)
|
||||
if self.position != self.target:
|
||||
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
|
||||
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)
|
||||
neighbors_list = self.engine.find_neighbors(self.destination) # Get the neighbors of the destination cell
|
||||
# Remove any neighbors that are not walkable
|
||||
neighbors_list = [cell for cell in neighbors_list if self.engine.battlefield[cell[1]][cell[0]].walkable]
|
||||
# Update position and visited list
|
||||
self.position = self.destination
|
||||
self.destination = None
|
||||
self.visited.append(self.position)
|
||||
self.destination = self.engine.get_closest_neighbor(neighbors_list,self.target)
|
||||
self.partial_move = 0
|
||||
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'{self.state}_dir{self.direction}.gif')
|
||||
return gif, screen_x, screen_y
|
||||
|
||||
def move_to(self, target):
|
||||
self.target = target
|
||||
self.state = "Walk"
|
||||
+1
-1
@@ -7,7 +7,7 @@ import random
|
||||
from Effects.animated_gif import AnimatedGif
|
||||
from Effects.order_click import OrderClick
|
||||
|
||||
class Knight:
|
||||
class Unit:
|
||||
def __init__(self, engine, position=(0,0)):
|
||||
self.engine = engine
|
||||
self.position = position
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
import tkinter as tk
|
||||
import os
|
||||
import glob
|
||||
import time
|
||||
import random
|
||||
|
||||
from Effects.animated_gif import AnimatedGif
|
||||
from Effects.order_click import OrderClick
|
||||
|
||||
class Unit:
|
||||
def __init__(self, engine, position=(0,0)):
|
||||
self.engine = engine
|
||||
self.position = position
|
||||
self.target = position
|
||||
self.script_name = os.path.basename(__file__).split('.')[0]
|
||||
self.destination = position
|
||||
gifs = glob.glob("assets/Zombie/**/*.gif", recursive=True)
|
||||
self.animation = {os.path.basename(gif): AnimatedGif(gif) for gif in gifs}
|
||||
self.state = "Walk"
|
||||
self.speed = .05 # This is now the delay between updates in seconds
|
||||
self.partial_move = 0
|
||||
self.direction = 2
|
||||
self.visited = [self.position]
|
||||
self.starting_position = (position)
|
||||
self.already_tried = []
|
||||
|
||||
def move(self, target):
|
||||
pass
|
||||
|
||||
|
||||
def ai(self):
|
||||
screen_x, screen_y = self.engine.iso_transform(*self.position)
|
||||
if self.position != self.target:
|
||||
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
|
||||
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)
|
||||
neighbors_list = self.engine.find_neighbors(self.destination) # Get the neighbors of the destination cell
|
||||
# Remove any neighbors that are not walkable
|
||||
neighbors_list = [cell for cell in neighbors_list if self.engine.battlefield[cell[1]][cell[0]].walkable]
|
||||
# Update position and visited list
|
||||
self.position = self.destination
|
||||
self.destination = None
|
||||
self.visited.append(self.position)
|
||||
self.destination = self.engine.get_closest_neighbor(neighbors_list,self.target)
|
||||
self.partial_move = 0
|
||||
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'{self.state}_dir{self.direction}.gif')
|
||||
return gif, screen_x, screen_y
|
||||
|
||||
def move_to(self, target):
|
||||
self.target = target
|
||||
self.state = "Walk"
|
||||
Reference in New Issue
Block a user