From d8cf576ddf39c60282db9b94090cd2b89fb159f7 Mon Sep 17 00:00:00 2001
From: Tomasz Adamczyk <tpadamczyk7@gmail.com>
Date: Sun, 21 Mar 2021 13:01:38 +0100
Subject: [PATCH] =?UTF-8?q?dzia=C5=82aj=C4=85cy=20losowy=20ruch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                    |  23 ++++++++++++-----------
 __pycache__/definitions.cpython-37.pyc | Bin 501 -> 501 bytes
 py.py                                  |  19 ++++++++++++++-----
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cd7d608..e7fcf79 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -79,6 +79,7 @@
       <workItem from="1615670854240" duration="68000" />
       <workItem from="1616276134469" duration="1463000" />
       <workItem from="1616322081205" duration="4362000" />
+      <workItem from="1616327331805" duration="551000" />
     </task>
     <servers />
   </component>
@@ -86,22 +87,22 @@
     <option name="version" value="1" />
   </component>
   <component name="WindowStateProjectService">
-    <state width="1879" height="364" key="GridCell.Tab.0.bottom" timestamp="1616326478875">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1616327942000">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1616326478875" />
-    <state width="1879" height="364" key="GridCell.Tab.0.center" timestamp="1616326478875">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1616327942000" />
+    <state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1616327942000">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1616326478875" />
-    <state width="1879" height="364" key="GridCell.Tab.0.left" timestamp="1616326478875">
+    <state width="1879" height="295" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1616327942000" />
+    <state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1616327942000">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1616326478875" />
-    <state width="1879" height="364" key="GridCell.Tab.0.right" timestamp="1616326478875">
+    <state width="1879" height="295" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1616327942000" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1616327942000">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1616326478875" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1616327942000" />
     <state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1616326478876">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
@@ -118,12 +119,12 @@
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
     <state width="1879" height="364" key="GridCell.Tab.1.right/0.0.1920.1080@0.0.1920.1080" timestamp="1616326478875" />
-    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1616322080552">
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1616327335999">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1616322080552" />
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1616327335999" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1616326392782" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1616327941991" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>
\ No newline at end of file
diff --git a/__pycache__/definitions.cpython-37.pyc b/__pycache__/definitions.cpython-37.pyc
index e3d956114d7337ad3f2df96fccbfea2f49593796..e2c10dc15b5131c629315e8bd2470af671525edb 100644
GIT binary patch
delta 19
Zcmey${FRx@iI<m)0SIJ`H*&pZ1OP8M1Xut7

delta 19
Zcmey${FRx@iI<m)0SMakHgdgY1OPFW1iSzM

diff --git a/py.py b/py.py
index 8b3dd77..ea25884 100644
--- a/py.py
+++ b/py.py
@@ -11,22 +11,31 @@ def draw_window(tractor1_rectangle):
     definitions.WIN.blit(definitions.TRACTOR, (tractor1_rectangle.x, tractor1_rectangle.y))
     pygame.display.update()
 def is_move_allowed(move, tractor1_rectangle):
-    return True
+    if ((move == 1) and (tractor1_rectangle.y + definitions.VEL + definitions.TRACTOR_HEIGHT <= definitions.HEIGHT)):
+        return True
+    elif ((move == 2) and (tractor1_rectangle.x - definitions.VEL >= 0)):
+        return True
+    elif ((move == 3) and (tractor1_rectangle.x + definitions.VEL + definitions.TRACTOR_WIDTH <= definitions.WIDTH)):
+        return True
+    elif ((move == 4) and (tractor1_rectangle.y - definitions.VEL >= 0)):
+        return True
+    else:
+        return False
 def tractor1_handle_movement(tractor1, tractor1_rectangle):
     random1 = random.randint(1, 4)
-    if (random == 1 and is_move_allowed(1, tractor1_rectangle) == True):
+    if ((random1 == 1) and (is_move_allowed(1, tractor1_rectangle) == True)):
         tractor1.move_down()
         tractor1_rectangle.x = tractor1.get_x()
         tractor1_rectangle.y = tractor1.get_y()
-    elif (random == 2 and is_move_allowed(2, tractor1_rectangle) == True):
+    elif ((random1 == 2) and (is_move_allowed(2, tractor1_rectangle) == True)):
         tractor1.move_left()
         tractor1_rectangle.x = tractor1.get_x()
         tractor1_rectangle.y = tractor1.get_y()
-    elif (random == 3 and is_move_allowed(3, tractor1_rectangle) == True):
+    elif ((random1 == 3) and (is_move_allowed(3, tractor1_rectangle) == True)):
         tractor1.move_right()
         tractor1_rectangle.x = tractor1.get_x()
         tractor1_rectangle.y = tractor1.get_y()
-    elif (random == 4 and is_move_allowed(4, tractor1_rectangle) == True):
+    elif ((random1 == 4) and (is_move_allowed(4, tractor1_rectangle) == True)):
         tractor1.move_up()
         tractor1_rectangle.x = tractor1.get_x()
         tractor1_rectangle.y = tractor1.get_y()