From 7a65079aa2db8c22cd4514a0f1f5904b48527ad0 Mon Sep 17 00:00:00 2001
From: Marcin Dobrowolski <mdobrowolski.1997@gmail.com>
Date: Tue, 28 Apr 2020 18:56:50 +0200
Subject: [PATCH] 4th part of AStar implementation

---
 main.py                               |  18 +++++++++++-------
 src/__pycache__/waiter.cpython-38.pyc | Bin 4471 -> 4486 bytes
 src/waiter.py                         |   7 ++++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/main.py b/main.py
index 35c974d..4be355f 100644
--- a/main.py
+++ b/main.py
@@ -43,15 +43,19 @@ if __name__ == "__main__":
 
                     goal = (x, y)
                     path = waiter.findPath(goal)
+                    print('goal: {}'.format(goal))
 
         if path != []:
-            temp = path.pop(0)
-            print(temp)
-            waiter.travel(temp, graphics)
-
-            #graphics.clear(waiter.X, waiter.Y)
-            #waiter.update(event, graphics)
-            #graphics.update(waiter.X, waiter.Y)
+            print(path)
+            nextStep = path.pop(0)
+            print(nextStep)
+            waiter.travel(nextStep, graphics)
 
+        print('{} {} current position'.format(waiter.X, waiter.Y))
+        '''
+        graphics.clear(waiter.X, waiter.Y)
+        waiter.update(event, graphics)
+        graphics.update(waiter.X, waiter.Y)
+        '''
         pygame.display.flip()
         clock.tick(fps)
diff --git a/src/__pycache__/waiter.cpython-38.pyc b/src/__pycache__/waiter.cpython-38.pyc
index ddb113712aa9cd57e9727fe2662dd56aaf5fbfdf..5807d509d3ec240e8e6ef524f68031ed42acc7db 100644
GIT binary patch
delta 1577
zcmaJ>&5ImG6t7p+-P1i^*>!ixOcJBnTpZafM*IZzAYm~Qg04n%FfPs3WM_INvpa8k
z69d&Wm?#Jl2Kp*uZV|l59t8gi!CPNE?@93DL4v+lvpX}JHFndlU%mRh_j|9ZUj4QF
z)%ohRN~I|1`TP3A&*qnZs-A%bX~c#X7Yu0i4Uq0@Cwmi47u>7+1wv*`82GIGAaF7J
z4L*W$_PqT4a)nH}d%L6KHda~p+O5u3JH|O4ly8T<?gmY5?{2jl4lb|}KF{F}ax7e&
zh^4)C6~eo|1+3?=hCu56KlGp^ts!xq!KYbQHc+$F=?`Pv-Hbci{bTX6N6rvF%?9qP
zsTM|VDC2zZ82JD|#IAAff`+a$QuwiPBC4CK20<8K!vjb>;}Y6qwDFAUO8jw4Bn9Io
zzVWr_2Kb#R5W<fFi}53s_=7J@K?{1FFI8Q9Ajl&yUX%tJ>VoLp5#WdnftECuCpi%j
z(aZC9p(|*9b!@RHvet=yim!{PsAX4LTtM{J`$^bw@==hE>1xvyp6FI1!U@I5{4WJ#
z4=HScGX>dVBo=LIDObzYv*8Feufep!2{q%6Q9q77N_|kAL^D~hF{3de<t08`BrQ4b
zL(mMR`7g?&Sf<pFP;!^V^<R^cap`|5DVvfh)22wguVqpMF_MFa^xZe(&6=0^3%il&
z9v!CAhRRm`lS}qg)M(%1GBq8oktsz%*7VP%&m|QKS)q^$DR@MBRI-P)d_bTEuZ+~7
zd_bV^ok@H?<Rwm&*#?(19m9ru)i%?(k04jw)*W2tK00B$6uE~Fns+C}mh8vbpZ*IH
zYuQS$0t?wEL3&}PQwg2>H#&X&UKqDuqtWml385CDrW|mj2bn7FKyfcFzNjugO;c0)
zrn+)v4WD7#ITB5|zJ}cMO-bgnq)=~9(y<-i@NBc=YW7Fv<+G2aQHe3^4|`$U;#|Jo
zd%OA}q#PKZWpRcB`uGz4a(4$i{W$k-Y~#%^wxM%(v)2l7hVVQ)xMRW#9D#4CW_7}1
zOU{GMc8K9-+``!lj7dB~I=5QA{j5HBZMDo1_`*Vtix*jNF8Df&X(?7)%D$aD1@C7+
z&s|JcXubjX)KS<H4;v&N(KqBvQGgvc0t{#{-b}@s^>kR{YaUB1To&wpjG1h?|HjR2
Rz1wTOMb~b&HGcwb{R>(VOB4VA

delta 1523
zcmaJ>&2Jl35P$Rb!*9KIk|sfolTw;if?E9q#FqpW2UIDdLMgN$MS^IRbz-kwCmwHH
zkltd6hzM1xWa(WvQVt-*355&)07oQl)n2&r2UO|>A!eQ(<1`doJ3BM)H}jj>_vY=N
zdwh24cDY;>^n3T!?>~98{L|Dam;)`={j{JVmiJj#v18tXCF#Cr)}f<(LjNFe&OC$<
zAv9OyA1ftt<=)*!oYt|-x?is~w(2QPvr)PmwVLa+w7t7kuevzPPWUv3&yaKB+*r&X
zeB?v`1@nu$ba{r|izKR!4Ot5t?QV*@8);*^eJs*QuM4+K&wH(}-ESN%9{`Bd)$Sg|
z&~yh5u4*^&Qa^U?(+Xh<F+70G*B+sLMr&U?O^M%aiL9XgOlcL1W`JMo0wGkQEJh_k
zraD>|VnKiROQ#|}5EKz;KT$DMMBIm_Hvqh69g-aKBo`tQ`ZHh;nu6BP4?Txr6{4pE
zBYZ_9#aK3_#RWufqo0Ny7JnGsUm%)M2~Q1M5EB&l^#4*Yc1*z?PBdhjk?4+#hi2a!
zu;U0dhy2^&n3{3NsGr0hr5-gWu{S}<jJ-p~{%9X0*L?_@pzQq@<xwnC#*h_t@Q(QS
zw=C2iy%)2R4t0q(MdE%evm%Ir?0ielz8-Ft#GfhZT#;O#(_sqN`A~%159wiAqKTr<
zr^7^<n`#b}sj20a=d&`UEmK+tDJCI33GIRPnPlK}e11k04!+HWSq47lA(zTl=bHIl
zRi0Vqd6~9zhdh;b98Dp(TFm{O2y5*WPntJ^i!f_8gZ_ny(IarKHXH4DHA?HRlhyr#
zgmC6z!EwQrX12Hk>R_+<lCyG(77$oS5^K(l8`tqPn`hXR?_bA)RmlA;DKx<2T9C)O
z>f4FNOXlzLE2p0*qMTyX?zW<|#+7_^aC7Pw^v_TfKF4B-;}yP4uiV?gMmx>@&279B
zr8af$ZM13;P7t2u0B=Zmku&h6vo<wmu?^?JMm@r4Bdy`&eZ(X_A>CfB^`|*MbNh10
z8TeL0&Wl%Ba4pE6Y$DV)HE({LS%g*d>&%P&3$$JZJaH5@&*lpx{-USLUsHg!s{tx9
phCAu7W+PqJ0v3F0qsM~7k1>-kS8v|gj(1zNYqV9ScVZfL{{i@ZJlg;O

diff --git a/src/waiter.py b/src/waiter.py
index 213e8a9..be879b1 100644
--- a/src/waiter.py
+++ b/src/waiter.py
@@ -8,8 +8,8 @@ from .tile import Tile
 class Waiter(pygame.sprite.Sprite):
     def __init__(self, graphics):
         pygame.sprite.Sprite.__init__(self)
-        self.X = 0
-        self.Y = 0
+        self.X = 7
+        self.Y = 7
         self.frame = 0
         self.matrix = Matrix(graphics=graphics)
         self.direction = 'E'
@@ -63,6 +63,7 @@ class Waiter(pygame.sprite.Sprite):
         openList = []
         closedList = []
 
+        startNode.parent = None
         openList.append(startNode)
 
         while len(openList) > 0:
@@ -125,7 +126,7 @@ class Waiter(pygame.sprite.Sprite):
                 for openNode in openList:
                     if child == openNode and child.startCost > openNode.startCost:
                         perm = 1
-                        continue
+                        break
 
                 if perm == 1:
                     perm = 0