From 5f043ff63e23445a42e5deda9fc6dacad585a4a4 Mon Sep 17 00:00:00 2001
From: rick <rick@gnous.eu>
Date: Sun, 6 Dec 2020 20:11:41 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20du=20sprite=20sp=C3=A9cial=20sur=20le?=
 =?UTF-8?q?=20sprite=20des=20flammes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Surprise Dungeon.yyp | 3 ---
 rooms/r1/r1.yy       | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Surprise Dungeon.yyp b/Surprise Dungeon.yyp
index de9bd3f..e5ba91c 100644
--- a/Surprise Dungeon.yyp	
+++ b/Surprise Dungeon.yyp	
@@ -32,7 +32,6 @@
     {"id":{"name":"oFire","path":"objects/oFire/oFire.yy",},"order":3,},
     {"id":{"name":"oTrou","path":"objects/oTrou/oTrou.yy",},"order":1,},
     {"id":{"name":"oWall","path":"objects/oWall/oWall.yy",},"order":2,},
-    {"id":{"name":"snFond","path":"sounds/snFond/snFond.yy",},"order":0,},
     {"id":{"name":"sWall","path":"sprites/sWall/sWall.yy",},"order":1,},
     {"id":{"name":"r2","path":"rooms/r2/r2.yy",},"order":3,},
     {"id":{"name":"sSwordh","path":"sprites/sSwordh/sSwordh.yy",},"order":2,},
@@ -44,9 +43,7 @@
     {"id":{"name":"sTrou","path":"sprites/sTrou/sTrou.yy",},"order":4,},
     {"id":{"name":"sSkeletonR","path":"sprites/sSkeletonR/sSkeletonR.yy",},"order":1,},
     {"id":{"name":"r3","path":"rooms/r3/r3.yy",},"order":4,},
-    {"id":{"name":"snAttack","path":"sounds/snAttack/snAttack.yy",},"order":1,},
     {"id":{"name":"rInit","path":"rooms/rInit/rInit.yy",},"order":12,},
-    {"id":{"name":"snHit","path":"sounds/snHit/snHit.yy",},"order":2,},
     {"id":{"name":"r5","path":"rooms/r5/r5.yy",},"order":6,},
     {"id":{"name":"Script1","path":"scripts/Script1/Script1.yy",},"order":0,},
     {"id":{"name":"sMonsterMelee","path":"sprites/sMonsterMelee/sMonsterMelee.yy",},"order":0,},
diff --git a/rooms/r1/r1.yy b/rooms/r1/r1.yy
index fff1146..5eb9e2c 100644
--- a/rooms/r1/r1.yy
+++ b/rooms/r1/r1.yy
@@ -108,6 +108,9 @@
         {"properties":[],"isDnd":false,"objectId":{"name":"oTrou","path":"objects/oTrou/oTrou.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":280.0,"y":168.0,"resourceVersion":"1.0","name":"inst_1D0FE220","tags":[],"resourceType":"GMRInstance",},
         {"properties":[],"isDnd":false,"objectId":{"name":"oTrou","path":"objects/oTrou/oTrou.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":264.0,"y":184.0,"resourceVersion":"1.0","name":"inst_1964DAD3","tags":[],"resourceType":"GMRInstance",},
         {"properties":[],"isDnd":false,"objectId":{"name":"oTrou","path":"objects/oTrou/oTrou.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":248.0,"y":200.0,"resourceVersion":"1.0","name":"inst_42A3E43C","tags":[],"resourceType":"GMRInstance",},
+        {"properties":[],"isDnd":false,"objectId":{"name":"oFire","path":"objects/oFire/oFire.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":216.0,"y":104.0,"resourceVersion":"1.0","name":"inst_133C5C67","tags":[],"resourceType":"GMRInstance",},
+        {"properties":[],"isDnd":false,"objectId":{"name":"oFire","path":"objects/oFire/oFire.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":120.0,"y":56.0,"resourceVersion":"1.0","name":"inst_9C890ED","tags":[],"resourceType":"GMRInstance",},
+        {"properties":[],"isDnd":false,"objectId":{"name":"oFire","path":"objects/oFire/oFire.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":312.0,"y":168.0,"resourceVersion":"1.0","name":"inst_404C6106","tags":[],"resourceType":"GMRInstance",},
       ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":true,"inheritLayerSettings":true,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",},
     {"assets":[
         {"spriteId":{"name":"sBox","path":"sprites/sBox/sBox.yy",},"headPosition":0.0,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"animationSpeed":1.0,"colour":4294967295,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":128.0,"y":64.0,"resourceVersion":"1.0","name":"graphic_6F20A653","tags":[],"resourceType":"GMRSpriteGraphic",},
@@ -246,6 +249,9 @@
     {"name":"inst_1D0FE220","path":"rooms/r1/r1.yy",},
     {"name":"inst_1964DAD3","path":"rooms/r1/r1.yy",},
     {"name":"inst_42A3E43C","path":"rooms/r1/r1.yy",},
+    {"name":"inst_133C5C67","path":"rooms/r1/r1.yy",},
+    {"name":"inst_9C890ED","path":"rooms/r1/r1.yy",},
+    {"name":"inst_404C6106","path":"rooms/r1/r1.yy",},
   ],
   "inheritCreationOrder": true,
   "sequenceId": null,