From 58bbd316b9b7596ad119069a72859aa52e03d1a9 Mon Sep 17 00:00:00 2001
From: Emulowsky <snajper537@gmail.com>
Date: Tue, 16 Apr 2019 13:43:41 +0200
Subject: [PATCH] Zmiany w poruszaniu, gridzie i elementach

---
 .idea/workspace.xml                    |  80 ++++++++++++-------------
 __pycache__/gridElement.cpython-36.pyc | Bin 932 -> 932 bytes
 __pycache__/waiter.cpython-36.pyc      | Bin 2028 -> 1548 bytes
 game.py                                |   3 +-
 gridElement.py                         |   2 +-
 waiter.py                              |  68 ++++++++++-----------
 6 files changed, 72 insertions(+), 81 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 160c6ab..728c259 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="152ea650-8e02-4ed6-aa8c-04d44b275be4" name="Default Changelist" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/path.py" />
-      <change beforePath="$PROJECT_DIR$/.idea/Test.iml" afterPath="$PROJECT_DIR$/.idea/Test.iml" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/game.py" afterPath="$PROJECT_DIR$/game.py" />
       <change beforePath="$PROJECT_DIR$/gridElement.py" afterPath="$PROJECT_DIR$/gridElement.py" />
-      <change beforePath="$PROJECT_DIR$/orderTable.py" afterPath="$PROJECT_DIR$/orderTable.py" />
-      <change beforePath="$PROJECT_DIR$/pool.py" afterPath="$PROJECT_DIR$/pool.py" />
-      <change beforePath="$PROJECT_DIR$/table.py" afterPath="$PROJECT_DIR$/table.py" />
       <change beforePath="$PROJECT_DIR$/waiter.py" afterPath="$PROJECT_DIR$/waiter.py" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -38,8 +32,8 @@
       <file leaf-file-name="game.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/game.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1145">
-              <caret line="87" column="0" lean-forward="true" selection-start-line="87" selection-start-column="0" selection-end-line="87" selection-end-column="0" />
+            <state relative-caret-position="-153">
+              <caret line="21" column="96" lean-forward="false" selection-start-line="21" selection-start-column="96" selection-end-line="21" selection-end-column="96" />
               <folding>
                 <element signature="e#0#18#0" expanded="true" />
               </folding>
@@ -51,7 +45,7 @@
         <entry file="file://$PROJECT_DIR$/gridElement.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="204">
-              <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
+              <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
               <folding>
                 <element signature="e#0#13#0" expanded="true" />
               </folding>
@@ -86,8 +80,8 @@
       <file leaf-file-name="pool.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pool.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="51">
-              <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
+            <state relative-caret-position="170">
+              <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
               <folding>
                 <element signature="e#0#13#0" expanded="true" />
               </folding>
@@ -98,8 +92,8 @@
       <file leaf-file-name="orderTable.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/orderTable.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="51">
-              <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
+            <state relative-caret-position="187">
+              <caret line="11" column="32" lean-forward="true" selection-start-line="11" selection-start-column="32" selection-end-line="11" selection-end-column="32" />
               <folding>
                 <element signature="e#0#13#0" expanded="true" />
               </folding>
@@ -110,8 +104,8 @@
       <file leaf-file-name="waiter.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/waiter.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-130">
-              <caret line="3" column="87" lean-forward="true" selection-start-line="3" selection-start-column="87" selection-end-line="3" selection-end-column="87" />
+            <state relative-caret-position="448">
+              <caret line="51" column="42" lean-forward="false" selection-start-line="51" selection-start-column="42" selection-end-line="51" selection-end-column="42" />
               <folding>
                 <element signature="e#0#13#0" expanded="true" />
               </folding>
@@ -147,9 +141,9 @@
         <option value="$PROJECT_DIR$/pool.py" />
         <option value="$PROJECT_DIR$/table.py" />
         <option value="$PROJECT_DIR$/path.py" />
-        <option value="$PROJECT_DIR$/waiter.py" />
         <option value="$PROJECT_DIR$/gridElement.py" />
         <option value="$PROJECT_DIR$/game.py" />
+        <option value="$PROJECT_DIR$/waiter.py" />
       </list>
     </option>
   </component>
@@ -494,23 +488,11 @@
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pool.py">
+    <entry file="file://$PROJECT_DIR$/order.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gridElement.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="102">
+          <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -534,28 +516,40 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/orderTable.py">
+    <entry file="file://$PROJECT_DIR$/pool.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
+        <state relative-caret-position="170">
+          <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
           <folding>
             <element signature="e#0#13#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/order.py">
+    <entry file="file://$PROJECT_DIR$/orderTable.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="187">
+          <caret line="11" column="32" lean-forward="true" selection-start-line="11" selection-start-column="32" selection-end-line="11" selection-end-column="32" />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gridElement.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/game.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1145">
-          <caret line="87" column="0" lean-forward="true" selection-start-line="87" selection-start-column="0" selection-end-line="87" selection-end-column="0" />
+        <state relative-caret-position="-153">
+          <caret line="21" column="96" lean-forward="false" selection-start-line="21" selection-start-column="96" selection-end-line="21" selection-end-column="96" />
           <folding>
             <element signature="e#0#18#0" expanded="true" />
           </folding>
@@ -564,8 +558,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/waiter.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-130">
-          <caret line="3" column="87" lean-forward="true" selection-start-line="3" selection-start-column="87" selection-end-line="3" selection-end-column="87" />
+        <state relative-caret-position="448">
+          <caret line="51" column="42" lean-forward="false" selection-start-line="51" selection-start-column="42" selection-end-line="51" selection-end-column="42" />
           <folding>
             <element signature="e#0#13#0" expanded="true" />
           </folding>
diff --git a/__pycache__/gridElement.cpython-36.pyc b/__pycache__/gridElement.cpython-36.pyc
index 97ec230456b80de3db3e267afa44a540f33cf8dc..e4d17c4830f0d788e76a6e09cde485ccab6ad029 100644
GIT binary patch
delta 30
mcmZ3&zJ#6An3tF9?7porn>TWvXJX`^e3Pk!k#n*ia~J@dc?rh=

delta 30
mcmZ3&zJ#6An3tEUX6M$J`i-3DnHc#d-()Ib<e2Qo90mZ8><K#n

diff --git a/__pycache__/waiter.cpython-36.pyc b/__pycache__/waiter.cpython-36.pyc
index 7e92afbb5d86fcb7e0b52a2cd530956e8e0e1494..0dec3a5a9d7657b154816b0dd273696131f5aeb5 100644
GIT binary patch
literal 1548
zcmaJ>L2uhO6edMVc5J0dU7$^X9g6PcOFC>rTMWZcpiR>tn-i?<ItT^?&E#CkvZRqr
zQwPe){Q*1VPYl>~=ly}5a^!IX2J|oNwD%~dc8XyF`1JVr_`Q$hd+)RL_0IRd|28~a
zBjhi#@^R1~!qA_C5Jb?NMELh|I`txtqRw(Q<q@Z3j|eXOw?z1o&spRP`i%60cd(NT
z`qZ|*lOt2APeJYOsZ{Ldaw-cm!u89~1LYwM{SgRBA}UDa2`ap|Bw~UI4u6P&xHfp1
zq(-U{a>Nh+K8!~&^aBuvWV9wVt-YGffuHd*mT^JnH1p@ACNZlCSOUT46ix!OxFrZ+
z`-9UPJ9qb|$yn;UCoalPRg4t{P#ZLcK6BHh=(iQa^>!SmMQY;M2GwkwOr`ZxM6x_D
z6JcAUvUn|(v7weG9+i2iCUR!EnN_mSE!Q&t(b6}Tf(>{7LezDD{paY>7sD4?Dm~nt
z9_QtWp3H`irJk6w8a_KU$D`9CxxHT)nWtk}jI!jtHNIlKJkCr70NaM4Q4qRGdo-k{
z8_limT%KZtPl6v_EgsNa@8570c)gi7Cug3)i{zQ_WH9&6Sna`TYnv!z+RfUW3OZrR
z)HGXL*n&CTCM)aS7TG3eyyjU)u!#r0fXYec3-1B(NbDEH;dTM{V!00x!DEX6`o;gD
z-@1x^u|&VWiXLv0pQ-v}$q{*@<tjEtTxGw?+<7<Lg9Z0s!F}DKpD)n?6?~9A>^lE2
z26A4W^n)1Zixa?pcY@0p*IbNW0c!*CFu7~CcpV?(=s#c{xOWL$+&{r@GrJCD0=}k)
zGglH=41C~n{GCgFUM1#L|AuNoB3Oor+Z{t1S4wIvg~D8k+EuAjla__L22-_xuE9b4
z_3o4BmZgP(yoTymA=+C9@wfYXPoG<U5WhG=x5tMs2bLYg+P3wp@&p@&?KMgJP5D~t
zr>TY}GP6NaRk9G)uM}YReYK9kHW8EqFCB$>qRr8QO0)r$mZut69sZC(A96+2h@RUs
z1#m1heGdeo9oq9cP!o4hV;y>Pp@mQ-cc4ysETmiSwUFM%+UYK82eAfyA6r2IB@C^g
z6UWn19OtNqas1P9k~b@^3f0FDa)lA{P)JK*Ps2LZsI<NInzQtS<^j4*gV~wFqqw_=
d*H|`I*N&Y3e?i;!mkpz@@L{!U25^Ru{R@@-Z|(p9

literal 2028
zcmbVN-EP}96ecNJR{WD>>DDG2HVgv>OczUm?PA4H3<a7r3sSg6nxKPWK=4e~kt|CZ
z$uzT}UAZr_2iQfQV|TpWRbOFOJBR*>Qg~ZY3Ou9^sY8C>`O&xScH__2fAn703Hggu
z8i)A<==v)Vf(V+DE{-gvW7cJq91-CO{)z}L+05&Df<7Z*?G5ZEosin*k&4A(D#tQ2
z15_>>gUJKv`aTFrx>S%Z6I8HQ1dKS7T`p?EhxeMOivUJnY={Pob<q?p7z5FU!#1t|
zydN8>26$O)IM$#)gs$&_FeITRDQU?{Z^kJxEb$U9=!_<{87WERl>{`t;4?}A5NPUx
zAdt@V*8bh&aepZF-79y>evu6o1*6uVD?-n`UW+hLh|UI46lbxCBI_5EVSg-bEk;Y0
zr+Hu4`XJ9<N@Z+IOA`(9G*=@zvD{1w8FI_DOkY^~tEHgBuYV_M8_fRw^x^ltb1jwb
z9gZ*4{7R1|y#uL7CNFx=rsi@m&HA4oXGW&+P-cUqztToGv`aV>g<OH-i4H&zx=nXz
zi%z%ZtnM#S3=kAHZ_ypSr|@Ec!h|MlMg<*ts#DU$Tj+q$z3MvKC41yIR<fifyb*)F
z@Fgb+6YL&gBw`sv7ZA@oj?XuaXkPTqMd({E&WsI;T*oHPGu4Kpff@)fwFy(z1Od)y
z;d~3%wt&<$*0A@<&xsru$KPChfa}3He<>f!7X~fq1_%WI1#QqBwt~OhvmX9W@Xa-R
z01h#{OMry4{~&?hxh8=D31=%3=yz2TypGxd`|1{m&{rSg{38^2Uv(SBTHxvqE@7}#
zz-}Or(|CAc(8L1m?Iqgng|k<i*2DcDZ({^F4_Cea?%w_vv<{;~>u|sA=Cx>j1ae+{
zdJT2u*mec#d9fbnJGs@xJGycW+V^tn`v7$@e2`ydUtU99d3Bk>NCxh?0T$EQrLchs
zR!B%-mzps5_K5lnqLP<TBPl5v=xU(*26TQ!R|nlA&;=FU2I#t=YgBYi&=rsoE$D4m
zV=>8TC)`v%oNhg=e9a-$!9q!`rLg`<^!V`6ncBtW`bl(peDvd)+QT<~5}iL)ALA5u
z9Xxs7QJ**?Cy};+zR0ier{nVDMmgYch<-aQICAqfe6BIV2yL(i<p0fQ+N^|3C)~iw
zo<T*1%HD{gaV{=XoVTLrm&<-SUvWj%-QHc=UDsVxp`$9daA}I=NMT*YQmnCp1uXD`
lMRO}5pHtPug17jiy8nz@U1!h+_vd%}0jsFSzhXdJ-ao2en_B<?

diff --git a/game.py b/game.py
index 96b6601..af3dba8 100644
--- a/game.py
+++ b/game.py
@@ -19,7 +19,8 @@ class Game(object):
         self.idOrder = 0
         self.idItem = -1
         self.idOrderTable = 0
-        self.waiter = Waiter(5, 0, self) #Waiter jest atrybutem klasy Game
+        self.waiter = Waiter(5, 0, self) #Waiter jest atrybutem klasy Game i nie ma go w gridzie
+        self.waiterMovesHistory = []
         pygame.display.set_caption('Automatic Waiter')
         self.background = pygame.image.load("./Images/tlo.jpg")
 
diff --git a/gridElement.py b/gridElement.py
index 2886e2d..3094dcf 100644
--- a/gridElement.py
+++ b/gridElement.py
@@ -11,7 +11,7 @@ class GridElement(object):
         game.idItem += 1
         self.number = game.idItem
 
-    #Cała matematyka rysowania odbywa się tutaj
+    #Cała matematyka skalowania odbywa się tutaj
     def draw(self):
         self.rect = pygame.Rect(self.position.x * self.game.gridElementWidth, self.position.y * self.game.gridElementHeight, self.game.gridElementWidth, self.game.gridElementHeight)
         self.game.screen.blit(self.image, (self.position.x * self.game.gridElementWidth, self.position.y * self.game.gridElementHeight))
\ No newline at end of file
diff --git a/waiter.py b/waiter.py
index 4945f9c..8268099 100644
--- a/waiter.py
+++ b/waiter.py
@@ -1,4 +1,5 @@
 import pygame
+from pygame.math import Vector2
 from gridElement import GridElement
 
 #Klasa Waiter dziedziczy z klasy GridElement ale obiekt Waiter nie należy do listy grid
@@ -10,48 +11,43 @@ class Waiter(GridElement):
         self.image.set_colorkey((0, 0, 0))
         self.type = "waiter"
 
-    def moveLeft(self, game):
-        if int(self.position.x) != 0:
-            collisionObject = game.grid[int(self.position.y)][int(self.position.x) - 1]
-            if collisionObject.type == "path":
-                self.position.x -= 1
-            else:
-                pass
-
-    def moveRight(self, game):
-        if int(self.position.x) != game.x - 1:
-            collisionObject = game.grid[int(self.position.y)][int(self.position.x) + 1]
-            if collisionObject.type == "path":
-                self.position.x += 1
-            else:
-                pass
-
-    def moveUp(self, game):
-        if int(self.position.y) != 0:
-            collisionObject = game.grid[int(self.position.y) - 1][int(self.position.x)]
-            if collisionObject.type == "path":
-                self.position.y -= 1
-            else:
-                pass
-
-    def moveDown(self, game):
-        if int(self.position.y) != game.y - 1:
-            collisionObject = game.grid[int(self.position.y) + 1][int(self.position.x)]
-            if collisionObject.type == "path":
-                self.position.y += 1
-            else:
-                pass
-
+    #Waiter może wejść tylko na pole które znajduje się na gridzie i ma atrybut type równy "path"
+    #metoda move dodaje poprzednią pozycję waitera do listy waiterMovesHistory
+    #aktualna pozycja waitara jest w obiekcie position typu Vector2 (dziedziczonym z GridElement)
     def move(self, game):
         keys = pygame.key.get_pressed()
+        lastPosition = Vector2(self.position.x, self.position.y)
 
         if keys[pygame.K_LEFT]:
-            self.moveLeft(game)
+            if int(self.position.x) != 0:
+                collisionObject = game.grid[int(self.position.y)][int(self.position.x) - 1]
+                if collisionObject.type == "path":
+                    self.position.x -= 1
+                else:
+                    pass
         if keys[pygame.K_RIGHT]:
-            self.moveRight(game)
+            if int(self.position.x) != game.x - 1:
+                collisionObject = game.grid[int(self.position.y)][int(self.position.x) + 1]
+                if collisionObject.type == "path":
+                    self.position.x += 1
+                else:
+                    pass
         if keys[pygame.K_UP]:
-            self.moveUp(game)
+            if int(self.position.y) != 0:
+                collisionObject = game.grid[int(self.position.y) - 1][int(self.position.x)]
+                if collisionObject.type == "path":
+                    self.position.y -= 1
+                else:
+                    pass
         if keys[pygame.K_DOWN]:
-            self.moveDown(game)
+            if int(self.position.y) != game.y - 1:
+                collisionObject = game.grid[int(self.position.y) + 1][int(self.position.x)]
+                if collisionObject.type == "path":
+                    self.position.y += 1
+                else:
+                    pass
         if keys[pygame.K_s]:
             game.showGrid(game.grid)
+        if(lastPosition.x != self.position.x or lastPosition.y != self.position.y):
+            game.waiterMovesHistory.append(lastPosition)
+            print(game.waiterMovesHistory)