aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/map.world20
-rw-r--r--res/rooms.world27
-rw-r--r--res/rooms/room_begin.tmj (renamed from res/room_begin.tmj)29
-rw-r--r--res/rooms/room_begin_1.tmj (renamed from res/room_begin_1.tmj)26
-rw-r--r--res/rooms/room_begin_secret_1.tmj51
-rw-r--r--res/tileset.tsj6
-rw-r--r--res/world.tiled-session61
7 files changed, 165 insertions, 55 deletions
diff --git a/res/map.world b/res/map.world
deleted file mode 100644
index 8de5c1c..0000000
--- a/res/map.world
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "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/rooms.world b/res/rooms.world
new file mode 100644
index 0000000..1be004f
--- /dev/null
+++ b/res/rooms.world
@@ -0,0 +1,27 @@
+{
+ "maps": [
+ {
+ "fileName": "rooms/room_begin.tmj",
+ "height": 320,
+ "width": 480,
+ "x": 307,
+ "y": 292
+ },
+ {
+ "fileName": "rooms/room_begin_1.tmj",
+ "height": 320,
+ "width": 480,
+ "x": -173,
+ "y": 292
+ },
+ {
+ "fileName": "rooms/room_begin_secret_1.tmj",
+ "height": 320,
+ "width": 480,
+ "x": 787,
+ "y": 292
+ }
+ ],
+ "onlyShowAdjacentMaps": false,
+ "type": "world"
+}
diff --git a/res/room_begin.tmj b/res/rooms/room_begin.tmj
index e483cc0..ca9ea36 100644
--- a/res/room_begin.tmj
+++ b/res/rooms/room_begin.tmj
@@ -32,9 +32,32 @@
"width":30,
"x":0,
"y":0
+ },
+ {
+ "draworder":"topdown",
+ "id":2,
+ "name":"Object Layer 1",
+ "objects":[
+ {
+ "height":0,
+ "id":1,
+ "name":"Player Spawn",
+ "point":true,
+ "rotation":0,
+ "type":"player_spawn",
+ "visible":true,
+ "width":0,
+ "x":240,
+ "y":149
+ }],
+ "opacity":1,
+ "type":"objectgroup",
+ "visible":true,
+ "x":0,
+ "y":0
}],
- "nextlayerid":2,
- "nextobjectid":1,
+ "nextlayerid":3,
+ "nextobjectid":2,
"orientation":"orthogonal",
"renderorder":"right-down",
"tiledversion":"1.11.2",
@@ -42,7 +65,7 @@
"tilesets":[
{
"firstgid":1,
- "source":"tileset.tsj"
+ "source":"..\/tileset.tsj"
}],
"tilewidth":16,
"type":"map",
diff --git a/res/room_begin_1.tmj b/res/rooms/room_begin_1.tmj
index 06f7afa..2f882a1 100644
--- a/res/room_begin_1.tmj
+++ b/res/rooms/room_begin_1.tmj
@@ -4,25 +4,25 @@
"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, 40, 40, 40, 40, 40, 40, 40, 40, 40, 27, 19, 31, 31, 19, 19, 31, 19, 19, 19, 19, 28, 40, 40, 40, 40, 40, 40, 40, 40,
+ 40, 40, 40, 40, 40, 40, 40, 40, 21, 19, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 31, 19, 28, 40, 40, 40, 40, 40,
+ 40, 40, 40, 40, 40, 40, 27, 19, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 31, 28, 40, 40, 40,
+ 40, 40, 40, 27, 31, 31, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 28, 40, 40,
+ 40, 40, 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, 16, 28, 40,
+ 40, 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, 7, 40,
+ 40, 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, 16, 28,
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],
+ 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, 0,
+ 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, 0,
+ 40, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 18, 20, 20, 20, 20, 18, 9, 18, 9,
+ 40, 38, 9, 18, 42, 0, 0, 0, 0, 0, 0, 0, 41, 9, 18, 18, 9, 18, 18, 20, 39, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 40, 40, 40, 40, 43, 20, 9, 18, 9, 18, 20, 9, 39, 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",
@@ -42,7 +42,7 @@
"tilesets":[
{
"firstgid":1,
- "source":"tileset.tsj"
+ "source":"..\/tileset.tsj"
}],
"tilewidth":16,
"type":"map",
diff --git a/res/rooms/room_begin_secret_1.tmj b/res/rooms/room_begin_secret_1.tmj
new file mode 100644
index 0000000..94b5eb2
--- /dev/null
+++ b/res/rooms/room_begin_secret_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, 27, 19, 31, 31, 31, 28, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 40, 40, 21, 31, 17, 0, 0, 0, 0, 16, 31, 31, 19, 31, 28, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 40, 27, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 19, 28, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 27, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 18, 18, 20, 18, 39, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 9, 9, 20, 9, 18, 18, 18, 9, 18, 18, 9, 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, 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, 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,
+ 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, 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 1aa009f..9c42c22 100644
--- a/res/tileset.tsj
+++ b/res/tileset.tsj
@@ -1,6 +1,6 @@
{ "backgroundcolor":"#444444",
"columns":11,
- "image":"tilesets.png",
+ "image":"img\/tilesets.png",
"imageheight":64,
"imagewidth":176,
"margin":0,
@@ -484,7 +484,6 @@
"objectgroup":
{
"draworder":"index",
- "id":2,
"name":"",
"objects":[
{
@@ -521,7 +520,6 @@
"objectgroup":
{
"draworder":"index",
- "id":2,
"name":"",
"objects":[
{
@@ -608,7 +606,6 @@
"objectgroup":
{
"draworder":"index",
- "id":2,
"name":"",
"objects":[
{
@@ -645,7 +642,6 @@
"objectgroup":
{
"draworder":"index",
- "id":2,
"name":"",
"objects":[
{
diff --git a/res/world.tiled-session b/res/world.tiled-session
index b5833be..f989b50 100644
--- a/res/world.tiled-session
+++ b/res/world.tiled-session
@@ -3,51 +3,84 @@
"height": 4300,
"width": 2
},
- "activeFile": "tileset.tsj",
+ "activeFile": "rooms/room_begin_secret_1.tmj",
"expandedProjectPaths": [
+ "rooms",
"."
],
"fileStates": {
"room_begin.tmj": {
- "scale": 1.5,
+ "scale": 0.75,
"selectedLayer": 0,
"viewCenter": {
- "x": 180,
- "y": 278.99999999999994
+ "x": 281.33333333333337,
+ "y": 403.33333333333326
}
},
"room_begin_1.tmj": {
+ "scale": 0.33,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 433.33333333333337,
+ "y": 816.6666666666666
+ }
+ },
+ "rooms/room_begin.tmj": {
+ "scale": 1.8485416666666665,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240.1893384424659,
+ "y": 159.85574213907358
+ }
+ },
+ "rooms/room_begin_1.tmj": {
"scale": 1,
"selectedLayer": 0,
"viewCenter": {
- "x": 505,
- "y": 245.5
+ "x": 648,
+ "y": 349.5
}
},
+ "rooms/room_begin_secret_1.tmj": {
+ "scale": 1,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 24,
+ "y": 129.5
+ }
+ },
+ "rooms/tileset.tsj": {
+ "scaleInDock": 1
+ },
"tileset.tsj": {
"scaleInDock": 1,
"scaleInEditor": 3
}
},
- "last.imagePath": "/home/xswan/demonchime/res",
+ "last.externalTilesetPath": "/home/xswan/demonchime/res",
+ "last.imagePath": "/home/xswan/demonchime/res/img",
"last.worldFilePath": "/home/xswan/demonchime/res",
"loadedWorlds": [
- "/home/xswan/demonchime/res/map.world"
+ "/home/xswan/demonchime/res/rooms.world"
],
"map.lastUsedFormat": "json",
"map.tileHeight": 16,
"map.tileWidth": 16,
"openFiles": [
- "room_begin_1.tmj",
- "room_begin.tmj",
- "tileset.tsj"
+ "tileset.tsj",
+ "rooms/room_begin_1.tmj",
+ "rooms/room_begin.tmj",
+ "rooms/room_begin_secret_1.tmj"
],
"project": "world.tiled-project",
- "property.type": "int",
+ "property.type": "string",
"recentFiles": [
- "room_begin_1.tmj",
+ "tileset.tsj",
+ "rooms/room_begin_1.tmj",
+ "rooms/room_begin.tmj",
+ "rooms/room_begin_secret_1.tmj",
"room_begin.tmj",
- "tileset.tsj"
+ "room_begin_1.tmj"
],
"tileset.lastUsedFormat": "json",
"tileset.tileSize": {
generated by cgit v1.3-2-g0d8e (git 2.53.0) at 2026-06-06 09:30:56 +0000