diff --git a/Surprise Dungeon.yyp b/Surprise Dungeon.yyp index e59fb6b..73d8b77 100644 --- a/Surprise Dungeon.yyp +++ b/Surprise Dungeon.yyp @@ -12,6 +12,7 @@ {"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":"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,}, diff --git a/objects/oChest/Collision_oPlayer.gml b/objects/oChest/Collision_oPlayer.gml new file mode 100644 index 0000000..c361a3b --- /dev/null +++ b/objects/oChest/Collision_oPlayer.gml @@ -0,0 +1,2 @@ +if (global.weapon < 3) global.weapon ++; +instance_destroy(self); \ No newline at end of file diff --git a/objects/oChest/oChest.yy b/objects/oChest/oChest.yy new file mode 100644 index 0000000..60d2703 --- /dev/null +++ b/objects/oChest/oChest.yy @@ -0,0 +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",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "resourceVersion": "1.0", + "name": "oChest", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/objects/oGame/KeyPress_69.gml b/objects/oGame/KeyPress_69.gml deleted file mode 100644 index 8478ef8..0000000 --- a/objects/oGame/KeyPress_69.gml +++ /dev/null @@ -1,8 +0,0 @@ -for (i = 0; i < 4; i++) -{ - for(j = 0; j < 4; j++) - { - tableau[i, j] = irandom(10); - - } -} \ No newline at end of file diff --git a/objects/oGame/KeyRelease_82.gml b/objects/oGame/KeyRelease_82.gml new file mode 100644 index 0000000..ec79328 --- /dev/null +++ b/objects/oGame/KeyRelease_82.gml @@ -0,0 +1 @@ +game_restart(); \ No newline at end of file diff --git a/objects/oGame/Step_0.gml b/objects/oGame/Step_0.gml index 3d943ed..2c22782 100644 --- a/objects/oGame/Step_0.gml +++ b/objects/oGame/Step_0.gml @@ -46,6 +46,5 @@ with (oPlayer) { if place_meeting(x,y,oMaudit) { global.minutes = 5; room_goto(rWin); - } } diff --git a/objects/oGame/oGame.yy b/objects/oGame/oGame.yy index b4022f9..30dbbc3 100644 --- a/objects/oGame/oGame.yy +++ b/objects/oGame/oGame.yy @@ -20,8 +20,8 @@ "eventList": [ {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"parent":{"name":"oGame","path":"objects/oGame/oGame.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oGame","path":"objects/oGame/oGame.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":69,"eventType":9,"collisionObjectId":null,"parent":{"name":"oGame","path":"objects/oGame/oGame.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oGame","path":"objects/oGame/oGame.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":82,"eventType":10,"collisionObjectId":null,"parent":{"name":"oGame","path":"objects/oGame/oGame.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/rooms/r9/r9.yy b/rooms/r9/r9.yy index c122811..6c22ef9 100644 --- a/rooms/r9/r9.yy +++ b/rooms/r9/r9.yy @@ -89,6 +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":"oChest","path":"objects/oChest/oChest.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":112.0,"resourceVersion":"1.0","name":"inst_3E244709","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":[ @@ -186,6 +187,7 @@ {"name":"inst_33482310","path":"rooms/r9/r9.yy",}, {"name":"inst_2CF67492","path":"rooms/r9/r9.yy",}, {"name":"inst_DF7EF93","path":"rooms/r9/r9.yy",}, + {"name":"inst_3E244709","path":"rooms/r9/r9.yy",}, ], "inheritCreationOrder": true, "sequenceId": null,