From 9e5b73b27cea8883b28f9b568f1714524ddff2c2 Mon Sep 17 00:00:00 2001
From: Marcin Kostrzewski <komar86311@gmail.com>
Date: Mon, 21 Jan 2019 21:56:43 +0100
Subject: [PATCH] Added sprite rotation

---
 __pycache__/events.cpython-37.pyc  | Bin 1673 -> 1817 bytes
 __pycache__/mygame.cpython-37.pyc  | Bin 762 -> 0 bytes
 __pycache__/sprites.cpython-37.pyc | Bin 3329 -> 3468 bytes
 data/graphics/bullet.png           | Bin 0 -> 227 bytes
 events.py                          |   2 ++
 mygame.py                          |  16 ++++++++++++++++
 sprites.py                         |  12 +++++++-----
 7 files changed, 25 insertions(+), 5 deletions(-)
 delete mode 100644 __pycache__/mygame.cpython-37.pyc
 create mode 100644 data/graphics/bullet.png

diff --git a/__pycache__/events.cpython-37.pyc b/__pycache__/events.cpython-37.pyc
index 2db02b304c076910adbfe23e9c8a5dbd58d245fc..8a7ba710007412e6db857b20a56766bd6cfb038c 100644
GIT binary patch
delta 565
zcmZ{h&r1SP5XWcs$8*(IMAXWQTDhT+5!Inv6nF_DFbF~tYfUuNcrKlc&Ru<{I_bGn
z|3>#N9y<imKhUw6P09}KW4~|a&3ESWmc6$hB9T4Y4goy_r&LK;&ygzL2}<|r?EwOK
z;Nl{*aHvtFaWq2t*{AqQlYLkJu2*^Is&R{+*%HIRw9lIEhHJ#3kFGfnu1ErB3ozoD
zG`(v5Ry;WOj|^8Y17VObZ$5^``xw5?EQYa+@$vs+xcdjA-Z8ftD1!@S$Xkb!z7r-a
z$CFbIH5P-Uln<&kZ9Oe@O2$D?);hh*u56Em?0Pk?J~o@}TBEKi+P0G+3usBSFhpw$
zV`$9AS_tQKnNnfnNuBA1Sd=G*dS3Us-Mwjc8dQ4JkI+#cdKz<Ndv(|%(<~{L3`>?}
ziDj82k8(u`GmD$tCJJ<P0V-<5Rn0t!`CU2oa>4h$nAyZGB|ZPAqoA8wv}AE0Hc~z>
S%>KWfvZxNkj+wM<%l-mFRcCkr

delta 426
zcmbQq*U8K0#LLUY00ddRt}*)T8~NfH>sf$YXCN+~0VGNoQWzx}vKSXI0a;8S)<VXj
z2{k}=HdB#D3Nu7L9z=s=S!x+;7*klp8B$oqpnBt3Qka7ofI1j~I;y}rfGWW{KqjN>
zV457lB(KC4%#gwm%%I8cSHuW(#Y+$o@{$R}1Ub)5lXdbeCjH4Tm`s&qfP4lfF-8tX
zE+7<QWI?c)xEOhui^L|+W?4P?9kZ4YKTzc@uHusXg53PF%)E4<lom?>qsruJ7I{WR
zpt7rKASFf8AVLg8fDA8^1rc%}LLNwHG8QRJp2n)kXb95ArUn#BW|+KyMP%|v)^H)P
zE=7=9kOWw56q}-`9gtHD4roR;pes3mut;n21U5q{u!Y<p4X9dy(zn?xSw%Q_Id}mK
CGE0>J

diff --git a/__pycache__/mygame.cpython-37.pyc b/__pycache__/mygame.cpython-37.pyc
deleted file mode 100644
index 1e3c2e7ed3d40e58c10d307fb24bdd9c2ebe0212..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 762
zcmX|9OK;Oa5cb<4F9Hpe@@jcXK`25TQH5xmLL#6<YEY!eQe=52smsQ8y*4E0{tXV!
zkt2U+j&RC9K%AJ}rtE0vo7c`uyI-r7H9D=`j`!2hwBJ&>JT3`u=!!qYn8tLj4K7e$
zqp?O)p~0<@MR5kVN47#|<fwP<Km(^JEj69+^vZv!TvVV6wTZFRM|JX)i>uIB>MH75
zaeb+cHlSJDfSb%@7Lk2!Deq=+3z|}5&S-1ig{|}#Y!tWQj`H3;mvuIad#YZ&xDVUw
zS36KwlC1P#-Oa<|k(AE94`q*!mDMhuNMy#b)^b-gz1GrEe|ChXFWBlO=_{Mqp!F1;
zAdV*C6kU;|VFm)-Am(wN3UuHrM43P%7HEnE8Ir}+p8?h`u+8JZ=K`%T3Ny54;T%$Q
zStt_jFR&ya8_!|}SRM9`I-iE)VXrgjVr{K;4}0&r19U`?0z_Dm;enrIVH{zJV#Y^%
z9}m&WLMmt<P^m9y2MS!7A7q1ml0d}J=_><Pe9p(0W0*c;=%#rTh0#>zp#<jJ{xR0n
zSmP5vVw@Uw@`U*rpfw3OM|=On-obmcSn7Wx6Au%#RXkcrK1<L#%V|~%=3(|jOP|vY
z75m!`UU{DdHRW~tUMCLnnOvRMUt}k7w9`-HQwTC|ruNrPXgj;Knw-OH`m>sNL9C=J
cG8z)il3vyudQ~qQO}dupknWJDtf)@XKjMJiuK)l5

diff --git a/__pycache__/sprites.cpython-37.pyc b/__pycache__/sprites.cpython-37.pyc
index 26701dcd691edd403d8d7a3e959fd9672922e065..a55588e7634c45656741a399058ba8f155663d01 100644
GIT binary patch
delta 596
zcma)&y-EW?5XX1+ybtd#iQfjJ2@(~QM2+8_Vju{bAjT>RA<2oFXabj5C^mv%qc-yb
z3O1G!d!Imj0H45Guy*FKNg=w+{C4+0voo`MF>oF7t@?bXps|`r?Pi{QFA}!#Ri<sH
z>r&(_r#magdzxV-E@1*U)Wz%y#h#0@aG;{NV+|<FJB7||o+f*QqXfmhJQw*k2Z+L9
zkDAvU)mwE(P)05DAt{eLLil*bS9Qmqpl#jj1WXvj1uYg`A<0YoTPYdD3+>9k)Oxi~
zk8l5Z^`BiTl-ld^&<}X4=lsj9wZ8Od6i7<4Y!Dg(g!e?qj6+VZ)*1(g)qSj*{b99!
zP^&dk9LbLtaAt2F6;AiuNp_%R6kx4+Y{bBdlh>VKOyNU&5!O*ROE8NSa~Se?V}`)S
zM{{Z`#vzl8X$F6xJHwb|%rOG3=-^{7AwpK~A{bzphW;}pMy)p};iolh&2#7iV-X|v
eP$&O#k<4q}0Cx$~_KC)-8^DCxjqmm-B)<U>vTqvz

delta 315
zcmeB?Zj|D6;^pOH0D{-zZZUEjdG|9h`b<8{<jWGwpeeLjjaiq8QG0R-tNG*&ET)s!
zu<<i8P2R(1K3RZGlg|jKs~D`8k&97cvOAj&R8b+HC90G*yDm&WJ2OzKNQGhY8ulnY
z2UKMu9LkgDas)HFZ~n-k!^o`zQmF+Z^d@U?B{6zU?&eBnG@SgNOOY{dvLLrKBll!o
zZha|jkP=-Gp${SqK!hQPFq*ucM?z8*$dm`-VgVq*!N|eQ!483w*Kwa`OqyKBqsVOx
rQf>kwOee46krgxpG82Kgm<dR5Fcz6jzQI$<Xa+P-d~zzU8lw{c%ji6D

diff --git a/data/graphics/bullet.png b/data/graphics/bullet.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e6b50d33023e6f9ea7990b9c32bcdfe9a09bdd4
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1SFYWcSQjy&H|6fVg?31We{epSZZGe6l5>)
z^mS!_%qS{i&iJe6+I*mpWQl7;iF1B#Zfaf$gL6@8Vo7R>LV0FMhJw4NZ$Nk>pEyua
ztfz}(h{fr*QylpYC~&Y$@BRP()3+-wUfHa+yTa30lCG#c6f{2K!jthoD*lsu!Kpt9
zGYptd&Usmzq_}L8mTswCQPi}o?^{ye<b0m}{K3vXU;A%8?`M7s(*CD%QdG~LS3z<9
Tlh;du7BP6b`njxgN@xNAgRxIH

literal 0
HcmV?d00001

diff --git a/events.py b/events.py
index c5bb83d..1056e14 100644
--- a/events.py
+++ b/events.py
@@ -19,11 +19,13 @@ def collision_check(p):
         if p==1:
             players[0].colliding=True
             direction=players[1].facing
+            players[0].image=pygame.transform.rotate(players[0].image, players[0].facing*90-((direction+2)%4)*90)
             players[0].facing=(direction+2)%4
             return True
         elif p==0:
             players[1].colliding=True
             direction=players[0].facing
+            players[1].image=pygame.transform.rotate(players[1].image, players[1].facing*90-((direction+2)%4)*90)
             players[1].facing=(direction+2)%4
             return True
         else:
diff --git a/mygame.py b/mygame.py
index 2f1635d..a35a8ff 100644
--- a/mygame.py
+++ b/mygame.py
@@ -26,6 +26,21 @@ all_sprites.add(events.players)
 
 events.running=True
 
+# debug text
+
+font=pygame.font.SysFont("Arial", 12)
+
+def draw_debug_text():
+    text_sprites=pygame.sprite.Group()
+    texts=[
+            font.render("P1 facing: " + str(events.players[0].facing), True, (100,100,100)),
+            font.render("P2 facing: " + str(events.players[1].facing), True, (100,100,100))
+        ]
+    count=0
+    for text in texts:
+        screen.blit(text, (0,count*12))
+        count+=1
+
 # game loop
 
 while events.running:
@@ -37,6 +52,7 @@ while events.running:
     all_sprites.update()
     screen.fill(BLACK)
     # draw
+    draw_debug_text()
     all_sprites.draw(screen)
     pygame.display.flip()
 pygame.quit() 
diff --git a/sprites.py b/sprites.py
index 317cc50..5d97af0 100644
--- a/sprites.py
+++ b/sprites.py
@@ -16,7 +16,7 @@ def load_img(name):
     return image, image.get_rect()
 
 def load_sound(name):
-    sound_path=os.path.join('data\\sounds')
+    sound_path=os.path.join('data/sounds')
     sound=pygame.mixer.Sound(sound_path)
     return sound
 
@@ -39,7 +39,6 @@ class Player(pygame.sprite.Sprite):
         self.friction=-0.25
         self.facing=0     # where the player is looking (0-north, 1-east, 2-south, 3-west)
         self.colliding=False
-
     def moveup(self):
         if self.facing!=0:
             self.image=pygame.transform.rotate(self.image, (self.facing*90))
@@ -49,25 +48,28 @@ class Player(pygame.sprite.Sprite):
 
     def movedown(self):
         if self.facing!=2:
-            self.image=pygame.transform.rotate(self.image, (self.facing*90))
+            self.image=pygame.transform.rotate(self.image, (self.facing*90)-180)
         self.facing=2
         self.acc.y=1.5
         self.acc.x=0
 
     def moveright(self):
         if self.facing!=1:
-            self.image=pygame.transform.rotate(self.image, (self.facing*90))
+            self.image=pygame.transform.rotate(self.image, (self.facing*90)-90)
         self.facing=1
         self.acc.x=1.5
         self.acc.y=0
 
     def moveleft(self):
         if self.facing!=3:
-            self.image=pygame.transform.rotate(self.image, (self.facing*90))
+            self.image=pygame.transform.rotate(self.image, (self.facing*90)-270)
         self.facing=3
         self.acc.x=-1.5
         self.acc.y=0
     
+    def shoot(self):
+        nothing
+
     def stopmoving(self):
         self.acc=vec(0, 0)