From 791802839ce6bedbb49a636712fadebbe73c0d13 Mon Sep 17 00:00:00 2001
From: rick <rick@gnous.eu>
Date: Sun, 6 Dec 2020 20:10:49 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20d=C3=A9g=C3=A2ts=20collision=20joueur?=
 =?UTF-8?q?=20par=20le=20feu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects/oFire/Collision_oPlayer.gml |  1 +
 objects/oFire/oFire.yy              | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 objects/oFire/Collision_oPlayer.gml

diff --git a/objects/oFire/Collision_oPlayer.gml b/objects/oFire/Collision_oPlayer.gml
new file mode 100644
index 0000000..61ff146
--- /dev/null
+++ b/objects/oFire/Collision_oPlayer.gml
@@ -0,0 +1 @@
+hit(self, other, 2);
\ No newline at end of file
diff --git a/objects/oFire/oFire.yy b/objects/oFire/oFire.yy
index 1b435b2..8a05866 100644
--- a/objects/oFire/oFire.yy
+++ b/objects/oFire/oFire.yy
@@ -1,7 +1,10 @@
 {
-  "spriteId": null,
+  "spriteId": {
+    "name": "sFlamDetect",
+    "path": "sprites/sFlamDetect/sFlamDetect.yy",
+  },
   "solid": false,
-  "visible": true,
+  "visible": false,
   "spriteMaskId": null,
   "persistent": false,
   "parentObjectId": null,
@@ -17,7 +20,9 @@
   "physicsStartAwake": true,
   "physicsKinematic": false,
   "physicsShapePoints": [],
-  "eventList": [],
+  "eventList": [
+    {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"parent":{"name":"oFire","path":"objects/oFire/oFire.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+  ],
   "properties": [],
   "overriddenProperties": [],
   "parent": {