Updated graphics

This commit is contained in:
Serhii Hromov 2020-06-27 14:42:34 +00:00
parent 6ba99e625b
commit 0e8d3c40bd
3 changed files with 49 additions and 2 deletions

BIN
act1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -30,6 +30,9 @@ KITCHEN = (1, 1)
MIDDLE = (floor(WIDTH / 2), floor(HEIGHT / 2)) MIDDLE = (floor(WIDTH / 2), floor(HEIGHT / 2))
display = pygame.display.set_mode((WIDTH * 32 + 200, HEIGHT * 32)) display = pygame.display.set_mode((WIDTH * 32 + 200, HEIGHT * 32))
tileFoil = pygame.image.load('tile.jpg')
waiterAct = pygame.image.load('act1.png')
waiterAct.set_colorkey((255, 255, 255))
# eating time # eating time
EAT_TIME = 15 EAT_TIME = 15
@ -139,19 +142,46 @@ class Agent:
def __init__(self, x, y): def __init__(self, x, y):
self.x = x self.x = x
self.y = y self.y = y
self.dir = 1 #1234 NorWesSouEas
self.path = [] self.path = []
self.idle = True self.idle = True
self.orders = [] self.orders = []
self.food = False self.food = False
self.ordered_food = [] self.ordered_food = []
self.goal = (0,0)
def walk(self): def walk(self):
#'''
t = self.path.pop(0) t = self.path.pop(0)
self.x = t[0] self.x = t[0]
self.y = t[1] self.y = t[1]
if not self.path: if not self.path:
self.idle = True self.idle = True
'''
t = self.path.pop(0)
if t[0] == "rotate":
if t[1] == "right":
self.dir = self.dir - 1
if self.dir == 0:
self.dir = 4
else:
self.dir = self.dir + 1
if self.dir == 5:
self.dir = 1
else:
if self.dir == 1:
self.y = self.y - 1
elif self.dir == 2:
self.x = self.x - 1
elif self.dir == 3:
self.y = self.y + 1
else:
self.x = self.x + 1
if not self.path:
waiter.goal = (random.randint(1, 8), random.randint(1, 8))
'''
def BFS(self, goal): def BFS(self, goal):
restaurant.flush() restaurant.flush()
queue = [(self.x, self.y)] queue = [(self.x, self.y)]
@ -212,7 +242,8 @@ def drawScreen():
for iw in range(WIDTH): for iw in range(WIDTH):
tile = restaurant.tiles[ih][iw] tile = restaurant.tiles[ih][iw]
if tile.canwalk: if tile.canwalk:
pygame.draw.rect(display, (128, 128, 128), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) #pygame.draw.rect(display, (128, 128, 128), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1))
display.blit(tileFoil, (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1))
if tile.table: if tile.table:
if tile.clientState: if tile.clientState:
if tile.clientState == "decide": if tile.clientState == "decide":
@ -231,7 +262,23 @@ def drawScreen():
# pygame.draw.rect(display, (64,0,64), (iw * 32 + 1, ih * 32+1, 14, 14)) # pygame.draw.rect(display, (64,0,64), (iw * 32 + 1, ih * 32+1, 14, 14))
else: else:
pygame.draw.rect(display, (128, 0, 128), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) pygame.draw.rect(display, (128, 0, 128), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1))
pygame.draw.circle(display, (255, 255, 255), (waiter.x * 32 + 16, waiter.y * 32 + 16), 16) #pygame.draw.circle(display, (255, 255, 255), (waiter.x * 32 + 16, waiter.y * 32 + 16), 16)
display.blit(waiterAct, (waiter.x * 32 + 8, waiter.y * 32 + 8))
'''
xx = 0
yy = 0
if waiter.dir == 1:
yy = -16
elif waiter.dir == 2:
xx = -16
elif waiter.dir == 3:
yy = 16
elif waiter.dir == 4:
xx = 16
pygame.draw.circle(display, (255, 0, 0), (waiter.x * 32 + 16 + xx, waiter.y * 32 + 16 + yy), 8)
'''
textsurface = font.render(str(restaurant.clients), False, (255, 255, 255)) textsurface = font.render(str(restaurant.clients), False, (255, 255, 255))
display.blit(textsurface, (WIDTH * 32 + 80, 300)) display.blit(textsurface, (WIDTH * 32 + 80, 300))

BIN
tile.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 891 B