From 7d0e773b7a4f32705225002246772978fa5d57b2 Mon Sep 17 00:00:00 2001
From: micwuj <micwuj1@st.amu.edu.pl>
Date: Mon, 29 May 2023 10:04:27 +0200
Subject: [PATCH] tractor collect

---
 __pycache__/settings.cpython-310.pyc    | Bin 606 -> 609 bytes
 main.py                                 |   7 +++++--
 src/__pycache__/Field.cpython-310.pyc   | Bin 1127 -> 1130 bytes
 src/__pycache__/ID3.cpython-310.pyc     | Bin 1394 -> 1397 bytes
 src/__pycache__/Plant.cpython-310.pyc   | Bin 1663 -> 1666 bytes
 src/__pycache__/Road.cpython-310.pyc    | Bin 565 -> 568 bytes
 src/__pycache__/Tractor.cpython-310.pyc | Bin 3791 -> 3794 bytes
 src/__pycache__/bfs.cpython-310.pyc     | Bin 3057 -> 3060 bytes
 src/__pycache__/map.cpython-310.pyc     | Bin 3198 -> 3193 bytes
 src/map.py                              |   4 ++--
 10 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/__pycache__/settings.cpython-310.pyc b/__pycache__/settings.cpython-310.pyc
index 0af80cb05eeb962a636735d62d8559a31d3f8fff..21c67934ffb4bf4379af193361ee3be98f3f02f5 100644
GIT binary patch
delta 44
ycmcb|@{ol)pO=@50SNruN;Y!;W)#-e&&bbB)h{hhEz);MEzT~<FPJRG<N*K^FbyUE

delta 41
vcmaFJa*u^OpO=@50SJm4@;7q-W)#rS&&bbB)z8h$$uF+bcl4Yr$>ae5^V$py

diff --git a/main.py b/main.py
index ae78dfa..22aa97e 100644
--- a/main.py
+++ b/main.py
@@ -73,9 +73,10 @@ if isinstance(this_contain, Plant):
      print(decision)
      if decision == 1:
         #   Tractor.collect(self=tractor, plant_group=plant_group)
-          print('Gotowe do zbioru')
+        print('Gotowe do zbioru')
      else:
-          print('nie zbieramy')
+        # decision = 1
+        print('nie zbieramy')
      
 else:
      print('Road, no plant growing')
@@ -106,6 +107,8 @@ if __name__ == "__main__":
                     step = moves_list.pop()  # pop the last element
                     moves = tuple(moves_list)  # convert back to tuple
                     tractor.movement(step[0])
+                    if (tractor.rect.x, tractor.rect.y) == destination and decision == 1:
+                        tractor.collect(plant_group)
                     
 
         Tractor.movement_using_keys(tractor)
diff --git a/src/__pycache__/Field.cpython-310.pyc b/src/__pycache__/Field.cpython-310.pyc
index a0ccddf2a88b867b172e7350884422e17c281d4d..2e0ff0d25507b595e997bc3d2d5c48044cfc30e7 100644
GIT binary patch
delta 45
zcmaFP@rr{xpO=@50SNruN;YykFbV7EXXNLm>X#O$7U{dB7H5~_7i^AZ;$Z>+5`7G^

delta 42
wcmaFG@tlJ@pO=@50SKf^i#BpQFbQbtXXNLm>gQ(W<QG@zJ9=)8W8z@~0O=14H~;_u

diff --git a/src/__pycache__/ID3.cpython-310.pyc b/src/__pycache__/ID3.cpython-310.pyc
index ac80307d5f33946260393f6e244a0b79302a33d5..54f48932d686afc314d2a6cd7de4b8c17b47becb 100644
GIT binary patch
delta 45
zcmeyw^_7b|pO=@50SH!llx*al!YHhzpOK%Ns$W{1TBPriTAW>yU$A*S<6&k1E!_@<

delta 42
wcmey$^@)o+pO=@50SGE2i#KvlVH8l;&&bbB)z8h$$uF+bcl6x6iSaNq0Qe*fumAu6

diff --git a/src/__pycache__/Plant.cpython-310.pyc b/src/__pycache__/Plant.cpython-310.pyc
index 7c7a94e94ef0612d83349153dceeaaee54fb3e2d..baf14b049ae2915c2fb6f31d43d01ddf59392081 100644
GIT binary patch
delta 45
zcmey*)5Oc2&&$ij00e$+B^$X5ScG--GxBp&^-GIWi}YPmi?d7e3pRJNd|?Ct4wwzL

delta 42
wcmZqT{m;Xl&&$ij00dH{MH{&bSOhfnGxBp&^>Z_G@{6nV9X&Vqv3y|!0OU>#I{*Lx

diff --git a/src/__pycache__/Road.cpython-310.pyc b/src/__pycache__/Road.cpython-310.pyc
index 705dffadd48f5855d69f3f9cb1bd33516cf1cb4e..6cbb25b74987ff5681559e86111c57e3913c9c74 100644
GIT binary patch
delta 44
ycmdnWvV(;?pO=@50SNruN;Y!qF$!zzXXNLm>X#O$7U{dB7H5~_7fkkKd;<XS#0=d4

delta 41
vcmdnNvXzB9pO=@50SH8M^EPtpF$!qtXXNLm>gQ(W<QG@zJ9<v`VSEDs$#)A;

diff --git a/src/__pycache__/Tractor.cpython-310.pyc b/src/__pycache__/Tractor.cpython-310.pyc
index 77d9d9fd7af9e20eaccb942a0fc5151882eb4b2d..4612495d1f50d1a03fb1e822038b3907a39c5bbf 100644
GIT binary patch
delta 45
zcmX>vdr6i%pO=@50SNruN;YzbG7IbJXXNLm>X#O$7U{dB7H5~_7i=zIj^_pd6w(bg

delta 42
wcmca4dtR11pO=@50SF{Zi#BqHG7D(yXXNLm>gQ(W<QG@zJ9=&|W{&3u0P6G$x&QzG

diff --git a/src/__pycache__/bfs.cpython-310.pyc b/src/__pycache__/bfs.cpython-310.pyc
index 4a303922e623d3cd17efc18590e420b740575d16..a493c26e7663324de7cc42987f2816256a2ebba1 100644
GIT binary patch
delta 45
zcmew;{zaTSpO=@50SJD%mTcrc!ziq!pOK%Ns$W{1TBPriTAW>yU$FT(BNrC{K?4q{

delta 42
wcmew&{!yGepO=@50SE*Fvo~^|VH8l;&&bbB)z8h$$uF+bcl6x+ijj*80QwgUP5=M^

diff --git a/src/__pycache__/map.cpython-310.pyc b/src/__pycache__/map.cpython-310.pyc
index b957405a92ee4f3c454f0f0f1a5e8445c973ac3a..83dbb624a37fb40c86a5ea72c96b431e0686f400 100644
GIT binary patch
delta 104
zcmew-@l%2?pO=@50SNB-m85(U*vO~IB&?;Mk)NBYUs{}6r0<eioL!P%u-TqToK?b$
zk%6IvA&YSV(?W(?h7#rymS#p5hS-^t^Vr217fo(sZ(>SeoGiq#jWKHTNsj%Dj7*z5
IxxO+205P>5hyVZp

delta 109
zcmew<@lS#;pO=@50SK;27N@WZZsb#B5>VIA$j?pH&&|xqFRs#e^xW*kB+e=k#K^!<
z!jQ$dfN3E^Ekg-&2}?7h3q$PO$%X9VjLRl>vNv&+urA<BVN79O$TXRkV;iH$<|7>Y
N85y}Yw{U%B1OP8k9qRx9

diff --git a/src/map.py b/src/map.py
index 701d238..6b0241d 100644
--- a/src/map.py
+++ b/src/map.py
@@ -73,11 +73,11 @@ def seedForFirstTime():
             # wzrost;wilgotnosc;dni_od_nawiezienia;aktualna_pogoda;czy_roslina_robaczywa;typ_rosliny;pojemnosc_ekwipunku;cena_sprzedarzy;czy_zebrac
             
             new_plant = Plant(
-                    wzrost=random.randint(20, 100),
+                    wzrost=random.randint(90, 100),
                     wilgotnosc=random.randint(0, 100),
                     dni_od_nawiezienia=random.randint(0, 31),
                     aktualna_pogoda=random.randint(1,4),
-                    czy_robaczywa=random.randint(0, 1),
+                    czy_robaczywa=0,
                     cena_sprzedarzy=random.randint(1000, 2000),
                     species=plant_name,
                     pos_x=x,