From 3079018adf914fab0475e58fc9a45318030470a9 Mon Sep 17 00:00:00 2001 From: Valsept Date: Sat, 5 Dec 2020 22:20:44 +0100 Subject: [PATCH] --- Surprise Dungeon.yyp | 2 +- rooms/r10/r10.yy | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Surprise Dungeon.yyp b/Surprise Dungeon.yyp index 9fceedf..d0c2c09 100644 --- a/Surprise Dungeon.yyp +++ b/Surprise Dungeon.yyp @@ -46,6 +46,7 @@ "children": [], }, "RoomOrderNodes": [ + {"roomId":{"name":"r10","path":"rooms/r10/r10.yy",},}, {"roomId":{"name":"rTestSolaris","path":"rooms/rTestSolaris/rTestSolaris.yy",},}, {"roomId":{"name":"rTestRick","path":"rooms/rTestRick/rTestRick.yy",},}, {"roomId":{"name":"rTestVal","path":"rooms/rTestVal/rTestVal.yy",},}, @@ -59,7 +60,6 @@ {"roomId":{"name":"r2","path":"rooms/r2/r2.yy",},}, {"roomId":{"name":"r3","path":"rooms/r3/r3.yy",},}, {"roomId":{"name":"r4","path":"rooms/r4/r4.yy",},}, - {"roomId":{"name":"r10","path":"rooms/r10/r10.yy",},}, ], "Folders": [ {"folderPath":"folders/Sprites.yy","order":0,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",}, diff --git a/rooms/r10/r10.yy b/rooms/r10/r10.yy index bd26736..7cf54fe 100644 --- a/rooms/r10/r10.yy +++ b/rooms/r10/r10.yy @@ -78,21 +78,26 @@ {"properties":[],"isDnd":false,"objectId":{"name":"oWall","path":"objects/oWall/oWall.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":352.0,"y":16.0,"resourceVersion":"1.0","name":"inst_37DCEA20","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oWall","path":"objects/oWall/oWall.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":368.0,"y":16.0,"resourceVersion":"1.0","name":"inst_1BEF2BB2","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oWall","path":"objects/oWall/oWall.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":384.0,"y":16.0,"resourceVersion":"1.0","name":"inst_22C33455","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oWall","path":"objects/oWall/oWall.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":368.0,"y":176.0,"resourceVersion":"1.0","name":"inst_73342910","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":96.0,"resourceVersion":"1.0","name":"inst_457CCEB2","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":288.0,"y":144.0,"resourceVersion":"1.0","name":"inst_38E7D3E3","tags":[],"resourceType":"GMRInstance",}, ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",}, - {"assets":[],"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Assets_1","tags":[],"resourceType":"GMRAssetLayer",}, + {"assets":[ + {"ignore":false,"spriteId":{"name":"sStone","path":"sprites/sStone/sStone.yy",},"headPosition":0.0,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"animationSpeed":1.0,"colour":4294967295,"inheritedItemId":null,"frozen":false,"inheritItemSettings":false,"x":368.0,"y":176.0,"resourceVersion":"1.0","name":"graphic_6002561C","tags":[],"resourceType":"GMRSpriteGraphic",}, + ],"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"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":[ 34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, 34,1,2,2,2,2,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,3,34,34, +34,16,17,17,17,17,17,19,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,34,34, 34,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,34,34, 34,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,34,34, 34,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,34,34, -34,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,34,34, -34,7,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,34,34, -34,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,6,34,34, -34,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,34,34, +34,7,17,17,17,17,17,17,17,19,17,17,17,17,17,17,17,17,19,19,17,17,17,17,18,34,34, +34,16,17,17,17,17,17,17,19,19,17,17,17,17,17,17,17,17,19,19,17,17,17,17,6,34,34, 34,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,34,34, 34,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,34,34, 34,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,34,34, +34,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,19,17,17,17,19,18,34,34, 34,31,32,32,32,32,32,32,32,32,32,32,5,32,32,32,32,32,32,32,32,32,32,32,33,34,34, 34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, 34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, @@ -167,6 +172,9 @@ {"name":"inst_37DCEA20","path":"rooms/r10/r10.yy",}, {"name":"inst_1BEF2BB2","path":"rooms/r10/r10.yy",}, {"name":"inst_22C33455","path":"rooms/r10/r10.yy",}, + {"name":"inst_73342910","path":"rooms/r10/r10.yy",}, + {"name":"inst_457CCEB2","path":"rooms/r10/r10.yy",}, + {"name":"inst_38E7D3E3","path":"rooms/r10/r10.yy",}, ], "inheritCreationOrder": false, "sequenceId": null,