sOlaris38 2 years ago
parent b3c996cc58
commit 1ba6c89ba2
  1. 4
      Surprise Dungeon.yyp
  2. 110
      Surprise Dungeon.yyp.base
  3. 112
      Surprise Dungeon.yyp.ours
  4. 112
      Surprise Dungeon.yyp.theirs
  5. 2
      objects/oGame/Step_0.gml
  6. 4
      rooms/r11/r11.yy

@ -9,9 +9,11 @@
{"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":14,},
{"id":{"name":"sTrouDetect","path":"sprites/sTrouDetect/sTrouDetect.yy",},"order":2,},
{"id":{"name":"r0","path":"rooms/r0/r0.yy",},"order":1,},
{"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":"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,},
@ -72,6 +74,8 @@
{"roomId":{"name":"r9","path":"rooms/r9/r9.yy",},},
{"roomId":{"name":"r10","path":"rooms/r10/r10.yy",},},
{"roomId":{"name":"rOver","path":"rooms/rOver/rOver.yy",},},
{"roomId":{"name":"rWin","path":"rooms/rWin/rWin.yy",},},
{"roomId":{"name":"r11","path":"rooms/r11/r11.yy",},},
],
"Folders": [
{"folderPath":"folders/Sprites.yy","order":0,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",},

@ -0,0 +1,110 @@
{
"resources": [
{"id":{"name":"r1","path":"rooms/r1/r1.yy",},"order":2,},
{"id":{"name":"sFire","path":"sprites/sFire/sFire.yy",},"order":6,},
{"id":{"name":"r11","path":"rooms/r11/r11.yy",},"order":14,},
{"id":{"name":"r9","path":"rooms/r9/r9.yy",},"order":10,},
{"id":{"name":"sBox","path":"sprites/sBox/sBox.yy",},"order":10,},
{"id":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"order":3,},
{"id":{"name":"r7","path":"rooms/r7/r7.yy",},"order":8,},
{"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":14,},
{"id":{"name":"r0","path":"rooms/r0/r0.yy",},"order":1,},
{"id":{"name":"oGame","path":"objects/oGame/oGame.yy",},"order":2,},
{"id":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"order":0,},
{"id":{"name":"sWalls","path":"sprites/sWalls/sWalls.yy",},"order":7,},
{"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":"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":5,},
{"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":16,},
{"id":{"name":"oMonster","path":"objects/oMonster/oMonster.yy",},"order":1,},
{"id":{"name":"oWall","path":"objects/oWall/oWall.yy",},"order":5,},
{"id":{"name":"sWall","path":"sprites/sWall/sWall.yy",},"order":3,},
{"id":{"name":"r2","path":"rooms/r2/r2.yy",},"order":3,},
{"id":{"name":"sSwordh","path":"sprites/sSwordh/sSwordh.yy",},"order":2,},
{"id":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"order":2,},
{"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":0,},
{"id":{"name":"r10","path":"rooms/r10/r10.yy",},"order":11,},
{"id":{"name":"sCoffre","path":"sprites/sCoffre/sCoffre.yy",},"order":9,},
{"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,},
{"id":{"name":"sTrou","path":"sprites/sTrou/sTrou.yy",},"order":8,},
{"id":{"name":"sSkeletonR","path":"sprites/sSkeletonR/sSkeletonR.yy",},"order":1,},
{"id":{"name":"r3","path":"rooms/r3/r3.yy",},"order":4,},
{"id":{"name":"rInit","path":"rooms/rInit/rInit.yy",},"order":12,},
{"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,},
],
"Options": [
{"name":"Linux","path":"options/linux/options_linux.yy",},
{"name":"macOS","path":"options/mac/options_mac.yy",},
{"name":"Main","path":"options/main/options_main.yy",},
{"name":"Windows","path":"options/windows/options_windows.yy",},
{"name":"HTML5","path":"options/html5/options_html5.yy",},
],
"isDnDProject": false,
"isEcma": false,
"tutorialPath": "",
"configs": {
"name": "Default",
"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",},},
{"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":"r5","path":"rooms/r5/r5.yy",},},
{"roomId":{"name":"r6","path":"rooms/r6/r6.yy",},},
{"roomId":{"name":"r7","path":"rooms/r7/r7.yy",},},
{"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":"rOver","path":"rooms/rOver/rOver.yy",},},
{"roomId":{"name":"r11","path":"rooms/r11/r11.yy",},},
],
"Folders": [
{"folderPath":"folders/Sprites.yy","order":0,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Tile Sets.yy","order":1,"resourceVersion":"1.0","name":"Tile Sets","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sounds.yy","order":2,"resourceVersion":"1.0","name":"Sounds","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Paths.yy","order":3,"resourceVersion":"1.0","name":"Paths","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Scripts.yy","order":4,"resourceVersion":"1.0","name":"Scripts","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Shaders.yy","order":5,"resourceVersion":"1.0","name":"Shaders","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Fonts.yy","order":6,"resourceVersion":"1.0","name":"Fonts","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Timelines.yy","order":7,"resourceVersion":"1.0","name":"Timelines","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Objects.yy","order":8,"resourceVersion":"1.0","name":"Objects","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Rooms.yy","order":9,"resourceVersion":"1.0","name":"Rooms","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sequences.yy","order":10,"resourceVersion":"1.0","name":"Sequences","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Animation Curves.yy","order":11,"resourceVersion":"1.0","name":"Animation Curves","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Notes.yy","order":12,"resourceVersion":"1.0","name":"Notes","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Extensions.yy","order":13,"resourceVersion":"1.0","name":"Extensions","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sprites/Monsters.yy","order":1,"resourceVersion":"1.0","name":"Monsters","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Objects/Entity.yy","order":0,"resourceVersion":"1.0","name":"Entity","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Rooms/rooms.yy","order":4,"resourceVersion":"1.0","name":"rooms","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sprites/Player.yy","order":15,"resourceVersion":"1.0","name":"Player","tags":[],"resourceType":"GMFolder",},
],
"AudioGroups": [
{"targets":461609314234257646,"resourceVersion":"1.0","name":"audiogroup_default","resourceType":"GMAudioGroup",},
],
"TextureGroups": [
{"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":461609314234257646,"resourceVersion":"1.0","name":"Default","resourceType":"GMTextureGroup",},
],
"IncludedFiles": [],
"MetaData": {
"IDEVersion": "2.3.1.536",
},
"resourceVersion": "1.4",
"name": "Surprise Dungeon",
"tags": [],
"resourceType": "GMProject",
}

@ -0,0 +1,112 @@
{
"resources": [
{"id":{"name":"r1","path":"rooms/r1/r1.yy",},"order":2,},
{"id":{"name":"sFire","path":"sprites/sFire/sFire.yy",},"order":6,},
{"id":{"name":"r11","path":"rooms/r11/r11.yy",},"order":14,},
{"id":{"name":"r9","path":"rooms/r9/r9.yy",},"order":10,},
{"id":{"name":"sBox","path":"sprites/sBox/sBox.yy",},"order":10,},
{"id":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"order":3,},
{"id":{"name":"r7","path":"rooms/r7/r7.yy",},"order":8,},
{"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":14,},
{"id":{"name":"r0","path":"rooms/r0/r0.yy",},"order":1,},
{"id":{"name":"oGame","path":"objects/oGame/oGame.yy",},"order":2,},
{"id":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"order":0,},
{"id":{"name":"sWalls","path":"sprites/sWalls/sWalls.yy",},"order":7,},
{"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":"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":5,},
{"id":{"name":"rWin","path":"rooms/rWin/rWin.yy",},"order":15,},
{"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":16,},
{"id":{"name":"oMonster","path":"objects/oMonster/oMonster.yy",},"order":1,},
{"id":{"name":"oWall","path":"objects/oWall/oWall.yy",},"order":5,},
{"id":{"name":"sWall","path":"sprites/sWall/sWall.yy",},"order":3,},
{"id":{"name":"r2","path":"rooms/r2/r2.yy",},"order":3,},
{"id":{"name":"sSwordh","path":"sprites/sSwordh/sSwordh.yy",},"order":2,},
{"id":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"order":2,},
{"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":0,},
{"id":{"name":"r10","path":"rooms/r10/r10.yy",},"order":11,},
{"id":{"name":"sCoffre","path":"sprites/sCoffre/sCoffre.yy",},"order":9,},
{"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,},
{"id":{"name":"sTrou","path":"sprites/sTrou/sTrou.yy",},"order":8,},
{"id":{"name":"sSkeletonR","path":"sprites/sSkeletonR/sSkeletonR.yy",},"order":1,},
{"id":{"name":"r3","path":"rooms/r3/r3.yy",},"order":4,},
{"id":{"name":"rInit","path":"rooms/rInit/rInit.yy",},"order":12,},
{"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,},
],
"Options": [
{"name":"Linux","path":"options/linux/options_linux.yy",},
{"name":"macOS","path":"options/mac/options_mac.yy",},
{"name":"Main","path":"options/main/options_main.yy",},
{"name":"Windows","path":"options/windows/options_windows.yy",},
{"name":"HTML5","path":"options/html5/options_html5.yy",},
],
"isDnDProject": false,
"isEcma": false,
"tutorialPath": "",
"configs": {
"name": "Default",
"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",},},
{"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":"r5","path":"rooms/r5/r5.yy",},},
{"roomId":{"name":"r6","path":"rooms/r6/r6.yy",},},
{"roomId":{"name":"r7","path":"rooms/r7/r7.yy",},},
{"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":"rOver","path":"rooms/rOver/rOver.yy",},},
{"roomId":{"name":"r11","path":"rooms/r11/r11.yy",},},
{"roomId":{"name":"rWin","path":"rooms/rWin/rWin.yy",},},
],
"Folders": [
{"folderPath":"folders/Sprites.yy","order":0,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Tile Sets.yy","order":1,"resourceVersion":"1.0","name":"Tile Sets","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sounds.yy","order":2,"resourceVersion":"1.0","name":"Sounds","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Paths.yy","order":3,"resourceVersion":"1.0","name":"Paths","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Scripts.yy","order":4,"resourceVersion":"1.0","name":"Scripts","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Shaders.yy","order":5,"resourceVersion":"1.0","name":"Shaders","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Fonts.yy","order":6,"resourceVersion":"1.0","name":"Fonts","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Timelines.yy","order":7,"resourceVersion":"1.0","name":"Timelines","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Objects.yy","order":8,"resourceVersion":"1.0","name":"Objects","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Rooms.yy","order":9,"resourceVersion":"1.0","name":"Rooms","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sequences.yy","order":10,"resourceVersion":"1.0","name":"Sequences","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Animation Curves.yy","order":11,"resourceVersion":"1.0","name":"Animation Curves","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Notes.yy","order":12,"resourceVersion":"1.0","name":"Notes","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Extensions.yy","order":13,"resourceVersion":"1.0","name":"Extensions","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sprites/Monsters.yy","order":1,"resourceVersion":"1.0","name":"Monsters","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Objects/Entity.yy","order":0,"resourceVersion":"1.0","name":"Entity","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Rooms/rooms.yy","order":4,"resourceVersion":"1.0","name":"rooms","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sprites/Player.yy","order":15,"resourceVersion":"1.0","name":"Player","tags":[],"resourceType":"GMFolder",},
],
"AudioGroups": [
{"targets":461609314234257646,"resourceVersion":"1.0","name":"audiogroup_default","resourceType":"GMAudioGroup",},
],
"TextureGroups": [
{"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":461609314234257646,"resourceVersion":"1.0","name":"Default","resourceType":"GMTextureGroup",},
],
"IncludedFiles": [],
"MetaData": {
"IDEVersion": "2.3.1.536",
},
"resourceVersion": "1.4",
"name": "Surprise Dungeon",
"tags": [],
"resourceType": "GMProject",
}

@ -0,0 +1,112 @@
{
"resources": [
{"id":{"name":"r1","path":"rooms/r1/r1.yy",},"order":2,},
{"id":{"name":"sFire","path":"sprites/sFire/sFire.yy",},"order":2,},
{"id":{"name":"r9","path":"rooms/r9/r9.yy",},"order":10,},
{"id":{"name":"sBox","path":"sprites/sBox/sBox.yy",},"order":0,},
{"id":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"order":3,},
{"id":{"name":"r7","path":"rooms/r7/r7.yy",},"order":8,},
{"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":14,},
{"id":{"name":"sTrouDetect","path":"sprites/sTrouDetect/sTrouDetect.yy",},"order":2,},
{"id":{"name":"r0","path":"rooms/r0/r0.yy",},"order":1,},
{"id":{"name":"oGame","path":"objects/oGame/oGame.yy",},"order":2,},
{"id":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"order":0,},
{"id":{"name":"sWalls","path":"sprites/sWalls/sWalls.yy",},"order":5,},
{"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":"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":"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":"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,},
{"id":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"order":2,},
{"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":0,},
{"id":{"name":"r10","path":"rooms/r10/r10.yy",},"order":11,},
{"id":{"name":"sCoffre","path":"sprites/sCoffre/sCoffre.yy",},"order":1,},
{"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,},
{"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":"rInit","path":"rooms/rInit/rInit.yy",},"order":12,},
{"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,},
],
"Options": [
{"name":"Linux","path":"options/linux/options_linux.yy",},
{"name":"macOS","path":"options/mac/options_mac.yy",},
{"name":"Main","path":"options/main/options_main.yy",},
{"name":"Windows","path":"options/windows/options_windows.yy",},
{"name":"HTML5","path":"options/html5/options_html5.yy",},
],
"isDnDProject": false,
"isEcma": false,
"tutorialPath": "",
"configs": {
"name": "Default",
"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",},},
{"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":"r5","path":"rooms/r5/r5.yy",},},
{"roomId":{"name":"r6","path":"rooms/r6/r6.yy",},},
{"roomId":{"name":"r7","path":"rooms/r7/r7.yy",},},
{"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":"rOver","path":"rooms/rOver/rOver.yy",},},
],
"Folders": [
{"folderPath":"folders/Sprites.yy","order":0,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Tile Sets.yy","order":1,"resourceVersion":"1.0","name":"Tile Sets","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sounds.yy","order":2,"resourceVersion":"1.0","name":"Sounds","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Paths.yy","order":3,"resourceVersion":"1.0","name":"Paths","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Scripts.yy","order":4,"resourceVersion":"1.0","name":"Scripts","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Shaders.yy","order":5,"resourceVersion":"1.0","name":"Shaders","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Fonts.yy","order":6,"resourceVersion":"1.0","name":"Fonts","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Timelines.yy","order":7,"resourceVersion":"1.0","name":"Timelines","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Objects.yy","order":8,"resourceVersion":"1.0","name":"Objects","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Rooms.yy","order":9,"resourceVersion":"1.0","name":"Rooms","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sequences.yy","order":10,"resourceVersion":"1.0","name":"Sequences","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Animation Curves.yy","order":11,"resourceVersion":"1.0","name":"Animation Curves","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Notes.yy","order":12,"resourceVersion":"1.0","name":"Notes","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Extensions.yy","order":13,"resourceVersion":"1.0","name":"Extensions","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Sprites/Monsters.yy","order":1,"resourceVersion":"1.0","name":"Monsters","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Objects/Entity.yy","order":0,"resourceVersion":"1.0","name":"Entity","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Rooms/rooms.yy","order":4,"resourceVersion":"1.0","name":"rooms","tags":[],"resourceType":"GMFolder",},
{"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",},
],
"AudioGroups": [
{"targets":461609314234257646,"resourceVersion":"1.0","name":"audiogroup_default","resourceType":"GMAudioGroup",},
],
"TextureGroups": [
{"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":461609314234257646,"resourceVersion":"1.0","name":"Default","resourceType":"GMTextureGroup",},
],
"IncludedFiles": [],
"MetaData": {
"IDEVersion": "2.3.1.536",
},
"resourceVersion": "1.4",
"name": "Surprise Dungeon",
"tags": [],
"resourceType": "GMProject",
}

@ -44,6 +44,8 @@ if (global.perdu) {
with (oPlayer) {
if place_meeting(x,y,oMaudit) {
global.minutes = 5;
room_goto(rWin);
}
}

@ -89,7 +89,7 @@
{"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",},
{"properties":[],"isDnd":false,"objectId":{"name":"oMaudit","path":"objects/oMaudit/oMaudit.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":184.0,"y":88.0,"resourceVersion":"1.0","name":"inst_4E4B7741","tags":[],"resourceType":"GMRInstance",},
{"properties":[],"isDnd":false,"objectId":{"name":"oMaudit","path":"objects/oMaudit/oMaudit.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":183.0,"y":88.0,"resourceVersion":"1.0","name":"inst_413D504D","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":[
@ -187,7 +187,7 @@
{"name":"inst_33482310","path":"rooms/r11/r11.yy",},
{"name":"inst_2CF67492","path":"rooms/r11/r11.yy",},
{"name":"inst_DF7EF93","path":"rooms/r11/r11.yy",},
{"name":"inst_4E4B7741","path":"rooms/r11/r11.yy",},
{"name":"inst_413D504D","path":"rooms/r11/r11.yy",},
],
"inheritCreationOrder": true,
"sequenceId": null,

Loading…
Cancel
Save