diff --git a/Surprise Dungeon.yyp b/Surprise Dungeon.yyp index bed1bca..ab72766 100644 --- a/Surprise Dungeon.yyp +++ b/Surprise Dungeon.yyp @@ -10,6 +10,7 @@ {"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":"sTileSet","path":"sprites/sTileSet/sTileSet.yy",},"order":5,}, {"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,}, diff --git a/sprites/sTileSet/3e676be7-6cb6-45a4-b99f-1456115e1f85.png b/sprites/sTileSet/3e676be7-6cb6-45a4-b99f-1456115e1f85.png new file mode 100644 index 0000000..cf97f6f Binary files /dev/null and b/sprites/sTileSet/3e676be7-6cb6-45a4-b99f-1456115e1f85.png differ diff --git a/sprites/sTileSet/layers/3e676be7-6cb6-45a4-b99f-1456115e1f85/a44bf0c0-4467-460f-a54f-70773beb6409.png b/sprites/sTileSet/layers/3e676be7-6cb6-45a4-b99f-1456115e1f85/a44bf0c0-4467-460f-a54f-70773beb6409.png new file mode 100644 index 0000000..cf97f6f Binary files /dev/null and b/sprites/sTileSet/layers/3e676be7-6cb6-45a4-b99f-1456115e1f85/a44bf0c0-4467-460f-a54f-70773beb6409.png differ diff --git a/sprites/sTileSet/sTileSet.yy b/sprites/sTileSet/sTileSet.yy index 5a7716f..3e66546 100644 --- a/sprites/sTileSet/sTileSet.yy +++ b/sprites/sTileSet/sTileSet.yy @@ -8,14 +8,14 @@ "collisionTolerance": 0, "swfPrecision": 2.525, "bbox_left": 0, - "bbox_right": 0, + "bbox_right": 47, "bbox_top": 0, - "bbox_bottom": 0, + "bbox_bottom": 47, "HTile": false, "VTile": false, "For3D": false, - "width": 320, - "height": 160, + "width": 240, + "height": 240, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", @@ -24,9 +24,9 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"ff1fd9e7-0aeb-49ed-9f74-2c5982e5ec0a","path":"sprites/sTileSet/sTileSet.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"ff1fd9e7-0aeb-49ed-9f74-2c5982e5ec0a","path":"sprites/sTileSet/sTileSet.yy",},"LayerId":{"name":"86934910-98fb-4935-ac7e-3abe6fa2c3ac","path":"sprites/sTileSet/sTileSet.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"sTileSet","path":"sprites/sTileSet/sTileSet.yy",},"resourceVersion":"1.0","name":"ff1fd9e7-0aeb-49ed-9f74-2c5982e5ec0a","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"3e676be7-6cb6-45a4-b99f-1456115e1f85","path":"sprites/sTileSet/sTileSet.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"3e676be7-6cb6-45a4-b99f-1456115e1f85","path":"sprites/sTileSet/sTileSet.yy",},"LayerId":{"name":"a44bf0c0-4467-460f-a54f-70773beb6409","path":"sprites/sTileSet/sTileSet.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"sTileSet","path":"sprites/sTileSet/sTileSet.yy",},"resourceVersion":"1.0","name":"3e676be7-6cb6-45a4-b99f-1456115e1f85","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { "spriteId": {"name":"sTileSet","path":"sprites/sTileSet/sTileSet.yy",}, @@ -41,7 +41,7 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f6334477-7cf9-4a30-b113-317e5b807990","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ff1fd9e7-0aeb-49ed-9f74-2c5982e5ec0a","path":"sprites/sTileSet/sTileSet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"23cede5c-7e7c-4faf-8509-bb66ef8cb347","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3e676be7-6cb6-45a4-b99f-1456115e1f85","path":"sprites/sTileSet/sTileSet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, ], "visibleRange": null, @@ -54,8 +54,8 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 160, - "yorigin": 80, + "xorigin": 120, + "yorigin": 120, "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"sTileSet","path":"sprites/sTileSet/sTileSet.yy",}, @@ -65,11 +65,11 @@ "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"86934910-98fb-4935-ac7e-3abe6fa2c3ac","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"a44bf0c0-4467-460f-a54f-70773beb6409","tags":[],"resourceType":"GMImageLayer",}, ], "parent": { - "name": "walls", - "path": "folders/Sprites/walls.yy", + "name": "Sprites", + "path": "folders/Sprites.yy", }, "resourceVersion": "1.0", "name": "sTileSet", diff --git a/tilesets/tWalls/output_tileset.png b/tilesets/tWalls/output_tileset.png index dfba2a8..33ce725 100644 Binary files a/tilesets/tWalls/output_tileset.png and b/tilesets/tWalls/output_tileset.png differ diff --git a/tilesets/tWalls/tWalls.yy b/tilesets/tWalls/tWalls.yy index 391dbc9..36262bb 100644 --- a/tilesets/tWalls/tWalls.yy +++ b/tilesets/tWalls/tWalls.yy @@ -16,9 +16,28 @@ }, "out_tilehborder": 2, "out_tilevborder": 2, - "out_columns": 14, - "tile_count": 200, - "autoTileSets": [], + "out_columns": 15, + "tile_count": 225, + "autoTileSets": [ + {"tiles":[ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + ],"closed_edge":false,"resourceVersion":"1.0","name":"autotile_1","tags":[],"resourceType":"GMAutoTileSet",}, + ], "tileAnimationFrames": [], "tileAnimationSpeed": 15.0, "tileAnimation": { @@ -223,6 +242,31 @@ 197, 198, 199, + 200, + 201, + 202, + 203, + 204, + 205, + 206, + 207, + 208, + 209, + 210, + 211, + 212, + 213, + 214, + 215, + 216, + 217, + 218, + 219, + 220, + 221, + 222, + 223, + 224, ], "SerialiseFrameCount": 1, },