From 2a23798c85e2155137bae904477bd88aa8d8689b Mon Sep 17 00:00:00 2001 From: sOlaris38 Date: Sun, 6 Dec 2020 14:59:53 +0100 Subject: [PATCH] correction transition --- Surprise Dungeon.yyp | 2 +- objects/oGame/Create_0.gml | 12 ++++-------- objects/oGame/Draw_64.gml | 4 +++- objects/oTransition/oTransition.yy | 2 +- rooms/r0/r0.yy | 2 +- rooms/r1/r1.yy | 2 +- rooms/r10/r10.yy | 2 +- rooms/r2/r2.yy | 2 +- rooms/r3/r3.yy | 2 +- rooms/r4/r4.yy | 2 +- rooms/r5/r5.yy | 2 +- rooms/r6/r6.yy | 2 +- rooms/r7/r7.yy | 2 +- rooms/r8/r8.yy | 2 +- rooms/r9/r9.yy | 2 +- rooms/rType/InstanceCreationCode_inst_2CF67492.gml | 2 +- rooms/rType/InstanceCreationCode_inst_33482310.gml | 1 - rooms/rType/InstanceCreationCode_inst_7E9DFE94.gml | 2 +- rooms/rType/InstanceCreationCode_inst_DF7EF93.gml | 2 +- rooms/rType/rType.yy | 2 +- 20 files changed, 24 insertions(+), 27 deletions(-) delete mode 100644 rooms/rType/InstanceCreationCode_inst_33482310.gml diff --git a/Surprise Dungeon.yyp b/Surprise Dungeon.yyp index 652be8c..e06119b 100644 --- a/Surprise Dungeon.yyp +++ b/Surprise Dungeon.yyp @@ -56,6 +56,7 @@ "children": [], }, "RoomOrderNodes": [ + {"roomId":{"name":"rInit","path":"rooms/rInit/rInit.yy",},}, {"roomId":{"name":"rType","path":"rooms/rType/rType.yy",},}, {"roomId":{"name":"r0","path":"rooms/r0/r0.yy",},}, {"roomId":{"name":"r1","path":"rooms/r1/r1.yy",},}, @@ -68,7 +69,6 @@ {"roomId":{"name":"r8","path":"rooms/r8/r8.yy",},}, {"roomId":{"name":"r9","path":"rooms/r9/r9.yy",},}, {"roomId":{"name":"r10","path":"rooms/r10/r10.yy",},}, - {"roomId":{"name":"rInit","path":"rooms/rInit/rInit.yy",},}, {"roomId":{"name":"rOver","path":"rooms/rOver/rOver.yy",},}, ], "Folders": [ diff --git a/objects/oGame/Create_0.gml b/objects/oGame/Create_0.gml index db5c742..7891a24 100644 --- a/objects/oGame/Create_0.gml +++ b/objects/oGame/Create_0.gml @@ -14,14 +14,10 @@ global.difficulty = 1; global.minutes = 1; global.secondes = 20; -enum transition { - left, - right, - up, - down -} - perdu = false; posX = irandom(3); -posY = irandom(3); \ No newline at end of file +posY = irandom(3); + +room_goto(r0); + diff --git a/objects/oGame/Draw_64.gml b/objects/oGame/Draw_64.gml index 871be7b..eced73c 100644 --- a/objects/oGame/Draw_64.gml +++ b/objects/oGame/Draw_64.gml @@ -10,4 +10,6 @@ for (i = 0; i < 4; i++) } if (!perdu) draw_text(160,16, string(global.minutes) + " : " + string(global.secondes)); -else draw_text(160,16, "PERDU"); \ No newline at end of file +else draw_text(160,16, "PERDU"); + +draw_text(320,16,global.difficulty); \ No newline at end of file diff --git a/objects/oTransition/oTransition.yy b/objects/oTransition/oTransition.yy index 2336829..324a0d5 100644 --- a/objects/oTransition/oTransition.yy +++ b/objects/oTransition/oTransition.yy @@ -25,7 +25,7 @@ {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [ - {"varType":4,"value":"transition.left","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"next","tags":[],"resourceType":"GMObjectProperty",}, + {"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": { diff --git a/rooms/r0/r0.yy b/rooms/r0/r0.yy index 2fd7b66..6e34160 100644 --- a/rooms/r0/r0.yy +++ b/rooms/r0/r0.yy @@ -86,7 +86,7 @@ {"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_54D90856","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","tags":[],"resourceType":"GMRInstance",}, {"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":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_7E9DFE94","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":112.0,"resourceVersion":"1.0","name":"inst_7E9DFE94","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_2CF67492","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":208.0,"resourceVersion":"1.0","name":"inst_2CF67492","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_DF7EF93","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":16.0,"y":112.0,"resourceVersion":"1.0","name":"inst_DF7EF93","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",}, diff --git a/rooms/r1/r1.yy b/rooms/r1/r1.yy index d217560..5238349 100644 --- a/rooms/r1/r1.yy +++ b/rooms/r1/r1.yy @@ -86,7 +86,7 @@ {"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_54D90856","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","tags":[],"resourceType":"GMRInstance",}, {"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":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_7E9DFE94","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":112.0,"resourceVersion":"1.0","name":"inst_7E9DFE94","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_2CF67492","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":208.0,"resourceVersion":"1.0","name":"inst_2CF67492","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_DF7EF93","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":16.0,"y":112.0,"resourceVersion":"1.0","name":"inst_DF7EF93","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",}, diff --git a/rooms/r10/r10.yy b/rooms/r10/r10.yy index c6cecee..3b2da5f 100644 --- a/rooms/r10/r10.yy +++ b/rooms/r10/r10.yy @@ -86,7 +86,7 @@ {"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_54D90856","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","tags":[],"resourceType":"GMRInstance",}, {"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":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_7E9DFE94","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":112.0,"resourceVersion":"1.0","name":"inst_7E9DFE94","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_2CF67492","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":208.0,"resourceVersion":"1.0","name":"inst_2CF67492","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_DF7EF93","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":16.0,"y":112.0,"resourceVersion":"1.0","name":"inst_DF7EF93","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",}, diff --git a/rooms/r2/r2.yy b/rooms/r2/r2.yy index a3e9ac0..18d3629 100644 --- a/rooms/r2/r2.yy +++ b/rooms/r2/r2.yy @@ -86,7 +86,7 @@ {"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_54D90856","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","tags":[],"resourceType":"GMRInstance",}, {"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":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_7E9DFE94","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":112.0,"resourceVersion":"1.0","name":"inst_7E9DFE94","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_2CF67492","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":208.0,"resourceVersion":"1.0","name":"inst_2CF67492","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_DF7EF93","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":16.0,"y":112.0,"resourceVersion":"1.0","name":"inst_DF7EF93","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",}, diff --git a/rooms/r3/r3.yy b/rooms/r3/r3.yy index b63ecee..b78c5df 100644 --- a/rooms/r3/r3.yy +++ b/rooms/r3/r3.yy @@ -86,7 +86,7 @@ {"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_54D90856","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","tags":[],"resourceType":"GMRInstance",}, {"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":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_7E9DFE94","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":112.0,"resourceVersion":"1.0","name":"inst_7E9DFE94","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_2CF67492","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":208.0,"resourceVersion":"1.0","name":"inst_2CF67492","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_DF7EF93","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":16.0,"y":112.0,"resourceVersion":"1.0","name":"inst_DF7EF93","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",}, diff --git a/rooms/r4/r4.yy b/rooms/r4/r4.yy index 9c9f030..d1eb77d 100644 --- a/rooms/r4/r4.yy +++ b/rooms/r4/r4.yy @@ -86,7 +86,7 @@ {"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_54D90856","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","tags":[],"resourceType":"GMRInstance",}, {"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":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_7E9DFE94","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":112.0,"resourceVersion":"1.0","name":"inst_7E9DFE94","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_2CF67492","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":208.0,"resourceVersion":"1.0","name":"inst_2CF67492","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_DF7EF93","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":16.0,"y":112.0,"resourceVersion":"1.0","name":"inst_DF7EF93","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",}, diff --git a/rooms/r5/r5.yy b/rooms/r5/r5.yy index a6c721e..2249860 100644 --- a/rooms/r5/r5.yy +++ b/rooms/r5/r5.yy @@ -86,7 +86,7 @@ {"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_54D90856","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","tags":[],"resourceType":"GMRInstance",}, {"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":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_7E9DFE94","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":112.0,"resourceVersion":"1.0","name":"inst_7E9DFE94","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_2CF67492","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":208.0,"resourceVersion":"1.0","name":"inst_2CF67492","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_DF7EF93","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":16.0,"y":112.0,"resourceVersion":"1.0","name":"inst_DF7EF93","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",}, diff --git a/rooms/r6/r6.yy b/rooms/r6/r6.yy index 80fbad9..c2dedf8 100644 --- a/rooms/r6/r6.yy +++ b/rooms/r6/r6.yy @@ -86,7 +86,7 @@ {"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_54D90856","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","tags":[],"resourceType":"GMRInstance",}, {"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":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_7E9DFE94","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":112.0,"resourceVersion":"1.0","name":"inst_7E9DFE94","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_2CF67492","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":208.0,"resourceVersion":"1.0","name":"inst_2CF67492","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_DF7EF93","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":16.0,"y":112.0,"resourceVersion":"1.0","name":"inst_DF7EF93","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",}, diff --git a/rooms/r7/r7.yy b/rooms/r7/r7.yy index 89ab593..456db01 100644 --- a/rooms/r7/r7.yy +++ b/rooms/r7/r7.yy @@ -86,7 +86,7 @@ {"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_54D90856","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","tags":[],"resourceType":"GMRInstance",}, {"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":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_7E9DFE94","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":112.0,"resourceVersion":"1.0","name":"inst_7E9DFE94","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_2CF67492","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":208.0,"resourceVersion":"1.0","name":"inst_2CF67492","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_DF7EF93","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":16.0,"y":112.0,"resourceVersion":"1.0","name":"inst_DF7EF93","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",}, diff --git a/rooms/r8/r8.yy b/rooms/r8/r8.yy index 93ada55..34ec29d 100644 --- a/rooms/r8/r8.yy +++ b/rooms/r8/r8.yy @@ -86,7 +86,7 @@ {"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_54D90856","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","tags":[],"resourceType":"GMRInstance",}, {"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":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_7E9DFE94","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":112.0,"resourceVersion":"1.0","name":"inst_7E9DFE94","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_2CF67492","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":208.0,"resourceVersion":"1.0","name":"inst_2CF67492","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_DF7EF93","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":16.0,"y":112.0,"resourceVersion":"1.0","name":"inst_DF7EF93","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",}, diff --git a/rooms/r9/r9.yy b/rooms/r9/r9.yy index 320e820..c122811 100644 --- a/rooms/r9/r9.yy +++ b/rooms/r9/r9.yy @@ -86,7 +86,7 @@ {"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_54D90856","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","tags":[],"resourceType":"GMRInstance",}, {"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":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_7E9DFE94","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":112.0,"resourceVersion":"1.0","name":"inst_7E9DFE94","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_33482310","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_2CF67492","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":208.0,"y":208.0,"resourceVersion":"1.0","name":"inst_2CF67492","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":true,"hasCreationCode":true,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_DF7EF93","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":16.0,"y":112.0,"resourceVersion":"1.0","name":"inst_DF7EF93","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",}, diff --git a/rooms/rType/InstanceCreationCode_inst_2CF67492.gml b/rooms/rType/InstanceCreationCode_inst_2CF67492.gml index 5553b19..10c9a34 100644 --- a/rooms/rType/InstanceCreationCode_inst_2CF67492.gml +++ b/rooms/rType/InstanceCreationCode_inst_2CF67492.gml @@ -1 +1 @@ -next = transition.down; \ No newline at end of file +next = 2; \ No newline at end of file diff --git a/rooms/rType/InstanceCreationCode_inst_33482310.gml b/rooms/rType/InstanceCreationCode_inst_33482310.gml deleted file mode 100644 index 762088d..0000000 --- a/rooms/rType/InstanceCreationCode_inst_33482310.gml +++ /dev/null @@ -1 +0,0 @@ -next = transition.top; \ No newline at end of file diff --git a/rooms/rType/InstanceCreationCode_inst_7E9DFE94.gml b/rooms/rType/InstanceCreationCode_inst_7E9DFE94.gml index 4bc13a5..621cdf8 100644 --- a/rooms/rType/InstanceCreationCode_inst_7E9DFE94.gml +++ b/rooms/rType/InstanceCreationCode_inst_7E9DFE94.gml @@ -1 +1 @@ -next = transition.right; \ No newline at end of file +next = 1; \ No newline at end of file diff --git a/rooms/rType/InstanceCreationCode_inst_DF7EF93.gml b/rooms/rType/InstanceCreationCode_inst_DF7EF93.gml index 6cc6b44..7ad62b6 100644 --- a/rooms/rType/InstanceCreationCode_inst_DF7EF93.gml +++ b/rooms/rType/InstanceCreationCode_inst_DF7EF93.gml @@ -1 +1 @@ -next = transition.left; \ No newline at end of file +next = 3; \ No newline at end of file diff --git a/rooms/rType/rType.yy b/rooms/rType/rType.yy index ce8afcc..a52930c 100644 --- a/rooms/rType/rType.yy +++ b/rooms/rType/rType.yy @@ -83,7 +83,7 @@ {"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":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","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":400.0,"y":16.0,"resourceVersion":"1.0","name":"inst_35D0D","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":false,"hasCreationCode":true,"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":400.0,"y":112.0,"resourceVersion":"1.0","name":"inst_7E9DFE94","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":false,"hasCreationCode":true,"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":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.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":208.0,"y":16.0,"resourceVersion":"1.0","name":"inst_33482310","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":false,"hasCreationCode":true,"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":208.0,"y":208.0,"resourceVersion":"1.0","name":"inst_2CF67492","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"inheritCode":false,"hasCreationCode":true,"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":16.0,"y":112.0,"resourceVersion":"1.0","name":"inst_DF7EF93","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",},