From 86db94616f78e454d77708f17a7626685bceb366 Mon Sep 17 00:00:00 2001
From: rick <rick@gnous.eu>
Date: Sat, 5 Dec 2020 18:56:12 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20invisibilit=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects/oPlayer/Collision_oMonster.gml | 23 +++++++++++++----------
 objects/oPlayer/Create_0.gml           |  3 ++-
 objects/oPlayer/Draw_0.gml             |  7 +++++++
 objects/oPlayer/KeyPress_74.gml        |  1 +
 objects/oPlayer/oPlayer.yy             |  1 +
 5 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 objects/oPlayer/Draw_0.gml

diff --git a/objects/oPlayer/Collision_oMonster.gml b/objects/oPlayer/Collision_oMonster.gml
index 43fafb0..fadd6b6 100644
--- a/objects/oPlayer/Collision_oMonster.gml
+++ b/objects/oPlayer/Collision_oMonster.gml
@@ -2,15 +2,18 @@ if (pdv <= 0) {
 		instance_destroy();
 		show_debug_message("game overe");
 		// GAME OVER
-} else {
+} else if (inv == 0) {
 	pdv--;
-	if (other.x > x) {
-		x -= 10;
-	} else if (other.x < x) {
-		x += 10;
-	} else if (other.y > y) {
-		y -= 10;
-	} else if (other.y < y) {
-		y += 10;
-	}
+	inv = 120;
+}
+
+// pushback
+if (other.x > x) {
+	x -= 10;
+} else if (other.x < x) {
+	x += 10;
+} else if (other.y > y) {
+	y -= 10;
+} else if (other.y < y) {
+	y += 10;
 }
\ No newline at end of file
diff --git a/objects/oPlayer/Create_0.gml b/objects/oPlayer/Create_0.gml
index cf50ae9..f089c12 100644
--- a/objects/oPlayer/Create_0.gml
+++ b/objects/oPlayer/Create_0.gml
@@ -1,2 +1,3 @@
 seDeplace = 0;
-pdv = 100;
\ No newline at end of file
+pdv = 100;
+inv = 0; //timer invinsiblité
\ No newline at end of file
diff --git a/objects/oPlayer/Draw_0.gml b/objects/oPlayer/Draw_0.gml
new file mode 100644
index 0000000..d693e22
--- /dev/null
+++ b/objects/oPlayer/Draw_0.gml
@@ -0,0 +1,7 @@
+// Suppression de l'invinsibilité
+if (inv > 0) {
+	inv--;
+	draw_sprite_ext(sprite_index, image_index, x, y, image_xscale, image_yscale, image_angle, c_lime, image_alpha);
+ } else {
+	 draw_sprite_ext(sprite_index, image_index, x, y, image_xscale, image_yscale, image_angle, image_blend, image_alpha);
+ }
\ No newline at end of file
diff --git a/objects/oPlayer/KeyPress_74.gml b/objects/oPlayer/KeyPress_74.gml
index a04445e..2094ffa 100644
--- a/objects/oPlayer/KeyPress_74.gml
+++ b/objects/oPlayer/KeyPress_74.gml
@@ -33,6 +33,7 @@
 	 show_debug_message("pas d'objet...");
  }
  
+
  /*
  if (inst != noone && !ds_list_empty(inst)) {
 	show_debug_message("objet trouvé !");
diff --git a/objects/oPlayer/oPlayer.yy b/objects/oPlayer/oPlayer.yy
index aef0b23..d7affeb 100644
--- a/objects/oPlayer/oPlayer.yy
+++ b/objects/oPlayer/oPlayer.yy
@@ -25,6 +25,7 @@
     {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
     {"isDnD":false,"eventNum":74,"eventType":9,"collisionObjectId":null,"parent":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
     {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"oMonster","path":"objects/oMonster/oMonster.yy",},"parent":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+    {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
   ],
   "properties": [
     {"varType":1,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"deplaceHorizontal","tags":[],"resourceType":"GMObjectProperty",},