From 53603120bc2e3c1fdf0ea8184a6465a60f0bdd37 Mon Sep 17 00:00:00 2001
From: MarRac <marekraczkowski5@gmail.com>
Date: Tue, 9 Apr 2024 15:02:58 +0200
Subject: [PATCH] added tractor rotation and movement

---
 .../crop_protection_product.cpython-311.pyc   | Bin 651 -> 651 bytes
 source/__pycache__/ground.cpython-311.pyc     | Bin 1341 -> 1341 bytes
 source/__pycache__/plant.cpython-311.pyc      | Bin 1424 -> 1424 bytes
 source/__pycache__/tile.cpython-311.pyc       | Bin 1714 -> 1714 bytes
 .../area/__pycache__/__init__.cpython-311.pyc | Bin 178 -> 178 bytes
 .../__pycache__/constants.cpython-311.pyc     | Bin 451 -> 573 bytes
 source/area/__pycache__/field.cpython-311.pyc | Bin 3228 -> 2562 bytes
 .../area/__pycache__/tractor.cpython-311.pyc  | Bin 3224 -> 5766 bytes
 source/area/constants.py                      |   5 +-
 source/area/tractor.py                        |  50 +++++++++++++++++-
 source/main.py                                |  17 ++++--
 11 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/source/__pycache__/crop_protection_product.cpython-311.pyc b/source/__pycache__/crop_protection_product.cpython-311.pyc
index d4e10b42977eef6edebb799c7ba61069314f1050..6a05fd6c408c338ff6e3508624558cd698721358 100644
GIT binary patch
delta 27
hcmeBX?Pld(&dbZi00iq3MK*HFGBPG_)?`d#1OQJ&1(^T<

delta 27
hcmeBX?Pld(&dbZi00cW0GHm3QWn|3WtjU<f2mn$-1=aun

diff --git a/source/__pycache__/ground.cpython-311.pyc b/source/__pycache__/ground.cpython-311.pyc
index 440582acd744a9f98e4a6077af280327370cee5a..adf86d09444b17c22eedd34a6c757b078c8e09d5 100644
GIT binary patch
delta 27
hcmdnXwU>)~IWI340}!lF6xql<hmkRP^9shP%m86Q2RZ-%

delta 27
hcmdnXwU>)~IWI340}$+3$gq)n4kKgs<`s-nnE_-!2X_Df

diff --git a/source/__pycache__/plant.cpython-311.pyc b/source/__pycache__/plant.cpython-311.pyc
index 4dca0beb6da621b1033222a53ef4531727232ca9..3976f891a2eaf1b7f97d1773ea600f5eaeb2ef11 100644
GIT binary patch
delta 27
hcmbQhJ%O8hIWI340}!lF6xqn#%gC6#c_!m`W&l`F2POaj

delta 27
hcmbQhJ%O8hIWI340}zC6W!T8w%gC6$c_!m`W&l>`2NVDR

diff --git a/source/__pycache__/tile.cpython-311.pyc b/source/__pycache__/tile.cpython-311.pyc
index afdea507b858812fdbd011e7231cc317a3250209..415b652dc527c8edf686886587a913d7835daf9b 100644
GIT binary patch
delta 27
hcmdnQyNQ>3IWI340}!lF6xqlf$;g<zIhE0u6#!eN23`OF

delta 27
hcmdnQyNQ>3IWI340}$+3$gq(+l94fcb1I`RD*#@k2Aco?

diff --git a/source/area/__pycache__/__init__.cpython-311.pyc b/source/area/__pycache__/__init__.cpython-311.pyc
index a319c592373413ccf52f095dfa274696da8b635f..1de898dbb589316707e24213231967a159cc3c0e 100644
GIT binary patch
delta 25
fcmdnQxQUTxIWI340}!lF6iJ)N6Udl6F)joEP7MZK

delta 25
fcmdnQxQUTxIWI340}xa_eU&<qCy+6FVq6FSS+EC*

diff --git a/source/area/__pycache__/constants.cpython-311.pyc b/source/area/__pycache__/constants.cpython-311.pyc
index fc5dca7db6e4a764e825e1088e3e6f827af8ea9f..170b454b9834dc7618f1aa810ea99a3153c1730c 100644
GIT binary patch
delta 199
zcmX@iyqAS{IWI340}xzG7D;QF$ScVhG*R72ls$?&g(He5g)@pbg)53Lg)x{xlY3&G
zlh{i}pxT#AAc7f0umA~7{)wC7oNn>Ecm}yThj{w?#rydOg?QZJLkPG!28SRk2=)&}
zRS@nP95PveQI#=yvKgZZmmJVokWIzWlS>%gWFH6#H}KyO6l&nR0cSPvHSiV50M!5h
Dz%esD

delta 76
zcmdnXa+sNSIWI340}$+3$dG0-kynz@X`;FlD`PN&Ci}!XCninqiPz#Lmocg`W>22O
bXu>51RLTg%#qN`DF}iU!ur#m~i2(Tkxs4G)

diff --git a/source/area/__pycache__/field.cpython-311.pyc b/source/area/__pycache__/field.cpython-311.pyc
index e78f0fe881d09a2bf2782cc2d8121cedaccedd4f..3a7109fbd4f188c573cfd25db4ec6cc6efab41e4 100644
GIT binary patch
delta 789
zcmZva&ubG=5Xax!U)dk|u}Pa)TN`6R<0_&D5vBg12p(H%E!A8k<ZWeTvk9}2U@jK%
zZp#zu!Gnk(y?E)_t4E<14?#rmA6V$ki_WY`1a)9PJ3I5<o9~<1S4W>t*WcxGHbZ-R
zxxD#PW$ZhBj7=Fihp<y$y7YiGvcBSL1Kc3Afx}oMC-g>M7|&RvATmf-n8>2AkR`#_
zm}l>Nx-HN0lRT2Eyln}##`gHKr_1xoyj)j2-jYw0YxWVW<l+-A%8$xLJJA)rk}$-6
zRlUdWV=V?5#L$IiBs%S2;NR>-JwNIJZ5tZRZr6_l&^ew8Q?$NF39T1|evB7mwOS1-
z6mnYNH+%jaN<bAO75Q1)UYJ3z#SvpO(4mco1B~vn9+zK@+5I>AU0$MVKml`JK0N_k
z8JRa$sA5`sm=QtT4V#aL+GZGZJ$0z|g9yr$KY{qKpj&|-3OIvl5*6<<dE9z_DzP-Z
znlJ?Xqmb043SY=2dt;_YibwWP8+)&HS=6SbYvk8C`y<>yX+ao*iR;p$P$RESIF0Z)
zc=(E`BcsOI0-F7e0Q=vEa~P(z@fG>SUXYGGXOcW`3TiUvEH1-5enC1n8W5BS(*zpP
z@21gJ(}VU{dbe~uKg_G`j(8OM*Wm)@seJrFzIRq+AzN-H26NnP=fIwOxq4t#w~TLA
hcFRaimE-R+LDt~M5;lQraO~g&C6&+8;=hq<_yt#$om&6^

delta 1123
zcmZWnU1(HC6rQ<v?$6%c&2DlxKbxfOR-^Hf7%*BWR9iyCx?l|Ths32Km&}dc_U=z-
zZ;hsk*AQq5K4cjM3$|#{*5IRk=z~7`z8e=476XdVH_Jlb`qVQwF*fxu^UcgTGiSc@
zGncxR?*A<wHxS4lchK}c1)*2s@J8Sq%HO|K`bVZIqQr~k<GDCSXHl+2LQa$-N1cUh
zZ`NNWgdV_Lmt4Y;95M?ZP-QlXP%cT;Tr1V)QLc^ZfF_Lqrl<kfPVsSMMJqoa)3p=K
zp7M*V@_HA3#yfC6>W3sluY3qwTh5c%icoYME#ae<%CF(~A`Q)7cfgmhg}>%c@c|<Z
zkCQOVCwaHDuWyY+gY10vMn{cwip~GeK{m)foRm)CGckC?G=N5u*#%n6yR*({vEVxe
zpS23LYL`k*fim%fC9{;c-zE&icRi;p!#0!2ur8sBPBF*!ofE>qGN9??NwSE$`5ls$
zo=XoOkqemrMFu6mmp4g@?^F^v!7Eyd@0MGn%QDX?yRpm{6ibmWq1zE*>boTSz2Is?
zzS>OHf3>`!Oty(EF_8o-8Gg=M`62bQD}roDyP;9HT=MLT4KnSyCDs9kMtrJRIPWn3
zjO~@q*%oQYGj4%(iZ|PZJ?7@^v(84v$^=vp?bdJ)xsFHK5STuIStb~v0IiY4)v@`p
zV2r<1=T5Jg>FfJf%)Vu_@7~1S(=~H%-Q2rkjx3uaHFLCXjs{2IO5NPPVp_|lb${@2
z`boC>@zI(&UN^^sBdbLF{_x!4g)e{l{8skf%-xICo;@`(Tqna-GR!M_59GM0rST;H
zL7O=EHW4y}>Utj2fmq1U!fa5G1deDU3WG9xX2ONq&#*n99uW2&yr^$WR7na3>jsV0
z!M5?=^-rc7F&m0Jw9$eL`W`V6Hw!ySv`m;-W{O?A0MR+?1ra$4|5!qy)39s)(f8+z
z^jpvQlzjwt!L0lzKM)zelBuFCV->Ymw~iOO5h$xh>q7tHhl|<Dz|C)Nr+@seW(?Gg
zfk0a|5{uEA(R1^QTIBseeG!QTYExHmR}*bQi;8=jXcLkK?rx%W$iTKs!tG7;E`;>|
E1^-tQ%>V!Z

diff --git a/source/area/__pycache__/tractor.cpython-311.pyc b/source/area/__pycache__/tractor.cpython-311.pyc
index d57462a6bfc74dd6e04bef4114262159a930642b..36769f12cd03e88e231dd853dd1c8211863de59d 100644
GIT binary patch
literal 5766
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
E3n%OV=l}o!

delta 728
zcmZqEogvA$oR^o20SKP#Wk~DfoX96(qyywlXGmd4Va#F3WsG8EWME=&XGmdcVMt+K
z#>Bv|8i*kviYbL9m_d_uVvihS@<c(=`fXsXsSHt!DGWeK#wcbWW&vVWCWchD6ebJ<
z*uml~7~&jI^{i+XazfRki*td+ZJAQo&@^yEHK2?0q_DRzMDeC@07<?SMxZY^C;wtJ
z7Gs9_4M>Ch3F3b?nC#4?$d<xb!w}Cj`5Kd+D)TMIid&48w^%cC6Vp>QnQyTar{<&;
z@c<PU@dAlrkhaO;%!-WJlPj5>WduNC(m<kt;fA142TKndj1o28{D=7}D<l8pOPuPA
z0+WAnYBGv$R^j4hViN+Y*W{nPUsyE{Zg3GFP_PJOdXW-{Py-RlAVM8PsDKC!5FrR6
z^nt`mh9ZzbMIa{>vBC%zAftFKkZ6Fz8yq|hj$mSPfk<&ZGpor51~|c`&T9050h553
z4Kmgb7z*OaMfnBs1x5KKsmUdo`FS8_N@;Ql#KB<8jX^GeJLngOO)gMHPO4pzDNuqD
hh>Jae#0TcdPenz|Kd@Oa0<Fa)K7z!)V37bD4FIQyjf?;Q

diff --git a/source/area/constants.py b/source/area/constants.py
index 1aff5be..c0326a0 100644
--- a/source/area/constants.py
+++ b/source/area/constants.py
@@ -12,6 +12,9 @@ GROUND = ""
 # path to ground image
 GREY = (20, 17, 17, 255)
 
-
+DIRECTION_NORTH = 1
+DIRECTION_EAST = 2
+DIRECTION_SOUTH = 3
+DIRECTION_WEST = 4
 
 
diff --git a/source/area/tractor.py b/source/area/tractor.py
index dc27ee8..1dab655 100644
--- a/source/area/tractor.py
+++ b/source/area/tractor.py
@@ -1,9 +1,13 @@
 from crop_protection_product import CropProtectionProduct
+from area.constants import TILE_SIZE, DIRECTION_EAST, DIRECTION_SOUTH, DIRECTION_WEST, DIRECTION_NORTH
+from area.field import fieldX,fieldY
+import pygame
 
 
 class Tractor:
     x = None
     y = None
+    direction = None #direction takes values in the range of 1 to 4 
     image = None
     cypermetryna = CropProtectionProduct("pests", "cereal")
     diflufenikan = CropProtectionProduct("weeds", "cereal")
@@ -13,10 +17,12 @@ class Tractor:
     metazachlor = CropProtectionProduct("weeds", "vegetable")
 # etc
 
-    def __init__(self, x, y):
+    def __init__(self, x, y, direction):
         self.x = x
         self.y = y
-        self.image = 'resources/images/tractor.png'
+        self.direction = direction
+        self.image = pygame.image.load('resources/images/tractor.png').convert_alpha()
+        
 
     def work_on_field(self, tile, ground, plant1):
         if plant1 is None:
@@ -58,3 +64,43 @@ class Tractor:
         if ground.nutrients_level < plant1.nutrients_requirements:
             ground.nutrients_level += 20
             print("Tractor added some nutrients")
+
+
+
+    def move(self):
+        if self.direction == DIRECTION_EAST:
+            self.x = self.x + TILE_SIZE
+
+        elif self.direction == DIRECTION_WEST:
+            self.x = self.x - TILE_SIZE
+
+        elif self.direction == DIRECTION_NORTH:
+            self.y = self.y - TILE_SIZE
+        
+        elif self.direction == DIRECTION_SOUTH:
+            self.y = self.y + TILE_SIZE
+
+    
+    def rotate_to_right(self):
+        if self.direction == 4:
+            self.direction = 1
+        else:
+            self.direction += 1
+        self.image = pygame.transform.rotate(self.image, -90)
+
+    
+    def rotate_to_left(self):
+        if self.direction == 1:
+            self.direction = 4
+        else:
+            self.direction -= 1
+        self.image = pygame.transform.rotate(self.image, 90)
+
+    
+    def draw_tractor(self, win):
+        
+        imageTractor = pygame.transform.scale(self.image, (TILE_SIZE, TILE_SIZE))
+        self.x += fieldX
+        self.y += fieldY
+        win.blit(imageTractor, (self.x, self.y))
+        pygame.display.flip()
\ No newline at end of file
diff --git a/source/main.py b/source/main.py
index 2dac1b5..4f62a5c 100644
--- a/source/main.py
+++ b/source/main.py
@@ -2,7 +2,7 @@ import pygame
 import time
 import random
 
-from area.constants import WIDTH, HEIGHT
+from area.constants import WIDTH, HEIGHT, TILE_SIZE
 from area.field import drawWindow
 from area.tractor import Tractor
 from area.field import tiles
@@ -16,6 +16,8 @@ def main():
     run = True
     window = drawWindow(WIN)
     pygame.display.update()
+
+    
     while run:
         for event in pygame.event.get():
             if event.type == pygame.QUIT:
@@ -28,12 +30,19 @@ def main():
         d1 = Dirt(random.randint(1, 100), random.randint(1,100))
         d1.pests_and_weeds()
         tile1.ground=d1
-        t1 = Tractor(10, 10)        
-        t1.work_on_field(tile1, d1, p1)
+        
+        tractor = Tractor(0*TILE_SIZE, 0*TILE_SIZE, 2)
+        tractor.rotate_to_right()
+        tractor.move()
+        tractor.draw_tractor(WIN)
+       
+        pygame.display.update()      
+        tractor.work_on_field(tile1, d1, p1)
         time.sleep(3)
         print("\n")
 
 
-#        in loop move tractor
+#        in loop move tractor:
+        
 
 main()