From 86cd71cc50502840a01ed4e75221f3ebacf48277 Mon Sep 17 00:00:00 2001
From: Marcin Kostrzewski <komar86311@gmail.com>
Date: Mon, 21 Jan 2019 23:43:13 +0100
Subject: [PATCH] Added killing

---
 __pycache__/events.cpython-37.pyc  | Bin 2358 -> 2569 bytes
 __pycache__/sprites.cpython-37.pyc | Bin 3815 -> 4306 bytes
 events.py                          |   5 +++++
 mygame.py                          |   6 +++++-
 sprites.py                         |   7 +++++--
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/__pycache__/events.cpython-37.pyc b/__pycache__/events.cpython-37.pyc
index f7649adf2b7c3e952242087ef772e25b12d578c4..29bdf93551847c695028384ad485a9d6d58e7456 100644
GIT binary patch
delta 754
zcmZ{hPis>_5Wsid-_1*26O*QxY9$73`dSqe|CB0HNkFX!BQ$sjLTKG*n(|1Wn-@W`
zc&HbTVXuPi-IE2cDtPl7ybs|A(2Fy9C3taRelt5eJ3BM`CI5cbZMd$(aD9Dv@9F2U
zTY?Yc>h0&gw#yGwN37#at#prdGAQoUGc&ca!Vu;=*2xJ=*r-nlE>fuT!VziI1(6Xh
z>RB-(vZ#v!Hkp?jfBFIW;}`G~;Iz7<UwKP~&;k?-rHL|}Lqu#B4z);+3;_a;jD02;
zX3!qBJyYr!5L?4g_9H*e^yJ<se6|+^ec{JEtam4lI2+cw+oK@xqr~AsZ0z)-p-kcJ
z1kPDX<Rnpab{Y3W4Z%Q`k9+zynDQL%RBU{NtLnA60;{U0x7Ba+``z<+ATxvt!Yjr6
zalO0wpw()}DXb#NDlbyNA|Xep5|#*_`eV%(m&v?9SRs@Mm(;RdZPv(~C)5eo2-gWW
z5FW^zWdG9(ZeuqLwqE(N-t7;<QPi9iysp04C8(>|UZ@=4pd;%II{?&nqEF_UG{IGY
zS6XFCy-HX|{O>LQr9X(eJ6i)0`0@z`4rv$+EO3A$ImiZGpHusMZQ~4@v3Z~V3O}iq
z{E1vZZ_@r6Su|^Ti;yNvx-XM8Ek-ufFTS`$6U*TXTtfi^49&q;PqfA@UgSD2@WNk;
CG@I`L

delta 513
zcmYL_%}PQ+6vywm>2>batG7%+vk&b<q%xISXrHvGXpxe&NCF{7qA-+ETeS#k<D!Mk
z15~S^t<V#+5PE{{({#=?YKHm!&kSeI`OkF6KgP^m(=-$uZyS5(&@&@&-%G9^UMdxa
zORuTd#*6n=srddPle@V4QK|U3#yzM3&bW?haf5qNN4bxisAC+;O3L3Ge1g?~f-iuu
zJR3>NGp*FWb@^e`4m7jXi%z{>YgaEtqtldK_cJWXl(q=D{;3v%oe4B1e1sSx6|q?<
zS1lhDizl|;%>7;#)08knun2KNf-o!JJ<-rSg;RtDLWGc%-=1WAiNYvhnUE%|5Hg4q
zh^&mWIBYwP3bMf>=&s8qV|U5}fYR26$`yR4dNj1?kpq@6b5x}8Uu0Zbx*0vjgO>Bz
zpn(Alr`V*Vpv>#}O~>LY?rp8r6j$w<?cS$v5p#GZ)(BpLWB9LwQ$gtHG?-x<Hx1sY
d*R}xjT2#-XE-H0$flH-jfT1#tg;|gVe*o?SVwV5_

diff --git a/__pycache__/sprites.cpython-37.pyc b/__pycache__/sprites.cpython-37.pyc
index 8307f7b5f3dbbc57ec3220c31938d81888075bae..fcc26b001b0e53c32e14a8e5599c2e18fe89c6cf 100644
GIT binary patch
delta 573
zcmYjN&2G~`5Z+m@?M)LqK?)@VApw`*3*rC>A%q|V>Rf_QD@8&Gi`EXclhoCEBT5x1
zhj8M6RQv)74}io2@Dd#N$c5Knrp<ws=9`&ses;h8d;RxKzw3Eh3{MumeEZcu^IP!c
ztTSuxu(%r6KC`%%Secu7OY2P|=DRHLetrjU(Zh*3Td_3*^ciG4hA}H1p2yaIvC#Hd
zY<NezW1*hnoTRy!;W|E0fV+Z<dW240MKI2Ou5~^&wn{%7Y9l7eNSoTQKj^(0M#Fw@
zFKio2=f}p|aN&#oPPk{pIGs$&U*3(1gKHQ_xLf}5-jzT2HZ;rE)yoUKP#7mn^?rVG
zU{ezw@&fHST0yVSYz1?e^ATUeoJAZ(@s+hkp%KcV%91z{p&;^^vxJQt7z9$$?Z(}m
zsnPp`#E2q2O_Yb6T97<-ji60E_OVKjbYQDnMBOIn5Dy;>9I86y=g^?2h42ZjkO&MK
zPy-)M>lb3~L{WN_>L?lnLfyl<x=-+cfCex2l$C0IyNl@wTEP({D9VFNW!IlV_gnQ!
g$H>RiJf2OGC)7|hsmp5MXG$Sm>23+ho6nl9e-aUTe*gdg

delta 101
zcmcbl_*|CHiI<m)0SK6F++tLDC-O-!mQ7SIWlLcSX3*r`xQ&r_av7Hxixp7C<N!Ve
zRwj_z$(4L@Oqv3d)dX@G`6nx~iA-KAz$+#Ml;L0&VB}!rVBuirVCQ1tU=ncz0P@ce
A$p8QV

diff --git a/events.py b/events.py
index 433a224..1b8184b 100644
--- a/events.py
+++ b/events.py
@@ -7,6 +7,8 @@ from config import *
 running=True
 players=[]
 
+p1_group=pygame.sprite.Group()
+p2_group=pygame.sprite.Group()
 p1_bullet=[]
 p2_bullet=[]
 
@@ -40,6 +42,8 @@ def collision_check(p):
 
     else:
         return False
+def bullethits():
+    hits=pygame.sprite.groupcollide(p2_group, p1_bullet_group, True, True)
 
 def player1_input(keys):
     if keys[P1_SHOOT]:
@@ -83,6 +87,7 @@ def event_handler():
     events()
     keys=pygame.key.get_pressed()
     collision_check(-1)
+    bullethits()
     player1_input(keys)
     player2_input(keys) 
     
diff --git a/mygame.py b/mygame.py
index 6e58113..bbc8d2c 100644
--- a/mygame.py
+++ b/mygame.py
@@ -22,6 +22,8 @@ clock=pygame.time.Clock()
 
 events.players.append(Player('asd', 400, 100, 10))
 events.players.append(Player('qwe', 400, 500, 10))
+events.p1_group.add(events.players[0])
+events.p2_group.add(events.players[1])
 all_sprites.add(events.players)
 
 events.running=True
@@ -31,7 +33,6 @@ events.running=True
 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)),
@@ -44,6 +45,9 @@ def draw_debug_text():
         count+=1
 
 # set hitbox objects as screen boundaries ### DEBUG ###
+boundary=pygame.sprite.Group()
+boundary.add=Hitbox(int(WINDOW_WIDTH/2), 0, WINDOW_WIDTH, 10)
+
 # game loop
 
 while events.running:
diff --git a/sprites.py b/sprites.py
index 3480b0f..d7fd6c7 100644
--- a/sprites.py
+++ b/sprites.py
@@ -114,9 +114,12 @@ class Bullet(pygame.sprite.Sprite):
 
     def update(self):
         self.shoot()
+        if self.rect.bottom<0 or self.rect.right<0 or self.rect.left>WINDOW_WIDTH or self.rect.top>WINDOW_HEIGHT:
+            self.kill()
 
 class Hitbox(pygame.sprite.Sprite):
     def __init__(self, x, y, w, h):
-        self.size=vec(w, h)
+        self.size=pygame.Surface((x,y))
         self.rect=self.size.get_rect()
-        self.rect.center=vec(x,y)
\ No newline at end of file
+        self.rect.center=vec(x,y)
+        print(self.rect.center)
\ No newline at end of file