From ff8f1bf6d071f80169c72a3ef1d6f4674b50c0df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Sura=C5=BCy=C5=84ski?= <krzychna33@gmail.com>
Date: Wed, 26 May 2021 09:25:15 +0200
Subject: [PATCH] Fixed moves

---
 .gitignore                                   |   3 ++-
 src/__pycache__/config.cpython-38.pyc        | Bin 504 -> 541 bytes
 src/config.py                                |   2 ++
 src/entitie/Truck.py                         |  27 ++++++-------------
 src/entitie/__pycache__/Truck.cpython-38.pyc | Bin 3306 -> 2905 bytes
 src/main.py                                  |  27 ++++++-------------
 6 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index 82195aa..c25c502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 venv
-.idea
\ No newline at end of file
+.idea
+__pycache__/
diff --git a/src/__pycache__/config.cpython-38.pyc b/src/__pycache__/config.cpython-38.pyc
index 8ff18ceef7989050d0b4a2db1d79f2ea62f4977c..1b5b8d8cd476bc70bc8a4686adbf85094f45d4a1 100644
GIT binary patch
delta 99
zcmeytJeP$xl$V!_0SKfYtxlLbkyn;6WTLh&Pn19kUzA`9e=vilz{Hw#p<67z{$Z}S
y*!}!NJUso}{WOIpK3gbU#0S(^#1AA^G8Bn|*rJmsFuE}+O}@^k$il+N!UzBiKNwj6

delta 61
zcmbQs@`IT-l$V!_0SKx-S0~g@<dtRgnW*i{63n2<H?bw1*-uko;@^dwD;bJ}foh6`
PCvRkQW0afxgHaIx`lS%j

diff --git a/src/config.py b/src/config.py
index e445471..aaf5fb0 100644
--- a/src/config.py
+++ b/src/config.py
@@ -21,4 +21,6 @@ R_RIGHT = "R_RIGHT"
 R_LEFT = "R_LEFT"
 R_UP = "R_UP"
 R_DOWN = "R_DOWN"
+MOVE="MOVE"
+NOTHING="NOTHING"
 
diff --git a/src/entitie/Truck.py b/src/entitie/Truck.py
index aa8e3be..3137b67 100644
--- a/src/entitie/Truck.py
+++ b/src/entitie/Truck.py
@@ -11,7 +11,7 @@ class Truck:
     def __init__(self, x=0, y=0):
         self.abstractX = x
         self.abstractY = y
-        self.direction = R_RIGHT
+        self.direction = 90
         asset_path = os.path.join(os.path.dirname(__file__), '..', '..', 'assets', 'garbage-truck.png')
         self.backAsset = pygame.transform.scale(pygame.image.load(asset_path), (DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE))
         self.asset = pygame.transform.scale(pygame.image.load(asset_path), (DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE))
@@ -20,33 +20,22 @@ class Truck:
         self.velocity = DEFAULT_ASSET_SIZE
 
     def rotate_up(self):
-        self.asset = self.backAsset
         self.asset = pygame.transform.rotate(self.asset, 90)
-        self.direction = R_UP
+        self.direction = (self.direction + 90) % 360
 
     def rotate_down(self):
-        self.asset = self.backAsset
         self.asset = pygame.transform.rotate(self.asset, -90)
-        self.direction = R_DOWN
-
-    def rotate_right(self):
-        self.asset = self.backAsset
-        self.direction = R_RIGHT
-
-    def rotate_left(self):
-        self.asset = self.backAsset
-        self.asset = pygame.transform.rotate(self.asset, 180)
-        self.asset = pygame.transform.flip(self.asset, False, True)
-        self.direction = R_LEFT
+        self.direction = (self.direction - 90) % 360
 
     def move(self, map):
-        if self.direction == R_UP:
+        print(self.direction)
+        if self.direction == 180:
             self.move_up(map)
-        if self.direction == R_DOWN:
+        if self.direction == 0:
             self.move_down(map)
-        if self.direction == R_RIGHT:
+        if self.direction == 90:
             self.move_right(map)
-        if self.direction == R_LEFT:
+        if self.direction == 270:
             self.move_left(map)
 
     def replace(self, map, oldX, oldY):
diff --git a/src/entitie/__pycache__/Truck.cpython-38.pyc b/src/entitie/__pycache__/Truck.cpython-38.pyc
index 2f213cb56a27ffcb84d512123887166dd371daae..7a20e183a3164856a0e1745b4354d49937b56022 100644
GIT binary patch
delta 1247
zcmb7D%}*0S6rb7IZMVDKQa&tS2GNMgs-WUW^hgwfMj8{qz#c3OyGRSPbvmdqH5|Np
zA#*bEqxC>SJSu1J9z2q`2ahCp@jnpXn}XCHNZ3t&`}Q~Q{ob43WPWx3NF}Bn$0G1-
z{QNZc#9mLlNj!wVfOym=p5~ue-@2zy5;rB=>5Vm?R!Bw@EU#A$g%J_0QD1|X`FhQG
z$%L7YRV_ff8n3V#6^?Kgw3-HWi6hopgjr2iNS+9%gTNQ+Iv^HKO^3=>;Q+SzHi1cu
z^sWaJ%I~zFw#(nNQ?_V})RWJ(G1@1;YU^v~U|E1h6}sk`PgQpYvF_7O;%h1BkkNe<
zV`(0N?A=95$fm)Q5c5`mFv5!>D*~QE1`XPzya(gHe{c$-FjmjYtd=mdtOHOYx7pB9
zQ)pepXAM*6>D<QN-kutTpT-7f5Y8er^|SZ;`Nd}ioJVyew2i)Ko#LzWOG5|i3=-rY
zqi5|AWC`WzD@xVZr%M{|s}S&q)($ugxMAQ}1IK_H15R(?bl^PTj5?=Wgd_Qavx134
zZ6cR|(2ayfiO=N<LKzrFSBg&qFe;3x0Cx~tD&)Dxi(;Q%4i<!~DX&Aek}WkGpkoD^
zQf>nv)RH@q%&1G#F5~DvHxXh0n|l4k1|jzJ;<7)ZaJE@7%7fB!c0O?B>*(iktW+AI
zl`H28Wsxn+2b>|>g>Vv~8{sm-C4~Rah`YcI%C~l}{Aj-ShT+eRsfohmozbz8>HAZe
ziIE4H$-CZYecG!ia;z5Tq2i|eVD-wa*t>~q^%iR9*HKGtqDi$E7mgnM0;Jpq)vfU>
zsAwK~$&W8~5hT*!!Yvw?+xEarKm79n1iYVo2tiqhc5&Pg$Nn7a8XQ&L;#K1Y0NzA(
Y@FulvQ-{}<+4yYo@C54l@>{(BFV0x~)c^nh

literal 3306
zcmb_fTW=dh6rS0eFL9hpL)(-hin!I48UqE|LWBr3EtQHJC9Y`wvTSzN$vU>z%x(%X
z?o<2BZ%AH{^3HGIN6ahYA%B6F^gFY*W9L$-D!cNTnKLuH-}%mE){iD9^9<L&H-7*5
z?*e20&|vg3G58k0_&W%}1aGoh+VUF5*k~G68k<eCWz{TBeXD7=oSMVgJtl17ykNq4
zZqzb@ud!0*0MB8S5?A~hg!yniMq{saJU{ShYV;buybf)^=!G>y%nL)9FL=!qmat#2
znk5{OL2HYw$f0#aUQD3Ph=Q0zn-xVdg*GRq#SGfKm=)*HPKY`27TSV1FD{^+6c+*T
zlCrCE+uxEL@AL`5;Ih!k;P*X#@gER9-eWH78IU|7X(m>~-gUIhB-uSK=my$7`<a>K
z8u{G`$inVq&)nllF)7xKJ=!<*in-||w>#5g4VDz=7+UO`Lq93*S=c$76d}(E2IN+y
zYb-1%$BW}2iMul!o?Q1fg6j#Hv(Ra8l;%{<TaOdz`N`v>?h}<+byx4-`=P3GB9wuj
zgi%`=QLL<vmuxDl5ru7)!BpF81uE;h^{^SZu5vm%8>GqMiS4)^$(FKX-)jcS4qJG$
zvYL@6)a;$*yGxHARNbYuwdJb2cE7f)a_gSIwM0Obt??>r6)#p!wBDdL`!r}qewgf(
zEM>((v#$7WitnhrUhERCeJ0<96aKqh-i%s7c}sS8;xO1Muk84no@}kih@KReH=^rH
z_sg;L%RxH{lQ1Z2|1NZP$ds@hCaya{E<F#yxTEjOobEYpFyqiMy2W(MV7X7RF}SEt
zp`pX#19Zq)a0)`AVeZ074FrL9Gf!;j9qlZma!|wCQby8i<pmPcBxWF#BcsGiK;WwT
zXhl+n?sNGzO_Rx~xPqR_r3>Bd4m~DzAQ;c`S>ByWArI&O7tG<Ghlhu!W0vm|9%t3P
z^YEvNhAcmX<~ZPqJ|GeO+9rcWA<v9KrWGeZ8`z?Wo<-+~XwYgBt^2%EvPKxq5dxy`
zR4j!)78!1ACRea3CO;B?-PtiHdcg@SHr8q^x6nDla>D5p25>yWfGUBhL&Jg0^t1Nh
zFYLctEoDc54?`iP)v7nc4w3s{`EK=Wg9hX_gL*=d7-u2Uc$nkeae8TuPjn70>YMm!
zld9;DNeSOF<Xn&K8a=+pd8#v^y9%8(qO+k}gw7e!WuRMuE}QDeTv@_{OS#kpf~YdB
z=xKoXl^@e6r$^*^NxoBgJ=Xlo>qiR+e96!mq0E-oIUZ#eZM%l`F%ijle(dh%Q}5Cu
zU%Q+Z;iCSKf{!prsJffaVSLY+XFYQf1W?s)aEw^PSj2HRFv^s)UD635iT8ag&Db00
z*Q}^19&7pJIM$2|I!&B@pJQD=0Fl0v{Qyko#vDbj8OB}%19FrgM->STp?ii?rNMCK
z5b^<99M%`vJWF7Yyp^uBXs2<D8FY@ZhJ`Ujs-rdN?PkbwoK_|s?8q;(qR+(xDtZW5
zvQt~E@?jjd<HT$Gfg}p$Jc)NmTq5x$i7!ZuS1?(IjuI%Qj3!T6x&U87TckSHCql=;
zcIRv&+SpA-C#bd;8OWIJlVJ?WFf|$ENKM!UBEte1iz8(4n*%azkbyL9WV8l7isLad
zjEW@W2xsC!O%KkwAD342DVN5=ZOpwMC7)o2&cc+E;&Dp)rCn2^tK?`Jk449sq%cj2
zfe1-SLHrOMFc<W^2`Tcclo6c<Uz6!NMvjqinI>Kx7oTED1;2h=oFHNPD2Ls&KA*|L
zsX3A|z=t`~&kitv+<ucBkvD-FxiKsR^7W1X43BtnWc-Pw7>xj`g%uP-N=YqBMf$Lz
zZ#8_Q<z2TGiEaJ8R&d>4w!LOLBj2O-ROIAU5>zea0tqTaX}(f!N{U8F-jIZ9Bz<)v
zUm+b;qdb246DrH|6ImO#m36Xt$O*dj8n8lNTKYpr<?%_j;79FxxS^(~-~T*Yz+VEL
jFKT8~tN$USC6-=y8V;3ROl|#!xQGc+*1*jRykNcrTGo|)

diff --git a/src/main.py b/src/main.py
index e585be1..e8a0a4e 100644
--- a/src/main.py
+++ b/src/main.py
@@ -44,6 +44,7 @@ class EnvMap:
                 no = None
                 if o.__class__.__name__ == 'Truck':
                     no = Truck(x, y)
+                    no.direction = o.direction
                     newEnvMap.truck = no
 
                 if o.__class__.__name__ == 'Trash':
@@ -125,18 +126,11 @@ class PathFinder():
 
         altState3 = state.get_map_copy()
         t3 = altState3.map[truck.abstractX][truck.abstractY]
-        t3.rotate_right()
         t3.move(altState3.map)
 
-        altState4 = state.get_map_copy()
-        t4 = altState4.map[truck.abstractX][truck.abstractY]
-        t4.rotate_left()
-        t4.move(altState4.map)
-
         pack.append([R_UP, altState1])
         pack.append([R_DOWN, altState2])
-        pack.append([R_RIGHT, altState3])
-        pack.append([R_LEFT, altState4])
+        pack.append([NOTHING, altState3])
 
         return pack
 
@@ -145,6 +139,9 @@ class PathFinder():
             for y in range(DEFAULT_MAP_SIZE):
                 a = s1.map[x][y]
                 b = s2.map[x][y]
+                if a.__class__.__name__ == 'Truck' and b.__class__.__name__ == 'Truck':
+                    if a.direction != b.direction:
+                        return False
                 if a.__class__.__name__ != b.__class__.__name__:
                     return False
         return True
@@ -202,10 +199,6 @@ class Environment:
             self.envMap.truck.rotate_up()
         if key == pygame.K_s:
             self.envMap.truck.rotate_down()
-        if key == pygame.K_d:
-            self.envMap.truck.rotate_right()
-        if key == pygame.K_a:
-            self.envMap.truck.rotate_left()
         if key == pygame.K_o:
             actions = self.pathFinder.graphsearch(self.envMap.get_map_copy())
             self.navigate(actions)
@@ -217,18 +210,14 @@ class Environment:
                 action = actions.pop()
                 next = pygame.time.get_ticks() + 300
                 self.update()
+                ev=None
                 if action == R_UP:
                     ev = pygame.event.Event(pygame.KEYDOWN, {"key": pygame.K_w})
                 if action == R_DOWN:
                     ev = pygame.event.Event(pygame.KEYDOWN, {"key": pygame.K_s})
 
-                if action == R_RIGHT:
-                    ev = pygame.event.Event(pygame.KEYDOWN, {"key": pygame.K_d})
-
-                if action == R_LEFT:
-                    ev = pygame.event.Event(pygame.KEYDOWN, {"key": pygame.K_a})
-
-                pygame.event.post(ev)
+                if ev:
+                    pygame.event.post(ev)
 
                 ev = pygame.event.Event(pygame.KEYDOWN, {"key": pygame.K_SPACE})
                 pygame.event.post(ev)