From 142d9f07c3e3403b27f6b2ae62aab34aeb945be0 Mon Sep 17 00:00:00 2001
From: Serhii Hromov <serhro@st.amu.edu.pl>
Date: Sun, 28 Jun 2020 16:36:52 +0000
Subject: [PATCH] PROJECT 3 FUNCTION FIX + cooker sprite update

---
 cooker.png | Bin 0 -> 3554 bytes
 main.py    |  10 +++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 cooker.png

diff --git a/cooker.png b/cooker.png
new file mode 100644
index 0000000000000000000000000000000000000000..dda605962a96f7ca72a590274ced855e79c11268
GIT binary patch
literal 3554
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

literal 0
HcmV?d00001

diff --git a/main.py b/main.py
index a01c0f5..5241dee 100644
--- a/main.py
+++ b/main.py
@@ -101,6 +101,7 @@ tableOrder = pygame.image.load('tableOrder.png')
 tableDecide = pygame.image.load('tableDecide.png')
 tableWait = pygame.image.load('tableWait.png')
 tableEat = pygame.image.load('tableEat.png')
+cooker = pygame.image.load('cooker.png')
 wall = pygame.image.load('wall.png')
 # eating time
 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))
                         display.blit(tableEmpty, (iw * 32 + 1, ih * 32 + 1, 32 - 1, 32 - 1))
                 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:
                 #   pygame.draw.rect(display, (64,0,64), (iw * 32 + 1, ih * 32+1, 14, 14))
             else:
@@ -574,7 +576,8 @@ if help:
     display.blit(tableEat, (WIDTH * 32 + 10, 192, 32 - 1, 32 - 1))
     display.blit(textsurface, (WIDTH * 32 + 50, 192))
     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))
     textsurface = font.render("kaluza", False, (255, 255, 255))
     pygame.draw.circle(display, (128, 128, 255), (WIDTH * 32 + 26, 272), 8)
@@ -594,7 +597,8 @@ while True:
                 project = 1
             #Execute project
             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:
                 pygame.quit()
             if event.key == pygame.K_F5: