aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/props.tsj8
-rw-r--r--res/rooms/carrabassett0.tmj12
-rw-r--r--res/rooms/carrabassett2.tmj29
-rw-r--r--res/rooms/carrabassett3.tmj36
-rw-r--r--res/templates/muntik.tj18
5 files changed, 87 insertions, 16 deletions
diff --git a/res/props.tsj b/res/props.tsj
index dba886b..9704a76 100644
--- a/res/props.tsj
+++ b/res/props.tsj
@@ -8,7 +8,7 @@
"margin":0,
"name":"props",
"spacing":0,
- "tilecount":10,
+ "tilecount":11,
"tiledversion":"1.11.2",
"tileheight":55,
"tiles":[
@@ -71,6 +71,12 @@
"image":"img\/windchimes_1.png",
"imageheight":25,
"imagewidth":9
+ },
+ {
+ "id":12,
+ "image":"img\/muntik.ase",
+ "imageheight":10,
+ "imagewidth":15
}],
"tilewidth":32,
"type":"tileset",
diff --git a/res/rooms/carrabassett0.tmj b/res/rooms/carrabassett0.tmj
index 2ec94ef..cb71a70 100644
--- a/res/rooms/carrabassett0.tmj
+++ b/res/rooms/carrabassett0.tmj
@@ -632,8 +632,8 @@
40, 40, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 19, 31, 19, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
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, 0, 0, 0, 0, 5, 18, 9, 9, 20, 9, 9,
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, 0, 0, 0, 7, 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, 5, 42, 0, 0, 0, 0, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40, 40,
- 40, 32, 0, 0, 0, 0, 0, 0, 0, 41, 9, 20, 20, 20, 18, 20, 20, 9, 20, 9, 20, 9, 20, 39, 43, 9, 18, 6, 0, 0, 0, 0, 0, 7, 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, 0, 0, 0, 7, 40, 40, 40, 40, 40, 40,
+ 40, 32, 0, 0, 0, 0, 0, 0, 0, 41, 9, 20, 20, 20, 18, 20, 20, 9, 20, 9, 20, 9, 20, 18, 9, 9, 18, 6, 0, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40, 40,
27, 17, 0, 0, 0, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 27, 19, 17, 0, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40, 40,
17, 0, 0, 0, 0, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 21, 17, 0, 0, 5, 9, 20, 20, 9, 39, 40, 40, 40, 40, 40, 40,
0, 0, 0, 0, 0, 5, 20, 20, 18, 39, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 27, 17, 0, 0, 5, 39, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
@@ -678,6 +678,12 @@
"width":48,
"x":0,
"y":0
+ },
+ {
+ "id":96,
+ "template":"..\/templates\/muntik.tj",
+ "x":420,
+ "y":116
}],
"opacity":1,
"type":"objectgroup",
@@ -686,7 +692,7 @@
"y":0
}],
"nextlayerid":6,
- "nextobjectid":92,
+ "nextobjectid":98,
"orientation":"orthogonal",
"renderorder":"right-down",
"tiledversion":"1.11.2",
diff --git a/res/rooms/carrabassett2.tmj b/res/rooms/carrabassett2.tmj
index 54d8f37..c9362bb 100644
--- a/res/rooms/carrabassett2.tmj
+++ b/res/rooms/carrabassett2.tmj
@@ -160,7 +160,7 @@
"type":"",
"visible":true,
"width":16,
- "x":128,
+ "x":107,
"y":152
},
{
@@ -218,6 +218,23 @@
"y":0
},
{
+ "draworder":"topdown",
+ "id":4,
+ "name":"Objects",
+ "objects":[
+ {
+ "id":21,
+ "template":"..\/templates\/muntik.tj",
+ "x":172,
+ "y":136
+ }],
+ "opacity":1,
+ "type":"objectgroup",
+ "visible":true,
+ "x":0,
+ "y":0
+ },
+ {
"data":[40, 40, 40, 8, 0, 0, 7, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
40, 40, 40, 8, 0, 0, 7, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
40, 40, 40, 8, 0, 0, 10, 31, 31, 28, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
@@ -225,9 +242,9 @@
40, 27, 31, 19, 28, 38, 18, 6, 0, 0, 0, 0, 10, 19, 28, 40, 40, 40, 40, 40,
27, 17, 0, 0, 10, 28, 40, 38, 20, 42, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40,
17, 0, 0, 0, 0, 16, 19, 31, 19, 17, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 39, 40, 40, 40, 40, 40,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 18, 9, 9, 39, 40, 40, 40, 40, 40, 40,
- 20, 9, 18, 9, 9, 9, 20, 20, 9, 39, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 40, 40, 40, 40, 40,
+ 0, 0, 0, 0, 0, 0, 0, 0, 41, 18, 18, 9, 9, 9, 39, 40, 40, 40, 40, 40,
+ 20, 9, 18, 9, 9, 9, 20, 20, 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,
@@ -248,8 +265,8 @@
"x":0,
"y":0
}],
- "nextlayerid":4,
- "nextobjectid":20,
+ "nextlayerid":5,
+ "nextobjectid":22,
"orientation":"orthogonal",
"renderorder":"right-down",
"tiledversion":"1.11.2",
diff --git a/res/rooms/carrabassett3.tmj b/res/rooms/carrabassett3.tmj
index 412d482..9389bf1 100644
--- a/res/rooms/carrabassett3.tmj
+++ b/res/rooms/carrabassett3.tmj
@@ -208,7 +208,7 @@
"type":"",
"visible":true,
"width":14,
- "x":44,
+ "x":36,
"y":248
},
{
@@ -837,6 +837,30 @@
"y":0
},
{
+ "draworder":"topdown",
+ "id":4,
+ "name":"Objects",
+ "objects":[
+ {
+ "gid":2147483705,
+ "id":71,
+ "template":"..\/templates\/muntik.tj",
+ "x":104,
+ "y":488
+ },
+ {
+ "id":72,
+ "template":"..\/templates\/muntik.tj",
+ "x":108,
+ "y":264
+ }],
+ "opacity":1,
+ "type":"objectgroup",
+ "visible":true,
+ "x":0,
+ "y":0
+ },
+ {
"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, 27, 19, 31, 19, 19, 31, 28, 40, 40, 40, 40, 40, 40,
40, 40, 40, 40, 21, 19, 31, 17, 0, 0, 0, 0, 0, 16, 19, 28, 40, 40, 40, 40,
@@ -851,9 +875,9 @@
40, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 18, 9, 18, 39, 40, 40, 40, 40,
40, 32, 0, 0, 0, 0, 41, 20, 20, 18, 18, 39, 40, 40, 40, 40, 40, 21, 28, 40,
40, 32, 0, 0, 0, 0, 10, 31, 31, 19, 19, 28, 40, 40, 40, 40, 27, 17, 7, 40,
- 40, 43, 42, 0, 0, 0, 0, 0, 0, 0, 0, 10, 19, 19, 19, 31, 17, 0, 7, 40,
- 40, 40, 38, 18, 18, 20, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 40,
- 40, 40, 40, 40, 40, 40, 38, 20, 20, 18, 6, 0, 0, 0, 0, 0, 0, 0, 7, 40,
+ 40, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 19, 19, 19, 31, 17, 0, 7, 40,
+ 40, 43, 18, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 40,
+ 40, 40, 40, 38, 9, 20, 20, 20, 20, 18, 6, 0, 0, 0, 0, 0, 0, 0, 7, 40,
40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 38, 6, 0, 0, 0, 0, 0, 0, 7, 40,
40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 43, 6, 0, 0, 0, 0, 0, 7, 40,
40, 21, 28, 40, 21, 31, 28, 40, 40, 40, 40, 40, 32, 0, 0, 0, 0, 0, 7, 40,
@@ -887,8 +911,8 @@
"x":0,
"y":0
}],
- "nextlayerid":4,
- "nextobjectid":67,
+ "nextlayerid":5,
+ "nextobjectid":73,
"orientation":"orthogonal",
"renderorder":"right-down",
"tiledversion":"1.11.2",
diff --git a/res/templates/muntik.tj b/res/templates/muntik.tj
new file mode 100644
index 0000000..a0614ab
--- /dev/null
+++ b/res/templates/muntik.tj
@@ -0,0 +1,18 @@
+{ "object":
+ {
+ "gid":13,
+ "height":10,
+ "id":95,
+ "name":"Muntik",
+ "rotation":0,
+ "type":"muntik",
+ "visible":true,
+ "width":15
+ },
+ "tileset":
+ {
+ "firstgid":1,
+ "source":"..\/props.tsj"
+ },
+ "type":"template"
+} \ No newline at end of file