From 311f369d6670ac5b0479c5f8ae04494f52ef3c19 Mon Sep 17 00:00:00 2001 From: sOlaris38 Date: Sat, 5 Dec 2020 19:01:32 +0100 Subject: [PATCH] --- Surprise Dungeon.yyp | 1 + objects/oGame/Draw_64.gml | 1 + objects/oGame/oGame.yy | 33 ++++++++++++++++++++++++++++++ objects/oMonster/Draw_64.gml | 3 --- objects/oMonster/oMonster.yy | 1 - rooms/rTestSolaris/rTestSolaris.yy | 2 ++ 6 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 objects/oGame/Draw_64.gml create mode 100644 objects/oGame/oGame.yy delete mode 100644 objects/oMonster/Draw_64.gml diff --git a/Surprise Dungeon.yyp b/Surprise Dungeon.yyp index 25a271d..f7f1d09 100644 --- a/Surprise Dungeon.yyp +++ b/Surprise Dungeon.yyp @@ -4,6 +4,7 @@ {"id":{"name":"sPlayerRun","path":"sprites/sPlayerRun/sPlayerRun.yy",},"order":4,}, {"id":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.yy",},"order":2,}, {"id":{"name":"rTestVal","path":"rooms/rTestVal/rTestVal.yy",},"order":2,}, + {"id":{"name":"oGame","path":"objects/oGame/oGame.yy",},"order":4,}, {"id":{"name":"oMaudit","path":"objects/oMaudit/oMaudit.yy",},"order":2,}, {"id":{"name":"oMonster","path":"objects/oMonster/oMonster.yy",},"order":1,}, {"id":{"name":"oWall","path":"objects/oWall/oWall.yy",},"order":3,}, diff --git a/objects/oGame/Draw_64.gml b/objects/oGame/Draw_64.gml new file mode 100644 index 0000000..4599725 --- /dev/null +++ b/objects/oGame/Draw_64.gml @@ -0,0 +1 @@ +draw_text(16,16,oPlayer.pdv); \ No newline at end of file diff --git a/objects/oGame/oGame.yy b/objects/oGame/oGame.yy new file mode 100644 index 0000000..a8072d8 --- /dev/null +++ b/objects/oGame/oGame.yy @@ -0,0 +1,33 @@ +{ + "spriteId": null, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": true, + "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":64,"eventType":8,"collisionObjectId":null,"parent":{"name":"oGame","path":"objects/oGame/oGame.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "resourceVersion": "1.0", + "name": "oGame", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/objects/oMonster/Draw_64.gml b/objects/oMonster/Draw_64.gml deleted file mode 100644 index 00bd603..0000000 --- a/objects/oMonster/Draw_64.gml +++ /dev/null @@ -1,3 +0,0 @@ -draw_text(16,16,dir); -draw_text(16,48,deplaceVertical); -draw_text(16,80,deplaceHorizontal); diff --git a/objects/oMonster/oMonster.yy b/objects/oMonster/oMonster.yy index a82c7eb..18557cc 100644 --- a/objects/oMonster/oMonster.yy +++ b/objects/oMonster/oMonster.yy @@ -20,7 +20,6 @@ "eventList": [ {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oMonster","path":"objects/oMonster/oMonster.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oMonster","path":"objects/oMonster/oMonster.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"parent":{"name":"oMonster","path":"objects/oMonster/oMonster.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [ {"varType":0,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"hp","tags":[],"resourceType":"GMObjectProperty",}, diff --git a/rooms/rTestSolaris/rTestSolaris.yy b/rooms/rTestSolaris/rTestSolaris.yy index 4852bbb..64f1ccd 100644 --- a/rooms/rTestSolaris/rTestSolaris.yy +++ b/rooms/rTestSolaris/rTestSolaris.yy @@ -100,6 +100,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":352.0,"y":16.0,"resourceVersion":"1.0","name":"inst_34F12FA1","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_7BDBC444","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_7DF0F9A4","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oGame","path":"objects/oGame/oGame.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":48.0,"y":48.0,"resourceVersion":"1.0","name":"inst_9E5ECD3","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",}, {"spriteId":null,"colour":4289967027,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",}, ], @@ -193,6 +194,7 @@ {"name":"inst_34F12FA1","path":"rooms/rTestSolaris/rTestSolaris.yy",}, {"name":"inst_7BDBC444","path":"rooms/rTestSolaris/rTestSolaris.yy",}, {"name":"inst_7DF0F9A4","path":"rooms/rTestSolaris/rTestSolaris.yy",}, + {"name":"inst_9E5ECD3","path":"rooms/rTestSolaris/rTestSolaris.yy",}, ], "inheritCreationOrder": false, "sequenceId": null,