From 311d648ee6eb9a080d9592cd5fd2e4c27ccff695 Mon Sep 17 00:00:00 2001
From: gaetanv <gaetan.viatour@eica.be>
Date: Tue, 8 Dec 2020 16:15:27 +0100
Subject: [PATCH] Collision

---
 birdiesV2.py | 47 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/birdiesV2.py b/birdiesV2.py
index 09f1470..39eb7bd 100644
--- a/birdiesV2.py
+++ b/birdiesV2.py
@@ -10,8 +10,8 @@ titi.speed = 1
 ecart = 140
 tube_superieur = Actor('top', (300, 0))
 tube_inferieur = Actor('bottom', (300, tube_superieur.height + ecart))
-tube_inferieur = Actor('bottom', (300, tube_superieur.height + ecart))
-vitesse_defilement = 1
+vitesse_defilement = 2
+gravite = 0.3
 
 fond = Actor('background', (200,350))
 fond2 = Actor('background', (-200,350))
@@ -19,17 +19,34 @@ fond2 = Actor('background', (-200,350))
 def draw():
     fond.draw()
     fond2.draw()
-    titi.draw()
     tube_superieur.draw()
     tube_inferieur.draw()
+    titi.draw()
+    
 
 def on_mouse_down():
     print('Clic souris !')
-    titi.y -= 60
+    titi.y -= 30
+    
+    
+def reset():
+    print("Retour au départ...")
+    titi.speed = 1
+    titi.center = (75, 350)
+    tube_superieur.center = (300, 0)
+    tube_inferieur.center = (300, tube_superieur.height + ecart)
+    titi.image = "bird1"
+    
+def heurte_tube() :
+    print ("Paf !")
+    titi.image = "birddead" # (oiseau mort)
+    if titi.y < 700 :
+        titi.y += 5 
+
 
 def update():
-    fond.x += 2
-    fond2.x +=2
+    fond.x += 1
+    fond2.x += 1
     if fond.x > 400 :
         fond.x = 200
     if fond2.x > 200 :
@@ -38,10 +55,20 @@ def update():
     tube_superieur.x -= vitesse_defilement
     tube_inferieur.x -= vitesse_defilement
     if tube_superieur.x + tube_superieur.width/2< 0 :
-        tube_superieur.x = random.randint(100, 400)
-        tube_inferieur.x = random.randint(100, 400)
-
-
+        tube_superieur.x = 400
+        tube_inferieur.x = 400
+    if (titi.colliderect(tube_superieur)) :
+        heurte_tube()
+    if (titi.colliderect(tube_inferieur)) :
+        heurte_tube()
+    if titi.y > HEIGHT :
+        reset()
+    if titi.y < 0 :
+        reset()
+    if (titi.colliderect(tube_inferieur)) :
+        heurte_tube()
+    
+        
  #print(tube_superieur.width, tube_superieur.height)
 
 pgzrun.go()
\ No newline at end of file