From 9ab7b66267b22d11cfce8dd81b23dcfc79425456 Mon Sep 17 00:00:00 2001
From: Tomasz Adamczyk <tpadamczyk7@gmail.com>
Date: Sat, 27 Mar 2021 21:31:22 +0100
Subject: [PATCH] =?UTF-8?q?naw=C3=B3z?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                |  26 +++++++++++++++-----------
 __pycache__/plant.cpython-37.pyc   | Bin 663 -> 923 bytes
 __pycache__/soil.cpython-37.pyc    | Bin 951 -> 1239 bytes
 __pycache__/tractor.cpython-37.pyc | Bin 1503 -> 1797 bytes
 definitions.py                     |   1 +
 fertilizer.py                      |   7 +++++++
 plant.py                           |   7 ++++++-
 py.py                              |  22 ++++++++++++----------
 soil.py                            |   7 ++++++-
 tractor.py                         |   7 ++++++-
 10 files changed, 53 insertions(+), 24 deletions(-)
 create mode 100644 fertilizer.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e775232..6bb1ad4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,10 @@
     <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$/soil.py" beforeDir="false" afterPath="$PROJECT_DIR$/soil.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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -86,6 +89,7 @@
       <workItem from="1616515878589" duration="110000" />
       <workItem from="1616517453952" duration="124000" />
       <workItem from="1616517732434" duration="704000" />
+      <workItem from="1616874983490" duration="2052000" />
     </task>
     <servers />
   </component>
@@ -93,22 +97,22 @@
     <option name="version" value="1" />
   </component>
   <component name="WindowStateProjectService">
-    <state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1616518442382">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1616877053760">
       <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="1616518442382" />
-    <state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1616518442382">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1616877053760" />
+    <state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1616877053760">
       <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="1616518442382" />
-    <state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1616518442382">
+    <state width="1879" height="295" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1616877053760" />
+    <state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1616877053760">
       <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="1616518442382" />
-    <state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1616518442382">
+    <state width="1879" height="295" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1616877053760" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1616877053760">
       <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="1616518442382" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1616877053760" />
     <state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1616326478876">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
@@ -125,12 +129,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="1616517731968">
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1616874983207">
       <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="1616517731968" />
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1616874983207" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1616518408138" 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="1616876630669" 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__/plant.cpython-37.pyc b/__pycache__/plant.cpython-37.pyc
index 3e4e0931f610f7855050e1948b6f58d7b2569c3e..7acb7b4fae20fe4a5b7301553dd9237476f2d72c 100644
GIT binary patch
literal 923
zcma)3%}(1u5T0Gz$tFNs^$B|Qg%hW$LbOQjEs6xaM3%NIk4vF(LU+v}QEu=Ayali1
zYu}=$&bN*u1g*qa^W&Y}`M#O?bZ{^xk;%RN_E{1A#!oMa1Sg{5t(Y&w#OhA;R?mp_
z8RbbS=R467ors1bF%``e(@e8seMhr|6Hdjaobf<>#zQvZ2R!1j_#y8}z5O<u&fTIZ
z0Stjh*;CQ*M$ATS$kIlOmGbgLO>*6)3s+Zd78=)7dD5n#nt%6r=TYE+d?xPC@#*{G
zYp8rE&X=_d>vtd7)#ZBivzV^RAI{fPzr3o-CKPA2^Ub+;WwZ3fH5eUUuUcd6<>Ioj
z7L`LPhSWf<Uq#A?eX^7xMuCS$?gI%nbhTxyBDq|76p7?IgIle+s2YogKso@6b|8JK
zjK`9Jhei-AvKvr8nk|s-fN=2{TG*luCHVxcPra-qjQT$<jler@XY>f=bvL+O?&VEI
zsBKe-pEflD^N6?i9B-GK<OVy%sI6_s*49hDnIqn}_ScP@cNve#cmo6W9#i(H`v?`Q
i^4Om5w;piKD3chCFP=|iJjnm+VQW5g@W;3jMCmWB39FF+

delta 275
zcmbQuKAn}%iI<m)0SIbDq7rs7OyqN8RGAp6${oz0$#IJ{ASW@eWO6r?ro=7Q;*!LY
zR86K^EXAogX+=yxEh`y{SSCIXVg<1oCOa_N$uk2PMJ#ZF709~9nVwn_57x{wxq!)a
z@&iV86|g#xHVnnZFvV<>A27)>vQ7TSq?*MBQppY?I8gO~tpeFn#0VrnxEQ3CgOP)Y
gg9$9=r^yJWkt~91y2W9Wo1apelWGUn3Dn2{0O2k(ivR!s

diff --git a/__pycache__/soil.cpython-37.pyc b/__pycache__/soil.cpython-37.pyc
index 36b18cde9633345e5d177cb8e933ec9eb7cf27d1..9084cf8421028324f3345ad024af077ce5510134 100644
GIT binary patch
literal 1239
zcma)5&2G~`5Z<+&#LjO8h%?t*`Tz(JPz1NAQpzPVS}e~NQtSqH-J(Rf(L2w<EBVS>
zaALl-9r8n^tTjLO%+5F8?)dd!&=tHs{8S&`dP4lhOS61-Ub5H+tlkL{B=1;$cr!uX
zRE+(Uzi$@ruCm{-qs2^;n0X}0yAv~?d<xhG)S@=q7Ii3O+op)RY&+DWKHHE6G-Mmm
zi0hw}!E`at(xAqG1<DzVeavbt*FuT4$6Bs^)*cDoCnsaS>|Sb9%(MAQo3dq#q|jyW
zJ8PpdeXFx^PzF|Kmj(q5m>QJ-B}|*mpXX;!<M&n@8(%E)#IByaq9jjO%P;ZyGX0#G
z{M;<AbXwSWnkS~XFiBc0Ol-N`)33`iRBC=bFO))ci;6<F`B@D>=(LHZ5)odo5XTJZ
zYjIUGk*>qBG%fz@nyXZYU(4YqU8sLVvC{%l$kjuKv>Q)djKi=Hhlc^EPO>?@8q=#V
zk$3=XcYs4q*#+K>A4e3oa1YT4MBFW++Xia5;pjrg({o5QJ^1_dBDC*n_7C7Tq2owl
zs_r2*0;#Q;9ByGf+ECj{IG&(GtqH>4CpZF&t;#0{(0d7!aTim4o#a}nva3|SpqmVS
zU#V|5NmfM+Cc#8dxG2+u!Wo(Y6c}!`f_XI<WYhcr78#)ogV1Xp7n|@ABIkdb%kWv%
K%nM{#7V#HWt?vr}

delta 446
zcmcc4xt*QQiI<m)0SIbDq7qsdC-S*5noJBetq*3<<hjKXoS&JK%nXtS0uapv#Lhrm
zEC3{G7;6~f8ETk-Bx4E#PzR%*Cetm};*!LY)LY!;K(Z)4C$%g!N0a#$OL1yWS`kQl
z5y+gC3`ML!>X)svRZM7cYEf}aNPcc&ag~B&N@8wuRpn#@MpIT6pbCb`IgIx5AQo5y
zgkS@5Z*iulmc)bYVx7F1$weDvwkA^%SSi>ZkOj!<i(%^7Co3^KOzvf3SH)&7Kge7p
z$8%2ZWA-uxIT~g<h>h+Vevs)%y0|BEvM4cfOx9shWnl-ZpB%s<>WOd>m<94i5hIWQ
f;bKrMa4>Q(b1;D*SlmyO5lkal2GKbAAd46P=%rV=

diff --git a/__pycache__/tractor.cpython-37.pyc b/__pycache__/tractor.cpython-37.pyc
index 160b8d0a8a8bc63e1531db70d882e5d02358715c..ecec3a7a814ddbd494106177d55f86f9afccd92e 100644
GIT binary patch
literal 1797
zcma)6&2G~`5Z<+&#Bt*M^dC-Kedz<B3WZh(AyBE*!Xb*ZSRSWMiQ}+#AdYgQkHAat
zO1^U96*w`ov5OPZCTs1?+B4p7zS-G1wQY;x`1nJ7YUqspqL+N&JL}+#o}vH-e8{@&
zH3JRwI|ll9t;>O5GROFhc6RQO%!h`H4$cTr_zXQ+R|5{(9qa0#gMr$B5|mMwpaLf9
zGE~7rU4a_ZQJY{x19cUe&_ZoN8+K6FU>EjK*I^$HP}^{bQ5>a}E9rW1C_Mu)X^^Hs
z&TvKtDCT_51e<Fp`CLb-0mEPUxud66-<R=VIGFh|<<pcWj*%LXKkQ4&gQUG=3B^w)
zE2#c-&Yt%^M81rAS7G2rvu7{C4ZK<Mxp$FxH?9mWWO(a)an!pETp4Gv_2Na0$Kxb5
zg&2$mu@D3hl~FKW#%I>boR4z{kCPDxX_|@={V`{^83V53bhxC?D#V2_@ilE+`?2^(
zkO)MS8OCP^IoPs`r_AU<`aX$NEQ=)OiOXQM1*}RH?Ow!=mawa6{SSNDWjnfbA`j3l
z5tnJLfMge0PPZqgKr(Ww1XjqEDDtVj4oO+Iqe6A{7?q^C4uD7|+fz{>85LTu)`+5#
zwAUdKm1K#^eMRh`KNVrjZ?!{Q3G5Wvl~UIwt%2XCG9QGaD78-Cy+3;^F5h%tJ;1jb
zgkOCD;kVIlA(D1}eD~JP(HyNrqmHjd#EIjh@I${J?>`7n*3Iy%$=C|sQvBrL`X)Xs
z;O{KaSLV$Dtnyc9zKMTD1uz*uDWEr(&?n<_r$N1I<OaSFsU<`Z!emJ6x)5I`?r>p|
zbkiku3`sXp)=AJ!kqr`5(vqr2(m~5T5|r~oS*p86{Y&OeNOf_On}(^aKFY_@q+&?^
S>o!WwlSQyEsEevLWb(fa0Y{?%

literal 1503
zcma)6&5qhI5VjM3LV)F`NUeJ6HJ5#Ws;ah&s;cUWt^~bANN$t~yHG+{JG2|bt@|>4
zrCfXJEA-SEhai5o3r3!CJhs2@8+*8{*KLMv)p5UG8I1j=kGz>UxWKMnq5%ec%3St=
zfdS?N1M{cha^QXD6#ihG^?b5<!?Uuz0~`blS2EWC4#op>O)#N=z5qoip)W!iEc7L)
zfQ`NkRj8r2pblr~E6{)@dK+5MMqh<zh}ucZ1L^s3Bz+=EjXVK&v8yJU6<;yIRt8!m
zfSY*FF;ae?^29OIf(oW1Nt<K=%`YZP=>A@GUk|^iK&s&&3O%)a^$xtyUnbv%*NK1Y
z$?#f6lfaMFupfFdUXvKc8JY8Wl3GHHXX981I$P1%jF<Sbxn6pnhkZ^VY~-nH;zVM_
zCTqG}6Lh#N;<P51nKFK+#hV}&_q0KgZpN4O979KZJ&OVIo6OLSXPL=!vIa3S5S<Y^
zbQ?(#l7*88NIG(w6iUTYQWBze06<cb)1_#TwG<j3B#j6swa1WjWJk&-X>D9jw-WP-
z@f=42D<XSPrhYwX6@n4n`Z$`Y)V{p>-2Ei_AKmx=(OU_l?}32m$Lws2Nh`m;P4qaM
z7kg~<_0>r@o%|&HG#JHHCwa<u;VF6?em@x}!P{D&9N*l=l-L}<y(3?Tj}zF}ukZYr
z{<0>pn0L0&8$0NWdC#d)DbKtx5F)jO2qRcbX<QTHZsAR{h@`5J6*BaEWt9v)FWDeN
x`IRj)q;%^s>I$PWmU(q5T48a^w2bYajys0bnrQ7~hosh<jNV)NBhd-9_&*pA4ITgh

diff --git a/definitions.py b/definitions.py
index bcde6b3..37d1b11 100644
--- a/definitions.py
+++ b/definitions.py
@@ -12,6 +12,7 @@ WIDTH, HEIGHT = 1000, 1000
 WIN = pygame.display.set_mode((WIDTH, HEIGHT))
 TRACTOR = pygame.image.load(os.path.join('resources', 'tractor.png'))
 TRACTOR = pygame.transform.scale(TRACTOR, (BLOCK_SIZE, BLOCK_SIZE))
+TRACTOR_FERTILIZER = 2
 WHEAT_GROW_TIME = 5
 WHEAT_MAXIMUM_STATE = 21
 WHEATSTAGE1 = pygame.image.load(os.path.join('resources', 'wheat_stage1.png'))
diff --git a/fertilizer.py b/fertilizer.py
new file mode 100644
index 0000000..488b8ee
--- /dev/null
+++ b/fertilizer.py
@@ -0,0 +1,7 @@
+class Fertilizer:
+    def __init__(self, name):
+        self.name = name
+    def get_name(self):
+        return self.name
+    def set_name(self, name):
+        self.name = name
\ No newline at end of file
diff --git a/plant.py b/plant.py
index d8c2d02..3f3f3b0 100644
--- a/plant.py
+++ b/plant.py
@@ -1,6 +1,11 @@
 class Plant:
-    def __init__(self, state):
+    def __init__(self, name, state):
+        self.name = name
         self.state = state
+    def get_name(self):
+        return self.name
+    def set_name(self, name):
+        self.name = name
     def get_state(self):
         return self.state
     def set_state(self, state):
diff --git a/py.py b/py.py
index bd17882..2137f68 100644
--- a/py.py
+++ b/py.py
@@ -12,8 +12,8 @@ def create_base_map():
         temp_map_field = []
         for j in range(10):
             temp_rect = pygame.Rect(i * definitions.BLOCK_SIZE, j * definitions.BLOCK_SIZE, definitions.BLOCK_SIZE, definitions.BLOCK_SIZE)
-            temp_soil = soil.Soil(False, False)
-            temp_plant = plant.Plant(0)
+            temp_soil = soil.Soil(None, False, False)
+            temp_plant = plant.Plant("wheat", 0)
             temp_field = field.Field(temp_plant, temp_rect, temp_soil)
             temp_map_field.append(temp_field)
         fields.append(temp_map_field)
@@ -22,15 +22,15 @@ def fill_map():
         for j in range(10):
             field = fields[i][j]
             rect = field.get_rect()
-            if field.get_plant().get_state() > 0 and field.get_plant().get_state() <= 1 * definitions.WHEAT_GROW_TIME:
+            if field.get_plant().get_name() == "wheat" and field.get_plant().get_state() > 0 and field.get_plant().get_state() <= 1 * definitions.WHEAT_GROW_TIME:
                 block = definitions.WHEATSTAGE1
-            elif field.get_plant().get_state() > 1 * definitions.WHEAT_GROW_TIME and field.get_plant().get_state() <= 2 * definitions.WHEAT_GROW_TIME:
+            elif field.get_plant().get_name() == "wheat" and field.get_plant().get_state() > 1 * definitions.WHEAT_GROW_TIME and field.get_plant().get_state() <= 2 * definitions.WHEAT_GROW_TIME:
                 block = definitions.WHEATSTAGE2
-            elif field.get_plant().get_state() > 2 * definitions.WHEAT_GROW_TIME and field.get_plant().get_state() <= 3 * definitions.WHEAT_GROW_TIME:
+            elif field.get_plant().get_name() == "wheat" and field.get_plant().get_state() > 2 * definitions.WHEAT_GROW_TIME and field.get_plant().get_state() <= 3 * definitions.WHEAT_GROW_TIME:
                 block = definitions.WHEATSTAGE3
-            elif field.get_plant().get_state() > 3 * definitions.WHEAT_GROW_TIME and field.get_plant().get_state() <= 4 * definitions.WHEAT_GROW_TIME:
+            elif field.get_plant().get_name() == "wheat" and field.get_plant().get_state() > 3 * definitions.WHEAT_GROW_TIME and field.get_plant().get_state() <= 4 * definitions.WHEAT_GROW_TIME:
                 block = definitions.WHEATSTAGE4
-            elif field.get_plant().get_state() == 4 *definitions.WHEAT_GROW_TIME + 1:
+            elif field.get_plant().get_name() == "wheat" and field.get_plant().get_state() == 4 *definitions.WHEAT_GROW_TIME + 1:
                 block = definitions.WHEATSTAGE5
             elif field.get_soil().get_state() is False:
                 block = definitions.DIRT
@@ -48,8 +48,9 @@ def do_work(tractor1_rect):
     elif field.get_soil().get_state() is True and field.get_soil().get_water_level() is False:
         field.get_soil().set_water_level(True)
     elif field.get_plant().get_state() == 0:
+        field.get_plant().set_name("wheat")
         field.get_plant().set_state(1)
-    elif field.get_plant().get_state() == definitions.WHEAT_MAXIMUM_STATE:
+    elif field.get_plant().get_name() == "wheat" and field.get_plant().get_state() == definitions.WHEAT_MAXIMUM_STATE:
         field.get_plant().set_state(0)
         field.get_soil().set_water_level(False)
         field.get_soil().set_state(False)
@@ -61,7 +62,7 @@ def grow_plants():
     for i in range(10):
         for j in range(10):
             field = fields[i][j]
-            if field.get_plant().get_state() > 0 and field.get_plant().get_state() < definitions.WHEAT_MAXIMUM_STATE:
+            if field.get_plant().get_name() == "wheat" and field.get_plant().get_state() > 0 and field.get_plant().get_state() < definitions.WHEAT_MAXIMUM_STATE:
                 field.get_plant().set_state(field.get_plant().get_state() + 1)
 def is_move_allowed(move, tractor1_rect):
     if ((move == 1) and (tractor1_rect.y + definitions.BLOCK_SIZE + definitions.BLOCK_SIZE <= definitions.HEIGHT)):
@@ -100,7 +101,8 @@ def tractor1_handle_movement(tractor1, tractor1_rect):
             loop = False
 def main():
     create_base_map()
-    tractor1 = tractor.Tractor(0, 0)
+    fertilizer_dict = {"beetroot": definitions.TRACTOR_FERTILIZER, "carrot": definitions.TRACTOR_FERTILIZER, "potato": definitions.TRACTOR_FERTILIZER, "wheat": definitions.TRACTOR_FERTILIZER}
+    tractor1 = tractor.Tractor(fertilizer_dict, 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/soil.py b/soil.py
index a383c4b..9d3c5eb 100644
--- a/soil.py
+++ b/soil.py
@@ -1,7 +1,12 @@
 class Soil:
-    def __init__(self, state, water_level):
+    def __init__(self, fertilizer, state, water_level):
+        self.fertilizer = fertilizer
         self.state = state
         self.water_level = water_level
+    def get_fertilizer(self):
+        return self.fertilizer
+    def set_fertilizer(self, fertilizer):
+        self.fertilizer = fertilizer
     def get_state(self):
         return self.state
     def set_state(self, state):
diff --git a/tractor.py b/tractor.py
index a7df05f..14dc554 100644
--- a/tractor.py
+++ b/tractor.py
@@ -1,8 +1,13 @@
 import definitions
 class Tractor:
-    def __init__(self, x, y):
+    def __init__(self, fertilizer, x, y):
+        self.fertilizer = fertilizer
         self.x = x
         self.y = y
+    def get_fertilizer(self):
+        return self.fertilizer
+    def set_fertilizer(self, fertilizer):
+        self.fertilizer = fertilizer
     def get_x(self):
         return self.x
     def set_x(self, x):