PROJECT 3 FUNCTION FIX + cooker sprite update

This commit is contained in:
Serhii Hromov 2020-06-28 16:36:52 +00:00
parent 695c6b199a
commit 142d9f07c3
2 changed files with 7 additions and 3 deletions

BIN
cooker.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

10
main.py
View File

@ -101,6 +101,7 @@ tableOrder = pygame.image.load('tableOrder.png')
tableDecide = pygame.image.load('tableDecide.png') tableDecide = pygame.image.load('tableDecide.png')
tableWait = pygame.image.load('tableWait.png') tableWait = pygame.image.load('tableWait.png')
tableEat = pygame.image.load('tableEat.png') tableEat = pygame.image.load('tableEat.png')
cooker = pygame.image.load('cooker.png')
wall = pygame.image.load('wall.png') wall = pygame.image.load('wall.png')
# eating time # eating time
EAT_TIME = 15 EAT_TIME = 15
@ -499,7 +500,8 @@ def drawScreen():
# pygame.draw.rect(display, (64, 64, 64), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) # pygame.draw.rect(display, (64, 64, 64), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1))
display.blit(tableEmpty, (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) display.blit(tableEmpty, (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1))
if tile.kitchen: if tile.kitchen:
pygame.draw.rect(display, (255, 0, 255), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1)) #pygame.draw.rect(display, (255, 0, 255), (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1))
display.blit(cooker, (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1))
# if tile.visited: # if tile.visited:
# 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:
@ -574,7 +576,8 @@ if help:
display.blit(tableEat, (WIDTH * 32 + 10, 192, 32 - 1, 32 - 1)) display.blit(tableEat, (WIDTH * 32 + 10, 192, 32 - 1, 32 - 1))
display.blit(textsurface, (WIDTH * 32 + 50, 192)) display.blit(textsurface, (WIDTH * 32 + 50, 192))
textsurface = font.render("kuchnia", False, (255, 255, 255)) textsurface = font.render("kuchnia", False, (255, 255, 255))
pygame.draw.rect(display, (255, 0, 255), (WIDTH * 32 + 10, 224, 32 - 1, 32 - 1)) #pygame.draw.rect(display, (255, 0, 255), (WIDTH * 32 + 10, 224, 32 - 1, 32 - 1))
display.blit(cooker, (WIDTH * 32 + 10, 224, 32 - 1, 32 - 1))
display.blit(textsurface, (WIDTH * 32 + 50, 224)) display.blit(textsurface, (WIDTH * 32 + 50, 224))
textsurface = font.render("kaluza", False, (255, 255, 255)) textsurface = font.render("kaluza", False, (255, 255, 255))
pygame.draw.circle(display, (128, 128, 255), (WIDTH * 32 + 26, 272), 8) pygame.draw.circle(display, (128, 128, 255), (WIDTH * 32 + 26, 272), 8)
@ -594,7 +597,8 @@ while True:
project = 1 project = 1
#Execute project #Execute project
if event.key == pygame.K_2: if event.key == pygame.K_2:
print("Passed: %s. Prediction: %s" % (client_ordering(), print_leaf(classify(client_ordering(), tree)))) temp_order = client_ordering()
print("Passed: %s. Prediction: %s" % (temp_order, print_leaf(classify(temp_order, tree))))
if event.key == pygame.K_F4: if event.key == pygame.K_F4:
pygame.quit() pygame.quit()
if event.key == pygame.K_F5: if event.key == pygame.K_F5: