From 0e8d3c40bd5a259c9afc0e7d57ca470db25183ea Mon Sep 17 00:00:00 2001
From: Serhii Hromov <serhro@st.amu.edu.pl>
Date: Sat, 27 Jun 2020 14:42:34 +0000
Subject: [PATCH] Updated graphics

---
 act1.png  | Bin 0 -> 2433 bytes
 main-2.py |  51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 tile.jpg  | Bin 0 -> 891 bytes
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 act1.png
 create mode 100644 tile.jpg

diff --git a/act1.png b/act1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fef41c2f03320515b24e09684f31565739b2d5b
GIT binary patch
literal 2433
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
G+P?vGO|9Jk

literal 0
HcmV?d00001

diff --git a/main-2.py b/main-2.py
index d21bf5e..2b28585 100644
--- a/main-2.py
+++ b/main-2.py
@@ -30,6 +30,9 @@ KITCHEN = (1, 1)
 MIDDLE = (floor(WIDTH / 2), floor(HEIGHT / 2))
 
 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
 EAT_TIME = 15
@@ -139,19 +142,46 @@ class Agent:
     def __init__(self, x, y):
         self.x = x
         self.y = y
+        self.dir = 1 #1234 NorWesSouEas
         self.path = []
         self.idle = True
         self.orders = []
         self.food = False
         self.ordered_food = []
+        self.goal = (0,0)
 
     def walk(self):
+        #'''
         t = self.path.pop(0)
         self.x = t[0]
         self.y = t[1]
         if not self.path:
             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):
         restaurant.flush()
         queue = [(self.x, self.y)]
@@ -212,7 +242,8 @@ def drawScreen():
         for iw in range(WIDTH):
             tile = restaurant.tiles[ih][iw]
             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.clientState:
                         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))
             else:
                 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))
     display.blit(textsurface, (WIDTH * 32 + 80, 300))
diff --git a/tile.jpg b/tile.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1578b81620d996c90b38657caf6d1272217e6706
GIT binary patch
literal 891
zcmex=<NpH&0WUXCHwH#VMurL?WcdG(LCLiuGmU}4*Ox(yfq{VoC?~|g3}i6^AsGC>
z&EU+y#K;IjP{7Q}3<7K{EX=IzZ0zhH%)!ac$-%+J!OqUb%f-db0|e}xeEhsTd>}T+
z5Ri6|E+FFJVCMj-APxLKz#z!MpunKO%&5e`B*@4t$oT&VgFMi!tUw=uJOu@eOw25-
zY(OV*aRU`>6#zP)nVAXbSXLGmpz2znJOhg$tB|6hBb#twBD+$dh*9Ijg&fLG8xM*G
zUHqV8oK)1r$t5N(At|M*rmmr>WnyY(ZeeNV?BeR??&0Yb91<E99uXOpoRXTBo{^bV
zTvA$AUQt=q+|t_C-qG1LY4Vh*)27duIcw44B}<nrU$Ju4rp;TnZri?N=dMGCj~qRA
z{KUyqmo8tqdhPm+o3|c5di><+v*#~fzWVs-^OvvRzW@073*;|G24;x2;66k1mmttz
zOu#r`VF&q(k*OSrnFU!`6%E;h90S=C3x$=88aYIqCNA7~kW<+>=!0ld(M2vX6_bam
zA3<IN`;0h`HId~rxW^Fwy2Zf5%m|D;W<dsfhJW=h7IiWFyKn#S^8QWd|4RG6`Oom5
zq3yHBe}*SjANhZ1uKy#f{Vn%{_#ff?Z_U?B^l!d@P}jZo#eUuz_xk0p#N=2ny<N9P
zPwCRTIL$><75HU3UaeWTL{ve*QS^Il4ah9kr2h<4BI_>Q|K_zP@IS+{?o|x-4<_&b
z)UAJW`M;Clt^XOmT+EJl2tOqM!Dsys&Fyb)KhXc7cK^-Kh1vVJ$RGGC9(}P+>POMx
zfXnaylrFs;8xiBW^tQ@|)57QEECsJlo!Fq|$ik$3`#;0OH}OCp$ZQAupq(G&1E9|o
JK>quG69DU3K#%|c

literal 0
HcmV?d00001