From 65a2ceda55198dab3bab75c06c0d50adeb0a1101 Mon Sep 17 00:00:00 2001 From: Xander Swan <[hidden email]> Date: Thu, 1 Jan 2026 18:32:20 -0500 Subject: lots of changes + player dash --- res/map.world | 20 ++++++++++++++++++ res/room_begin.tmj | 14 ++++++------- res/room_begin_1.tmj | 51 ++++++++++++++++++++++++++++++++++++++++++++++ res/tileset.tsj | 54 +++++++++++++++++++++++++++++++++++++++++++------ res/world.tiled-session | 33 +++++++++++++++++++++++++++++- 5 files changed, 158 insertions(+), 14 deletions(-) create mode 100644 res/map.world create mode 100644 res/room_begin_1.tmj (limited to 'res') diff --git a/res/map.world b/res/map.world new file mode 100644 index 0000000..8de5c1c --- /dev/null +++ b/res/map.world @@ -0,0 +1,20 @@ +{ + "maps": [ + { + "fileName": "room_begin_1.tmj", + "height": 320, + "width": 480, + "x": -528, + "y": -64 + }, + { + "fileName": "room_begin.tmj", + "height": 320, + "width": 480, + "x": -48, + "y": -64 + } + ], + "onlyShowAdjacentMaps": false, + "type": "world" +} diff --git a/res/room_begin.tmj b/res/room_begin.tmj index 1a294fc..a5e7cf3 100644 --- a/res/room_begin.tmj +++ b/res/room_begin.tmj @@ -17,12 +17,12 @@ 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 32, 0, 0, 0, 0, 0, 0, 5, 9, 20, 9, 20, 20, 20, 18, 20, 20, 18, 18, 9, 18, 9, 18, 6, 0, 0, 0, 0, 0, 33, 32, 0, 0, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 8, 0, 0, 0, 0, 0, 7, - 11, 0, 0, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 38, 9, 9, 42, 0, 0, 7, - 0, 0, 0, 5, 9, 20, 9, 44, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 21, 19, 19, 17, 0, 0, 33, - 0, 0, 0, 7, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 32, 0, 0, 0, 0, 0, 33, - 20, 9, 18, 39, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 27, 17, 0, 41, 18, 20, 20, 44, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 27, 17, 0, 0, 33, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 8, 0, 41, 20, 44, 40, 40, 40, 40], + 11, 0, 0, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 38, 9, 9, 18, 18, 9, 39, + 0, 0, 0, 5, 9, 20, 9, 44, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 0, 0, 0, 7, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 20, 9, 18, 39, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40], "height":20, "id":1, "name":"Tile Layer 1", @@ -48,4 +48,4 @@ "type":"map", "version":"1.10", "width":30 -} +} \ No newline at end of file diff --git a/res/room_begin_1.tmj b/res/room_begin_1.tmj new file mode 100644 index 0000000..06f7afa --- /dev/null +++ b/res/room_begin_1.tmj @@ -0,0 +1,51 @@ +{ "compressionlevel":-1, + "height":20, + "infinite":false, + "layers":[ + { + "data":[40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 21, 19, 19, 19, 19, 31, 31, 28, 40, + 40, 40, 40, 40, 40, 40, 27, 31, 19, 31, 31, 31, 19, 19, 31, 31, 31, 31, 19, 19, 19, 17, 0, 0, 0, 0, 0, 0, 10, 28, + 40, 40, 21, 19, 31, 31, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 40, 21, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 40, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 40, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 40, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 40, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 40, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 40, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 40, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 40, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 40, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 40, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, + 27, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 9, 20, 20, 20, 18, 18, 18, 20, + 8, 0, 0, 0, 0, 0, 0, 5, 18, 9, 9, 20, 20, 20, 18, 9, 18, 9, 18, 18, 9, 39, 40, 40, 40, 40, 40, 40, 40, 40, + 43, 20, 20, 9, 20, 9, 9, 39, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40], + "height":20, + "id":1, + "name":"Tile Layer 1", + "opacity":1, + "type":"tilelayer", + "visible":true, + "width":30, + "x":0, + "y":0 + }], + "nextlayerid":2, + "nextobjectid":1, + "orientation":"orthogonal", + "renderorder":"right-down", + "tiledversion":"1.11.2", + "tileheight":16, + "tilesets":[ + { + "firstgid":1, + "source":"tileset.tsj" + }], + "tilewidth":16, + "type":"map", + "version":"1.10", + "width":30 +} \ No newline at end of file diff --git a/res/tileset.tsj b/res/tileset.tsj index 22fe6c0..1aa009f 100644 --- a/res/tileset.tsj +++ b/res/tileset.tsj @@ -215,7 +215,6 @@ "objectgroup": { "draworder":"index", - "id":2, "name":"", "objects":[ { @@ -252,7 +251,6 @@ "objectgroup": { "draworder":"index", - "id":2, "name":"", "objects":[ { @@ -289,7 +287,6 @@ "objectgroup": { "draworder":"index", - "id":3, "name":"", "objects":[ { @@ -326,7 +323,6 @@ "objectgroup": { "draworder":"index", - "id":2, "name":"", "objects":[ { @@ -363,7 +359,6 @@ "objectgroup": { "draworder":"index", - "id":2, "name":"", "objects":[ { @@ -389,7 +384,6 @@ "objectgroup": { "draworder":"index", - "id":2, "name":"", "objects":[ { @@ -490,6 +484,7 @@ "objectgroup": { "draworder":"index", + "id":2, "name":"", "objects":[ { @@ -502,6 +497,17 @@ "width":16, "x":0, "y":8 + }, + { + "height":8, + "id":2, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":0, + "y":0 }], "opacity":1, "type":"objectgroup", @@ -515,6 +521,7 @@ "objectgroup": { "draworder":"index", + "id":2, "name":"", "objects":[ { @@ -527,6 +534,17 @@ "width":16, "x":0, "y":8 + }, + { + "height":8, + "id":2, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":8, + "y":0 }], "opacity":1, "type":"objectgroup", @@ -590,6 +608,7 @@ "objectgroup": { "draworder":"index", + "id":2, "name":"", "objects":[ { @@ -602,6 +621,17 @@ "width":16, "x":0, "y":8 + }, + { + "height":8, + "id":2, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":0, + "y":0 }], "opacity":1, "type":"objectgroup", @@ -615,6 +645,7 @@ "objectgroup": { "draworder":"index", + "id":2, "name":"", "objects":[ { @@ -627,6 +658,17 @@ "width":16, "x":0, "y":8 + }, + { + "height":8, + "id":2, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":8, + "y":0 }], "opacity":1, "type":"objectgroup", diff --git a/res/world.tiled-session b/res/world.tiled-session index 42585f3..e38b017 100644 --- a/res/world.tiled-session +++ b/res/world.tiled-session @@ -3,20 +3,51 @@ "height": 4300, "width": 2 }, - "activeFile": "", + "activeFile": "tileset.tsj", "expandedProjectPaths": [ + "." ], "fileStates": { + "room_begin.tmj": { + "scale": 1.5, + "selectedLayer": 0, + "viewCenter": { + "x": 180, + "y": 278.99999999999994 + } + }, + "room_begin_1.tmj": { + "scale": 1, + "selectedLayer": 0, + "viewCenter": { + "x": 505, + "y": 246.5 + } + }, + "tileset.tsj": { + "scaleInDock": 1, + "scaleInEditor": 3 + } }, "last.imagePath": "/home/xswan/demonchime/res", + "last.worldFilePath": "/home/xswan/demonchime/res", + "loadedWorlds": [ + "/home/xswan/demonchime/res/map.world" + ], "map.lastUsedFormat": "json", "map.tileHeight": 16, "map.tileWidth": 16, "openFiles": [ + "room_begin_1.tmj", + "room_begin.tmj", + "tileset.tsj" ], "project": "world.tiled-project", "property.type": "int", "recentFiles": [ + "room_begin_1.tmj", + "room_begin.tmj", + "tileset.tsj" ], "tileset.lastUsedFormat": "json", "tileset.tileSize": { -- cgit v1.3-2-g0d8e