From f9dffe68f1c63dd05dc1d40208421e6c75804459 Mon Sep 17 00:00:00 2001
From: sOlaris38 <solaris.pouvoir@yahoo.com>
Date: Sun, 6 Dec 2020 12:57:05 +0100
Subject: [PATCH] profondeur des instances

---
 objects/oMonster/Step_0.gml      | 1 +
 objects/oPlayer/Step_0.gml       | 1 +
 rooms/r1/r1.yy                   | 6 ++++++
 sprites/sSkeletonR/sSkeletonR.yy | 6 +++---
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/objects/oMonster/Step_0.gml b/objects/oMonster/Step_0.gml
index aefbbc6..6104334 100644
--- a/objects/oMonster/Step_0.gml
+++ b/objects/oMonster/Step_0.gml
@@ -1,4 +1,5 @@
 // deplacement monstre
+depth = -bbox_bottom;
 
 if (touche == 0) {
 	if dureeDeplacement != 0 {
diff --git a/objects/oPlayer/Step_0.gml b/objects/oPlayer/Step_0.gml
index ab299c4..054dc3e 100644
--- a/objects/oPlayer/Step_0.gml
+++ b/objects/oPlayer/Step_0.gml
@@ -5,6 +5,7 @@ keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));
 
 
 // Déplacement du joueur
+depth = -bbox_bottom;
 
 deplaceHorizontal = keyRight - keyLeft;
 deplaceVertical = keyDown - keyUp;
diff --git a/rooms/r1/r1.yy b/rooms/r1/r1.yy
index b698d44..a0f0f58 100644
--- a/rooms/r1/r1.yy
+++ b/rooms/r1/r1.yy
@@ -87,6 +87,9 @@
         {"properties":[],"isDnd":false,"objectId":{"name":"oWall","path":"objects/oWall/oWall.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_35D0D","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":16.0,"resourceVersion":"1.0","name":"inst_35D0D","tags":[],"resourceType":"GMRInstance",},
         {"properties":[],"isDnd":false,"objectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.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":224.0,"y":112.0,"resourceVersion":"1.0","name":"inst_1F99BFFE","tags":[],"resourceType":"GMRInstance",},
         {"properties":[],"isDnd":false,"objectId":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":0.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":320.0,"y":80.0,"resourceVersion":"1.0","name":"inst_45379430","tags":[],"resourceType":"GMRInstance",},
+        {"properties":[],"isDnd":false,"objectId":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.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":304.0,"y":160.0,"resourceVersion":"1.0","name":"inst_291A1015","tags":[],"resourceType":"GMRInstance",},
+        {"properties":[],"isDnd":false,"objectId":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.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":128.0,"y":144.0,"resourceVersion":"1.0","name":"inst_7CD6A298","tags":[],"resourceType":"GMRInstance",},
+        {"properties":[],"isDnd":false,"objectId":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.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":160.0,"y":64.0,"resourceVersion":"1.0","name":"inst_51EBEA4D","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":[],"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":true,"inheritLayerSettings":true,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Assets_1","tags":[],"resourceType":"GMRAssetLayer",},
     {"tilesetId":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"x":0,"y":0,"tiles":{"SerialiseWidth":27,"SerialiseHeight":15,"TileSerialiseData":[
@@ -182,6 +185,9 @@
     {"name":"inst_35D0D","path":"rooms/r1/r1.yy",},
     {"name":"inst_1F99BFFE","path":"rooms/r1/r1.yy",},
     {"name":"inst_45379430","path":"rooms/r1/r1.yy",},
+    {"name":"inst_291A1015","path":"rooms/r1/r1.yy",},
+    {"name":"inst_7CD6A298","path":"rooms/r1/r1.yy",},
+    {"name":"inst_51EBEA4D","path":"rooms/r1/r1.yy",},
   ],
   "inheritCreationOrder": true,
   "sequenceId": null,
diff --git a/sprites/sSkeletonR/sSkeletonR.yy b/sprites/sSkeletonR/sSkeletonR.yy
index 35c730e..dcb01b0 100644
--- a/sprites/sSkeletonR/sSkeletonR.yy
+++ b/sprites/sSkeletonR/sSkeletonR.yy
@@ -7,9 +7,9 @@
   "edgeFiltering": false,
   "collisionTolerance": 0,
   "swfPrecision": 2.525,
-  "bbox_left": 9,
-  "bbox_right": 23,
-  "bbox_top": 8,
+  "bbox_left": 10,
+  "bbox_right": 22,
+  "bbox_top": 15,
   "bbox_bottom": 30,
   "HTile": false,
   "VTile": false,