From 3a100d925bfc0225507fa3c8049f0f04cca11a3e Mon Sep 17 00:00:00 2001
From: Arthur 'Grizzly' Grisel-Davy <grisel-davy@crans.org>
Date: Tue, 21 Apr 2020 00:51:51 -0400
Subject: [PATCH] perfect collisions perso/map and solve #5 with collisions
 bullet/map

---
 asset/asset.svg        |  73 ++++++++++++++++++++++++++++-------------
 asset/perso.png        | Bin 0 -> 819 bytes
 asset/perso1_right.png | Bin 236 -> 938 bytes
 main.py                |   2 +-
 models.py              |  37 ++++++++++++---------
 5 files changed, 74 insertions(+), 38 deletions(-)
 create mode 100644 asset/perso.png

diff --git a/asset/asset.svg b/asset/asset.svg
index d3b414f..6b764c7 100644
--- a/asset/asset.svg
+++ b/asset/asset.svg
@@ -14,7 +14,7 @@
    viewBox="0 0 210 297"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="asset.svg">
   <defs
      id="defs2" />
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.24748737"
-     inkscape:cx="-3244.5066"
-     inkscape:cy="371.0213"
+     inkscape:zoom="20.055905"
+     inkscape:cx="-1045.8998"
+     inkscape:cy="197.95561"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -73,24 +73,6 @@
        y="238.79167"
        inkscape:export-xdpi="96"
        inkscape:export-ydpi="96" />
-    <rect
-       style="opacity:1;fill:#0000b9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.22474444;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4525"
-       width="7.9374938"
-       height="7.9375"
-       x="-280.45831"
-       y="240.11458"
-       inkscape:export-xdpi="96"
-       inkscape:export-ydpi="96" />
-    <rect
-       style="opacity:1;fill:#ff6600;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4529"
-       width="2.6458333"
-       height="1.3229166"
-       x="-277.8125"
-       y="238.79167"
-       inkscape:export-xdpi="96"
-       inkscape:export-ydpi="96" />
     <rect
        inkscape:export-ydpi="96"
        inkscape:export-xdpi="96"
@@ -752,5 +734,52 @@
        inkscape:export-filename="/home/grizzly/Documents/Python/tangledmind/maps/map_1.png"
        inkscape:export-xdpi="94.092171"
        inkscape:export-ydpi="94.092171" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -267.22916,244.08333 h -9.26042 l 9.26041,-9.26041"
+       id="path4613"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -276.48958,237.46875 v 6.61458 l -7.9375,-7.9375"
+       id="path4615"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -285.75,244.08333 h 9.26042 l -6.61459,6.61459"
+       id="path4617"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g4628"
+       transform="rotate(90,-276.48959,244.08333)"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <path
+         id="path4621"
+         transform="scale(0.26458333)"
+         d="m -1056.1582,912.51953 a 15.000079,14.999977 0 0 0 -3.8418,10 15.000079,14.999977 0 0 0 15,15 15.000079,14.999977 0 0 0 15,-15 15.000079,14.999977 0 0 0 -3.8438,-10 z"
+         style="opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:7.55905533;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <rect
+         inkscape:export-ydpi="96"
+         inkscape:export-xdpi="96"
+         y="238.2625"
+         x="-277.8125"
+         height="3.1750042"
+         width="2.6458333"
+         id="rect4529"
+         style="opacity:1;fill:#ff6600;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.54919434;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -276.48958,252.02083 v -7.9375 l 7.9375,7.9375"
+       id="path4619"
+       inkscape:connector-curvature="0" />
+    <circle
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4632"
+       cx="-280.15704"
+       cy="243.85907"
+       r="3.96875" />
   </g>
 </svg>
diff --git a/asset/perso.png b/asset/perso.png
new file mode 100644
index 0000000000000000000000000000000000000000..19c8aec1f630d618f1b43d5c5a6c6aa978e4f8a1
GIT binary patch
literal 819
zcmV-31I+x1P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm000ie000ie0hKEb8vp<R8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10<cL$K~z|U&Dg(B6JZ#@@$d5%8zJhZn-C+0vI<dJQY2BqxVQdT
z9Z^aA3;YX=K@2er&K%K&L{d#`0=BkV*9tKv6h?4CBT{<zIMBlrs<hPh{BC`F_x6)s
z(|g|&YAkG}I~`+&QTi1L3EBZ1Ex*04$g-ddz?*<=C(_sZKi4w9RCCZ^GTHKD?eH~4
zMu2cFAD~DY<#7jvsp)v!t{W7#(pMZYW5AhOAQf5!?q*|sFAoIjnaQ;s+T0pbm0NW}
zb~kC%8GRd%Y*Y=3JWrjlOMzL0v;P?5mJ4d}>U?})bze~AdFq612j+mT24UP5gIbL4
zMj7vmo|#;mT?))L0Rzxgl;DfOr^&;A1RdJk8f)NXs#NdBk=BRaft^csemXM*B$|lv
zAoOY`7M_LjH#C?`wgBUPU;q?(5VNen4rt>`>vih?pQ)$Nvb4u`Ksb!}h}llL4Ip7F
z-RX$=<hKV<RXJ@OV}|{floNy@gVOJ}#8cD&-F_?F1PvMBq~8!XMcNI&7FYj6$ISl6
zG&ci$^&8=7-2f|oE8GNKHX@q$8{+AsQI(Y63O7aGn1F330QDOKs3|!KQ{Fda{MG=e
z%#HAp0Z<j+)<SL~`UuL)j}8h`Z10==Du2>hc?RAktd+Tp@YhXTqf(WN@8aiQgJ+SS
zjrY9*CYz2CnQ$?`fdGs;qd=~So^0FK@Atd|dp3$uYwmbag7Y+fZ?;g{YKeZh*}LW)
z+;elCj}NQ{wHOuE_YK5kgIXNejj0H7QG#9op8RWxicGYA+Ze30uZJog$MijWdr2L6
z1cd6e<W=R4_Xm6+5J1eb0tM3%7e_}BBGsP9_AMzTs^gh_-!%8d+3$pEC*J9tl|6+p
x1Vlx(8{xM{dO$&u1z_HkoJ8hEc&V28e*&w>?U;Ysi;4gM002ovPDHLkV1m1DZ~p)Q

literal 0
HcmV?d00001

diff --git a/asset/perso1_right.png b/asset/perso1_right.png
index cca4d3004022641fc0d30fcfde86ea126c36d30e..ea122db7981ecfdb64c855742a79138b99dda5d7 100644
GIT binary patch
delta 877
zcmV-z1Cspg0jdWfiBL{Q4GJ0x0000DNk~Le0000U0000U2nGNE06Q?QqLCp?e*-5;
zL_t(YiM^LiYZE~j$Df&<>1H=}n>K0*k<y?R#3Ek&27;9mUywZsNllydpgrUhxCI6A
zU=?f+Z80gRmsGJu5b33O6Fe2HU`y$x;0rO?G;3ZayW^qVl9V=SO_M+D;d$m^e(cQ7
zv;RSG0I8}fD2md@7`wq3I|Bf2f6jR;05F751^{$Q=?cbp-Y|@hiA2JzH7BYz7>!1y
zWHLF*80*jFay_PLl4|vY5Yypse4~`kyWQ>wV`F2vLxTf>z%XO%o?#fhoby^QP&p|=
z;B-2d9S+CiSS&VkP%sJxgHJX$H-{Kw#|}l@B|=D6QIuJq&o`)PnpHj~f0PHBrs1xx
zu325z1Ey&@>VX0PSeDgNC=}cP0Diy!^Wx&-&eGxX!nL)vr@F3Rw=7H8JxLvKlMphq
zv9U2wp5Fn7LZL`Do4s?CP+Q~U<4Ml>mvA_IwE`TCMx|UXH&XAOR@3zK^b$g-D-wyw
zJK$6*HEI|}Z=;~L2qCWke?SEQz^bYWg+ihKut(;9G%+!eMF<g9RRy9bN?$UW>}eFN
zQ!ogRz#lv2d=h`^I46^0v3RpqN2*77t5dYwF#--JxqbzgN~P0{g6^kIo<55?=f|53
zmY~><0YGjxSj47+YnL6pINv(Qf13?1f}mrB(C=o0bG#*uDW$8;e+K^m*9xYTzNM71
zMnSBthM2M+3sB}4S3ZzTCbJ-l;&;Z_`9^?$n$8lMgbq6%9*zupPI+QDkw}=LD89$I
z@gI076lw*4f~IMfP19sqUTQR$QhHmK<u?G^zr}bwo)<;&IUyw5C}=nwz6b#8w)3no
zd%<AvSvsA*d&Dkef8FEpT;iNxo0^(>VJ9m#*5~s@T`t!<jB!mveo$eI1%yz*>-EOV
z^VRI_AY-hx9w;Fs-PYFjy1To3WVgMoX6T0)V<U!PTsW*d!5D)iNna&NdK8PrUhY*>
z^$IgEFyOE(>po-5pU>xeN~IF5R!;~qB}rPQl+Gc99>(MGL;QZVRl&AYRTW$=*X4XZ
zf6Fw@)131YoO34tl(sKzDN5<8D2j7luXkbhvhJmSQ0_?^U-|`A00000NkvXXu0mjf
D*mR6m

delta 169
zcmZ3*{)SPpGr-TCmrII^fq{Y7)59eQNNa#F2OE&=`L`o?qM}bdL#C&TV@O2n+v^*7
z8w_|{E*d8tU2`B{%>+f??v$1mKSj-d+Of4eH|j7}i25JCX7rzL;*xudzvLJ@?Nhkm
zx}e)Zym4J^*@0L&E%BV6yh1OOz=GF<rmLL$rL4Q(ktvpC7e|R8N5Tf~e-Z2s@sg2O
QfVMMuy85}Sb4q9e0Q#CeC;$Ke

diff --git a/main.py b/main.py
index 78a601b..a925ea2 100644
--- a/main.py
+++ b/main.py
@@ -23,7 +23,7 @@ BLUE=(0,0,255)
 RED=(255,0,0)
 
 carte = Carte('map_1.png')
-perso = Perso('Alice',660,1570,center_screen,pygame.K_z,pygame.K_s,pygame.K_q,pygame.K_d,323,'perso1_right.png','canon.png','projectile1_right.png')
+perso = Perso('Alice',660,1570,center_screen,pygame.K_z,pygame.K_s,pygame.K_q,pygame.K_d,323,'perso.png','canon.png','projectile1_right.png')
 game = Game(carte,perso)
 
 clock = pygame.time.Clock()
diff --git a/models.py b/models.py
index 43254ca..c1a8579 100644
--- a/models.py
+++ b/models.py
@@ -26,7 +26,7 @@ class Game():
         # draw the projectiles and remove them if needed
         to_remove = []
         for k,proj in enumerate(self.perso.projectiles):
-            if not proj.is_out(surface):
+            if not proj.is_out(self.carte):
                 proj.move()
                 proj.draw(surface, self.perso.get_draw_offset())
             else:
@@ -108,29 +108,32 @@ class Perso():
 
         # Update the position on x axis
         self.posx = self.posx+self.speed[0]
+        # If new position cause to enter a wall, rollback to last position (i.e. don't move)
         if carte.mask.overlap(self.mask, (self.posx-self.perso_rect.center[0],self.posy-self.perso_rect.center[1])):
             self.posx = self.posx-self.speed[0]
+            self.speed[0] = 0
 
         # Update the position on y axis
         self.posy = self.posy+self.speed[1]
         if carte.mask.overlap(self.mask, (self.posx-self.perso_rect.center[0],self.posy-self.perso_rect.center[1])):
             self.posy = self.posy-self.speed[1]
+            self.speed[1] = 0
 
 
         if keystate[self.key_fire]:
-            self.fire('fireball','asset/projectile')
+            self.fire('bullet','asset/projectile')
 
 
     def draw(self,surface):
         #Calculate player rotation:
-        if self.speed != [0,0]:
-            if self.speed[0]!=0:
-                self.degres_perso = -1*degrees(atan(self.speed[1]/self.speed[0]))
-                if self.speed[0] < 0:
-                    self.degres_perso = 180+self.degres_perso
-            else:
-                self.degres_perso = ((self.speed[1]>0)*2-1)*-90
-            self.perso = pygame.transform.rotate(self.img_perso,self.degres_perso)
+        # if self.speed != [0,0]:
+        #     if self.speed[0]!=0:
+        #         self.degres_perso = -1*degrees(atan(self.speed[1]/self.speed[0]))
+        #         if self.speed[0] < 0:
+        #             self.degres_perso = 180+self.degres_perso
+        #     else:
+        #         self.degres_perso = ((self.speed[1]>0)*2-1)*-90
+        #     self.perso = pygame.transform.rotate(self.img_perso,self.degres_perso)
 
         #Calculate canon rotation:
         x_mouse, y_mouse = pygame.mouse.get_pos()
@@ -172,17 +175,21 @@ class Projectile(pygame.sprite.Sprite):
         self.direction = direction = [cos(radians(angle)),-sin(radians(angle))]
         self.img = pygame.transform.rotate(pygame.image.load(img_path+texture).convert_alpha(),angle)
         self.rect = self.img.get_rect()
+        self.mask = pygame.mask.from_surface(self.img)
 
     def move(self):
         self.deplacement = (round(self.deplacement[0]+self.speed*self.direction[0]),round(self.deplacement[1]+self.speed*self.direction[1]))
+    
     def draw(self,surface,offset):
         surface.blit(self.img,(offset[0]+self.pos_init[0]+self.deplacement[0]-self.rect[0],offset[1]+self.pos_init[1]+self.deplacement[1]-self.rect[1]))
 
-    def is_out(self,surface):
-        if (self.deplacement[0]+surface.get_width()/2<0-self.img.get_width() or 
-        self.deplacement[1]+surface.get_height()/2<0-self.img.get_height() or 
-        self.deplacement[0]+surface.get_width()/2>surface.get_width()+self.img.get_width() or 
-        self.deplacement[1]+surface.get_height()/2>surface.get_height()+self.img.get_height()):
+    def is_out(self,carte):
+        abs_pos = (self.pos_init[0]+self.deplacement[0],self.pos_init[1]+self.deplacement[1])
+        if carte.mask.overlap(self.mask, (abs_pos[0]-self.rect.center[0],abs_pos[1]-self.rect.center[1])):
+        # if (self.deplacement[0]+surface.get_width()/2<0-self.img.get_width() or 
+        # self.deplacement[1]+surface.get_height()/2<0-self.img.get_height() or 
+        # self.deplacement[0]+surface.get_width()/2>surface.get_width()+self.img.get_width() or 
+        # self.deplacement[1]+surface.get_height()/2>surface.get_height()+self.img.get_height()):
             return True
         else:
             return False
\ No newline at end of file