From 338c224824d80e37feb7304f622a1dbeb01a48a1 Mon Sep 17 00:00:00 2001 From: rick Date: Sun, 6 Dec 2020 19:56:12 +0100 Subject: [PATCH] Modification arborescence objet --- Surprise Dungeon.yyp | 11 +++-- objects/oChest/oChest.yy | 71 ++++++++++++++------------- objects/oMaudit/oMaudit.yy | 70 +++++++++++++-------------- objects/oTransition/oTransition.yy | 78 +++++++++++++++--------------- objects/oTrou/oTrou.yy | 4 +- objects/oWall/oWall.yy | 66 ++++++++++++------------- 6 files changed, 151 insertions(+), 149 deletions(-) diff --git a/Surprise Dungeon.yyp b/Surprise Dungeon.yyp index 73d8b77..9a8e249 100644 --- a/Surprise Dungeon.yyp +++ b/Surprise Dungeon.yyp @@ -12,24 +12,25 @@ {"id":{"name":"rWin","path":"rooms/rWin/rWin.yy",},"order":14,}, {"id":{"name":"oGame","path":"objects/oGame/oGame.yy",},"order":2,}, {"id":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"order":0,}, - {"id":{"name":"oChest","path":"objects/oChest/oChest.yy",},"order":7,}, + {"id":{"name":"oChest","path":"objects/oChest/oChest.yy",},"order":0,}, {"id":{"name":"sWalls","path":"sprites/sWalls/sWalls.yy",},"order":5,}, {"id":{"name":"r11","path":"rooms/r11/r11.yy",},"order":15,}, {"id":{"name":"rOver","path":"rooms/rOver/rOver.yy",},"order":13,}, {"id":{"name":"r8","path":"rooms/r8/r8.yy",},"order":9,}, - {"id":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"order":3,}, + {"id":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"order":0,}, {"id":{"name":"rType","path":"rooms/rType/rType.yy",},"order":0,}, {"id":{"name":"sPlayerRun","path":"sprites/sPlayerRun/sPlayerRun.yy",},"order":1,}, {"id":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.yy",},"order":2,}, {"id":{"name":"sStone","path":"sprites/sStone/sStone.yy",},"order":3,}, + {"id":{"name":"sFlamDetect","path":"sprites/sFlamDetect/sFlamDetect.yy",},"order":3,}, {"id":{"name":"oMaudit","path":"objects/oMaudit/oMaudit.yy",},"order":1,}, {"id":{"name":"oOver","path":"objects/oOver/oOver.yy",},"order":4,}, {"id":{"name":"r4","path":"rooms/r4/r4.yy",},"order":5,}, {"id":{"name":"r6","path":"rooms/r6/r6.yy",},"order":7,}, {"id":{"name":"sTransition","path":"sprites/sTransition/sTransition.yy",},"order":0,}, {"id":{"name":"oMonster","path":"objects/oMonster/oMonster.yy",},"order":1,}, - {"id":{"name":"oTrou","path":"objects/oTrou/oTrou.yy",},"order":6,}, - {"id":{"name":"oWall","path":"objects/oWall/oWall.yy",},"order":5,}, + {"id":{"name":"oTrou","path":"objects/oTrou/oTrou.yy",},"order":1,}, + {"id":{"name":"oWall","path":"objects/oWall/oWall.yy",},"order":2,}, {"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,}, @@ -99,6 +100,8 @@ {"folderPath":"folders/Sprites/Player.yy","order":15,"resourceVersion":"1.0","name":"Player","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Sprites/SpecialsSprite.yy","order":18,"resourceVersion":"1.0","name":"SpecialsSprite","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Sprites/Decors.yy","order":19,"resourceVersion":"1.0","name":"Decors","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Objects/Item.yy","order":8,"resourceVersion":"1.0","name":"Item","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Objects/SpecialCase.yy","order":9,"resourceVersion":"1.0","name":"SpecialCase","tags":[],"resourceType":"GMFolder",}, ], "AudioGroups": [ {"targets":461609314234257646,"resourceVersion":"1.0","name":"audiogroup_default","resourceType":"GMAudioGroup",}, diff --git a/objects/oChest/oChest.yy b/objects/oChest/oChest.yy index 19fedfc..39eda8b 100644 --- a/objects/oChest/oChest.yy +++ b/objects/oChest/oChest.yy @@ -1,37 +1,36 @@ -{ - "spriteId": { - "name": "sCoffre", - "path": "sprites/sCoffre/sCoffre.yy", - }, - "solid": false, - "visible": true, - "spriteMaskId": null, - "persistent": false, - "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, - "physicsAngularDamping": 0.1, - "physicsFriction": 0.2, - "physicsStartAwake": true, - "physicsKinematic": false, - "physicsShapePoints": [], - "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"parent":{"name":"oChest","path":"objects/oChest/oChest.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oChest","path":"objects/oChest/oChest.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - ], - "properties": [], - "overriddenProperties": [], - "parent": { - "name": "Objects", - "path": "folders/Objects.yy", - }, - "resourceVersion": "1.0", - "name": "oChest", - "tags": [], - "resourceType": "GMObject", +{ + "spriteId": { + "name": "sCoffre", + "path": "sprites/sCoffre/sCoffre.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"parent":{"name":"oChest","path":"objects/oChest/oChest.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "Item", + "path": "folders/Objects/Item.yy", + }, + "resourceVersion": "1.0", + "name": "oChest", + "tags": [], + "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/oMaudit/oMaudit.yy b/objects/oMaudit/oMaudit.yy index 425eec0..9d617ed 100644 --- a/objects/oMaudit/oMaudit.yy +++ b/objects/oMaudit/oMaudit.yy @@ -1,36 +1,36 @@ -{ - "spriteId": { - "name": "sMaudit", - "path": "sprites/sMaudit/sMaudit.yy", - }, - "solid": false, - "visible": true, - "spriteMaskId": null, - "persistent": false, - "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, - "physicsAngularDamping": 0.1, - "physicsFriction": 0.2, - "physicsStartAwake": true, - "physicsKinematic": false, - "physicsShapePoints": [], - "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,"parent":{"name":"oMaudit","path":"objects/oMaudit/oMaudit.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - ], - "properties": [], - "overriddenProperties": [], - "parent": { - "name": "Objects", - "path": "folders/Objects.yy", - }, - "resourceVersion": "1.0", - "name": "oMaudit", - "tags": [], - "resourceType": "GMObject", +{ + "spriteId": { + "name": "sMaudit", + "path": "sprites/sMaudit/sMaudit.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,"parent":{"name":"oMaudit","path":"objects/oMaudit/oMaudit.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "Item", + "path": "folders/Objects/Item.yy", + }, + "resourceVersion": "1.0", + "name": "oMaudit", + "tags": [], + "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/oTransition/oTransition.yy b/objects/oTransition/oTransition.yy index 3004895..24058a9 100644 --- a/objects/oTransition/oTransition.yy +++ b/objects/oTransition/oTransition.yy @@ -1,40 +1,40 @@ -{ - "spriteId": { - "name": "sTransition", - "path": "sprites/sTransition/sTransition.yy", - }, - "solid": false, - "visible": true, - "spriteMaskId": null, - "persistent": false, - "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, - "physicsAngularDamping": 0.1, - "physicsFriction": 0.2, - "physicsStartAwake": true, - "physicsKinematic": false, - "physicsShapePoints": [], - "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.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":"next","tags":[],"resourceType":"GMObjectProperty",}, - ], - "overriddenProperties": [], - "parent": { - "name": "Objects", - "path": "folders/Objects.yy", - }, - "resourceVersion": "1.0", - "name": "oTransition", - "tags": [], - "resourceType": "GMObject", +{ + "spriteId": { + "name": "sTransition", + "path": "sprites/sTransition/sTransition.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.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":"next","tags":[],"resourceType":"GMObjectProperty",}, + ], + "overriddenProperties": [], + "parent": { + "name": "SpecialCase", + "path": "folders/Objects/SpecialCase.yy", + }, + "resourceVersion": "1.0", + "name": "oTransition", + "tags": [], + "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/oTrou/oTrou.yy b/objects/oTrou/oTrou.yy index 7ddf665..8d39ee1 100644 --- a/objects/oTrou/oTrou.yy +++ b/objects/oTrou/oTrou.yy @@ -26,8 +26,8 @@ "properties": [], "overriddenProperties": [], "parent": { - "name": "Objects", - "path": "folders/Objects.yy", + "name": "SpecialCase", + "path": "folders/Objects/SpecialCase.yy", }, "resourceVersion": "1.0", "name": "oTrou", diff --git a/objects/oWall/oWall.yy b/objects/oWall/oWall.yy index 544fcb1..2784e80 100644 --- a/objects/oWall/oWall.yy +++ b/objects/oWall/oWall.yy @@ -1,34 +1,34 @@ -{ - "spriteId": { - "name": "sWall", - "path": "sprites/sWall/sWall.yy", - }, - "solid": false, - "visible": false, - "spriteMaskId": null, - "persistent": false, - "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, - "physicsAngularDamping": 0.1, - "physicsFriction": 0.2, - "physicsStartAwake": true, - "physicsKinematic": false, - "physicsShapePoints": [], - "eventList": [], - "properties": [], - "overriddenProperties": [], - "parent": { - "name": "Objects", - "path": "folders/Objects.yy", - }, - "resourceVersion": "1.0", - "name": "oWall", - "tags": [], - "resourceType": "GMObject", +{ + "spriteId": { + "name": "sWall", + "path": "sprites/sWall/sWall.yy", + }, + "solid": false, + "visible": false, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "SpecialCase", + "path": "folders/Objects/SpecialCase.yy", + }, + "resourceVersion": "1.0", + "name": "oWall", + "tags": [], + "resourceType": "GMObject", } \ No newline at end of file