From a357b56d58b522c92d90600debffd171169814b5 Mon Sep 17 00:00:00 2001
From: Tomasz Adamczyk <tpadamczyk7@gmail.com>
Date: Fri, 9 Apr 2021 14:57:52 +0200
Subject: [PATCH] =?UTF-8?q?obracaj=C4=85ca=20si=C4=99=20grafika=20w=C3=B3z?=
 =?UTF-8?q?ka?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  26 ++++++++++--------
 __pycache__/definitions.cpython-37.pyc        | Bin 3041 -> 3400 bytes
 __pycache__/map.cpython-37.pyc                | Bin 4217 -> 4609 bytes
 __pycache__/tractor.cpython-37.pyc            | Bin 7920 -> 7861 bytes
 definitions.py                                |  10 +++++--
 map.py                                        |  11 ++++++--
 py.py                                         |   2 +-
 resources/minecart_command_block_east.png     | Bin 0 -> 590 bytes
 resources/minecart_command_block_north.png    | Bin 0 -> 523 bytes
 resources/minecart_command_block_south.png    | Bin 0 -> 518 bytes
 ...ck.png => minecart_command_block_west.png} | Bin
 11 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 resources/minecart_command_block_east.png
 create mode 100644 resources/minecart_command_block_north.png
 create mode 100644 resources/minecart_command_block_south.png
 rename resources/{minecart_command_block.png => minecart_command_block_west.png} (100%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5afcf9d..a992cfd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,9 @@
     <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$/map.py" beforeDir="false" afterPath="$PROJECT_DIR$/map.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/py.py" beforeDir="false" afterPath="$PROJECT_DIR$/py.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tractor.py" beforeDir="false" afterPath="$PROJECT_DIR$/tractor.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/minecart_command_block.png" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -103,6 +104,7 @@
       <workItem from="1617439271903" duration="2500000" />
       <workItem from="1617794241086" duration="273000" />
       <workItem from="1617966682687" duration="4169000" />
+      <workItem from="1617972419025" duration="598000" />
     </task>
     <servers />
   </component>
@@ -110,22 +112,22 @@
     <option name="version" value="1" />
   </component>
   <component name="WindowStateProjectService">
-    <state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1617971848584">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1617973021898">
       <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="1617971848584" />
-    <state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1617971848584">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1617973021898" />
+    <state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1617973021898">
       <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="1617971848584" />
-    <state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1617971848584">
+    <state width="1879" height="295" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1617973021898" />
+    <state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1617973021898">
       <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="1617971848584" />
-    <state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1617971848584">
+    <state width="1879" height="295" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1617973021898" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1617973021898">
       <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="1617971848584" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1617973021898" />
     <state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1617385468328">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
@@ -142,12 +144,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="1617966682675">
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1617972418605">
       <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="1617966682675" />
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1617972418605" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <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$" />
+    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1617972977225" 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 601248d25fe3b86a637eb9a378e62be6bbdd0c78..0d34f9c86670be340507ccc64399d4afedab458e 100644
GIT binary patch
delta 642
zcmaDTenN`RiI<m)0SG?&6(l?ro5&}@WW>5r!-Tm$l`)HT0b43V7W)E@6t)zpg-i<>
zqtt++Tno5U)l!*KnbMdRGJ!>q)k%ZZsYBJN!_|RAkk!e6)oDQ0X~5NKq{v2Trm#k7
zYo)M6X{X3V=>P?EQ{<!cQWT=}Qxu~NQk0?$Q<$TSQjJoSMHo_8#Th2Ev7D_(He3^I
zxFytZOSs`65oC2*V0Bhdbyje7AQ5DB+F*6oP<7UDbs!O&1-7Y@sS-TE&|r+ROJNLV
z(A3%djHQ*aUOqQ7FEu%_s3bl)KQ}iqFC{)HCqFqmJ~gqpM6Vz(y-ERxg1r2qk_@~m
zit|gMDsWj+p2}2QGP#NE0Hgh8XLc4QM!Cs>oMKt=A+8Z2p+T-u@*zQv&LRFm@h+Z0
zuFfHz{(kX({y`xg_!I>DhaxGE!!#k>H8=!jz+`_;3C3HK8##qHS99huvdIDyS&{7I
S_goQ-iza(;Cr_Tw?F0aB>%G$e

delta 335
zcmX>h^-!G8iI<m)0SH>{3lg3PPvnze+QqU_!-Tm$MJh@yg*8e&g(XTOMLJ3o$k$4d
ziPBDyjnYYxi_%SzkJ3wFj?z!nPf-wINMRLch%!iJ%wk=@mdcRDzJMczEk$u5(?Z55
zL!c<v0`649RHjs>G^T}2U=d_>N?>(HP<2LNb=n|>AR%Oh%3y`YP=&@Y11GbwoE5fQ
zV3jJFDgm^BG0HlHF_=M9b8{SPE2FqnZf0I;a$-?Qd~$wnZem_ad{Rz+a`xmD_5+MI
zn^iejm=xJVf*hSg{DY#zpp1AI&mdRl5Kn)<cvr{Zkf_avxf&VSWPssRBs1BICxU$%
VkjcTwF<FsUeDVPvx5+}hW&oksSLy%&

diff --git a/__pycache__/map.cpython-37.pyc b/__pycache__/map.cpython-37.pyc
index 7e8fb74eef362447b5683138996418358b18a6d4..549db50ee011d3647ea416d56d954c00be1f1ee6 100644
GIT binary patch
delta 586
zcmeyV(5S-a#LLUY00g~$1qpNIH}W0lt7iuBfdE9a0<kj?7jFR)H4F<F7BVn0)G#h!
zT*y$ul*OFQRAd08Sr)JYNwylMEOsE~NMl;a#K@3W23N-kR2KnP$AzZO53Y_IsIH+N
zu8;>!p&DEvFHqq!xH>*mbtU{+0t*B|4ozVQX3%8x(-bNS1Uf&8H$Al^J|(j#HMt}+
zKd*=nD0WLMB*@V@#6KwB#WTp&ImFZ7uRh+@F*u~i3n*LU4N@Y9p#-cVKEyR5Bs9pi
z$QPv252R8YQ>CAOP>9DZc^ncjGmv%GL){S{>>r9<D_8=q71Iat;jY0U*qjX#hv_R4
z1i6?!C9}97C$aJtTWLW`Vo9nda}gg4NP?rJC^5MtzsPWMD!+lK2vCTDk%N(sQ3`=4
O&*2YcjGO$4za0Q|Bb);O

delta 195
zcmZov`KiF?#LLUY00eFN8434gHu4?kt7ii7fdE9a0<kj?7wZ9u8ioZ73mF(0N*J@4
z7BB-zmKw$^Rv>0eV_L`r6lc%kSilKVk-`wnpvmZ`$yF2x)K|m@BD_F^H;}l+9unl}
z9O55T<O>q=0}+B?@s!Nsf*irb%3Exu1u2OoshUhhEI^6L_XP~t*?<fNMvloUf}xCI
Nlg|o@Po5}P002>qC}IEr

diff --git a/__pycache__/tractor.cpython-37.pyc b/__pycache__/tractor.cpython-37.pyc
index 5db1e20868d55fac59792a41b17df51324d2052b..668045a18381ea12854d4c19f94ff5d366d70b05 100644
GIT binary patch
delta 229
zcmexhyVaJ@iI<m)0SMZ>3KEVPFXWS{p918iFxE0v_|z~J1=KJsU|7hI!j#PdW;50>
zE@Vt$%;qR^1IjQhWME_f(##7PY8c~LfGk!pi!Ft@mZ^{p$Y%$sC}ax<sp0@)kXbAe
z3=0{7`WUlVfaWq4O#rgkpe%+3S{x;uSzKTR3=6n{Y#tChg&~+hlhrSzh!N;Iw<0|t
qsmVL}v5fL$UfEbd2_Tn&k%du+k&lssk&BUQa<l9u#_-8ua<c%@>otA=

delta 270
zcmdmL`@xpaiI<m)0SMx~3KEh`7V^o|9{}=F7;Bj-Dr%UDYHAo3Ff3$9VajF!vl(j`
z7c!<WW^)u30cDsLGB7d#Y379tHH`5rKo%>Q#a6;z!<fa=%*e<9X0bt8V3lw-P%Vg^
z!d%N#$OhEQ0Wz)7mMt7)BqtDqEM}2lSO`=EG7jhnrlLJS78{fWR8_*2#SNBcSil2h
z^G=>8Bf-cwdAp1<`z_XjqRhOK$+u);B^7{vVqj!p6k_CK<Y452LLNq*$sV$o7$YW2
H%gq7+`H?`@

diff --git a/definitions.py b/definitions.py
index 1a9fd1a..2ee2ec4 100644
--- a/definitions.py
+++ b/definitions.py
@@ -45,8 +45,14 @@ SPONGE = pygame.image.load(os.path.join('resources', 'sponge.png'))
 SPONGE = pygame.transform.scale(SPONGE, (BLOCK_SIZE, BLOCK_SIZE))
 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_TEXTURE = pygame.image.load(os.path.join('resources', 'minecart_command_block_east.png'))
+TRACTOR_DIRECTION_EAST_TEXTURE = pygame.transform.scale(TRACTOR_DIRECTION_EAST_TEXTURE, (BLOCK_SIZE, BLOCK_SIZE))
+TRACTOR_DIRECTION_NORTH_TEXTURE = pygame.image.load(os.path.join('resources', 'minecart_command_block_north.png'))
+TRACTOR_DIRECTION_NORTH_TEXTURE = pygame.transform.scale(TRACTOR_DIRECTION_NORTH_TEXTURE, (BLOCK_SIZE, BLOCK_SIZE))
+TRACTOR_DIRECTION_SOUTH_TEXTURE = pygame.image.load(os.path.join('resources', 'minecart_command_block_south.png'))
+TRACTOR_DIRECTION_SOUTH_TEXTURE = pygame.transform.scale(TRACTOR_DIRECTION_SOUTH_TEXTURE, (BLOCK_SIZE, BLOCK_SIZE))
+TRACTOR_DIRECTION_WEST_TEXTURE = pygame.image.load(os.path.join('resources', 'minecart_command_block_west.png'))
+TRACTOR_DIRECTION_WEST_TEXTURE = pygame.transform.scale(TRACTOR_DIRECTION_WEST_TEXTURE, (BLOCK_SIZE, BLOCK_SIZE))
 TRACTOR_DIRECTION_EAST = 2
 TRACTOR_DIRECTION_NORTH = 1
 TRACTOR_DIRECTION_SOUTH = 3
diff --git a/map.py b/map.py
index e17419a..f06ea70 100644
--- a/map.py
+++ b/map.py
@@ -81,7 +81,14 @@ class Map:
                 elif block != definitions.DIRT or block != definitions.FARMLAND_DRY or block != definitions.FARMLAND_WET:
                     definitions.WINDOW.blit(definitions.FARMLAND_WET, (rect.x, rect.y))
                 definitions.WINDOW.blit(block, (rect.x, rect.y))
-    def draw_window(self, tractor1_rect): #rysuje mapę
+    def draw_window(self, tractor1, tractor1_rect): #rysuje mapę
         self.fill_map()
-        definitions.WINDOW.blit(definitions.TRACTOR, (tractor1_rect.x, tractor1_rect.y))
+        if tractor1.get_direction() == definitions.TRACTOR_DIRECTION_EAST:
+            definitions.WINDOW.blit(definitions.TRACTOR_DIRECTION_EAST_TEXTURE, (tractor1_rect.x, tractor1_rect.y))
+        elif tractor1.get_direction() == definitions.TRACTOR_DIRECTION_NORTH:
+            definitions.WINDOW.blit(definitions.TRACTOR_DIRECTION_NORTH_TEXTURE, (tractor1_rect.x, tractor1_rect.y))
+        elif tractor1.get_direction() == definitions.TRACTOR_DIRECTION_SOUTH:
+            definitions.WINDOW.blit(definitions.TRACTOR_DIRECTION_SOUTH_TEXTURE, (tractor1_rect.x, tractor1_rect.y))
+        elif tractor1.get_direction() == definitions.TRACTOR_DIRECTION_WEST:
+            definitions.WINDOW.blit(definitions.TRACTOR_DIRECTION_WEST_TEXTURE, (tractor1_rect.x, tractor1_rect.y))
         pygame.display.update()
\ No newline at end of file
diff --git a/py.py b/py.py
index 447f6b0..1f3464d 100644
--- a/py.py
+++ b/py.py
@@ -22,7 +22,7 @@ def main():
         for event in pygame.event.get():
             if event.type == pygame.QUIT:
                 run = False
-        map1.draw_window(tractor1_rect)
+        map1.draw_window(tractor1, tractor1_rect)
         tractor1.tractor1_handle_movement(tractor1_rect)
         tractor1.do_work(map1, station1, tractor1_rect)
         plant.Plant.grow_plants(map1)
diff --git a/resources/minecart_command_block_east.png b/resources/minecart_command_block_east.png
new file mode 100644
index 0000000000000000000000000000000000000000..52efbd0112a035faec5af6d59b9d79a8044b2bb1
GIT binary patch
literal 590
zcmV-U0<ryxP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0pm$TK~y+TWAt1&
zg#iY($LBy<BmiUskb$<2?te~BuK%K9V*h1i<^F^CP$?9^1f?;+y}NfAl$4bjvU7_W
z)YR1&Lc?RghC-#`fDuZAB|(~aczMA5u!tB2QBiS**RNkPT)%dSAv!jd;qjvf469cz
zVYqtbGF%@slxFzy`AY-H#)PB{21O-hxMmRj@ZmiMK|x^#Svds;pm#vx4X<ClY6R&6
zdjaInq|^+sGhv#L>C2Zcfi;6%0HTq-0}lgqO(1&e<X(nVE0!=UDvxHUD9uGN1P0&+
zAZrF`0%^{+Q(zG0_{t#g@g9aDC;;SzhUQLil!5T}-opPHa@=5iyv`p?H-wmh#X<6O
z7p{ayD>yVkf*=}X<BC&PK}?1SGi?TQOKULu<ng0mahO<K=TZhSF>!Eguz*zn0m!My
zia>x#-JXH-avz)zl6TjV1gm}Z>LpkV9-km*&QEY*_`t6O*2uSN6~hY)GluWHObo(;
zat!}&9t4L);(|S3^*0`U1?z<eB1ixv2~q@7{3$GqfrpuqL4=W!;r+tJU_(KMgDgP?
za2LP;$R#jutp0VDAzZfzY#;~}PMig%VYY+v5rzREfb1Pu0D=HaBMjg)00cmWK$%!I
cLI48;02G+$sO5;)LI3~&07*qoM6N<$g1<KHXaE2J

literal 0
HcmV?d00001

diff --git a/resources/minecart_command_block_north.png b/resources/minecart_command_block_north.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6aba75535b0c0b50231accb4ac563e22b935fa0
GIT binary patch
literal 523
zcmV+m0`&cfP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ia1lK~y+TV`Lx$
zcrKg*Wic>dH9%WO_dk>g2d`eeWO)7R6^eS0K^O*rG>3-AFv!X&Fg$+r08Ceu<}wI#
ze1)oDV7T$<D_9@M04A^q6yVals63iseu4{F4T#o|;|9BMdwdSU0DPKH9zV*ExL^-h
z^9Oz<s167K8$d|&ic?n^BFwbGnwiw?8T#|n;I3c+5g$K(WH@wiH;4%amoHrcYZmx;
z53bqV(i*J!{ldiz{1$RhmC#ra6%+fPom<TC`t?f&QBiR)y=ui0aKOQw&Hd{v!xNbh
z1`$R^hW`Sx496F=fei<H;mhYQ469czfolfQAONx%<aZGGu3N;w`S~9M<JW%-D=+tf
zT?7JP1C*4N8SdS^i{b*1i>4lW09FJFhkrK@GDw^_#qdvBo*|UY80<X|02^@i%4Npy
z-@h?}oQ-S<2!H|%<Wvy&6cz?H2o@`#^Z<`W7(n($SVRm%T<21-ILsBWfQ2O{6a(;u
z1xOP}Gt6eN1Q0MGXADANfvy=0kPUzVP_$yhP-zsvh-?5TZIcEV7yt-R^ak^9tPB7E
N002ovPDHLkV1i^Y$LIh6

literal 0
HcmV?d00001

diff --git a/resources/minecart_command_block_south.png b/resources/minecart_command_block_south.png
new file mode 100644
index 0000000000000000000000000000000000000000..0523f9e68d50319f52f4fe714871e116793e56b5
GIT binary patch
literal 518
zcmV+h0{Q)kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0h>ugK~y+TV`Lx$
zcrKg*Wic>dH9%BM>_3!=0$#s*g`ys05DSzI2O4tRK+Rtn-u~cb$j&Whc>Ve%gQ%!D
zn4UL##(yPcWrnL)F2fCCg3@3B(mX%G1<cO2Q(%}nxfiY(M1wTnyL%Tb4+7ica}Wl=
zG=Jb%Vu&!)W>|6RDp(xZ1)<?F3_QF%U~w1#8vxP_(gf1Xq;Ah(ZfOmcTvQ&-uxiB;
z6hqJf6U=6iCXi;nRja@fAOj00&H}TMy%81>!@$YO^<P^@7aY)F7l3SD{p&0P)6<6x
zFD%SZTtO%-zy_Q=ev~0xw}|0CHxt8mUM2?4%Y9%;kjn^#1volD-ssOyWB7RD5rbfS
zEW^K>2f>DdG{XWmu5&4auAUxP6A0Y8d5hu6<424r=>T0bEMP&JJGv(`Jbv_mK~_!y
zOuu~b5@-NYN`$#W;Nv}p#07i6nnB@!P4nuNOW=tKB_Y8y!(xSyW)NTmrDsrz0s)XK
zzziS&C1paIK>)=77yxA^F)?u{4*}3Mg8<k77(h3OFkoN+05SyO_d_P#LjV8(07*qo
IM6N<$f){(kH2?qr

literal 0
HcmV?d00001

diff --git a/resources/minecart_command_block.png b/resources/minecart_command_block_west.png
similarity index 100%
rename from resources/minecart_command_block.png
rename to resources/minecart_command_block_west.png