From 30ccb27ab82debffd78efd4836d03b94a9e3b33b Mon Sep 17 00:00:00 2001
From: Tomasz Adamczyk <tpadamczyk7@gmail.com>
Date: Sat, 3 Apr 2021 00:22:42 +0200
Subject: [PATCH] restore_station()

---
 .idea/workspace.xml                |  27 +++++++++----------
 __pycache__/tractor.cpython-37.pyc | Bin 7529 -> 7725 bytes
 tractor.py                         |  42 ++++++++++++++++-------------
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f0adf19..2293f7d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,6 @@
   <component name="ChangeListManager">
     <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$/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$/resources/rail_detector_powered.png" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/tractor.py" beforeDir="false" afterPath="$PROJECT_DIR$/tractor.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -101,6 +97,7 @@
       <workItem from="1617383739568" duration="1714000" />
       <workItem from="1617396071094" duration="3170000" />
       <workItem from="1617399305318" duration="2444000" />
+      <workItem from="1617401891560" duration="232000" />
     </task>
     <servers />
   </component>
@@ -108,22 +105,22 @@
     <option name="version" value="1" />
   </component>
   <component name="WindowStateProjectService">
-    <state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1617401771495">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1617402125132">
       <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="1617401771495" />
-    <state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1617401771495">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1617402125132" />
+    <state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1617402125132">
       <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="1617401771495" />
-    <state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1617401771494">
+    <state width="1879" height="295" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1617402125132" />
+    <state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1617402125132">
       <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="1617401771494" />
-    <state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1617401771495">
+    <state width="1879" height="295" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1617402125132" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1617402125132">
       <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="1617401771495" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1617402125132" />
     <state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1617385468328">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
@@ -140,12 +137,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="1617396163208">
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1617401891370">
       <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="1617396163208" />
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1617401891370" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1617401748390" 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="1617402000466" 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__/tractor.cpython-37.pyc b/__pycache__/tractor.cpython-37.pyc
index 8563cb40eff4dbe19b736ba52708a3737c152017..2c27beba99004c9a64b52e398c1dda5bcc357377 100644
GIT binary patch
delta 2725
zcmbVO-D_M$6rZ^}_wL<~Y_e(gE4%sXrpRinrYRB9zG$IBv_X=9C={Dys_5cYXBUyO
z;lA`yWZU}^`gB*{isC~+5Q@*f_+&sR^bgoK1>g0YGqd+2q#)U4&dfRUn=`+e`Q1Br
zwDIHhiMJ*uvJ8HMqfhSq@NnWbKY7^xJuk03U?0}y+74@7J-*IA&UqGs;D>b@$_*&p
z70y_n2TXFXT=F6BGhJ8M(Bcd{=#v(;5tkxd%HW`m;ZiZ2Ae=BbsJ$3a#DF#dZ3Bcl
zhO-Th1(xK!)Mvs_vScdZiG*jzJe$TjFwVoZ*fbDb?cu=4!+~Qj4Q+SG373I(7Tc1+
zb~;<C09&VE=a`yAGlixIrj=7QY**2g(JX^`wzRwb<_-UT>A-7Q3eW19+wJZ3KE2mj
zRXIeF$z#W)>G(+9?e^}eyH_FDT>-<m!^=E>hAr^qKhN)1cGcbi48MFTTlGL-D)?of
zI8aCg7t{VP`FB0F-*=?dwxDJ~x^Ll%2Ttc{KOMM37G#ES`fXP|Fn$)*LWsvP1P8>4
z@pERx3FO1J)fUjlg1qrXmC+9C{9ZmxxS32iuv9OW5~eVb2}27=V`SibJ=GUd_jh`Q
zU{VTc53NJD?@9p}uD*h)r=&9kNw<aZi_*cUM`7fI>PQEed>Uh+mz4rNnK~4me;{R=
zQvOCMK`SOD`bFu6(bE~Vs&xK%M(;aFnW2@;(qNDrrL+|KMVSqwr&E$R4dr;s_aLK9
zBnvb)7m`H3D05*HGJ1)11N5wQ5BQgb_t`*no|x$_z_~gwMM_mo1a*R&n~1;@Gy|nn
zWo<@1EGUP^pphPmtOA2UWCl{DlhMFv&4{aMt&G<kO^uVl8w7<ZI!=tFOC(Xuk!p}+
z81aS-2G2sN8<tODd&+WrvKpEsiHItlwZ{E_l66Be)!8?cJlx7GuoUXfDVB){5Ntr1
zBa+yIB*$9O$T&%jsFHd#?gb=0+L&xKHBMq!TAg1_97*PYq^(4Rr1MThVC+1U1tN((
zNOCMcjf|7Th=*H=iqyatusnn0LP&BpMiND7t8XHbKxf9pSg=Tky#!(mF<y{`>qe_y
zOAKx|dIr$T%ea>{9t$p#M4S5E0Yu>4G2op?F(N2DN6jRN%$iu7h!=s*M+9FvO_Hk!
ziHwhPtSv|3%i25vup<p3@)$-gYW?GuM4<B#!53ANBx#6r@Xo+V$LdL|`2>x5py6RK
zz9A9ld^Au?O%k1<LDzSFYnQI>n<KoyM|dI9eLkAS4<owJM=5MYxB9Ywt@Mg`4TApj
z(j`kR`2UucEmigx%eQS+$M|9S=SFn*w=(*g7oYEav8pa3V6*b}%kMy=djy7Y0av-;
zQ|4cQdYZ35nda+oo#*|(D;JLcs?>S;bwKZ`D`52p#~QX){iWI)eAEA+*5pUWhqa&h
zONdjeU~XzK;#x)3!0-l|YiPFpo%;F`eov?cG_Qhb2_maDF@O}+E&oY<g@5n=S>NXk
yf1~m36s}!uq1i^W<NwiEa*>qFUH8%4rHbWRZpFRj<`nK?D@7kZYQtZjTl)_@<(B^d

delta 2518
zcmbW3L2MgE6oz-!>)o-}j-9&LPGYxpn-EL@(G-EH5Qk8OwhD;SR+W%Iv>JiHu)rh-
zK(6-E69?pWd*A|EbE*)CL!=xypdL83mmYiISSd#k5{N_Lf3xHDtQ8~_Tl03_n}6PX
zo_V|8A70o!Szarbixxf?Z@&AseZBl9yK}vN*Ew%>SGP~Gcl?G!gZLECJhYe4HaB?G
zsceKpCa(=#VfSs-vtv&<13Tuz8L@$tTpQNNW)?h*30w6^msh&H*5PXC@`lb;I#=s(
zHFP1CP7``c=xHIYhS1YGD=r9UEBAg;BNaqG<GC5nGdy3-E9rT@npX-_mnKdIY2w%`
zqdzlZY6mLlSE)aAgI@+-JUg=D10zf1`W*XrOGj#gX-#Zsn9@Adk%MYhNYfr-Yst0y
zj`k`#!kd;_I9aHYrae2AHYdL^($Ydn<PnWW$BW3&{j@r8L^A%>Ry}Tnf{Vh)zRCw&
zaENRfW9cTHzQRd-Y<U_bB&r54rsQ*^Oud@m<cZu>C-?&yiz?&qYA)(SXCxoTrlKK*
zr&A)fXUcDp(pSIal$wlEQYmwi{DN@P=yXOX_ssZOh?E6I*;A8IbefX<g7DJlbV?}q
zN;$MY>0PphPVk-Hp?MsvgB2XPrXy4@bkr0HlWjx@g|&dzYFd3v$B-4b(_=^`Q?VVw
zWGc2qftpTr6F|}(PHIIjS(_|PYv8^DJRsfBpv)`E2NS8LG$NRM1g)bXAE?F0C+kR3
zW+6#|TP@X1Lx$=`(Mx72JDM^VTrnVBK<4EaQ;?Ym0FR;_Q;;-5J2|eEM43W{*vdrW
ztMW;N)0F=Wc}zpv!OsSy2S`^wH3gZ80B{j4TvC)YM3m$5OQb0!AQOeJ3Nq3Cf5@d2
za^8TXqI5&KGob{}f+F7m%%iF#mr;yvs;S{2oK$^MVmZUB2-B-+PyJ^goBBTy93Xgh
z3|VkPuNu<rL51hZ7c(G7bj$>qX!Zv}Wypnk;*3GUplECf6_+RJxvn3a*pZ_;mIWDW
z_6I@_Dy~X0)LRl<Gcc%pxICS~Sky5SW1`s~1|Dwf;Gm+@7{bC^L+RBElHnC$UCzMD
z3YjXIS(sfK*`+s%U7Jh}ru$g*S$)NyLsvG*)T2W)A4Iq6OVPc0C;F@YMs%sM)94l?
zy{6oEKD_+#@%wyp>+;rn9|gywZu8}}XE3n&6O6?iRzj<)??KjrXSNxZ{g$9RfbZ(|
zu-Rkv$C2TJd;(Ve1o<TOR-#|$o?~aC-~3wCov*SR+b8FLWXq(LD=_QH1k!eAWsAZ+
zGS8Da7gbx&c2=o-n9K>7uA_d5JVSxAWHwat&s%fs>*!|d3R{T&Y<=m!LPO`sydM42
kZbaX=i~MQ0oN*rAZZFqt{ucKoZDcnm7fINQ{%)W67j!FxxBvhE

diff --git a/tractor.py b/tractor.py
index 36e8e24..f8b5ebd 100644
--- a/tractor.py
+++ b/tractor.py
@@ -49,6 +49,29 @@ class Tractor:
         self.x = self.x + definitions.BLOCK_SIZE
     def move_up(self):
         self.y = self.y - definitions.BLOCK_SIZE
+    def station_restore(self, station1):
+        station1.set_collected_plants("beetroot",
+                                      station1.get_collected_plants("beetroot") + self.get_collected_plants("beetroot"))
+        self.set_collected_plants("beetroot", 0)
+        station1.set_collected_plants("carrot",
+                                      station1.get_collected_plants("carrot") + self.get_collected_plants("carrot"))
+        self.set_collected_plants("carrot", 0)
+        station1.set_collected_plants("potato",
+                                      station1.get_collected_plants("potato") + self.get_collected_plants("potato"))
+        self.set_collected_plants("potato", 0)
+        station1.set_collected_plants("wheat",
+                                      station1.get_collected_plants("wheat") + self.get_collected_plants("wheat"))
+        self.set_collected_plants("wheat", 0)
+        self.set_amount_of_seeds("beetroot", definitions.TRACTOR_AMOUNT_OF_SEEDS_EACH_TYPE)
+        self.set_amount_of_seeds("carrot", definitions.TRACTOR_AMOUNT_OF_SEEDS_EACH_TYPE)
+        self.set_amount_of_seeds("potato", definitions.TRACTOR_AMOUNT_OF_SEEDS_EACH_TYPE)
+        self.set_amount_of_seeds("wheat", definitions.TRACTOR_AMOUNT_OF_SEEDS_EACH_TYPE)
+        self.set_fertilizer("beetroot", definitions.TRACTOR_FERTILIZER)
+        self.set_fertilizer("carrot", definitions.TRACTOR_FERTILIZER)
+        self.set_fertilizer("potato", definitions.TRACTOR_FERTILIZER)
+        self.set_fertilizer("wheat", definitions.TRACTOR_FERTILIZER)
+        self.set_fuel(definitions.TRACTOR_FUEL)
+        self.set_water_level(definitions.TRACTOR_WATER_LEVEL)
     def do_work(self, map1, station1, tractor1_rect):
         loop = True
         if self.get_all_amount_of_seeds() == 0:
@@ -57,24 +80,7 @@ class Tractor:
         y = int(tractor1_rect.y / definitions.BLOCK_SIZE)
         field = map1.get_fields()[x][y]
         if x == 0 and y == 0:
-            station1.set_collected_plants("beetroot", station1.get_collected_plants("beetroot") + self.get_collected_plants("beetroot"))
-            self.set_collected_plants("beetroot", 0)
-            station1.set_collected_plants("carrot", station1.get_collected_plants("carrot") + self.get_collected_plants("carrot"))
-            self.set_collected_plants("carrot", 0)
-            station1.set_collected_plants("potato", station1.get_collected_plants("potato") + self.get_collected_plants("potato"))
-            self.set_collected_plants("potato", 0)
-            station1.set_collected_plants("wheat", station1.get_collected_plants("wheat") + self.get_collected_plants("wheat"))
-            self.set_collected_plants("wheat", 0)
-            self.set_amount_of_seeds("beetroot", definitions.TRACTOR_AMOUNT_OF_SEEDS_EACH_TYPE)
-            self.set_amount_of_seeds("carrot", definitions.TRACTOR_AMOUNT_OF_SEEDS_EACH_TYPE)
-            self.set_amount_of_seeds("potato", definitions.TRACTOR_AMOUNT_OF_SEEDS_EACH_TYPE)
-            self.set_amount_of_seeds("wheat", definitions.TRACTOR_AMOUNT_OF_SEEDS_EACH_TYPE)
-            self.set_fertilizer("beetroot", definitions.TRACTOR_FERTILIZER)
-            self.set_fertilizer("carrot", definitions.TRACTOR_FERTILIZER)
-            self.set_fertilizer("potato", definitions.TRACTOR_FERTILIZER)
-            self.set_fertilizer("wheat", definitions.TRACTOR_FERTILIZER)
-            self.set_fuel(definitions.TRACTOR_FUEL)
-            self.set_water_level(definitions.TRACTOR_WATER_LEVEL)
+            self.station_restore(station1)
         elif field.get_soil().get_state() is False:
             field.get_soil().set_state(True)
         elif field.get_soil().get_state() is True and field.get_soil().get_water_level() is False and self.get_water_level() > 0: