From e672b388240cbde058ba41f70c47b866b5b81a13 Mon Sep 17 00:00:00 2001 From: sOlaris38 Date: Sat, 5 Dec 2020 17:16:51 +0100 Subject: [PATCH] room test --- Surprise Dungeon.yyp | 8 ++- objects/oMonster/oMonster.yy | 1 + rooms/rTestRick/rTestRick.yy | 52 ++++++++++++++++++ .../rTest.yy => rTestSolaris/rTestSolaris.yy} | 6 +- rooms/rTestVal/rTestVal.yy | 52 ++++++++++++++++++ .../452ccb42-3358-42d5-beab-708a7068aa74.png | Bin 106 -> 86 bytes .../1956fe38-ffa4-4581-93ca-a202f6e7e129.png | Bin 106 -> 86 bytes sprites/sWall/sWall.yy | 12 ++-- 8 files changed, 120 insertions(+), 11 deletions(-) create mode 100644 rooms/rTestRick/rTestRick.yy rename rooms/{rTest/rTest.yy => rTestSolaris/rTestSolaris.yy} (95%) create mode 100644 rooms/rTestVal/rTestVal.yy diff --git a/Surprise Dungeon.yyp b/Surprise Dungeon.yyp index f160869..c540e94 100644 --- a/Surprise Dungeon.yyp +++ b/Surprise Dungeon.yyp @@ -2,16 +2,18 @@ "resources": [ {"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":14,}, {"id":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.yy",},"order":2,}, + {"id":{"name":"rTestVal","path":"rooms/rTestVal/rTestVal.yy",},"order":2,}, {"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,}, {"id":{"name":"sWall","path":"sprites/sWall/sWall.yy",},"order":3,}, + {"id":{"name":"rTestRick","path":"rooms/rTestRick/rTestRick.yy",},"order":1,}, {"id":{"name":"sSwordh","path":"sprites/sSwordh/sSwordh.yy",},"order":2,}, {"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":0,}, {"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,}, {"id":{"name":"Script1","path":"scripts/Script1/Script1.yy",},"order":0,}, {"id":{"name":"sMonsterMelee","path":"sprites/sMonsterMelee/sMonsterMelee.yy",},"order":0,}, - {"id":{"name":"rTest","path":"rooms/rTest/rTest.yy",},"order":0,}, + {"id":{"name":"rTestSolaris","path":"rooms/rTestSolaris/rTestSolaris.yy",},"order":0,}, ], "Options": [ {"name":"Linux","path":"options/linux/options_linux.yy",}, @@ -28,7 +30,9 @@ "children": [], }, "RoomOrderNodes": [ - {"roomId":{"name":"rTest","path":"rooms/rTest/rTest.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",},}, ], "Folders": [ {"folderPath":"folders/Sprites.yy","order":0,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",}, diff --git a/objects/oMonster/oMonster.yy b/objects/oMonster/oMonster.yy index a82c7eb..c0b3af2 100644 --- a/objects/oMonster/oMonster.yy +++ b/objects/oMonster/oMonster.yy @@ -21,6 +21,7 @@ {"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",}, + {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"oWall","path":"objects/oWall/oWall.yy",},"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/rTestRick/rTestRick.yy b/rooms/rTestRick/rTestRick.yy new file mode 100644 index 0000000..3128732 --- /dev/null +++ b/rooms/rTestRick/rTestRick.yy @@ -0,0 +1,52 @@ +{ + "isDnd": false, + "volume": 1.0, + "parentRoom": null, + "views": [ + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + ], + "layers": [ + {"instances":[],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"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",}, + ], + "inheritLayers": false, + "creationCodeFile": "", + "inheritCode": false, + "instanceCreationOrder": [], + "inheritCreationOrder": false, + "sequenceId": null, + "roomSettings": { + "inheritRoomSettings": false, + "Width": 1366, + "Height": 768, + "persistent": false, + }, + "viewSettings": { + "inheritViewSettings": false, + "enableViews": false, + "clearViewBackground": false, + "clearDisplayBuffer": true, + }, + "physicsSettings": { + "inheritPhysicsSettings": false, + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0.0, + "PhysicsWorldGravityY": 10.0, + "PhysicsWorldPixToMetres": 0.1, + }, + "parent": { + "name": "Rooms", + "path": "folders/Rooms.yy", + }, + "resourceVersion": "1.0", + "name": "rTestRick", + "tags": [], + "resourceType": "GMRoom", +} \ No newline at end of file diff --git a/rooms/rTest/rTest.yy b/rooms/rTestSolaris/rTestSolaris.yy similarity index 95% rename from rooms/rTest/rTest.yy rename to rooms/rTestSolaris/rTestSolaris.yy index 604f9d3..2778b8f 100644 --- a/rooms/rTest/rTest.yy +++ b/rooms/rTestSolaris/rTestSolaris.yy @@ -23,8 +23,8 @@ "creationCodeFile": "", "inheritCode": false, "instanceCreationOrder": [ - {"name":"inst_564B33A2","path":"rooms/rTest/rTest.yy",}, - {"name":"inst_601A75EA","path":"rooms/rTest/rTest.yy",}, + {"name":"inst_564B33A2","path":"rooms/rTestSolaris/rTestSolaris.yy",}, + {"name":"inst_601A75EA","path":"rooms/rTestSolaris/rTestSolaris.yy",}, ], "inheritCreationOrder": false, "sequenceId": null, @@ -52,7 +52,7 @@ "path": "folders/Rooms.yy", }, "resourceVersion": "1.0", - "name": "rTest", + "name": "rTestSolaris", "tags": [], "resourceType": "GMRoom", } \ No newline at end of file diff --git a/rooms/rTestVal/rTestVal.yy b/rooms/rTestVal/rTestVal.yy new file mode 100644 index 0000000..1f47119 --- /dev/null +++ b/rooms/rTestVal/rTestVal.yy @@ -0,0 +1,52 @@ +{ + "isDnd": false, + "volume": 1.0, + "parentRoom": null, + "views": [ + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + ], + "layers": [ + {"instances":[],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"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",}, + ], + "inheritLayers": false, + "creationCodeFile": "", + "inheritCode": false, + "instanceCreationOrder": [], + "inheritCreationOrder": false, + "sequenceId": null, + "roomSettings": { + "inheritRoomSettings": false, + "Width": 1366, + "Height": 768, + "persistent": false, + }, + "viewSettings": { + "inheritViewSettings": false, + "enableViews": false, + "clearViewBackground": false, + "clearDisplayBuffer": true, + }, + "physicsSettings": { + "inheritPhysicsSettings": false, + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0.0, + "PhysicsWorldGravityY": 10.0, + "PhysicsWorldPixToMetres": 0.1, + }, + "parent": { + "name": "Rooms", + "path": "folders/Rooms.yy", + }, + "resourceVersion": "1.0", + "name": "rTestVal", + "tags": [], + "resourceType": "GMRoom", +} \ No newline at end of file diff --git a/sprites/sWall/452ccb42-3358-42d5-beab-708a7068aa74.png b/sprites/sWall/452ccb42-3358-42d5-beab-708a7068aa74.png index e154fccfe0302b790e4224ed570bfa3d07260619..a45f0c0edce1f372059103f3fb4eff6379366127 100644 GIT binary patch literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`vYsxEAr*6y6BB;SKjXldu+Zi6 j3dY53JyHfUco-No6d4ykv91aRDrE3<^>bP0l+XkKNCy^Z literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzLr)jSkcv5P&lw6bFmN2%AYaf` s&s(q}!IRfys?YO{zveIl6(NBb?#8){k0lybf;2ODy85}Sb4q9e00t!*umAu6 diff --git a/sprites/sWall/layers/452ccb42-3358-42d5-beab-708a7068aa74/1956fe38-ffa4-4581-93ca-a202f6e7e129.png b/sprites/sWall/layers/452ccb42-3358-42d5-beab-708a7068aa74/1956fe38-ffa4-4581-93ca-a202f6e7e129.png index e154fccfe0302b790e4224ed570bfa3d07260619..a45f0c0edce1f372059103f3fb4eff6379366127 100644 GIT binary patch literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`vYsxEAr*6y6BB;SKjXldu+Zi6 j3dY53JyHfUco-No6d4ykv91aRDrE3<^>bP0l+XkKNCy^Z literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzLr)jSkcv5P&lw6bFmN2%AYaf` s&s(q}!IRfys?YO{zveIl6(NBb?#8){k0lybf;2ODy85}Sb4q9e00t!*umAu6 diff --git a/sprites/sWall/sWall.yy b/sprites/sWall/sWall.yy index f024fd0..8b580f9 100644 --- a/sprites/sWall/sWall.yy +++ b/sprites/sWall/sWall.yy @@ -8,14 +8,14 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 31, + "bbox_right": 15, "bbox_top": 0, - "bbox_bottom": 31, + "bbox_bottom": 15, "HTile": false, "VTile": false, "For3D": false, - "width": 32, - "height": 32, + "width": 16, + "height": 16, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -54,8 +54,8 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, + "xorigin": 8, + "yorigin": 8, "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"sWall","path":"sprites/sWall/sWall.yy",},