From f5eea95c5b4b6a4f2781eacaa2746400d36cba19 Mon Sep 17 00:00:00 2001
From: Tomasz Adamczyk <tpadamczyk7@gmail.com>
Date: Fri, 9 Apr 2021 14:38:25 +0200
Subject: [PATCH] rotate

---
 .idea/workspace.xml                    |  29 +++++------
 __pycache__/definitions.cpython-37.pyc | Bin 2914 -> 3041 bytes
 __pycache__/tractor.cpython-37.pyc     | Bin 7717 -> 7920 bytes
 definitions.py                         |   4 ++
 py.py                                  |   2 +-
 tractor.py                             |  66 +++++++++++++------------
 6 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2a7a549..5afcf9d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,7 @@
     <list default="true" id="56453584-72bd-49f4-a39c-fccf91ab20c6" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/definitions.py" beforeDir="false" afterPath="$PROJECT_DIR$/definitions.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/field.py" beforeDir="false" afterPath="$PROJECT_DIR$/field.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/map.py" beforeDir="false" afterPath="$PROJECT_DIR$/map.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/plant.py" beforeDir="false" afterPath="$PROJECT_DIR$/plant.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/py.py" beforeDir="false" afterPath="$PROJECT_DIR$/py.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/soil.py" beforeDir="false" afterPath="$PROJECT_DIR$/soil.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/station.py" beforeDir="false" afterPath="$PROJECT_DIR$/station.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/tractor.py" beforeDir="false" afterPath="$PROJECT_DIR$/tractor.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -106,6 +101,8 @@
       <workItem from="1617399305318" duration="2444000" />
       <workItem from="1617401891560" duration="232000" />
       <workItem from="1617439271903" duration="2500000" />
+      <workItem from="1617794241086" duration="273000" />
+      <workItem from="1617966682687" duration="4169000" />
     </task>
     <servers />
   </component>
@@ -113,22 +110,22 @@
     <option name="version" value="1" />
   </component>
   <component name="WindowStateProjectService">
-    <state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1617441783230">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1617971848584">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="295" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1617441783230" />
-    <state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1617441783230">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1617971848584" />
+    <state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1617971848584">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="295" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1617441783230" />
-    <state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1617441783230">
+    <state width="1879" height="295" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1617971848584" />
+    <state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1617971848584">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="295" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1617441783230" />
-    <state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1617441783230">
+    <state width="1879" height="295" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1617971848584" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1617971848584">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="295" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1617441783230" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1617971848584" />
     <state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1617385468328">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
@@ -145,12 +142,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="1617385468328" />
-    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1617439275650">
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1617966682675">
       <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="1617439275650" />
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1617966682675" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1617441749283" 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="1617971807019" 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 84429b8a7163b9fa8419efd2b95c47c44dfef471..601248d25fe3b86a637eb9a378e62be6bbdd0c78 100644
GIT binary patch
delta 456
zcmaDP_E4PHiI<m)0SH>{3lg48<dtOHwNc%Q*`75@J%uGoBSkt&Ges&&D@7(sJ4H51
zCq*twH$^^5FNHZuKUF_PL4+ZNRh%KpAeAwTbpcx{Ll*l2juf^O#mNRN>XYv?vrUd=
zQDRh{+yLb1v#?p40M&6V;7&D3WlCjAV_L`*1rkBlsk)G9A!C#&RGleYo$2HP7SVb$
zsJIzi93+CQUmdL99IDP7t_~!EtWE>0&H}2=0<I1uV!6O7RWelq=sw0M>lDUd22IVE
zpdj+we1~NLBO}Y?3bw6`Hk<X>d6<%-#6p4`okRSC;$1w0T%AKa{r%!y9fL!n#4*MF
z{DVR~ut@~_hXN(Am=x|B9J1Mp(}Iyr255hg%;XBL2*zoXFLLEGvjE*8$gMotfSUyX
Dc=~rT

delta 318
zcmaDT{z#11iI<m)0SMakGZKm>@=7wU+Nf^D>@FRpo+1;aks=$VnIadZmBJjQovNK8
zFT#+*D$Wq4lggOIx_~W}A&Y$hM+#et!a}Bnj8VEkQLY8tsk*65sZ4213z?#HCr@A&
zwbp}*>%qlABFOrc!20!}>h$62^d~=H7F9NYiW|ViK_bZdRVFWBR-bIo!Z!IVvl64)
z<PShzKMR|t2~?*ETqj7xbb(o_WU2(vg^W?=DU87kni`v*u`FYpJdtf9qs3-tb{?k9
n8#yf)*`$HtQY1b3Jy!%{-((N&{K>)GLX+on^RS393NZoz1-wzD

diff --git a/__pycache__/tractor.cpython-37.pyc b/__pycache__/tractor.cpython-37.pyc
index 9000e5150bc7f6adf12afae500265113ddd10056..5db1e20868d55fac59792a41b17df51324d2052b 100644
GIT binary patch
delta 2917
zcmai0O>7fK6yDig@2>yJubp6<5aOgJ1PDr?s)}e5oW>9muuak;(BiTi>cp{O)<B4i
zd;s;*N)?(@D^*RTRu!kJ<w_+El{og)%Zft}m8u-7_S~vc-y5$TW2e;Cj^Dob&G+8C
znfJzDzy0Uwz_j1*5#XbryLJ78iN}Gf<mKbFpN|+5kAy1`V=^NoPTFdg=5CZr^oARe
z@WEdZo*8(o31*P7U`4A4x@rh8fh;66_Bk2yxQ#qDZ<O<;BKv_16F2*nB-|9;JrSsn
zb%<GYAG`=eVXNY&`@A4hUt{nyw-h0MHY{B|h9+As=GM(-04lp~nq@t=Ub<5(>!lUl
zGEKt@vhSp;lbo&_F|ND0!kzY+R{P8jnAy#i<oCyd7zaj2J8<ZPAwj5I`)P~xr5q()
z>@WFRPs3|-pse8PBR%XR*R}p#doS`fFZUk+g;+>Quqicu-nF+Y(As`nb0fEXpt5i`
z1hU!V?9|a$5bTn)pM9eRFLF+i@)%HVb`P(%A5+pG-Vdra;#UwreE7Hmu!KX3>24(r
zU@R*pE$0jQO_N61XUfG%K1r%Y!Y8$61H%cRv)!2oSWKN`r!_U!ntudq+|3=caFBhh
z&K_2qqC&YfDvfgk{1E$Foo2_~YJ4x&AhO=el})M_%)4eG&hpxYajl6Q<yP__k~hs7
zVZUjqL97}$LwmV#p_`2ai+aLr)ji6td(;7r!#S<&E@a;rWzXDa2C<l4$9aDYIA=yU
z%-JK9_oTdk3@F3wOHZgu0aFoHg)&(c*F+itSpr!OfmWA_X~*UQ+nXROXbYoFDV}s}
zD%i4h8=t2X`yHDGwj#)!lh2dtox@GxU{(d&YnUtfVji1^W%p*&Q#0Acw0<^~PR?Xg
ziwk;kDwCy{9osWKzc_PV&!ny-?NB>#VKJSZ<4tETYi99scCL;895`4`X0rd0S$Vy5
z*Bl4mR;_*c$Ud_BZ2Ia&h%mP0>8%br=`;u|yweaNQ9{v&$uJ0CzQC6+E$k3L?l@iM
zH66f9OJz8ea3)vEZ($%<PXh4}P2B9NyKi8`mGb|EA@Uunhe3}48$AjGWZ*Sn_#78B
zfAhog8Gtv((cKaUl@ayyiSHa4<=qw6+S+2hv>&zD(`X2X5f%%KRAV68o%PL~O{TM{
zdD!nX9YBMxVYr-}r<iQJtFBs}$|lqLd~zu{?=&e}vmkeHuEtxdAm|u$YFcpJnP-8?
z8iL{JkAa8k5>H4iH5mU6_FNwSj)c<gJuyVPKw(SyVwoRNI)e5D4p@A)hqtP{SuiYm
ziha>Lq#Q)sAbZg}p!A>^V!!v!_C*ogf#AHg+XoFAWAh<K!t9sOaJZ2!xLL7d*z$Vr
z);K-MV&T3MynAq$t`&55MWwl-QCe?XxoVX3dnLNI%<|#ySz79;ega%hwPFVttdM#K
zfLeF0L9_<R)Da3GrU9YW`hX#>x#)D09qZkw+e6q@+`wQoAv}P1RQC}Uj4Dz*LVzK`
zgMTaJg)GG*Gn?@8Gg-^(8=$Er8S`tqmQ!b;+z+FcH@Z>ODs#!yyK`B31YYV_)kTCf
zUB8G6LY}c`^<1n_DBUxSuRv?z-7k<Bkx2v|{>xJR@ha{*mMZ@j^c)0(JP<cFDk7~^
zge_rPfIP@tCKa+xp!hXP!6I%81TwcJZ3`8m%OJV9q?A?2fc%gUflG=bab!aVEXsyd
zeIVXeV6ujEx0Pk2bi;#=p&4%j2<adQkv;=SaU?*MJ*!@B7q)yL`%&gOcGYuSEB*jI
z0L!9FIE>+N2nT+u;zA0<+S$5A@uXuz<n>tFm<fEvTBMUOB%HgRXZ;dtn^Mn;k?8QZ
zptJ^H5Fp8&BtSH1XSJ^nx~n4kK-<k;L`F!I{Sk?K0|4cPMtj&$G`Wn0O5->T<G|xR
zjuH>-6iOK!_-fumX*UEe`B8^OjT>uW{2I~R?0NJ6`zflNaBD93c4-$hFGs<WcwN5(
MK(1)xW8PT*zsM_Lt^fc4

delta 2783
zcma)8-A^1<6rVfa`@MX$%mPaZE~V2JD74k6s1)2Sw9pz@i<&m;$_(wovWs_yk2XuT
z#uuX|wqE0dF)1W|zBI=E5k8w(O*Vb=i8te$NliTG?y@Wk1()12XYM(_bME=LXZY)t
zZ-;^-fq++l-{Z5l-hDcFKX{$|c7Ne<Y+5kSm9!*H&$@X!tD^?|@F~I?h2`|IEa~-F
z0;rNJrpA6CG4==PCOZ3<nDUPT^|5|2sRTh+U>}R0h0zc7Rf(UOQakapgmk?hMI||x
zUbJf!aI@*A?WWR;`Q@CO%Fm@7+qRq_`&GJro||hz9c3k*UEYgy_9DZ8Y-TI++r4-!
z8bT6A(g4IHR4zaEob;(2C5^0AxpAcGwf3OwQzb&0*>}o~)*bl~v|Af)RE?0M>;=_i
z7Zvl2g04imqhF&6qEZk8pR=i($!6}@)L`FeZ=B~KsRmT<gd;KV9b_vr^|5Xh-H|e~
z&XdkPE!)|4_NAUU$u%nnL%uc!G_P~>px(h$&&X-**@i=Ccs1?XG?lei>})4<J(B|*
zP_d7Ez5Ni{uR(ROzdhq!*m}=6zk+VoV(f-@w1=xzj3ZxfTtVY&$JsC5*Sb81n7n-g
zOd4$1cZzLzwN73s#O!PH_DS}+ufNy`@`5lgxMW^z0WKwMUl55Rw&b(yxlAtOX7V|w
z<Q<u~I(j)ZJ^oJo8L@d5^DB1B%CF{51KPpMCy+Z0m5bR|mCh2B2<-bnXtwqYM%@{B
zPGX=*yMY|&G;7bfeW0|TQ}$J$eZJODeXRe>kCz{xW^Uec&(t_-+!Y;)*@HlfUF)ts
zEMAtw!qT|A<)y(IU!h&TmX{vA7`#MI@!^0Ot)CD+8o^xy$x$RR_At~_Yy-B`n4G#W
zn!GxdO2ns<;}cNRDH=tAzbbe$K0%M+R@3&@%!OopDm4+m7N4jL1Gryq8rx%_zRyAx
zL5kWAOlA8VSaLAvN6GMq+O;h_@D@%mis#?LUg788l91aOb1{mkEJ>N1OLy0)+@fAS
z4>ESva%ey6HDYQ98aT#gj83%~*`sXTNJLuEN&_lqoSk`N(KhzPV5EgDMUETQbeSGL
zdrI<RdTD_6v4@e!Aa~Ahg))ckN*Yb)to-7h$TcgUTFujii|n7s&qWLefB39^jXr{x
z0<p+~NMi+Y`vR7)Ay8?7(3mAoqmBeR!=NLh)DSFrL7~GHnF2CvTh>y!#-OJF-YV-9
zEftjRZab+MxQjwdgM}YN{R+j7PEzbO$~);SasxmTrpoh7tNmJ1$KvA`$CA7nC1qy(
z_2igYp7M|{7y$GVf-7SiDop+Cr?zI}3)pqAmICP{GBIHBCwtP?UBpJf#lO{W!4WL7
zF5V++-U3h>E(jaKreKK+GQPQFL$oAI-W1oRg2XfQ9%ukpAe$m&Rj2qaZwdqk%7(HD
zc}%ImX`It7WnFw<2PCHEYeYhps!-hU917I{`a41`t%}5V@1aN;kUB@oRb&x2d<R2k
zFcv>7%!FhJn*^dG^D1NobCd*LukxVj2IhlYN7x7fA4a}X?qs>hSoCs{i{;W|)y)Rl
zj{7emc^SzRlH*7^k??!ag&dz_J;<FvVj{sAQtlP}1n~Jmdx10M^4FaA#$^;uBH7g?
zW6|i)1K4$*2O{tu@k5{J#0!7wft*eniNQXJ_K<e=DB2wkpmA(AS{VU<M&pw_hPw0i
zqs|p1Jj`k2cK+kwoFDh_>f#l427%~A*VzXh&#`+QYNAP>)O}nIw;+bPJav4a?PIB=
U4=v`c<*fZGUNi@r9?X&d0M~mfNB{r;

diff --git a/definitions.py b/definitions.py
index b69daf0..1a9fd1a 100644
--- a/definitions.py
+++ b/definitions.py
@@ -47,6 +47,10 @@ STATION = pygame.image.load(os.path.join('resources', 'rail_normal.png'))
 STATION = pygame.transform.scale(STATION, (BLOCK_SIZE, BLOCK_SIZE))
 TRACTOR = pygame.image.load(os.path.join('resources', 'minecart_command_block.png'))
 TRACTOR = pygame.transform.scale(TRACTOR, (BLOCK_SIZE, BLOCK_SIZE))
+TRACTOR_DIRECTION_EAST = 2
+TRACTOR_DIRECTION_NORTH = 1
+TRACTOR_DIRECTION_SOUTH = 3
+TRACTOR_DIRECTION_WEST = 4
 TRACTOR_FERTILIZER = 2
 TRACTOR_FUEL = 200
 TRACTOR_AMOUNT_OF_SEEDS_EACH_TYPE = 20
diff --git a/py.py b/py.py
index 1dbedba..447f6b0 100644
--- a/py.py
+++ b/py.py
@@ -13,7 +13,7 @@ def main():
     collected_plants_dict = {"beetroot": 0, "carrot": 0, "potato": 0, "wheat": 0}
     fertilizer_dict = {"beetroot": definitions.TRACTOR_FERTILIZER, "carrot": definitions.TRACTOR_FERTILIZER, "potato": definitions.TRACTOR_FERTILIZER, "wheat": definitions.TRACTOR_FERTILIZER}
     station1 = station.Station(collected_plants_dict)
-    tractor1 = tractor.Tractor(amount_of_seeds_dict, collected_plants_dict, fertilizer_dict, definitions.TRACTOR_FUEL, definitions.TRACTOR_WATER_LEVEL, 0, 0)
+    tractor1 = tractor.Tractor(amount_of_seeds_dict, collected_plants_dict, definitions.TRACTOR_DIRECTION_NORTH, fertilizer_dict, definitions.TRACTOR_FUEL, definitions.TRACTOR_WATER_LEVEL, 0, 0)
     tractor1_rect = pygame.Rect(tractor1.get_x(), tractor1.get_y(), definitions.BLOCK_SIZE, definitions.BLOCK_SIZE)
     clock = pygame.time.Clock()
     run = True
diff --git a/tractor.py b/tractor.py
index c8558cd..93624ef 100644
--- a/tractor.py
+++ b/tractor.py
@@ -1,9 +1,10 @@
 import definitions
 import random
 class Tractor:
-    def __init__(self, amount_of_seeds, collected_plants, fertilizer, fuel, water_level, x, y):
+    def __init__(self, amount_of_seeds, collected_plants, direction, fertilizer, fuel, water_level, x, y):
         self.amount_of_seeds = amount_of_seeds #amount_of_seeds to słownik, przechowuje informacje o posiadanej ilości ziaren dla danej rośliny
         self.collected_plants = collected_plants #collected_plants to słownik, przechowuje informacje o zebranych plonach
+        self.direction = direction #w którą stronę patrzy, zgodnie ze wskazówkami zegara (1 -: godzina 12, 2 : godzina 3, 3 : godzina 6, 4 : godzina 9)
         self.fertilizer = fertilizer #fertilizer to słownik, przechowuje informacje o ilości posiadanego nawozu dla konkretnej rośliny
         self.fuel = fuel #aktualna ilość paliwa
         self.water_level = water_level #aktualna ilość wody do podlewania
@@ -21,6 +22,10 @@ class Tractor:
         return self.collected_plants[name]
     def set_collected_plants(self, name, value): #dla podanej rośliny (name) ustawia łączną ilość zebranych plonów (value)
         self.collected_plants[name] = value
+    def get_direction(self):
+        return self.direction
+    def set_direction(self, direction):
+        self.direction = direction
     def get_fertilizer(self, name): #zwraca łączną ilość posiadanego nawozu dla podanej rośliny (name)
         return self.fertilizer[name]
     def set_fertilizer(self, name, value): #dla podanej rośliny (name) ustawia ilość posiadanego nawozu (value)
@@ -41,14 +46,25 @@ class Tractor:
         return self.y
     def set_y(self, y):
         self.y = y
-    def move_down(self):
-        self.y = self.y + definitions.BLOCK_SIZE
-    def move_left(self):
-        self.x = self.x - definitions.BLOCK_SIZE
-    def move_right(self):
-        self.x = self.x + definitions.BLOCK_SIZE
-    def move_up(self):
-        self.y = self.y - definitions.BLOCK_SIZE
+    def move(self):
+        if self.direction == definitions.TRACTOR_DIRECTION_EAST:
+            self.x = self.x + definitions.BLOCK_SIZE
+        elif self.direction == definitions.TRACTOR_DIRECTION_NORTH:
+            self.y = self.y - definitions.BLOCK_SIZE
+        elif self.direction == definitions.TRACTOR_DIRECTION_SOUTH:
+            self.y = self.y + definitions.BLOCK_SIZE
+        elif self.direction == definitions.TRACTOR_DIRECTION_WEST:
+            self.x = self.x - definitions.BLOCK_SIZE
+    def rotate_left(self):
+        if self.direction == 1:
+            self.direction = 4
+        else:
+            self.direction = self.direction - 1
+    def rotate_right(self):
+        if self.direction == 4:
+            self.direction = 1
+        else:
+            self.direction = self.direction + 1
     def station_restore(self, station1): #aktualizuje stan stacji pod względem oddanych plonów oraz uzupełnia zapasy traktora
         station1.set_collected_plants("beetroot", station1.get_collected_plants("beetroot") + self.get_collected_plants("beetroot"))
         self.set_collected_plants("beetroot", 0)
@@ -145,41 +161,27 @@ class Tractor:
             field.get_soil().set_water_level(False)
             field.get_soil().set_state(False)
             self.set_collected_plants("wheat", self.get_collected_plants("wheat") + 1)
-    def is_move_allowed(self, move, tractor1_rect): #sprawdza czy dany ruch, który chce wykonać traktor jest możliwy, zwraca prawdę lub fałsz
-        if move == 1 and tractor1_rect.y + definitions.BLOCK_SIZE + definitions.BLOCK_SIZE <= definitions.HEIGHT:
+    def is_move_allowed(self, tractor1_rect): #sprawdza czy dany ruch, który chce wykonać traktor jest możliwy, zwraca prawdę lub fałsz
+        if self.direction == definitions.TRACTOR_DIRECTION_EAST and tractor1_rect.x + definitions.BLOCK_SIZE < definitions.WIDTH:
             return True
-        elif move == 2 and tractor1_rect.x - definitions.BLOCK_SIZE >= 0:
+        elif self.direction == definitions.TRACTOR_DIRECTION_NORTH and tractor1_rect.y - definitions.BLOCK_SIZE >= 0:
             return True
-        elif move == 3 and tractor1_rect.x + definitions.BLOCK_SIZE + definitions.BLOCK_SIZE <= definitions.WIDTH:
+        elif self.direction == definitions.TRACTOR_DIRECTION_SOUTH and tractor1_rect.y + definitions.BLOCK_SIZE < definitions.HEIGHT:
             return True
-        elif move == 4 and tractor1_rect.y - definitions.BLOCK_SIZE >= 0:
+        elif self.direction == definitions.TRACTOR_DIRECTION_WEST and tractor1_rect.x - definitions.BLOCK_SIZE >= 0:
             return True
         else:
             return False
     def tractor1_handle_movement(self, tractor1_rect): #odpowiada za poruszanie się traktora po mapie
         loop = True
         while loop and self.get_fuel() > 0:
-            random1 = random.randint(1, 4)
-            if random1 == 1 and self.is_move_allowed(1, tractor1_rect) is True:
-                self.move_down()
-                tractor1_rect.x = self.get_x()
-                tractor1_rect.y = self.get_y()
-                loop = False
-            elif random1 == 2 and self.is_move_allowed(2, tractor1_rect) is True:
-                self.move_left()
-                tractor1_rect.x = self.get_x()
-                tractor1_rect.y = self.get_y()
-                loop = False
-            elif random1 == 3 and self.is_move_allowed(3, tractor1_rect) is True:
-                self.move_right()
-                tractor1_rect.x = self.get_x()
-                tractor1_rect.y = self.get_y()
-                loop = False
-            elif random1 == 4 and self.is_move_allowed(4, tractor1_rect) is True:
-                self.move_up()
+            if self.is_move_allowed(tractor1_rect) is True:
+                self.move()
                 tractor1_rect.x = self.get_x()
                 tractor1_rect.y = self.get_y()
                 loop = False
+            else:
+                self.rotate_right()
         self.set_fuel(self.get_fuel() - 1)
         if tractor1_rect.x == 0 and tractor1_rect.y == 0:
             self.set_fuel(definitions.TRACTOR_FUEL)