add props

18 files changed, 1314 insertions, 13 deletions

diff --git a/res/img/carrabasset_big_trunk.png b/res/img/carrabasset_big_trunk.png
new file mode 100644
index 0000000..689fdf6
--- /dev/null
+++ b/res/img/carrabasset_big_trunk.png
diff --git a/res/img/carrabasset_vines_0.png b/res/img/carrabasset_vines_0.png
new file mode 100644
index 0000000..97e2482
--- /dev/null
+++ b/res/img/carrabasset_vines_0.png
diff --git a/res/img/carrabasset_vines_1.png b/res/img/carrabasset_vines_1.png
new file mode 100644
index 0000000..e2116d2
--- /dev/null
+++ b/res/img/carrabasset_vines_1.png
diff --git a/res/img/carrabasset_vines_2.png b/res/img/carrabasset_vines_2.png
new file mode 100644
index 0000000..2a43b05
--- /dev/null
+++ b/res/img/carrabasset_vines_2.png
diff --git a/res/img/carrabassett_big_bush_0.png b/res/img/carrabassett_big_bush_0.png
new file mode 100644
index 0000000..fc11931
--- /dev/null
+++ b/res/img/carrabassett_big_bush_0.png
diff --git a/res/img/carrabassett_props.png b/res/img/carrabassett_props.png
new file mode 100644
index 0000000..5b28a5b
--- /dev/null
+++ b/res/img/carrabassett_props.png
diff --git a/res/img/carrabassett_small_bush_0.png b/res/img/carrabassett_small_bush_0.png
new file mode 100644
index 0000000..dc926e4
--- /dev/null
+++ b/res/img/carrabassett_small_bush_0.png
diff --git a/res/img/carrabassett_small_trunk.png b/res/img/carrabassett_small_trunk.png
new file mode 100644
index 0000000..bfef5d5
--- /dev/null
+++ b/res/img/carrabassett_small_trunk.png
diff --git a/res/img/lamp_post_0.png b/res/img/lamp_post_0.png
new file mode 100644
index 0000000..c7efa8e
--- /dev/null
+++ b/res/img/lamp_post_0.png
diff --git a/res/img/small_lamp.png b/res/img/small_lamp.png
new file mode 100644
index 0000000..120a22d
--- /dev/null
+++ b/res/img/small_lamp.png
diff --git a/res/img/windchimes_0.png b/res/img/windchimes_0.png
new file mode 100644
index 0000000..9e1ba66
--- /dev/null
+++ b/res/img/windchimes_0.png
diff --git a/res/img/windchimes_1.png b/res/img/windchimes_1.png
new file mode 100644
index 0000000..892a768
--- /dev/null
+++ b/res/img/windchimes_1.png
diff --git a/res/props.tsj b/res/props.tsj
new file mode 100644
index 0000000..dba886b
--- /dev/null
+++ b/res/props.tsj
@@ -0,0 +1,78 @@
+{ "columns":0,
+ "grid":
+    {
+     "height":1,
+     "orientation":"orthogonal",
+     "width":1
+    },
+ "margin":0,
+ "name":"props",
+ "spacing":0,
+ "tilecount":10,
+ "tiledversion":"1.11.2",
+ "tileheight":55,
+ "tiles":[
+        {
+         "id":0,
+         "image":"img\/carrabasset_vines_0.png",
+         "imageheight":38,
+         "imagewidth":14
+        }, 
+        {
+         "id":1,
+         "image":"img\/carrabasset_big_trunk.png",
+         "imageheight":14,
+         "imagewidth":29
+        }, 
+        {
+         "id":2,
+         "image":"img\/carrabasset_vines_1.png",
+         "imageheight":22,
+         "imagewidth":14
+        }, 
+        {
+         "id":4,
+         "image":"img\/carrabassett_big_bush_0.png",
+         "imageheight":19,
+         "imagewidth":32
+        }, 
+        {
+         "id":6,
+         "image":"img\/carrabassett_small_bush_0.png",
+         "imageheight":18,
+         "imagewidth":16
+        }, 
+        {
+         "id":7,
+         "image":"img\/carrabassett_small_trunk.png",
+         "imageheight":22,
+         "imagewidth":14
+        }, 
+        {
+         "id":8,
+         "image":"img\/lamp_post_0.png",
+         "imageheight":55,
+         "imagewidth":26
+        }, 
+        {
+         "id":9,
+         "image":"img\/small_lamp.png",
+         "imageheight":9,
+         "imagewidth":5
+        }, 
+        {
+         "id":10,
+         "image":"img\/windchimes_0.png",
+         "imageheight":16,
+         "imagewidth":9
+        }, 
+        {
+         "id":11,
+         "image":"img\/windchimes_1.png",
+         "imageheight":25,
+         "imagewidth":9
+        }],
+ "tilewidth":32,
+ "type":"tileset",
+ "version":"1.10"
+}
\ No newline at end of file
diff --git a/res/rooms/carrabassett0.tmj b/res/rooms/carrabassett0.tmj
index a765631..803f112 100644
--- a/res/rooms/carrabassett0.tmj
+++ b/res/rooms/carrabassett0.tmj
@@ -3,6 +3,630 @@
  "infinite":false,
  "layers":[
         {
+         "draworder":"topdown",
+         "id":5,
+         "name":"Props",
+         "objects":[
+                {
+                 "gid":53,
+                 "height":55,
+                 "id":10,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":26,
+                 "x":340,
+                 "y":200
+                }, 
+                {
+                 "gid":54,
+                 "height":9,
+                 "id":11,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":5,
+                 "x":360,
+                 "y":168
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":12,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":352,
+                 "y":200
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":13,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":412,
+                 "y":200
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":14,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":364,
+                 "y":200
+                }, 
+                {
+                 "gid":49,
+                 "height":19,
+                 "id":15,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":32,
+                 "x":172,
+                 "y":200
+                }, 
+                {
+                 "gid":46,
+                 "height":14,
+                 "id":16,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":29,
+                 "x":224,
+                 "y":200
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":17,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":220,
+                 "y":92
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":18,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":296,
+                 "y":92
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":19,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":340,
+                 "y":76
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":20,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":416,
+                 "y":60
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":21,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":492,
+                 "y":76
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":22,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":432,
+                 "y":76
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":23,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":352,
+                 "y":92
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":24,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":236,
+                 "y":108
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":25,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":80,
+                 "y":124
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":30,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":528,
+                 "y":100
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":31,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":472,
+                 "y":88
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":33,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":512,
+                 "y":96
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":34,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":60,
+                 "y":124
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":35,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":44,
+                 "y":148
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":37,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":24,
+                 "y":180
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":38,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":148,
+                 "y":96
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":40,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":260,
+                 "y":92
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":42,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":164,
+                 "y":88
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":43,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":128,
+                 "y":100
+                }, 
+                {
+                 "gid":49,
+                 "height":19,
+                 "id":44,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":32,
+                 "x":20,
+                 "y":280
+                }, 
+                {
+                 "gid":49,
+                 "height":19,
+                 "id":45,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":32,
+                 "x":304,
+                 "y":200
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":46,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":260,
+                 "y":200
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":47,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":284,
+                 "y":200
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":48,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":132,
+                 "y":248
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":49,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":96,
+                 "y":248
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":50,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":64,
+                 "y":280
+                }, 
+                {
+                 "gid":52,
+                 "height":22,
+                 "id":51,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":116,
+                 "y":248
+                }, 
+                {
+                 "gid":52,
+                 "height":22,
+                 "id":52,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":300,
+                 "y":200
+                }, 
+                {
+                 "gid":52,
+                 "height":22,
+                 "id":53,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":448,
+                 "y":232
+                }, 
+                {
+                 "gid":55,
+                 "height":16,
+                 "id":56,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":9,
+                 "x":484,
+                 "y":208
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":57,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":540,
+                 "y":152
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":58,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":612,
+                 "y":152
+                }, 
+                {
+                 "gid":49,
+                 "height":19,
+                 "id":59,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":32,
+                 "x":576,
+                 "y":152
+                },
+            
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":60,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":556,
+                 "y":124
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":61,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":572,
+                 "y":136
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":62,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":588,
+                 "y":124
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":65,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":580,
+                 "y":132
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":67,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":504,
+                 "y":80
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":68,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":424,
+                 "y":68
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":69,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":248,
+                 "y":100
+                }, 
+                {
+                 "gid":2147483701,
+                 "height":55,
+                 "id":71,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":26,
+                 "x":484,
+                 "y":232
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":80,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":400,
+                 "y":172
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":81,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":412,
+                 "y":156
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":82,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":436,
+                 "y":172
+                }],
+         "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, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
             40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
             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, 31, 31, 19, 19, 28, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
@@ -10,11 +634,11 @@
             40, 40, 40, 40, 40, 40, 40, 40, 27, 31, 19, 31, 19, 19, 19, 31, 19, 31, 19, 19, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 28, 40, 40, 40, 40, 40, 40,
             40, 40, 40, 40, 21, 31, 31, 31, 11, 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, 40, 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, 16, 31, 31, 31, 19, 19, 31,
-            40, 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, 0, 0, 0, 0, 0, 0,
-            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, 0, 0, 0, 0, 0, 0,
+            40, 40, 21, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 20, 20, 18, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            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, 5, 18, 9, 39, 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, 10, 31, 31, 28, 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, 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, 20, 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, 40, 40, 32, 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, 40, 40, 40, 43, 9, 9, 20, 20, 9, 39, 40, 40, 40, 40, 40, 40,
@@ -48,7 +672,7 @@
                  "visible":true,
                  "width":0,
                  "x":240,
-                 "y":184
+                 "y":200
                 }, 
                 {
                  "height":48,
@@ -67,8 +691,8 @@
          "x":0,
          "y":0
         }],
- "nextlayerid":3,
- "nextobjectid":4,
+ "nextlayerid":6,
+ "nextobjectid":83,
  "orientation":"orthogonal",
  "renderorder":"right-down",
  "tiledversion":"1.11.2",
@@ -77,6 +701,10 @@
         {
          "firstgid":1,
          "source":"..\/tileset.tsj"
+        }, 
+        {
+         "firstgid":45,
+         "source":"..\/props.tsj"
         }],
  "tilewidth":16,
  "type":"map",
diff --git a/res/rooms/carrabassett1.tmj b/res/rooms/carrabassett1.tmj
index 91274b9..dbefbe3 100644
--- a/res/rooms/carrabassett1.tmj
+++ b/res/rooms/carrabassett1.tmj
@@ -3,6 +3,378 @@
  "infinite":false,
  "layers":[
         {
+         "draworder":"topdown",
+         "id":5,
+         "name":"Props",
+         "objects":[
+                {
+                 "gid":49,
+                 "height":19,
+                 "id":19,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":32,
+                 "x":92,
+                 "y":296
+                }, 
+                {
+                 "gid":46,
+                 "height":14,
+                 "id":7,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":29,
+                 "x":144,
+                 "y":296
+                }, 
+                {
+                 "gid":2147483701,
+                 "height":55,
+                 "id":9,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":26,
+                 "x":180,
+                 "y":296
+                }, 
+                {
+                 "gid":56,
+                 "height":25,
+                 "id":10,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":9,
+                 "x":179,
+                 "y":281
+                }, 
+                {
+                 "gid":56,
+                 "height":25,
+                 "id":11,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":9,
+                 "x":134,
+                 "y":281
+                }, 
+                {
+                 "gid":53,
+                 "height":55,
+                 "id":8,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":26,
+                 "x":116,
+                 "y":296
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":13,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":127,
+                 "y":296
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":14,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":181,
+                 "y":296
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":15,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":224,
+                 "y":296
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":16,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":252,
+                 "y":296
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":17,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":292,
+                 "y":280
+                }, 
+                {
+                 "gid":49,
+                 "height":19,
+                 "id":18,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":32,
+                 "x":48,
+                 "y":280
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":20,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":80,
+                 "y":104
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":24,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":88,
+                 "y":100
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":25,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":100,
+                 "y":96
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":26,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":108,
+                 "y":88
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":27,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":116,
+                 "y":88
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":29,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":96,
+                 "y":96
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":30,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":192,
+                 "y":76
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":32,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":272,
+                 "y":128
+                },
+            
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":33,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":244,
+                 "y":100
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":34,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":228,
+                 "y":72
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":35,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":264,
+                 "y":104
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":36,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":284,
+                 "y":128
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":37,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":40,
+                 "y":108
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":38,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":56,
+                 "y":92
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":39,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":68,
+                 "y":108
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":40,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":24,
+                 "y":172
+                }, 
+                {
+                 "gid":52,
+                 "height":22,
+                 "id":41,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":272,
+                 "y":280
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":42,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":24,
+                 "y":200
+                }],
+         "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, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
             40, 40, 40, 40, 40, 40, 40, 40, 40, 21, 31, 31, 31, 28, 40, 40, 40, 40, 40, 40,
@@ -68,8 +440,8 @@
          "x":0,
          "y":0
         }],
- "nextlayerid":3,
- "nextobjectid":7,
+ "nextlayerid":6,
+ "nextobjectid":43,
  "orientation":"orthogonal",
  "renderorder":"right-down",
  "tiledversion":"1.11.2",
@@ -78,6 +450,10 @@
         {
          "firstgid":1,
          "source":"..\/tileset.tsj"
+        }, 
+        {
+         "firstgid":45,
+         "source":"..\/props.tsj"
         }],
  "tilewidth":16,
  "type":"map",
diff --git a/res/rooms/carrabassett2.tmj b/res/rooms/carrabassett2.tmj
index 837862a..118837f 100644
--- a/res/rooms/carrabassett2.tmj
+++ b/res/rooms/carrabassett2.tmj
@@ -3,6 +3,221 @@
  "infinite":false,
  "layers":[
         {
+         "draworder":"topdown",
+         "id":3,
+         "name":"Props",
+         "objects":[
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":1,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":4,
+                 "y":124
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":2,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":32,
+                 "y":104
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":3,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":128,
+                 "y":72
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":4,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":212,
+                 "y":104
+                }, 
+                {
+                 "gid":47,
+                 "height":22,
+                 "id":5,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":104,
+                 "y":124
+                }, 
+                {
+                 "gid":45,
+                 "height":38,
+                 "id":6,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":116,
+                 "y":140
+                }, 
+                {
+                 "gid":49,
+                 "height":19,
+                 "id":7,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":32,
+                 "x":180,
+                 "y":136
+                }, 
+                {
+                 "gid":53,
+                 "height":55,
+                 "id":8,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":26,
+                 "x":32,
+                 "y":152
+                }, 
+                {
+                 "gid":56,
+                 "height":25,
+                 "id":9,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":9,
+                 "x":52,
+                 "y":136
+                }, 
+                {
+                 "gid":52,
+                 "height":22,
+                 "id":10,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":14,
+                 "x":84,
+                 "y":152
+                }, 
+                {
+                 "gid":49,
+                 "height":19,
+                 "id":11,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":32,
+                 "x":88,
+                 "y":72
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":12,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":120,
+                 "y":88
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":14,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":56,
+                 "y":56
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":15,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":128,
+                 "y":152
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":16,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":20,
+                 "y":152
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":17,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":40,
+                 "y":152
+                }, 
+                {
+                 "gid":51,
+                 "height":18,
+                 "id":18,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":16,
+                 "x":52,
+                 "y":152
+                }],
+         "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,
@@ -33,8 +248,8 @@
          "x":0,
          "y":0
         }],
- "nextlayerid":2,
- "nextobjectid":1,
+ "nextlayerid":4,
+ "nextobjectid":19,
  "orientation":"orthogonal",
  "renderorder":"right-down",
  "tiledversion":"1.11.2",
@@ -43,6 +258,10 @@
         {
          "firstgid":1,
          "source":"..\/tileset.tsj"
+        }, 
+        {
+         "firstgid":45,
+         "source":"..\/props.tsj"
         }],
  "tilewidth":16,
  "type":"map",
diff --git a/res/rooms/carrabassett3.tmj b/res/rooms/carrabassett3.tmj
index ed79838..4e9891e 100644
--- a/res/rooms/carrabassett3.tmj
+++ b/res/rooms/carrabassett3.tmj
@@ -53,7 +53,7 @@
          "x":0,
          "y":0
         }],
- "nextlayerid":2,
+ "nextlayerid":3,
  "nextobjectid":1,
  "orientation":"orthogonal",
  "renderorder":"right-down",
diff --git a/res/rooms/carrabassett4.tmj b/res/rooms/carrabassett4.tmj
index acb18b1..d9e6df7 100644
--- a/res/rooms/carrabassett4.tmj
+++ b/res/rooms/carrabassett4.tmj
@@ -68,7 +68,7 @@
          "x":0,
          "y":0
         }],
- "nextlayerid":3,
+ "nextlayerid":4,
  "nextobjectid":3,
  "orientation":"orthogonal",
  "renderorder":"right-down",