v0.8.13 Troubling Times content

AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json

@@ -194,7 +194,7 @@
     },
     {
         "id":"lookout_down",
-        "message":"You see the montain top you are standing on.",
+        "message":"You see the mountain top you are standing on.",
         "replies":[
             {
                 "text":"Look closer at the rocks.",

AndorsTrail/res/raw/conversationlist_feygard_1.json

@@ -4785,6 +4785,44 @@
                         "requireID":"echoes_of_enchantment",
                         "value":13,
                         "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"echoes_of_enchantment",
+                        "value":9,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"wexlow_well_ask_to_jump_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"echoes_of_enchantment",
+                        "value":13,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"echoes_of_enchantment",
+                        "value":9
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"wexlow_well_ask_to_jump_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"echoes_of_enchantment",
+                        "value":13,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"echoes_of_enchantment",
+                        "value":11
                     }
                 ]
             }
@@ -7921,5 +7959,40 @@
                 "value":13
             }
         ]
+    },
+    {
+        "id":"wexlow_well_ask_to_jump_10",
+        "message":"Do you want to jump inside?",
+        "replies":[
+            {
+                "text":"No way! I remember How badly I was hurt the last time.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Yes. What choice do I have?",
+                "nextPhraseID":"wexlow_well_ask_to_jump_20"
+            }
+        ]
+    },
+    {
+        "id":"wexlow_well_ask_to_jump_20",
+        "message":"You jumped down into the darkness of the well. At the bottom of the well, you find yourself dazed and bleeding from what feels like every part of your body.",
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"concussion",
+                "value":10
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":15
+            },
+            {
+                "rewardType":"mapchange",
+                "rewardID":"down",
+                "mapName":"gamjee_well_1"
+            }
+        ]
     }
 ]

AndorsTrail/res/raw/conversationlist_jolnor.json

@@ -77,6 +77,23 @@
             {
                 "text":"I require healing. Can I see what items you have available?",
                 "nextPhraseID":"jolnor_shop_1"
+            },
+            {
+                "text":"I need some help finding out who is responsible for casting a Shadow spell that causes a person to become noticeable.",
+                "nextPhraseID":"tt_jolnor_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":50
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":70,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_laeroth.json

@@ -10630,7 +10630,7 @@
     },
     {
         "id":"coin_collector_thief_coins_35",
-        "message":"These bronze pieces bear the mark of the Lunar Whispe, an infamous thieves' guild that once ruled the underground markets. Legend has it, these coins were minted in secret, their alloy infused with fragments of moonstone to enhance the guild's stealthy endeavors",
+        "message":"These bronze pieces bear the mark of the Lunar Whisper, an infamous thieves' guild that once ruled the underground markets. Legend has it, these coins were minted in secret, their alloy infused with fragments of moonstone to enhance the guild's stealthy endeavors",
         "replies":[
             {
                 "text":"N",

AndorsTrail/res/raw/conversationlist_mt_galmore.json

@@ -229,6 +229,17 @@
                     }
                 ]
             },
+            {
+                "text":"N",
+                "nextPhraseID":"thief_seraphina_bridge_fixed",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves04",
+                        "value":75
+                    }
+                ]
+            },
             {
                 "text":"N",
                 "nextPhraseID":"thief_seraphina_80",
@@ -239,10 +250,6 @@
                         "value":38
                     }
                 ]
-            },
-            {
-                "text":"N",
-                "nextPhraseID":"thief_seraphina_bridge_fixed"
             }
         ]
     },
@@ -289,6 +296,40 @@
             {
                 "text":"Yes, ma'am.",
                 "nextPhraseID":"X"
+            },
+            {
+                "text":"The Guild needs you. Umar ...",
+                "nextPhraseID":"tt_sly_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":100
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":140,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Hi Seraphina, you were away so quickly after you gave me Luthor's ring.",
+                "nextPhraseID":"tt_sly_300",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":270
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":320,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -735,7 +776,7 @@
                 "nextPhraseID":"aidem_camp_defy_76"
             },
             {
-                "text":"The Thieves Guild?",
+                "text":"The Thieves' Guild?",
                 "nextPhraseID":"aidem_camp_defy_77"
             }
         ]
@@ -752,7 +793,7 @@
     },
     {
         "id":"aidem_camp_defy_76a",
-        "message":"I'm talking about the Thieves Guild.",
+        "message":"I'm talking about the Thieves' Guild.",
         "replies":[
             {
                 "text":"Why would you want to do that?",
@@ -1952,12 +1993,29 @@
             {
                 "text":"Oh, you want to play dumb? Umar will hear about this!",
                 "nextPhraseID":"X"
+            },
+            {
+                "text":"No time to joke - the Guild needs you. Umar ...",
+                "nextPhraseID":"tt_sly_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":100
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":140,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
     {
         "id":"wild6_house_hatch_defy_killed_no_key",
-        "message":"I should come back with the Thieves Guild key."
+        "message":"I should come back with the Thieves' Guild key."
     },
     {
         "id":"troublemaker_wm_return_real_key_10",

AndorsTrail/res/raw/conversationlist_omi2.json

@@ -7804,8 +7804,13 @@
                 "value":33
             },
             {
-                "rewardType":"spawnAll",
-                "rewardID":"elm2f2_chest",
+                "rewardType":"activateMapObjectGroup",
+                "rewardID":"Chest",
+                "mapName":"elm_2f_2"
+            },
+            {
+                "rewardType":"deactivateMapObjectGroup",
+                "rewardID":"Chest",
                 "mapName":"elm_2f_2"
             }
         ]

AndorsTrail/res/raw/conversationlist_omicronrg9.json

@@ -1231,6 +1231,23 @@
             {
                 "text":"It's my job. Nice to see you survived those anklebiters ...",
                 "nextPhraseID":"X"
+            },
+            {
+                "text":"Hmm, maybe you can help me?",
+                "nextPhraseID":"fanamor_tt",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":150
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":180,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -1328,7 +1345,7 @@
     },
     {
         "id":"umar_guild02_5a",
-        "message":"But first I have to clarify something. You need to be more careful not to give information to outsiders about the Thieves Guild.",
+        "message":"But first I have to clarify something. You need to be more careful not to give information to outsiders about the Thieves' Guild.",
         "replies":[
             {
                 "text":"Did I?",
@@ -4314,7 +4331,7 @@
     },
     {
         "id":"umar_guild03_30",
-        "message":"Take 4000 gold coins, and some bottles of my favorite mead.\nNow you deserve a good rest, my friend. You have earned the trust of the Thieves Guild.",
+        "message":"Take 4000 gold coins, and some bottles of my favorite mead.\nNow you deserve a good rest, my friend. You have earned the trust of the Thieves' Guild.",
         "replies":[
             {
                 "text":"I'll be back soon.",
@@ -5276,7 +5293,7 @@
     },
     {
         "id":"umar_guild04_22",
-        "message":"He said that they will no longer be a part of the thieves guild. They are now referring to themselves as 'Aidem'.",
+        "message":"He said that they will no longer be a part of the Thieves' Guild. They are now referring to themselves as 'Aidem'.",
         "replies":[
             {
                 "text":"What a weird name. For what reason?",

AndorsTrail/res/raw/conversationlist_stoutford.json

@@ -522,6 +522,23 @@
                         "value":190
                     }
                 ]
+            },
+            {
+                "text":"I need some help finding out who is responsible for casting a Shadow spell that causes a person to become noticeable.",
+                "nextPhraseID":"tt_yolgen_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":50
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":70,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -1479,6 +1496,23 @@
             {
                 "text":"Do you have anything to trade?",
                 "nextPhraseID":"tahalendor_rumblings10x_1"
+            },
+            {
+                "text":"I need some help finding out who is responsible for casting a Shadow spell that causes a person to become noticeable.",
+                "nextPhraseID":"tt_tahalendor_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":50
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":70,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_sullengard.json

@@ -317,7 +317,7 @@
     },
     {
         "id":"sullengard_matpat_6",
-        "message":"Thank you. You are my only hope here. I don't trust those unlawful Feygard soldiers. You should talk to the head of the Thieves Guild about this.",
+        "message":"Thank you. You are my only hope here. I don't trust those unlawful Feygard soldiers. You should talk to the head of the Thieves' Guild about this.",
         "replies":[
             {
                 "text":"I'm going now. Stay strong.",
@@ -848,7 +848,7 @@
                 "nextPhraseID":"sullengard_godrey_sell"
             },
             {
-                "text":"Do you know by chance where this lost travelor is?",
+                "text":"Do you know by chance where this lost traveler is?",
                 "nextPhraseID":"sullengard_godrey_10a",
                 "requires":[
                     {
@@ -885,7 +885,7 @@
                 "nextPhraseID":"sullengard_godrey_10"
             },
             {
-                "text":"I'll take it, but I have to say that you really should join the thieves guild with that attitude!",
+                "text":"I'll take it, but I have to say that you really should join the Thieves' Guild with that attitude!",
                 "nextPhraseID":"sullengard_godrey_40",
                 "requires":[
                     {
@@ -1755,7 +1755,7 @@
                     {
                         "requireType":"killedMonster",
                         "requireID":"sullengard_snapper",
-                        "value":30,
+                        "value":26,
                         "negate":true
                     }
                 ]
@@ -5098,7 +5098,7 @@
     },
     {
         "id":"ff_captain_beer_tell_sull_10",
-        "message":"The thieves guild? Are you sure?",
+        "message":"The Thieves' Guild? Are you sure?",
         "replies":[
             {
                 "text":"Oh yeah. I heard it directly from them.",
@@ -6669,14 +6669,14 @@
         "message":"What else can you tell me?",
         "replies":[
             {
-                "text":"I know that the thieves guild are the ones helping the people of Sullengard distribute their beer.",
+                "text":"I know that the Thieves' Guild are the ones helping the people of Sullengard distribute their beer.",
                 "nextPhraseID":"ff_captain_beer_tell_everything_33"
             }
         ]
     },
     {
         "id":"ff_captain_beer_tell_everything_33",
-        "message":"The thieves guild? Are you sure?",
+        "message":"The Thieves' Guild? Are you sure?",
         "replies":[
             {
                 "text":"Oh yeah. I heard it directly from them.",
@@ -6875,7 +6875,7 @@
     },
     {
         "id":"sullengard_godrey_10a",
-        "message":"Sure. Look at the table over there. He is my best customer at he moment.",
+        "message":"Sure. Look at the table over there. He is my best customer at the moment.",
         "rewards":[
             {
                 "rewardType":"spawnAll",

AndorsTrail/res/raw/conversationlist_talion.json

@@ -86,6 +86,108 @@
                         "value":51
                     }
                 ]
+            },
+            {
+                "text":"I need some help finding out who is responsible for casting a Shadow spell that causes a person to become noticeable.",
+                "nextPhraseID":"tt_talion_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":50
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":70,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Sorry, we were interrupted. You were just talking about the Striking Spectacle Shadow spell.",
+                "nextPhraseID":"tt_talion_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":70
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":80,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Here I've brought you the things that you require for the dispelling.",
+                "nextPhraseID":"tt_talion_64",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":80
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":280,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Do you know the whereabouts of Sly Seraphina?",
+                "nextPhraseID":"tt_talion_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":140
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":180,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I've brought you the things you had required for dispelling.",
+                "nextPhraseID":"tt_talion_100",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":280
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":290,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Haven't you forgotten something?",
+                "nextPhraseID":"tt_talion_300",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":290
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":300,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_thievesguild_1.json

@@ -376,5 +376,44 @@
                 "nextPhraseID":"X"
             }
         ]
+    },
+    {
+        "id":"fallhaven_tunnel1",
+        "message":"Hey, kid! Don't be so nosy!",
+        "switchToNPC":"troublemaker"
+    },
+    {
+        "id":"fallhaven_tunnel2a",
+        "message":"A sign says 'Jail'\nThe exit above is blocked though."
+    },
+    {
+        "id":"fallhaven_tunnel2b",
+        "message":"A sign says 'Arcir'\nThe exit above is blocked though."
+    },
+    {
+        "id":"fallhaven_tunnel2c",
+        "message":"Attention - the catacombs. Keep silent!"
+    },
+    {
+        "id":"fallhaven_tunnel3",
+        "message":"Looks like the tunnel isn't quite finished yet.",
+        "replies":[
+            {
+                "text":"Typical Troublemaker - can't finish anything.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":45,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"So I have to go back the way I came.",
+                "nextPhraseID":"X"
+            }
+        ]
     }
 ]

AndorsTrail/res/raw/conversationlist_thoronir_faction_check.json

@@ -205,6 +205,23 @@
                         "negate":true
                     }
                 ]
+            },
+            {
+                "text":"I need some help finding out who is responsible for casting a Shadow spell that causes a person to become noticeable.",
+                "nextPhraseID":"tt_thoronir_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":50
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":70,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_umar.json

@@ -2,6 +2,58 @@
     {
         "id":"umar_select_1",
         "replies":[
+            {
+                "nextPhraseID":"nanath_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"wanted_men",
+                        "value":70
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"nanath_12",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"wanted_men",
+                        "value":80
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"umar_tt_100",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":115
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"troubling_times",
+                        "value":120,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"umar_tt",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"wanted_men",
+                        "value":57
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"wanted_men",
+                        "value":70,
+                        "negate":true
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"umar_return_1",
                 "requires":[

AndorsTrail/res/raw/droplists_omi2.json

@@ -163,7 +163,7 @@
             },
             {
                 "itemID":"ring_rough_life",
-                "chance":"2",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -603,7 +603,7 @@
             },
             {
                 "itemID":"gold",
-                "chance":"100",
+                "chance":"1/2",
                 "quantity":{
                     "min":2,
                     "max":68
@@ -611,7 +611,7 @@
             },
             {
                 "itemID":"gem2",
-                "chance":"100",
+                "chance":"1/5",
                 "quantity":{
                     "min":1,
                     "max":5
@@ -619,7 +619,7 @@
             },
             {
                 "itemID":"shield8",
-                "chance":"1/5",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -627,7 +627,7 @@
             },
             {
                 "itemID":"boots7",
-                "chance":"1/5",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -635,7 +635,7 @@
             },
             {
                 "itemID":"gloves5",
-                "chance":"1/5",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -844,7 +844,7 @@
         "items":[
             {
                 "itemID":"gold",
-                "chance":"100",
+                "chance":"1/2",
                 "quantity":{
                     "min":75,
                     "max":750
@@ -868,7 +868,7 @@
             },
             {
                 "itemID":"shield5",
-                "chance":"100",
+                "chance":"1/2",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -876,7 +876,7 @@
             },
             {
                 "itemID":"gem2",
-                "chance":"100",
+                "chance":"1/3",
                 "quantity":{
                     "min":5,
                     "max":20
@@ -884,7 +884,7 @@
             },
             {
                 "itemID":"bwm_olm_weapon1",
-                "chance":"1/5",
+                "chance":"1/2",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -916,10 +916,10 @@
             },
             {
                 "itemID":"silver_bar",
-                "chance":"1/5",
+                "chance":"20",
                 "quantity":{
                     "min":1,
-                    "max":5
+                    "max":2
                 }
             }
         ]
@@ -993,7 +993,7 @@
             },
             {
                 "itemID":"bwm_olm_boots1",
-                "chance":"1/75",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -1033,7 +1033,7 @@
             },
             {
                 "itemID":"bwm_olm_gloves1",
-                "chance":"1/75",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -1229,7 +1229,7 @@
             },
             {
                 "itemID":"bwm_pick",
-                "chance":"1/100",
+                "chance":"1/5",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -1255,15 +1255,15 @@
         "items":[
             {
                 "itemID":"vial_empty4",
-                "chance":"100",
+                "chance":"1/3",
                 "quantity":{
-                    "min":10,
-                    "max":10
+                    "min":1,
+                    "max":5
                 }
             },
             {
                 "itemID":"gold",
-                "chance":"100",
+                "chance":"1/2",
                 "quantity":{
                     "min":10,
                     "max":100
@@ -1279,9 +1279,9 @@
             },
             {
                 "itemID":"bonemeal_potion",
-                "chance":"100",
+                "chance":"1/5",
                 "quantity":{
-                    "min":10,
+                    "min":2,
                     "max":10
                 }
             },
@@ -1295,10 +1295,10 @@
             },
             {
                 "itemID":"bwm_pick",
-                "chance":"1/3",
+                "chance":"100",
                 "quantity":{
                     "min":1,
-                    "max":1
+                    "max":3
                 }
             },
             {
@@ -1359,7 +1359,7 @@
             },
             {
                 "itemID":"mace2",
-                "chance":"1/250",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -1367,7 +1367,7 @@
             },
             {
                 "itemID":"bwm_olm_weapon1",
-                "chance":"1/250",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -1769,7 +1769,7 @@
         "items":[
             {
                 "itemID":"silver_bar",
-                "chance":"50",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -1790,7 +1790,7 @@
         "items":[
             {
                 "itemID":"lead_bar",
-                "chance":"50",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1

AndorsTrail/res/raw/droplists_troubling_times.json

@@ -0,0 +1,83 @@
+[
+    {
+        "id":"tt_guys",
+        "items":[
+            {
+                "itemID":"vial_empty1",
+                "chance":"100",
+                "quantity":{
+                    "min":0,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":10,
+                    "max":100
+                }
+            },
+            {
+                "itemID":"tiny_knife",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"tt_loot1",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":300,
+                    "max":550
+                }
+            }
+        ]
+    },
+    {
+        "id":"tt_loot2",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":300,
+                    "max":550
+                }
+            }
+        ]
+    },
+    {
+        "id":"tt_loot3",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":300,
+                    "max":550
+                }
+            }
+        ]
+    },
+    {
+        "id":"tt_loot4",
+        "items":[
+            {
+                "itemID":"meat2",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    }
+]

AndorsTrail/res/raw/droplists_v0715.json

@@ -4,7 +4,7 @@
         "items":[
             {
                 "itemID":"gold_bar",
-                "chance":"50",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1

AndorsTrail/res/raw/itemlist_graveyard1.json

@@ -24,11 +24,11 @@
                 "max":7
             },
             "increaseAttackCost":4,
-			"setNonWeaponDamageModifier":104,
             "increaseAttackChance":30,
             "increaseCriticalSkill":0,
             "increaseBlockChance":0,
-            "setCriticalMultiplier":0.0
+            "setCriticalMultiplier":0.0,
+            "setNonWeaponDamageModifier":104
         },
         "hitEffect":{
             "conditionsTarget":[
@@ -42,7 +42,7 @@
                     "condition":"stunned",
                     "magnitude":1,
                     "duration":1,
-                    "chance":"5"
+                    "chance":"15"
                 }
             ]
         }
@@ -121,8 +121,8 @@
                 "max":8
             },
             "increaseAttackCost":7,
-            "setNonWeaponDamageModifier":195,
-            "increaseAttackChance":12
+            "increaseAttackChance":12,
+            "setNonWeaponDamageModifier":195
         },
         "hitEffect":{
             "conditionsTarget":[

AndorsTrail/res/raw/itemlist_laeroth.json

@@ -356,6 +356,7 @@
             },
             "increaseMoveCost":0,
             "increaseAttackCost":4,
+            "increaseAttackChance":15,
             "increaseCriticalSkill":10,
             "setCriticalMultiplier":3.0,
             "setNonWeaponDamageModifier":104
@@ -364,7 +365,7 @@
             "conditionsTarget":[
                 {
                     "condition":"bleeding_wound",
-                    "magnitude":2,
+                    "magnitude":3,
                     "duration":5,
                     "chance":"20"
                 }

AndorsTrail/res/raw/itemlist_mt_galmore.json

@@ -2,10 +2,10 @@
     {
         "id":"thieves_vault_key",
         "iconID":"items_japozero:399",
-        "name":"Thieve's vault key",
+        "name":"Thieves' vault key",
         "displaytype":"quest",
         "category":"other",
-        "description":"A key to the Thieves Guild's vault of gold and other treasures."
+        "description":"A key to the Thieves' Guild's vault of gold and other treasures."
     },
     {
         "id":"thieves_vault_key_fake",
@@ -13,7 +13,7 @@
         "name":"Fake Thieve's Guild vault key",
         "displaytype":"quest",
         "category":"other",
-        "description":"The fake key made by the Thieves Guild to trick Aidem."
+        "description":"The fake key made by the Thieves' Guild to trick Aidem."
     },
     {
         "id":"aidem_fake_vault_key",
@@ -55,6 +55,8 @@
         "iconID":"items_necklaces_1:25",
         "name":"Necklace of Feygard's Glory",
         "displaytype":"extraordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":3118,
         "category":"neck",
         "description":"A Feygardian soldier's medal of honor. To possess is to honor the glorious city of Feygard.",
         "equipEffect":{
@@ -62,8 +64,8 @@
                 "min":1,
                 "max":3
             },
-            "increaseAttackChance":11,
-            "increaseBlockChance":15,
+            "increaseAttackChance":8,
+            "increaseBlockChance":11,
             "addedConditions":[
                 {
                     "condition":"loyalist",

AndorsTrail/res/raw/itemlist_sullengard.json

@@ -18,7 +18,7 @@
     {
         "id":"deebo_apples",
         "iconID":"items_japozero:486",
-        "name":"Orchard apples",
+        "name":"Orchard apple",
         "displaytype":"rare",
         "hasManualPrice":1,
         "baseMarketCost":50,

AndorsTrail/res/raw/itemlist_troubling_times.json

@@ -0,0 +1,36 @@
+[
+    {
+        "id":"ring_luthor",
+        "iconID":"items_jewelry:0",
+        "name":"Luthor's Ring",
+        "displaytype":"quest",
+        "baseMarketCost":0,
+        "category":"ring",
+        "equipEffect":{
+            "addedConditions":[
+                {
+                    "condition":"life_drain",
+                    "magnitude":5
+                }
+            ]
+        }
+    },
+    {
+        "id":"tiny_knife",
+        "iconID":"items_weapons_3:39",
+        "name":"Tiny knife",
+        "displaytype":"ordinary",
+        "category":"dagger",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":1,
+                "max":4
+            },
+            "increaseAttackCost":4,
+            "increaseAttackChance":3,
+            "increaseCriticalSkill":0,
+            "increaseBlockChance":0,
+            "increaseDamageResistance":0
+        }
+    }
+]

AndorsTrail/res/raw/itemlist_v0610_1.json

@@ -157,7 +157,7 @@
                 "max":7
             },
             "increaseAttackCost":4,
-            "increaseAttackChance":32,
+            "increaseAttackChance":25,
             "setNonWeaponDamageModifier":97
         }
     },

AndorsTrail/res/raw/itemlist_v0610_2.json

@@ -185,12 +185,12 @@
         "name":"Gloves of life force",
         "displaytype":"extraordinary",
         "hasManualPrice":1,
-        "baseMarketCost":390,
+        "baseMarketCost":685,
         "category":"hnd_lthr",
         "equipEffect":{
-            "increaseMaxHP":9,
+            "increaseMaxHP":13,
             "increaseAttackChance":5,
-            "increaseBlockChance":3
+            "increaseBlockChance":6
         }
     }
 ]

AndorsTrail/res/raw/itemlist_v070.json

@@ -523,6 +523,7 @@
         "id":"clmr_wrld",
         "iconID":"items_weapons_3:26",
         "name":"Claymore of the warlord",
+        "displaytype":"rare",
         "baseMarketCost":2230,
         "category":"2hsword",
         "equipEffect":{

AndorsTrail/res/raw/monsterlist_guynmart.json

@@ -517,7 +517,7 @@
     },
     {
         "id":"guynmart_tort2",
-        "name":"Assistent torturer",
+        "name":"Assistant torturer",
         "iconID":"monsters_ld1:23",
         "maxHP":120,
         "maxAP":10,

AndorsTrail/res/raw/monsterlist_troubling_times.json

@@ -0,0 +1,189 @@
+[
+    {
+        "id":"nanath",
+        "name":"Nanath",
+        "iconID":"monsters_newb_1:41",
+        "monsterClass":"humanoid",
+        "spawnGroup":"nanath",
+        "phraseID":"nanath"
+    },
+    {
+        "id":"tt_seraphina",
+        "name":"Sly Seraphina",
+        "iconID":"monsters_tometik7:38",
+        "monsterClass":"humanoid",
+        "spawnGroup":"tt_seraphina",
+        "phraseID":"tt_sly_200"
+    },
+    {
+        "id":"tt_seraphina2",
+        "name":"Sly Seraphina",
+        "iconID":"monsters_tometik7:38",
+        "monsterClass":"humanoid",
+        "spawnGroup":"tt_seraphina2",
+        "phraseID":"tt_sly2"
+    },
+    {
+        "id":"tt_seraphina3",
+        "name":"Sly Seraphina",
+        "iconID":"monsters_tometik7:38",
+        "monsterClass":"humanoid",
+        "spawnGroup":"tt_seraphina3",
+        "phraseID":"tt_sly3"
+    },
+    {
+        "id":"tt_seraphina3b",
+        "name":"Sly Seraphina",
+        "iconID":"monsters_tometik7:38",
+        "monsterClass":"humanoid",
+        "spawnGroup":"tt_seraphina3b",
+        "phraseID":"tt_sly3"
+    },
+    {
+        "id":"tt_seraphina4",
+        "name":"Sly Seraphina",
+        "iconID":"monsters_tometik7:38",
+        "monsterClass":"humanoid",
+        "spawnGroup":"tt_seraphina4",
+        "phraseID":"tt_sly4"
+    },
+    {
+        "id":"tt_seraphina5",
+        "name":"Sly Seraphina",
+        "iconID":"monsters_tometik7:38",
+        "monsterClass":"humanoid",
+        "spawnGroup":"tt_seraphina5",
+        "phraseID":"tt_sly5"
+    },
+    {
+        "id":"tt_monster1",
+        "name":"Luthor's skeleton guard",
+        "iconID":"monsters_skeleton1:0",
+        "maxHP":52,
+        "maxAP":10,
+        "moveCost":10,
+        "monsterClass":"construct",
+        "attackDamage":{
+            "min":1,
+            "max":3
+        },
+        "spawnGroup":"tt_monster1",
+        "droplistID":"skeleton",
+        "attackCost":5,
+        "attackChance":60,
+        "blockChance":40,
+        "damageResistance":1
+    },
+    {
+        "id":"tt_monster2",
+        "name":"Luthor's skeleton guard",
+        "iconID":"monsters_skeleton2:0",
+        "maxHP":52,
+        "maxAP":10,
+        "moveCost":10,
+        "monsterClass":"construct",
+        "attackDamage":{
+            "min":1,
+            "max":3
+        },
+        "spawnGroup":"tt_monster2",
+        "droplistID":"skeleton",
+        "attackCost":5,
+        "attackChance":60,
+        "blockChance":40,
+        "damageResistance":1
+    },
+    {
+        "id":"tt_monster3",
+        "name":"Luthor's skeleton guard",
+        "iconID":"monsters_skeleton1:0",
+        "maxHP":52,
+        "maxAP":10,
+        "moveCost":10,
+        "monsterClass":"construct",
+        "attackDamage":{
+            "min":1,
+            "max":3
+        },
+        "spawnGroup":"tt_monster3",
+        "droplistID":"skeleton",
+        "attackCost":5,
+        "attackChance":60,
+        "blockChance":40,
+        "damageResistance":1
+    },
+    {
+        "id":"tt_guys",
+        "name":"Seraphina's bodyguard",
+        "iconID":"monsters_ld1:87",
+        "maxHP":52,
+        "maxAP":10,
+        "moveCost":10,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"protectSpawn",
+        "attackDamage":{
+            "min":8,
+            "max":15
+        },
+        "spawnGroup":"tt_guys",
+        "droplistID":"tt_guys",
+        "attackCost":5,
+        "attackChance":90,
+        "blockChance":40,
+        "damageResistance":1
+    },
+    {
+        "id":"spearborn_thrall",
+        "name":"Spearborn thrall",
+        "iconID":"monsters_newb_1:89",
+        "maxHP":236,
+        "maxAP":12,
+        "moveCost":4,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"wholeMap",
+        "attackDamage":{
+            "min":12,
+            "max":13
+        },
+        "droplistID":"molten_pyreling_dl",
+        "attackCost":4,
+        "attackChance":175,
+        "criticalSkill":10,
+        "criticalMultiplier":1.5,
+        "blockChance":165,
+        "damageResistance":8,
+        "hitEffect":{
+            "increaseCurrentAP":{
+                "min":1,
+                "max":2
+            }
+        }
+    },
+    {
+        "id":"young_spearborn_thrall",
+        "name":"Young spearborn thrall",
+        "iconID":"monsters_newb_1:89",
+        "maxHP":236,
+        "maxAP":10,
+        "moveCost":4,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"wholeMap",
+        "attackDamage":{
+            "min":10,
+            "max":11
+        },
+        "droplistID":"molten_pyreling_dl",
+        "attackCost":4,
+        "attackChance":170,
+        "criticalSkill":7,
+        "criticalMultiplier":1.5,
+        "blockChance":165,
+        "damageResistance":8,
+        "hitEffect":{
+            "increaseCurrentAP":{
+                "min":1,
+                "max":1
+            }
+        }
+    }
+]

AndorsTrail/res/raw/questlist.json

@@ -101,12 +101,20 @@
             },
             {
                 "progress":110,
-                "logText":"After talking with mother back at home, she and I tried to brainstorm about where Andor could be. She reminded me about Andor's friend Stanwick who lives in Brightport. We agreed that going to talk to him might be the next logical thing to do.\n\n[Quest is not completable at this time.]",
+                "logText":"After talking with mother back at home, she and I tried to brainstorm about where Andor could be. She reminded me about Andor's friend Stanwick who lives in Brightport. We agreed that going to talk to him might be the next logical thing to do.",
                 "rewardExperience":2000
             },
             {
                 "progress":120,
                 "logText":"In the dungeons of Laeroth manor, Kotheses, the torturer, mentioned that he had taught Andor the basics of torturing."
+            },
+            {
+                "progress":130,
+                "logText":"Andor was trying to find out from Seraphina about terrible monsters in the hideout near the place with the larval burrowers."
+            },
+            {
+                "progress":999,
+                "logText":"\n[Quest is not completable at this time.]"
             }
         ]
     },

AndorsTrail/res/raw/questlist_feygard_1.json

@@ -300,7 +300,7 @@
         "stages":[
             {
                 "progress":1,
-                "logText":"At the Wexlow well, I angered something evil and powerful (named Gamjee, I think) to the point that it pulled me down into the well. I've landed at the well's bottom severly injured, but alive.",
+                "logText":"At the Wexlow well, I angered something evil and powerful (named Gamjee, I think) to the point that it pulled me down into the well. I've landed at the well's bottom severely injured, but alive.",
                 "rewardExperience":500
             },
             {

AndorsTrail/res/raw/questlist_laeroth.json

@@ -151,11 +151,11 @@
             },
             {
                 "progress":20,
-                "logText":"I have agreed to set off to Laeroth Manor in persuit of the Korhald coins and to bring them back to Gylew."
+                "logText":"I have agreed to set off to Laeroth Manor in pursuit of the Korhald coins and to bring them back to Gylew."
             },
             {
                 "progress":12,
-                "logText":"I  sold the 10 coins that I looted from the Arulir secret room to Gylew.",
+                "logText":"I sold the 10 coins that I looted from the Arulir secret room to Gylew.",
                 "rewardExperience":750
             },
             {
@@ -165,7 +165,7 @@
             },
             {
                 "progress":30,
-                "logText":"In the Laeroth basement, I noticted a sign on the wall that i could not read in its entirety, but I was able make out the name 'Korhald'. This makes me wonder if this is a clue?"
+                "logText":"In the Laeroth basement, I noticed a sign on the wall that i could not read in its entirety, but I was able make out the name 'Korhald'. This makes me wonder if this is a clue?"
             },
             {
                 "progress":40,
@@ -344,7 +344,7 @@
             },
             {
                 "progress":170,
-                "logText":"I spoke to Jerelin again, and told him of Audela's wishes. He told me he will reease the caretaker, but with a condition. The caretakers last act must be to move his grave away from that of his nagging wife."
+                "logText":"I spoke to Jerelin again, and told him of Audela's wishes. He told me he will release the caretaker, but with a condition. The caretakers last act must be to move his grave away from that of his nagging wife."
             },
             {
                 "progress":180,

AndorsTrail/res/raw/questlist_lytwings.json

@@ -30,7 +30,7 @@
             },
             {
                 "progress":21,
-                "logText":"I was about to swing my axe, when the lytwings stopped me. They have changed their minds about chopping down the tree. I am beginnning to think they are indecisive on purpose."
+                "logText":"I was about to swing my axe, when the lytwings stopped me. They have changed their minds about chopping down the tree. I am beginning to think they are indecisive on purpose."
             },
             {
                 "progress":30,

AndorsTrail/res/raw/questlist_mt_galmore.json

@@ -14,11 +14,11 @@
             },
             {
                 "progress":20,
-                "logText":"While speaking with Defy, I've learned the he and his men have a grudge against the Thieves Guild and they want to \"hit them where it really hurts\". Whatever that means."
+                "logText":"While speaking with Defy, I've learned the he and his men have a grudge against the Thieves' Guild and they want to \"hit them where it really hurts\". Whatever that means."
             },
             {
                 "progress":25,
-                "logText":"Defy has revealed the location of the Thieves Guild's vault of treasure - an underground storage unit accessible from the vacant house south of Fallhaven."
+                "logText":"Defy has revealed the location of the Thieves' Guild's vault of treasure - an underground storage unit accessible from the vacant house south of Fallhaven."
             },
             {
                 "progress":30,
@@ -26,7 +26,7 @@
             },
             {
                 "progress":35,
-                "logText":"Defy has agreed to pay me 20 percent of the looted Thieves Guild treasure if I get the key from Troublemaker and hand it over to him."
+                "logText":"Defy has agreed to pay me 20 percent of the looted Thieves' Guild treasure if I get the key from Troublemaker and hand it over to him."
             },
             {
                 "progress":40,
@@ -34,11 +34,11 @@
             },
             {
                 "progress":45,
-                "logText":"I have talked my way into acquiring the Thieves Guild's vault key from Troublemaker, but I must return it to him quickly after I am done with it."
+                "logText":"I have talked my way into acquiring the Thieves' Guild's vault key from Troublemaker, but I must return it to him quickly after I am done with it."
             },
             {
                 "progress":50,
-                "logText":"I told Troublemaker all that I knew about Defy, his men, and the \"Lost Traveler\" Alaric and how they hired me to help rob the Thieves Guild."
+                "logText":"I told Troublemaker all that I knew about Defy, his men, and the \"Lost Traveler\" Alaric and how they hired me to help rob the Thieves' Guild."
             },
             {
                 "progress":55,
@@ -50,7 +50,7 @@
             },
             {
                 "progress":57,
-                "logText":"I have reported back to the vacant house and I met Rennik there. He informed me that the Thieves Guild has apprehended all five men and that they are now in the Guild jail.",
+                "logText":"I have reported back to the vacant house and I met Rennik there. He informed me that the Thieves' Guild has apprehended all five men and that they are now in the Guild jail.",
                 "rewardExperience":19797,
                 "finishesQuest":1
             },
@@ -70,7 +70,7 @@
             },
             {
                 "progress":75,
-                "logText":"I told Defy that I was keeping the key for myself and plan to loot the Thieves Guild's vault myself. A fight ensued."
+                "logText":"I told Defy that I was keeping the key for myself and plan to loot the Thieves' Guild's vault myself. A fight ensued."
             },
             {
                 "progress":76,

AndorsTrail/res/raw/questlist_sullengard.json

@@ -128,7 +128,7 @@
             },
             {
                 "progress":28,
-                "logText":"Umar gave player a 1,000 gold coins as a financial contribution from Thieves Guild."
+                "logText":"Umar gave player a 1,000 gold coins as a financial contribution from the Thieves' Guild."
             },
             {
                 "progress":29,

AndorsTrail/res/raw/questlist_troubling_times.json

@@ -0,0 +1,202 @@
+[
+    {
+        "id":"troubling_times",
+        "name":"Troubling times",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":10,
+                "logText":"I went to the Thieves' Guild in Fallhaven looking for things to do."
+            },
+            {
+                "progress":20,
+                "logText":"Since I had helped Defy, Umar and Nanath threw me out. I cannot enter the basement again.",
+                "rewardExperience":1,
+                "finishesQuest":1
+            },
+            {
+                "progress":30,
+                "logText":"Since I had looted the Thieves' Guild vault after killing Defy, Umar and Nanath threw me out. I cannot enter the basement again.",
+                "rewardExperience":1,
+                "finishesQuest":1
+            },
+            {
+                "progress":40,
+                "logText":"I met Nanath, who's scared and upset, because someone put a spell on all members of the Thieves' Guild. This spell made all thieves noticeable. He asked me if I could help dispel the spell."
+            },
+            {
+                "progress":50,
+                "logText":"Nanath told me to find the Shadow priest who had cast the spell on the Guild."
+            },
+            {
+                "progress":60,
+                "logText":"I set out interviewing Shadow priests to find who had cast the spell."
+            },
+            {
+                "progress":70,
+                "logText":"Talion, Shadow priest of Loneford, had cast the Striking Spectacle Shadow spell on the Guild, on payment from Dameni, a mysterious lady leading a band of toughs"
+            },
+            {
+                "progress":80,
+                "logText":"Talion could dispel the spell, using a few items - Villain's ring, Troublemaker's ring, ring of backstabbing, Tears of the Shadow potion, Luthor's ring.  He also wanted 50000 gold."
+            },
+            {
+                "progress":82,
+                "logText":"I have informed Nanath about the Striking Spectacle Shadow spell and Talion's demands."
+            },
+            {
+                "progress":90,
+                "logText":"Nanath told me Thieves' Guild would give me the 50000 gold back when I have got the spell dispelled."
+            },
+            {
+                "progress":95,
+                "logText":"Nanath asked if I had already found Luthor's ring."
+            },
+            {
+                "progress":100,
+                "logText":"I went back to Nanath as I couldn't find Luthor's ring anywhere."
+            },
+            {
+                "progress":105,
+                "logText":"He told me to seek out Fanamor's friend Sly Seraphina near the Sutdover bridge."
+            },
+            {
+                "progress":110,
+                "logText":"Seraphina didn't believe me. She told me to go away."
+            },
+            {
+                "progress":115,
+                "logText":"Nanath sent me to Umar. He should make sure Sly carries out the order."
+            },
+            {
+                "progress":120,
+                "logText":"Umar told me one of his secret passwords to convince Seraphina."
+            },
+            {
+                "progress":130,
+                "logText":"Sly Seraphina said that Luthor's ring was to be found in the cave which Crackshot tried to open. The door was sealed by Umar and Seraphina to prevent monsters in that cave from devastating Dhayavar. The sealing was done by using Luthor's items. She and Umar decided to separate them, and keep them separate."
+            },
+            {
+                "progress":140,
+                "logText":"Seraphina felt that the danger was too high to open that door. So she disappeared."
+            },
+            {
+                "progress":150,
+                "logText":"I had to find Sly Seraphina again."
+            },
+            {
+                "progress":160,
+                "logText":"Nanath told me to look for her in her usual hiding places: Near one of the towns Sullengard, Stoutford, Vilegard, Prim, Loneford, or Brimhaven."
+            },
+            {
+                "progress":170,
+                "logText":"Talion said that without the items he asked for he couldn't help. I had to find Seraphina."
+            },
+            {
+                "progress":180,
+                "logText":"After beating the tough guys protecting Seraphina, she was convinced that I was strong enough to help her beat the monsters in the cave."
+            },
+            {
+                "progress":190,
+                "logText":"Seraphina gave me back the money she had stolen from me earlier."
+            },
+            {
+                "progress":192,
+                "logText":"I have to ask Umar for Luthor's key."
+            },
+            {
+                "progress":193,
+                "logText":"I have got the key."
+            },
+            {
+                "progress":195,
+                "logText":"Seraphina agreed to help me and told me to meet her at the locked door in the cave where Crackshot was defeated."
+            },
+            {
+                "progress":200,
+                "logText":"I met Seraphina at the cave door where Crackshot was defeated."
+            },
+            {
+                "progress":210,
+                "logText":"Seraphina could open the door with Luthor's key wearing also his gloves. She entered the cave behind the door."
+            },
+            {
+                "progress":220,
+                "logText":"I followed her."
+            },
+            {
+                "progress":230,
+                "logText":"Seraphina got injured attacking one of the monsters."
+            },
+            {
+                "progress":240,
+                "logText":"I have killed the monsters blocking the entrance."
+            },
+            {
+                "progress":250,
+                "logText":"I healed Seraphina using potions."
+            },
+            {
+                "progress":252,
+                "logText":"I tried to poison Seraphina, but she noticed in time. At least she didn't notice that I did it on purpose."
+            },
+            {
+                "progress":255,
+                "logText":"Seraphina already started the search for the ring."
+            },
+            {
+                "progress":260,
+                "logText":"I searched the cave for Luthor's ring. I couldn't find it."
+            },
+            {
+                "progress":270,
+                "logText":"Sly Seraphina had found the ring. She gave it to me and told me to keep it safe. She disappeared again, probably back to Sutdover bridge. I had to go to Talion."
+            },
+            {
+                "progress":280,
+                "logText":"I gave 50000 gold, Villain's ring, Troublemaker's ring, ring of backstabbing, Tears of the Shadow potion, and Luthor's ring to Talion."
+            },
+            {
+                "progress":290,
+                "logText":"Talion used them to undo the spell."
+            },
+            {
+                "progress":300,
+                "logText":"Talion returned Luthor's ring. The other rings were broken in the process though and the Tears of the Shadow potion was used up of course."
+            },
+            {
+                "progress":302,
+                "logText":"The room with the dangerous creatures has been locked and sealed again."
+            },
+            {
+                "progress":310,
+                "logText":"Nanath gave me 75000 gold as a reward for a job well done.",
+                "rewardExperience":15000,
+                "finishesQuest":1
+            },
+            {
+                "progress":320,
+                "logText":"Sly Seraphina was friendly to me - for now."
+            }
+        ]
+    },
+    {
+        "id":"troubling_times_nd",
+        "name":"troubling_times_nd",
+        "showInLog":0,
+        "stages":[
+            {
+                "progress":10,
+                "logText":"Seraphina search"
+            },
+            {
+                "progress":20,
+                "logText":"Crackshot's door unsealed"
+            },
+            {
+                "progress":30,
+                "logText":"1=standing north of Sly while she blocks the passage"
+            }
+        ]
+    }
+]

AndorsTrail/res/values/loadresources.xml

@@ -120,6 +120,8 @@
         <!--Added by ATCS v0.6.20 for project feygard_1-->
         <item>@raw/itemlist_feygard_1</item>
         <item>@raw/itemlist_lytwings</item>
+        <!--Added by ATCS v0.6.21 for project troubling_times-->
+        <item>@raw/itemlist_troubling_times</item>
     </array>
         
     <array name="loadresource_droplists">
@@ -182,6 +184,8 @@
         <item>@raw/droplists_laeroth</item>
         <!--Added by ATCS v0.6.20 for project feygard_1-->
         <item>@raw/droplists_feygard_1</item>
+        <!--Added by ATCS v0.6.21 for project troubling_times-->
+        <item>@raw/droplists_troubling_times</item>
     </array>
         
     <array name="loadresource_quests">
@@ -241,6 +245,8 @@
         <!--Added by ATCS v0.6.20 for project feygard_1-->
         <item>@raw/questlist_feygard_1</item>
         <item>@raw/questlist_lytwings</item>
+        <!--Added by ATCS v0.6.21 for project troubling_times-->
+        <item>@raw/questlist_troubling_times</item>
     </array>
         
     <array name="loadresource_conversationlists">
@@ -454,6 +460,8 @@
         <!--Added by ATCS v0.6.20 for project feygard_1-->
         <item>@raw/conversationlist_feygard_1</item>
         <item>@raw/conversationlist_lytwings</item>
+        <!--Added by ATCS v0.6.21 for project troubling_times-->
+        <item>@raw/conversationlist_troubling_times</item>
     </array>
         
     <array name="loadresource_monsters">
@@ -524,6 +532,8 @@
         <!--Added by ATCS v0.6.20 for project feygard_1-->
         <item>@raw/monsterlist_feygard_1</item>
         <item>@raw/monsterlist_lytwings</item>
+        <!--Added by ATCS v0.6.21 for project troubling_times-->
+        <item>@raw/monsterlist_troubling_times</item>
     </array>
         
     <array name="loadresource_maps">
@@ -1560,6 +1570,11 @@
         <item>@xml/wexlow_village_nw_house</item>
         <item>@xml/wexlow_village_se_house</item>
         <item>@xml/wexlow_village_sw_house</item>
+        <!--Added by ATCS v0.6.21 for project troubling_times-->
+        <item>@xml/crackshot_hideout4</item>
+        <item>@xml/fallhaven_derelict2_t</item>
+        <item>@xml/fallhaven_tunnel1</item>
+        <item>@xml/fallhaven_tunnel2</item>
     </array>
         
 </resources>

AndorsTrail/res/xml/blackwater_mountain12.tmx

@@ -1,209 +1,209 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="2017.05.26" orientation="orthogonal" renderorder="right-down" width="28" height="27" tilewidth="32" tileheight="32" nextobjectid="11">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="28" height="27" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="14">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="28" height="27">
+ <layer id="1" name="Ground" width="28" height="27">
   <data encoding="base64" compression="zlib">
-   eJzVlk0OgyAQRgk7oxdoenWuIMb0AMoRKlfwEk031RSSL+PwI+rCxUsKSt/MYAa0FEIHMAsdjN8Lk8MyY+3e76sw1DE6DKzH57MjNE75RuKg6w3EQWMa5TZWk/DNUJNRbv3Wxbw+H9zcBAzwrq9rzEfXI7gns9svCzXwcxPMx1wrNuLDPF9VmBwPfi+xHH3sMV+ua6VjakTpmf/d60FfTsycryTPTvLrU75SQr6j+3Q0v7PA/nNnn5J/fK/zY+o7Iwfscf63J9XPS8Aeh2fWdJFvBXsc9g59kS9Ezhl5d1/qTC5BSR5/PpzpauX2XpR7v+H41EJ867SvDeS31/dohHg2+fmpg/nl1JM68V6Zs+97v8GYTzN1VnK716FvLraG8gNRVSiR
+   eJzVlk0OgyAQRg3txsQLND1J06t7BTFNDyAcQb1AJTLJ15F/deHiLUDxzQAOSFFV0oNe6KE9LkyW2dGW9v1P7Yc7lEXDeHx+v6342jGfYg4+XkMcPCbliFVHfObbNCdKbP2zjdk8H2zfBAzwLs1ryMfHI7gmJq7R9tEcUN8E/SGXYQ74MM9v7SfFg/sllCPFHvKlugy9Y444H8d3cz3oS4nZ5SvJk/6XXF8pPt/eddqb31Fg/bmyrxUrVOuozX1H5IA1bhD/NTJWz0vAGjey2nGGz4A1DmuHPMnnI+WMvLovdiaX0Ao3dD4c6erE9l6Uer9x8Wiq6tnEfZ0nv1zfa3G9E3xYW/bklzKf3In3ypR1z92DIZ90zHMrtmvt23OhMZwfZAFtKw==
   </data>
  </layer>
- <layer name="Objects" width="28" height="27">
+ <layer id="2" name="Objects" width="28" height="27">
   <data encoding="base64" compression="zlib">
-   eJytVs2KFDEQDjksCDJsN2x0wTfYx/ARfATvXjx52RcZfAI9q3NQhAF3GvY0wkg7owfBwW7/lsUdPG6KTm2+fJOMu+AHRSaZSn35KkmljTFmXpsrLKqh/VCZG+O8Hua3h8YsvX0Pbe+tC/1deG5jHMEzm/7HfUUHXMghfdXTkh6cj1C/Bfljn/XluB/alIP5r4NHYT7rw1bxuKCnpPMOjN/3v295O4Y15/avL+yfs5FL83R0t2wP7O79mwIP+s33ojE+OWNeg70N7Rtvp3W6/vM65Szp+7IXDXMma1q54fcrH+vrKPYvRnG+8L6sBx/Uqfh4mGrUGNqe+Vz2VRw78XFmIdZP0qs61acL83Lnc+l9L/ZTvo3v/xkN62+qYeyMYiBQlyJ3TgUnpOs3rV3sl8vHUFzp0v0q6JN7xnzavnPb8Uqcax9nVsV9UC6sZapv44acMl8DfIzSuWvCniuHnJGnNvpJXX6yP2hEvj6MTzSPVcolsd4HHvFDG9u0vglHS3VzE/j+Aq9iAv2OdGn7rUq1rujsaK3Dd0d5+KzfxD4X9uCY6mIfzvwsU6cXfvwFWeu2/29DbuSdumfTNwv5pv9R179i8DuWw8TFOlOqiyvwkRwtMjmQ/g/aV8znmtbS7Kgv180Nos9oVX7hntf5GsV1f5w5izk01Xa+BHofGsgpfwPxfZA3aUJ6BHL/+A1fUhxcD+J0x7ut2pSTtWK+8BxMSeNtN3w7KLDudJmcHNi0z9D5nLvcHM4zQ79L+A7I/cO4olXyPwYdUnOnpFt81rSuMe2N1kvM5wH45O5j7tsQ53PMUu5k/BJghngO
+   eJytVk1uEzEYtSwRmuEnyZROmt4AiW1hww04BkfgCOzZsGLTi0ScANZAFiCkSLSRugpS0NAU4aeZL35+tUsr8STLY/vz9/w+25/HOefWtdthM+nqXxN3a9T73fx25txFKPeOuroK9fCoa1+Hjz76AT74dEzbBvNtnAa0TU8reng+w+w2Ys9t1Zfjfu1TDuW/Cd7081Uf14a3BT0lnc+o/2X4fhzKCa05t39VYf+e+shlcXpxWC6v/PX7tyRdbLcexKK4bJz7SuV7X38L5bxO14/zxZwlff5uLBwzrGnbdN9fgu87o9g+GMX54P1cdzas0/B7lmo0H1aPw7yqjn2n4fusbz+YpnpNp9kMe7vc+bwItgeTlK8J7Uejbv2rfmwsPhisy5A7p8Cp6BrJ2lEeTvM+DDtd/T6V9OGeKZ/VP5qr/kqcA4xP4j4YF+cy09dMu5gq34r4FKVzh9hXdeTAGXnvox3y8rtxp5H5MAf9i75vWKdc8PWzXy/suMx9mt/A0UrehEbwHE4jr2FB7d3+SL0nd3ArZ8dyHb87xqNn/TblT2EPTiQvIn7gO8vk6U3o/ySlba6Ot/2e4J167tM3i/mW/1HXv3zoO5bDool5ppQXt2SDGG0yMUD7/n7qm+M5kD1f9WO5/HLT2DAq8c/84F7X+RyleX+eOYs5YP0aL8Dug+nju2A69T7gTVqIHgD3T99wjtceaV7Jes9n5XfbtBmnauV48Tmwt9nmPWm6fwcD5x3mNvtjn7YVNl9jl5ujcVbYf4neAdw/9gutiP+cdCDnLmepbtgM6J6gfy57Y/mS43lMNrn7mPs35PnqsxQ79P8F9ZMXxQ==
   </data>
  </layer>
- <layer name="Above" width="28" height="27">
+ <layer id="3" name="Above" width="28" height="27">
   <data encoding="base64" compression="zlib">
-   eJzdlTEOwjAMRa2cAHWo1KNyFgQXKFsHGNhYmWCiO5wDohJhPrbjtB0Qb0Epjn/87TZENuea6FhnglhsxBs/136M7xuia2NrWPtL9Uq41N+eavnSc+nMmFND8lTLl56jd10jx1lEvTYQbcOwPlXDbxveGr3So9Q//r9Vo/dMXlKPcuyeNe2r8hicz+jVbfEZc4c1x/IO4yRK5jdpoWaqy3MWj57mpZV7jvokJE1Na4yelQtZBVlvCfOBa0kL++ido6l+lvLvemuhpxr4/nl7huS+n3Pj9dSazzF6U3zy7vHeD8jhlVvT2Chzwb1Ev/Bu5mDPpfqkWbR6Z3lkeYLfMa4b9Tzed6yvWHdJv0vev19EuhMisa4HW2B16g==
+   eJzdVTEOwjAMtCLBDB0q9em8BcEHytYBBjZWJpjoBFGJcA/bddoOiFuqpI4vvnMSIhu3kuhSDgSx2Ahv/FzrMb6tiB6VzWGtz+XLwb381lTLl+alPWNODZKmWr40j9o1lRxnIfLVgegQuvG16L51+HC0ikfJP/7fqtG7Jy+SR0M4vmo6Ffkx2J9Rq8W6H7OEMYelHcZJyOnfxIWcqS7PXjx8mpZW7jnqkyBxalxj+KxciG2Q+Tar/hyOJS700dtHU/XMxb/z7QRPNeD583qGGLo/54ZXU6s/x/BN0cm7xvs+IM7v3BrHXukLriXqhW8zB3ou1Sf1ouWdpZGlCd5jnDfyebRvmK9Yd47fOefvFyG9CRGxridohoTM
   </data>
  </layer>
- <layer name="Walkable" width="28" height="27">
+ <layer id="4" name="Walkable" width="28" height="27" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztVEEKwDAI6yv2/y/0h2OHQSlEk9SOHSoIq9gkOm2/WuvHjxf7Y/P3GHvPc2yFDxnSpWAqfOOdCMPBi3LZ3iJtLm/ExdaGMNS400v2fkV9WT0ZVzafiu6K3WK5FB3V9je+HZyZFjXf1bsyM445O8/uEpPP9El5u1Z3HeEq9WV5iI/Roc5W5Rvk1Frx7770G0SrXd4=
+   eJztVEEKwDAI6yv2/y/1R2OHQSlEk9SOHSoIq9gkOm2/WuvHjxf7Y/P3GHvPc2yFDxnSpWAqfOOdCMPBi3LZ3iJtLm/ExdaGMNS400v2fkV9WT0ZVzafiu6K3WK5FB3V9je+HZyZFjXf1bsyM445O8/uEpPP9El5u1Z3HeEq9WV5iI/Roc5W5Rvk1Frx7770G3qdlh4=
   </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
+ <objectgroup id="5" name="Mapevents" visible="0">
   <object id="1" name="east" type="mapchange" x="864" y="544" width="32" height="96">
    <properties>
     <property name="map" value="blackwater_mountain10"/>
@@ -223,7 +223,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
+ <objectgroup id="6" name="Spawn">
   <object id="4" name="restless_dead_1" type="spawn" x="352" y="704" width="128" height="96">
    <properties>
     <property name="spawngroup" value="restless_dead_1"/>
@@ -245,6 +245,29 @@
     <property name="spawngroup" value="primwolf1"/>
    </properties>
   </object>
+  <object id="11" name="tt_seraphina" type="spawn" x="704" y="224" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="ignoreAreas" value="true"/>
+    <property name="spawngroup" value="tt_seraphina"/>
+   </properties>
+  </object>
+  <object id="12" name="tt_guys" type="spawn" x="640" y="224" width="128" height="128">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="5"/>
+    <property name="spawngroup" value="tt_guys"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="7" name="Keys">
+  <object id="13" name="dummy_key" type="key" x="704" y="224" width="32" height="32">
+   <properties>
+    <property name="phrase" value="dummy_key_noPhrase"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys"/>
 </map>

AndorsTrail/res/xml/cabin_norcity_road2.tmx

@@ -1,282 +1,248 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="20" height="15" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="20" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="8">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2513" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2641" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2769" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="2897" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="3025" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="3153" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="3281" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3409" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3537" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3665" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3793" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3921" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4049" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4177" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4305" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4433" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4561" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="4689" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4817" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4945" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5073" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5201" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5329" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="5457" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="5585" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="5713" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5841" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5969" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6097" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6217" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6337" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6457" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6585" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6713" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7705" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6841" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7833" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6969" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7961" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7097" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="8089" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7225" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="8217" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7353" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="8345" name="map_plant_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7481" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="15">
+ <layer id="1" name="Ground" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJybKcvAMHMUj+JRjIFnU9ksapk3m4rmDTWzAKAv1Wc=
+   eJyzlGJgsBzFo3gUY2BrKptFLfOsqWjeUDMLAMJMYWM=
   </data>
  </layer>
- <layer name="Objects" width="20" height="15">
+ <layer id="2" name="Objects" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJx9UzFOA0EMXOURlOtIKAUgcVoRRLoIOiiiK4jgC3lA+AL8IF2Q4AfkBdCRIlIUyjQ0vAObW7ODz2Qka8/e9Zx37K0p/OA6hjCO4ReTbggnVOK31D5zz7EHJ66+XQUjCi3o/iDv9amdW+e9Kq8JeGo4f8B2GP07CY7Af+K8ubFn4B04tdr7Ye6C7cbo8Wh8TxPVEVGBP+XvO7bE51+gzuTUt+2W7xT9f88g75L9q9jUqVqmf2peGl/6JHWi/l9wb4s+xCRvRaVfk1z3OZxZc/yYCl+1Y9aEa0PtuNdj7ZXijP7eEbk0fgp1eLoLsI+qFXJJrGfmUfg+YtHE013/h1wXeR1DDs6Htdcddb3n2Bs1M78PNeq70zXlnuA7s9rvdRquT2ru24v+W7RYg/ZD4FMumY1vftJsLg==
+   eJx9UzFOQzEMtbr1AHRI0pmeoGwgwQ3gBLDRAamCkYWFi6EOgMRXRBHdEN3KgP5AVUZifkxeHQtLVhI7dp6fndbTr3w5orWjP+kPiZ59sX/7+s5uIBqF2i5nvbJ8eqpE/Ivsm/s6ts2+Jq8R8rRw/z7pg7NrYnmE82HCvq/0KBT/wsCq68PYk6QbxdOB4sfiRHhEaeDtneQbJI3p/jHgjAa+62HZR2e/vQdvrdL5w3U4hcvo7biJmhXuE+NE/m99qVvLHPBy3EUo/epn3O9wZ5r2T5CvMWZQzpzrMtR2q8fSK5FXv10j5hL7C+CweGfBPgpXmIttMzWPnO8KZtviPRq5ltm2hhicD62n/+A6z7az0M38HWCUfycrv8E9wX+muR/3ulw3oat35uy/qGUK3L8Bx5KLZ+MHgh6X0Q==
   </data>
  </layer>
- <layer name="Above" width="20" height="15">
+ <layer id="3" name="Above" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYGBgcJFjYHCVw6RxAWzyxOpFVy8JxFJyuM2VJsIsYu1ywWEWur3IfFL9hQwUyVCPzW5kYAnkW2ExF58+fPFFKkCOL2IAMW4hxz3UModSQCi+8OkhNX2QA2B2UBpv1AKkljXIwBGoDgCJLhvO
+   eJxjYGBgeCLFwPBUCpPGBbDJE6sXXf1OIN4lhdvc3USYRaxdT3CYhW4vMp9UfyGDg2Sox2Y3MrgJ5N/CYi4+ffjii1SAHF/EAGLcQo57qGUOpYBQfOHTQ2r6IAfA7KA03qgFSC1rkMFDoDoAEnFKug==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="15" visible="0">
+ <layer id="4" name="Walkable" width="20" height="15" visible="0">
   <data encoding="base64" compression="zlib">
-   eJytksENACAIA93Eud3W+ONh28NIQiIK9DCsOcYCfqyea0xdmdIhtYrF8VJTuYnL6RLONFeHP+movqpO8RA+p1P7k5lS3Pkvl/+ygynH3dG9uPF198P1c++U7Tffqd/1WlNh
+   eJytksENACAIAx3ERdx/MeOPh20PIwmJKNDDsOYYC/ixeq4xdWVKh9QqFsdLTeUmLqdLONNcHf6ko/qqOsVD+JxO7U9mSnHnv1z+yw6mHHdH9+LG190P18+9U7bffKd+A4a0JoU=
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="south" type="mapchange" x="320" y="448" width="288" height="32">
+ <objectgroup id="5" name="Mapevents">
+  <object id="1" name="south" type="mapchange" x="320" y="448" width="288" height="32">
    <properties>
     <property name="map" value="cabin_norcity_road1"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="608" y="192" width="32" height="256">
+  <object id="2" name="east" type="mapchange" x="608" y="192" width="32" height="256">
    <properties>
     <property name="map" value="cabin_norcity_road3"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object name="west" type="mapchange" x="0" y="128" width="32" height="64">
-   <properties>
-    <property name="map" value="waytobrightport8"/>
-    <property name="place" value="east"/>
-   </properties>
-  </object>
-  <object name="north" type="mapchange" x="320" y="0" width="32" height="32">
-   <properties>
-    <property name="map" value="waytobrightport6"/>
-    <property name="place" value="south"/>
-   </properties>
-  </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object name="duleian_mountain_cat_spawn" type="spawn" x="64" y="96" width="96" height="96">
+ <objectgroup id="6" name="Spawn" visible="0">
+  <object id="3" name="duleian_mountain_cat_spawn" type="spawn" x="64" y="96" width="96" height="96">
    <properties>
     <property name="spawngroup" value="duleian_hornet"/>
    </properties>
   </object>
-  <object name="duleian_mountain_cat_spawn2" type="spawn" x="320" y="160" width="224" height="96">
+  <object id="4" name="duleian_mountain_cat_spawn2" type="spawn" x="320" y="160" width="224" height="96">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="duleian_hornet"/>
    </properties>
   </object>
-  <object name="duleian_mountain_cat_spawn3" type="spawn" x="128" y="256" width="64" height="160">
+  <object id="5" name="duleian_mountain_cat_spawn3" type="spawn" x="128" y="256" width="64" height="160">
    <properties>
     <property name="spawngroup" value="duleian_hornet"/>
    </properties>
   </object>
-  <object name="hardshell_beetle_spawn" type="spawn" x="416" y="320" width="64" height="64">
+  <object id="6" name="hardshell_beetle_spawn" type="spawn" x="416" y="320" width="64" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="hardshell_beetle"/>
    </properties>
   </object>
-  <object name="duleian_hornet_spawn" type="spawn" x="224" y="320" width="224" height="96">
+  <object id="7" name="duleian_hornet_spawn" type="spawn" x="224" y="320" width="224" height="96">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="duleian_hornet"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup id="7" name="Keys"/>
 </map>

AndorsTrail/res/xml/cabin_norcity_road3.tmx

@@ -1,254 +1,247 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="20" height="15" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="20" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="8">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4561" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4689" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4817" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4945" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5073" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="5201" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5329" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5457" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5585" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5713" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5841" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5969" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6097" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6225" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="6353" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6481" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6609" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6737" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6857" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6977" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7097" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7225" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7353" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7705" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7481" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="15">
+ <layer id="1" name="Ground" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJzbyMnAsHEUj2Ii8WYKMLXNw2YuLntI8RstwmvUPOqYBwBPG9pT
+   eJy7yMnAcHEUj2Ii8WUKMLXNw2YuLntI8RstwmvUPOqYBwCDQ//T
   </data>
  </layer>
- <layer name="Objects" width="20" height="15">
+ <layer id="2" name="Objects" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJy7IsvAcBWIr0DpjUB8FImPiwYBGDtcjoFhJZBeBcTmQHYEEOvJIdRcA+JjSDRIjzNUPkwOYY4TkN0KxG1QOWM5VPv0oeLH0MxEdosBVA0MwMTN0cwyhboTl/tA5sDsSxVC1QvymylU7jRSmOjhcZ8emrsaBbC7E+RnJyi2kMMf/qvR+OVoYWkozMDwQox8/FIM4W4jIO0IZduh+cUejQ8CFkhizEwQ+hWSuU5QtyKDh0KofDEmTHOl0Ox6BNRzQgwSV6+h5t0C8n+QiG+LIcx8BXXjb1mIWT/FEGnhEFCsVA5C60NpmLgplA8Ks29oZoLceEQWYhYsjV4E8i/JEqZhdh0XQ4QJyDxY+IHyH7FmwWgQOA51Hyg+QebtloWkdRggxSxHOYR5MPcdREqnlLgP5GeQeSA5AMlVuX0=
+   eJz7IsPA8BWIv0Dpi0D8FImPiwYBGLtcloHhJJA+BcThQHYFEPvJItR8A+JnSDRITzJUvkwWYU4SkL0UiJdB5YJlUe3zh4o/QzMT2S0BUDUwABMPRzMrFOpOXO4DmQOzj1UIVS/Ib6FQuddIYeKHx31+aO5aKIDdnSA/J0FxhCz+8D+Nxp+OFpYXge7uECMfd4oh3B0EpBOh7Dg0v8Sj8UEgAklMmQlCdyGZmwR1KzJoFELlmzFhmmuFZlcTUE+GGCSuuKFyVUD+DBJxtRjCzC6oG6VlIWbNFEOkhUdAN0+VhdD+UBomHgrlg8JsGpqZIDc+kYGYBUujH4H8TzKEaZhd6WKIMAGZBws/UP4j1iwYDQLpUPeB4hNk3m0ZSFqHAVLMSpRFmAdz30OkdEqJ+0B+BpkHkgMA/NW5Mw==
   </data>
  </layer>
- <layer name="Above" width="20" height="15">
+ <layer id="3" name="Above" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYEAFR2QR9FFZBI2uBl2MGDli1CGL47IbHRAyh1w34gP43I/LfbOxhCc13EIvgM1vlIDbQ8TfMHAQ6N5DsoRpappFCzMJgdkkuIuQmchylJoFSn8AG3xNhA==
+   eJxjYEAFT2QQ9FMZBI2uBl2MGDli1CGL47IbHRAyh1w34gP43I/LfbuxhCc13EIvgM1vlIDfQ8TfMPAQ6N5HMoRpappFCzMJgd0kuIuQmchylJoFSn8Ad+lYSw==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="15" visible="0">
+ <layer id="4" name="Walkable" width="20" height="15" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzbKMYABhvFqIeRASF1uPjY5HCZia6PkP3EuA+XOch8XG4kZBayfmx6iHUfMXxqAXx+ocTMoWYeKXFKSJ6c/ITLPEryKDXcR2zeo9R9ALlCbA4=
+   eJwLFGNgCKQyRgaE1OHiY5PDZSa6PkL2E+M+XOYg83G5kZBZyPqx6SHWfcTwqQXw+YUSM4eaeaTEKSF5cvITLvMoyaPUcB+xeY9S9wEABlE4VQ==
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="west" type="mapchange" x="0" y="192" width="32" height="256">
+ <objectgroup id="5" name="Mapevents">
+  <object id="1" name="west" type="mapchange" x="0" y="192" width="32" height="256">
    <properties>
     <property name="map" value="cabin_norcity_road2"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="south" type="mapchange" x="448" y="448" width="160" height="32">
+  <object id="2" name="south" type="mapchange" x="448" y="448" width="160" height="32">
    <properties>
     <property name="map" value="cabin_norcity_road4"/>
     <property name="place" value="north"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object name="duleian_hornet_sapwn1" type="spawn" x="32" y="0" width="96" height="192">
+ <objectgroup id="6" name="Spawn" visible="0">
+  <object id="3" name="duleian_hornet_sapwn1" type="spawn" x="32" y="0" width="96" height="192">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="duleian_hornet"/>
    </properties>
   </object>
-  <object name="duleian_hornet_sapwn2" type="spawn" x="544" y="224" width="64" height="32">
+  <object id="4" name="duleian_hornet_sapwn2" type="spawn" x="544" y="224" width="64" height="32">
    <properties>
     <property name="spawngroup" value="duleian_hornet"/>
    </properties>
   </object>
-  <object name="duleian_mountain_cat_spawn" type="spawn" x="320" y="96" width="128" height="64">
+  <object id="5" name="duleian_mountain_cat_spawn" type="spawn" x="320" y="96" width="128" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="duleian_mountain_cat"/>
    </properties>
   </object>
-  <object name="yelllow_tooth_spawn" type="spawn" x="512" y="96" width="64" height="64">
+  <object id="6" name="yelllow_tooth_spawn" type="spawn" x="512" y="96" width="64" height="64">
    <properties>
     <property name="spawngroup" value="duleian_mountain_cat"/>
    </properties>
   </object>
-  <object name="yellow_tooth_spawn2" type="spawn" x="576" y="160" width="32" height="160">
+  <object id="7" name="yellow_tooth_spawn2" type="spawn" x="576" y="160" width="32" height="160">
    <properties>
     <property name="spawngroup" value="duleian_mountain_cat"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup id="7" name="Keys"/>
 </map>

AndorsTrail/res/xml/cabin_norcity_road4.tmx

@@ -220,12 +220,6 @@
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="608" y="288" width="32" height="160">
-   <properties>
-    <property name="map" value="nor_city_road1"/>
-    <property name="place" value="west"/>
-   </properties>
-  </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
   <object name="yellow_tooth_spawn1" type="spawn" x="96" y="32" width="288" height="64">

AndorsTrail/res/xml/catacombs3.tmx

@@ -1,234 +1,275 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'https://mapeditor.org/dtd/1.0/map.dtd'><map height="20" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="20">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <tileset firstgid="1" name="map_bed_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bed_1.png" width="512"/>
- </tileset><tileset firstgid="129" name="map_border_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_border_1.png" width="512"/>
- </tileset><tileset firstgid="257" name="map_bridge_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_1.png" width="512"/>
- </tileset><tileset firstgid="385" name="map_bridge_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_2.png" width="512"/>
- </tileset><tileset firstgid="513" name="map_broken_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_broken_1.png" width="512"/>
- </tileset><tileset firstgid="641" name="map_cavewall_1" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_1.png" width="576"/>
- </tileset><tileset firstgid="749" name="map_cavewall_2" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_2.png" width="576"/>
- </tileset><tileset firstgid="857" name="map_cavewall_3" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_3.png" width="576"/>
- </tileset><tileset firstgid="965" name="map_cavewall_4" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_4.png" width="576"/>
- </tileset><tileset firstgid="1073" name="map_chair_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_1.png" width="512"/>
- </tileset><tileset firstgid="1201" name="map_chair_table_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_2.png" width="512"/>
- </tileset><tileset firstgid="1329" name="map_crate_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_crate_1.png" width="512"/>
- </tileset><tileset firstgid="1457" name="map_cupboard_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_cupboard_1.png" width="512"/>
- </tileset><tileset firstgid="1585" name="map_curtain_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_curtain_1.png" width="512"/>
- </tileset><tileset firstgid="1713" name="map_entrance_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_1.png" width="512"/>
- </tileset><tileset firstgid="1841" name="map_entrance_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_2.png" width="512"/>
- </tileset><tileset firstgid="1969" name="map_fence_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_1.png" width="512"/>
- </tileset><tileset firstgid="2097" name="map_fence_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_2.png" width="512"/>
- </tileset><tileset firstgid="2225" name="map_fence_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_3.png" width="512"/>
- </tileset><tileset firstgid="2353" name="map_fence_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_4.png" width="512"/>
- </tileset><tileset firstgid="2481" name="map_ground_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_1.png" width="512"/>
- </tileset><tileset firstgid="2609" name="map_ground_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_2.png" width="512"/>
- </tileset><tileset firstgid="2737" name="map_ground_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_3.png" width="512"/>
- </tileset><tileset firstgid="2865" name="map_ground_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_4.png" width="512"/>
- </tileset><tileset firstgid="2993" name="map_ground_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_5.png" width="512"/>
- </tileset><tileset firstgid="3121" name="map_ground_6" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_6.png" width="512"/>
- </tileset><tileset firstgid="3249" name="map_ground_7" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_7.png" width="512"/>
- </tileset><tileset firstgid="3377" name="map_ground_8" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_8.png" width="512"/>
- </tileset><tileset firstgid="3505" name="map_house_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_1.png" width="512"/>
- </tileset><tileset firstgid="3633" name="map_house_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_2.png" width="512"/>
- </tileset><tileset firstgid="3761" name="map_indoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_1.png" width="512"/>
- </tileset><tileset firstgid="3889" name="map_indoor_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_2.png" width="512"/>
- </tileset><tileset firstgid="4017" name="map_kitchen_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_kitchen_1.png" width="512"/>
- </tileset><tileset firstgid="4145" name="map_outdoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_outdoor_1.png" width="512"/>
- </tileset><tileset firstgid="4273" name="map_pillar_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_1.png" width="512"/>
- </tileset><tileset firstgid="4401" name="map_pillar_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_2.png" width="512"/>
- </tileset><tileset firstgid="4529" name="map_plant_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_1.png" width="512"/>
- </tileset><tileset firstgid="4657" name="map_plant_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_2.png" width="512"/>
- </tileset><tileset firstgid="4785" name="map_rock_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_1.png" width="512"/>
- </tileset><tileset firstgid="4913" name="map_rock_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_2.png" width="512"/>
- </tileset><tileset firstgid="5041" name="map_roof_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_1.png" width="512"/>
- </tileset><tileset firstgid="5169" name="map_roof_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_2.png" width="512"/>
- </tileset><tileset firstgid="5297" name="map_roof_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_3.png" width="512"/>
- </tileset><tileset firstgid="5425" name="map_shop_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_shop_1.png" width="512"/>
- </tileset><tileset firstgid="5553" name="map_sign_ladder_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_sign_ladder_1.png" width="512"/>
- </tileset><tileset firstgid="5681" name="map_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_table_1.png" width="512"/>
- </tileset><tileset firstgid="5809" name="map_trail_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_trail_1.png" width="512"/>
- </tileset><tileset firstgid="5937" name="map_transition_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_1.png" width="512"/>
- </tileset><tileset firstgid="6065" name="map_transition_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_2.png" width="512"/>
- </tileset><tileset firstgid="6193" name="map_transition_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_3.png" width="512"/>
- </tileset><tileset firstgid="6321" name="map_transition_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_4.png" width="512"/>
- </tileset><tileset firstgid="6449" name="map_transition_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_5.png" width="512"/>
- </tileset><tileset firstgid="6577" name="map_tree_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_1.png" width="512"/>
- </tileset><tileset firstgid="6705" name="map_tree_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_2.png" width="512"/>
- </tileset><tileset firstgid="6833" name="map_wall_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_1.png" width="512"/>
- </tileset><tileset firstgid="6961" name="map_wall_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_2.png" width="480"/>
- </tileset><tileset firstgid="7081" name="map_wall_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_3.png" width="480"/>
- </tileset><tileset firstgid="7201" name="map_wall_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_4.png" width="480"/>
- </tileset><tileset firstgid="7321" name="map_window_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_1.png" width="512"/>
- </tileset><tileset firstgid="7449" name="map_window_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_2.png" width="512"/>
- </tileset><layer height="20" name="Ground" width="20">
-  <data compression="zlib" encoding="base64">eJytlDEOwjAMRaNsqL0A4uq5QpOFPfQIaa/AJRALQTTS7+cnShHDm+w+Y8fGW2M8cMvMmWUjUpxzCypWPGvmvpEyk8jHmlyXPdfTHvYFqol1g/A8BmOew96Hvc2iZskLInYejbmM+zzsbz3oY7i/Wl6Pb2r0d8Tn7Ie50R/jhc/Ru/e48Bv0Rfu9E63f7sROow93tzYHvAveaTW/4uM3cMLBO618UcwtWn2LPe+bxNySrd+i6q1nFxC+R/b13AjC94hv9Yuv1eu/fPz/2Nrb3ttgcO9bsVrOmxeqHSUw</data>
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="20" height="23" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="14">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="20" height="23">
+  <data encoding="base64" compression="zlib">
+   eJytlEEOgjAQRZvuDKxNjDfmDL0CsNB96RGAK3gJ48YaOsnnOzQFXbxV6xtn+ofOGtMBQyREpoSnc74raGfimSOPxBhplftYk+uy535aw76eamLdXvE8K2Ne1dqHvQWlptzrlbNLbcy1Xt/D/uadPob727pX4msz/e3xObsQMv0xneJz9O4lLvwN+rz9zkTuvzsl0+jD7G7NAfeCM63NT3z8Bk5xcKY1n1fm5q2+iyXvOypzG+32Lmq9lWQB4X1kX8mOILyP+FZHfLle/+UTl8/MUDJbuhshfQd9ylYDDESjwN/ETwZu58U5/Yi4BMz5EdD1T94bVVdy
+  </data>
  </layer>
- <layer height="20" name="Objects" width="20">
-  <data compression="zlib" encoding="base64">eJy9U7EOgkAMbYjoZrgb7hYmv8/fcSIuOuJfMDKZmDBLWNz9ALkcDfVo8WDwJYRcr30tvFeA/8AmADqJy31sp7Gd8e+857j1z0EBtBqgnOHsMt+zY/is8TyxcLnvzPd0oH2X8CAuKUCjxrNW3/dNcEYUpJdN4vqfNgB3w8+AkDhqNXJIKJjaY+p7PnV8DRebm22uhn5byFWTfyvVh6gZPcK5YrkQnHed7r94nKftCs8h8qEe528ZjULdJA1wFylC71bEe+XQl3oSY5JmLtftHodr6u+ovzmtQnD/GOd+7af7IvlYiseC23NutsrIOWdBm6V+XIMPICQ5IQ==</data>
+ <layer id="2" name="Objects" width="20" height="23">
+  <data encoding="base64" compression="zlib">
+   eJy9VLEOgjAQvRDRzVCGdnHy+/wdJ+KiI/4FI5OJCbPI4u4HSFMunOUOCyG+hJBee+8dvXcA/AcmAkijsLP39TC20e69azmu7bNXAHUKkI9wNonTbBg+ox1PKOzZd+I0LajuFB7EOQaoVL9O1fd+5a0RGdEyUZj+cQVw03wNCImjVD2HhIzJPcRO85GG53CxsdrGcui3+VwluVsp30fJ9MOvK5QLwXnX9v0Xj/W0meE5xK7Lx/prpkd+36Qe4CxS+N4tiPfyTpd6EmNSz+xZO3scLrHbo/7meuWDu2Os+7UdzovkYykeCm7OudoKLZ85Cb2Z6sc5eC6ogR5bgnPOPzkEH7/JPEc=
+  </data>
  </layer>
- <layer height="20" name="Above" width="20">
-  <data compression="zlib" encoding="base64">eJxjYMAODovhkCARwMy5RIR5xNiJbM5FPOovi+G28zIZfoO5DWYnkyCmHLFmgAC+8CDGPHz+I8c8UuKbkFpS3EbIPFLNwmceOWbhM4/ccCXVPELpBps+bH4lNi9iMw+bHnzmPBFAsOcy4ZYjFqDndXLyMD5ArfKOVuahh+FgAQAtJyx+</data>
+ <layer id="3" name="Above" width="20" height="23">
+  <data encoding="base64" compression="zlib">
+   eJxjYMAODovhkCARwMy5RIR5xNiJbM5FPOovi+G28zIZfoO5DWYnkyCmHLFmgAC+8CDGPHz+I8c8UuKbkFpS3EbIPFLNwmceOWbhM4/ccCXVPELpBps+bH4lNi9iMw+bHnzmPBFAsOcy4ZYjFqDndXLyMD5ArfKOVuahh+FwBYeoGG4gs6iNAXamPw4=
+  </data>
  </layer>
- <layer height="20" name="Walkable" visible="0" width="20">
-  <data compression="zlib" encoding="base64">eJzdkkEKQCEIRDtF979CN/y0CEK+zTxp1YAbY56ajt7aeDymstz+tlTlRb/i/XliPsphuUyXoVikp1Nv6s+dGbL9ZLzq/agdVmpTjntH1Fvhqd2QHKmX9UzmUn5H5PYpi/avODfjA42EyVY=</data>
+ <layer id="4" name="Walkable" width="20" height="23" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzdkkEKwDAIBPOK/v8L+WHoIVAkdnekgdAFLwbHNdqv1vrP41aWe75NVXmxXvFWNTEf5bBcpstQLOLpzZv6c2eGbD8Zr3o/aoeV3pTj3hGtrfDUbkiO9Ms8k7lUvSNy+5RF/SvOyfGl7x0aRpTm4A==
+  </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object height="32" name="north" type="mapchange" width="32" x="544" y="64">
+ <objectgroup id="5" name="Mapevents" visible="0">
+  <object id="1" name="north" type="mapchange" x="544" y="64" width="32" height="32">
    <properties>
     <property name="map" value="catacombs4"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object height="32" name="up" type="mapchange" width="32" x="64" y="96">
+  <object id="2" name="up" type="mapchange" x="64" y="96" width="32" height="32">
    <properties>
     <property name="map" value="catacombs2"/>
     <property name="place" value="down"/>
    </properties>
   </object>
-  <object height="32" name="sign_catacombs3_grave1" type="sign" width="32" x="224" y="96"/>
-  <object height="32" name="sign_catacombs3_grave2" type="sign" width="32" x="448" y="416"/>
+  <object id="3" name="sign_catacombs3_grave1" type="sign" x="224" y="96" width="32" height="32"/>
+  <object id="4" name="sign_catacombs3_grave2" type="sign" x="448" y="416" width="32" height="32"/>
+  <object id="12" name="west" type="mapchange" x="0" y="672" width="32" height="64">
+   <properties>
+    <property name="map" value="fallhaven_tunnel1"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+  <object id="13" name="east" type="mapchange" x="608" y="672" width="32" height="64">
+   <properties>
+    <property name="map" value="fallhaven_tunnel2"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn rats" visible="0">
-  <object height="480" name="catacombrat1" type="spawn" width="544" x="64" y="128">
+ <objectgroup id="6" name="Spawn rats" visible="0">
+  <object id="5" name="catacombrat1" type="spawn" x="64" y="128" width="544" height="480">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="catacombrat1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn guards" visible="0">
-  <object height="32" name="catacombguard3" type="spawn" width="32" x="288" y="320">
+ <objectgroup id="7" name="Spawn guards" visible="0">
+  <object id="6" name="catacombguard3" type="spawn" x="288" y="320" width="32" height="32">
    <properties>
     <property name="spawngroup" value="catacombguard3"/>
    </properties>
   </object>
-  <object height="64" name="catacombguard2" type="spawn" width="32" x="32" y="288">
+  <object id="7" name="catacombguard2" type="spawn" x="32" y="288" width="32" height="64">
    <properties>
     <property name="spawngroup" value="catacombguard2"/>
    </properties>
   </object>
-  <object height="128" name="catacombguard2_1" type="spawn" width="224" x="64" y="128">
+  <object id="8" name="catacombguard2_1" type="spawn" x="64" y="128" width="224" height="128">
    <properties>
     <property name="spawngroup" value="catacombguard2"/>
    </properties>
   </object>
-  <object height="224" name="catacombguard3_1" type="spawn" width="224" x="64" y="384">
+  <object id="9" name="catacombguard3_1" type="spawn" x="64" y="384" width="224" height="224">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="catacombguard3"/>
    </properties>
   </object>
-  <object height="224" name="catacombguard3_2" type="spawn" width="288" x="320" y="96">
+  <object id="10" name="catacombguard3_2" type="spawn" x="320" y="96" width="288" height="224">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="catacombguard3"/>
    </properties>
   </object>
-  <object height="224" name="catacombguard2_2" type="spawn" width="288" x="320" y="384">
+  <object id="11" name="catacombguard2_2" type="spawn" x="320" y="384" width="288" height="224">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="catacombguard2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
-</map>
+ <objectgroup id="8" name="Keys"/>
+</map>

AndorsTrail/res/xml/catacombs4.tmx

@@ -1,196 +1,249 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'https://mapeditor.org/dtd/1.0/map.dtd'><map height="15" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="20">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <tileset firstgid="1" name="map_bed_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bed_1.png" width="512"/>
- </tileset><tileset firstgid="129" name="map_border_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_border_1.png" width="512"/>
- </tileset><tileset firstgid="257" name="map_bridge_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_1.png" width="512"/>
- </tileset><tileset firstgid="385" name="map_bridge_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_2.png" width="512"/>
- </tileset><tileset firstgid="513" name="map_broken_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_broken_1.png" width="512"/>
- </tileset><tileset firstgid="641" name="map_cavewall_1" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_1.png" width="576"/>
- </tileset><tileset firstgid="749" name="map_cavewall_2" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_2.png" width="576"/>
- </tileset><tileset firstgid="857" name="map_cavewall_3" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_3.png" width="576"/>
- </tileset><tileset firstgid="965" name="map_cavewall_4" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_4.png" width="576"/>
- </tileset><tileset firstgid="1073" name="map_chair_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_1.png" width="512"/>
- </tileset><tileset firstgid="1201" name="map_chair_table_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_2.png" width="512"/>
- </tileset><tileset firstgid="1329" name="map_crate_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_crate_1.png" width="512"/>
- </tileset><tileset firstgid="1457" name="map_cupboard_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_cupboard_1.png" width="512"/>
- </tileset><tileset firstgid="1585" name="map_curtain_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_curtain_1.png" width="512"/>
- </tileset><tileset firstgid="1713" name="map_entrance_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_1.png" width="512"/>
- </tileset><tileset firstgid="1841" name="map_entrance_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_2.png" width="512"/>
- </tileset><tileset firstgid="1969" name="map_fence_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_1.png" width="512"/>
- </tileset><tileset firstgid="2097" name="map_fence_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_2.png" width="512"/>
- </tileset><tileset firstgid="2225" name="map_fence_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_3.png" width="512"/>
- </tileset><tileset firstgid="2353" name="map_fence_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_4.png" width="512"/>
- </tileset><tileset firstgid="2481" name="map_ground_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_1.png" width="512"/>
- </tileset><tileset firstgid="2609" name="map_ground_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_2.png" width="512"/>
- </tileset><tileset firstgid="2737" name="map_ground_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_3.png" width="512"/>
- </tileset><tileset firstgid="2865" name="map_ground_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_4.png" width="512"/>
- </tileset><tileset firstgid="2993" name="map_ground_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_5.png" width="512"/>
- </tileset><tileset firstgid="3121" name="map_ground_6" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_6.png" width="512"/>
- </tileset><tileset firstgid="3249" name="map_ground_7" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_7.png" width="512"/>
- </tileset><tileset firstgid="3377" name="map_ground_8" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_8.png" width="512"/>
- </tileset><tileset firstgid="3505" name="map_house_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_1.png" width="512"/>
- </tileset><tileset firstgid="3633" name="map_house_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_2.png" width="512"/>
- </tileset><tileset firstgid="3761" name="map_indoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_1.png" width="512"/>
- </tileset><tileset firstgid="3889" name="map_indoor_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_2.png" width="512"/>
- </tileset><tileset firstgid="4017" name="map_kitchen_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_kitchen_1.png" width="512"/>
- </tileset><tileset firstgid="4145" name="map_outdoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_outdoor_1.png" width="512"/>
- </tileset><tileset firstgid="4273" name="map_pillar_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_1.png" width="512"/>
- </tileset><tileset firstgid="4401" name="map_pillar_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_2.png" width="512"/>
- </tileset><tileset firstgid="4529" name="map_plant_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_1.png" width="512"/>
- </tileset><tileset firstgid="4657" name="map_plant_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_2.png" width="512"/>
- </tileset><tileset firstgid="4785" name="map_rock_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_1.png" width="512"/>
- </tileset><tileset firstgid="4913" name="map_rock_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_2.png" width="512"/>
- </tileset><tileset firstgid="5041" name="map_roof_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_1.png" width="512"/>
- </tileset><tileset firstgid="5169" name="map_roof_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_2.png" width="512"/>
- </tileset><tileset firstgid="5297" name="map_roof_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_3.png" width="512"/>
- </tileset><tileset firstgid="5425" name="map_shop_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_shop_1.png" width="512"/>
- </tileset><tileset firstgid="5553" name="map_sign_ladder_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_sign_ladder_1.png" width="512"/>
- </tileset><tileset firstgid="5681" name="map_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_table_1.png" width="512"/>
- </tileset><tileset firstgid="5809" name="map_trail_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_trail_1.png" width="512"/>
- </tileset><tileset firstgid="5937" name="map_transition_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_1.png" width="512"/>
- </tileset><tileset firstgid="6065" name="map_transition_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_2.png" width="512"/>
- </tileset><tileset firstgid="6193" name="map_transition_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_3.png" width="512"/>
- </tileset><tileset firstgid="6321" name="map_transition_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_4.png" width="512"/>
- </tileset><tileset firstgid="6449" name="map_transition_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_5.png" width="512"/>
- </tileset><tileset firstgid="6577" name="map_tree_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_1.png" width="512"/>
- </tileset><tileset firstgid="6705" name="map_tree_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_2.png" width="512"/>
- </tileset><tileset firstgid="6833" name="map_wall_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_1.png" width="512"/>
- </tileset><tileset firstgid="6961" name="map_wall_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_2.png" width="480"/>
- </tileset><tileset firstgid="7081" name="map_wall_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_3.png" width="480"/>
- </tileset><tileset firstgid="7201" name="map_wall_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_4.png" width="480"/>
- </tileset><tileset firstgid="7321" name="map_window_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_1.png" width="512"/>
- </tileset><tileset firstgid="7449" name="map_window_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_2.png" width="512"/>
- </tileset><layer height="15" name="Ground" width="20">
-  <data compression="zlib" encoding="base64">eJxbx8TAsA6KD6DhdXgwIXUHgfgSGt6PxY4DWNTuRzNrPRBfBuInaPgiFjsuYVELUrcWzW1bOLFjdDue4FC7Fs1tMPFoVtxmo2NktfuRzENWk43FvJ/cDAy/uTHFkdXC/IxuHjYsycPAIM1DWB2x5hGLaWHeOhqYRy03Uts85DxCTbNgeA6J5s6B6sFXbsDMnYMWFmuxyGHDAK0i2y8=</data>
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="20" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="7">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
+ </tileset>
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="20" height="15">
+  <data encoding="base64" compression="zlib">
+   eJw7x8TAcA6KH6Dhc3gwIXUPgfgTGr6PxY4HWNTeRzPrPBB/BmIWZlT8EYsdn7CoBak7i+a2K5zYMbodIIxN3Vk0t8HEq1lxm42OkdXeRzIPWU03FvMkeRgYpHkwxZHVwvyMbh42bAk0yxqLedj8TIx5xGJamHeOBuZRy43UNg85j1DTLBjeQ6K5e6B68JUbMHP3oIXFWSxy2DAAsZ/yvQ==
+  </data>
  </layer>
- <layer height="15" name="Objects" width="20">
-  <data compression="zlib" encoding="base64">eJxjYBg6QIiJgUEciM1YEGJX+SC0Fj8qH6QGpBYXWAOUeyQEYbtBzVuNpB6kV4gJodYNyc7VWMxdzIrbLiVBCA2zDx0sQtO7Bs38i2IQ+osAgg0D6GLo8tjMB4GpQP+85EMVuy4IEQPJoZuDzc/XBTHFiAXY3EQMyGHFrlcFyS2H0dwO0oPsnw9EuHsnlnBEtx+f/ykJG2LAbLT4APkZW7yBACH/opuFDOYyoaqD8ZHZIHvxmUFNAACLrSjW</data>
+ <layer id="2" name="Objects" width="20" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYBg6wIiJgcEciMNYEGJf+SC0Fz8qH6QGpBYXOAOUYxKGsNOg5p1GUg/Sa8SEUJuGZOdpLOYeZsVtl5MghIbZhw4Ooek9g2b+RzEILSKIYMMAuhi6PDbzQWAr0D+c/Khi3wUhYiA5dHOw+fm7IKYYsQCbm4gBPazY9bogueUxmttBepD9IyBE2J6bWMIR3X58/qckbIgBu9HiA+RnbPEGAoT8i24WMtjLhKoOxkdmg+zFZwY1AQDtzyi+
+  </data>
  </layer>
- <layer height="15" name="Above" width="20">
-  <data compression="zlib" encoding="base64">eJxjYKAdOCxGPbUg+UskmEepfaSahc1tTwSIE8NmHjUBLvMukmkPvdyHCxBy91wm8t1CDfuJAZepHIa09vNgAQAH0xA2</data>
+ <layer id="9" name="Objects_replace" width="20" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJxjYBja4CsfhPbiR+WTAsJZIPRpJoSYOZBtxIRdPanASRBCMwmTp/+jGISeLoBgwwBIbBSMgpECAHbBB7k=
+  </data>
  </layer>
- <layer height="15" name="Walkable" width="20">
-  <data compression="zlib" encoding="base64">eJzbKMbAsHGEYhiAsUlRj0seWR26+bjEiXEbNvW45LGZic1uXObhU4/LL6QCcs0jxn3o8uS6GV/cU8s8cgGhNEoNs/D5HRubknxIrFoAbuCB0g==</data>
+ <layer id="3" name="Above" width="20" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYKAdeCxGPbUg+U8kmEepfaSahc1tLILEiWEzj5oAl3kfybSHXu7DBQi5ey8T+W6hhv3EgM9UDkNa+3mwAABGZRCY
+  </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object height="32" name="south" type="mapchange" width="32" x="288" y="448">
+ <layer id="11" name="Above_replace" width="20" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFtALtAsSJjYJRMAqIAwDmCQEv
+  </data>
+ </layer>
+ <layer id="4" name="Walkable" width="20" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJy7KMbAcHGEYhiAsUlRj0seWR26+bjEiXEbNvW45LGZic1uXObhU4/LL6QCcs0jxn3o8uS6GV/cU8s8cgGhNEoNs/D5HRubknxIrFoAJaiWsg==
+  </data>
+ </layer>
+ <layer id="10" name="Walkable_replace" width="20" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJxjYBh64KIYfkxtc6nhXmoAmDnI7qKW2aNgFAwFAACcYREm
+  </data>
+ </layer>
+ <objectgroup id="5" name="Mapevents">
+  <object id="1" name="south" type="mapchange" x="288" y="448" width="32" height="32">
    <properties>
     <property name="map" value="catacombs3"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object height="32" name="sign_catacombs4_grave1" type="sign" width="32" x="576" y="288"/>
-  <object height="32" name="sign_catacombs4_grave2" type="sign" width="32" x="320" y="128"/>
+  <object id="2" name="sign_catacombs4_grave1" type="sign" x="576" y="288" width="32" height="32"/>
+  <object id="3" name="sign_catacombs4_grave2" type="sign" x="320" y="128" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object height="160" name="catacombguard3" type="spawn" width="480" x="96" y="256">
+ <objectgroup id="6" name="Spawn" visible="0">
+  <object id="4" name="catacombguard3" type="spawn" x="96" y="256" width="480" height="160">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object height="32" name="Luthor" type="spawn" width="32" x="288" y="224">
+  <object id="5" name="Luthor" type="spawn" x="288" y="224" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup id="7" name="Keys"/>
+ <objectgroup id="8" name="Replace" visible="0">
+  <object id="6" name="troubling_times:10" type="replace" x="160" y="64" width="256" height="128">
    <properties>
+    <property name="Above" value="Above_replace"/>
+    <property name="Objects" value="Objects_replace"/>
+    <property name="Walkable" value="Walkable_replace"/>
+    <property name="requireId" value="troubling_times"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="10"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
-</map>
+</map>

AndorsTrail/res/xml/crackshot_hideout3.tmx

@@ -1,312 +1,325 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="19" height="19" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="19" height="19" tilewidth="32" tileheight="32" infinite="0" nextlayerid="15" nextobjectid="18">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="19" height="19">
+ <layer id="1" name="Ground" width="19" height="19">
   <data encoding="base64" compression="zlib">
-   eJztlEsKgDAMREN33h+8gnHtys8N/BzBs9hAAnFMpbhWeDixk2k2kYiIE9GkoOZAl3zCnNkUdrrL9IFGRu2T8z0zNESnfpO3PNYvZ6bPdPcJa7p7DXb1qDOjRp+/y2rJX9yc64v2vihLOKAugb4o6yt/1p9Vk4W7UaJmhxh2IyLydemZ/3Uu/w9rFdTWU+OrAe8tcQHX2wMY
+   eJztlEsOgDAIREl33v8uXkFcu/JzAz9HMJYEEhypaVxr8uJghykbJCLiRDQpqDnQJZ8wZzaFne4yfaCRUfvkfM8MDdGp3+Qtj/XLmekz3X3Cmu5eg1096syo0efvslryFzfn+qK9L8oSDqhLoC/K+sqf9WfVZOFulKjZIYbdiIh8XXrmf53L/8NaBbX11PhqwHtLXCrML/g=
   </data>
  </layer>
- <layer name="Objects" width="19" height="19">
+ <layer id="2" name="Objects" width="19" height="19">
   <data encoding="base64" compression="zlib">
-   eJxjYKAN2CPAwLCKCUIjg81sxKmDgXtAuTNQNSAaxIeBw2y41W0H0s5Iau8D2U1A8TtAvIIJQuMD6OruMuFXDwIg+8SIUIcMbgoizI9jgrgTxsfFPo/ExwUeEOGOUiHi1MFAM4EwIwQCJRkYgiURNAjA/E9IHTpIAoonSyJobKBVCCGfiEMdzP5yoNoKIVS5EHEGhjBx7OpxAVxuTwGakyZOWB0pfrwuSJw6GJiBFNdr+BkYevgJq8MGmpkgeaMVSd0cLGahq2tCSj8gNiwsVxGRBiWZUNWVIcXVYTEGBkEmSN5YhZQ3pgLp6VjYyOpMWSFygxkAAAh6S0M=
+   eJxjYKANuCPAwHCKCUIjg8tsxKmDgX9AuTdQNSAaxIeBx2y41V0H0slIav8D2YuA4n+A+AQThMYH0NX9ZcKvHgRA9pkRoQ4Z/BREmF/HBHEnjI+L/R6JjxMwE7Z7qhBx6mBgMYEwIwQKJRkYiiURNAjA/E9IHTpoAoo3SyJobGCpEEK+EYc6mP3TgWpnCKHKlYgzMJSJY1ePC+ByewvQnDZxwupI8eN3QeLUwcAOpDRzhp+BYQ0/YXXYwGImSN5YiqRuDxaz0NUtQko/IDYsLE8RkWcsmVDVTUOKq8diDAyGTJC8cQopb2wF0tuxsJHVhbJC5AYzAAD59VhF
   </data>
  </layer>
- <layer name="Objects_replace" width="19" height="19" visible="0">
+ <layer id="3" name="Objects_replace" width="19" height="19">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIKRCUJZB9oFhAEAP0cAWw==
+   eJxjYBgFo2AUjIKRCUpZB9oFhAEAU8cAew==
   </data>
  </layer>
- <layer name="Above" width="19" height="19">
+ <layer id="4" name="Above" width="19" height="19">
   <data encoding="base64" compression="zlib">
-   eJxbwcRAdXBYDDsbBObzE6cOBC6L4VezngSzQGKXgLiZCbsadP241KGL7WGCuBOEnbHoQWbD1OEyC9mdwVCzLiHJXxLDVIfPLHR5XACbOphZTYKoNC6ATx3MrEmCqDQugE8dzKxFgqg0LoBPHSE/vkDjU+rH40hi9PYjNQAtzcKWN7ABbOqmo5Vh2PIGLjcQm0cGEgAAdalAyw==
+   eJw7wcRAdfBYDDsbBPbzE6cOBD6L4VdzngSzQGKfgHgxE3Y16PpxqUMXu8MEcScIJ2PRg8yGqcNlFrI7i6FmfUKS/ySGqQ6fWejyuAA2dTCzFgmi0rgAPnUwszYJotK4AD51MLMOCaLSuAA+dYT8yCGEyqfUj8+RxOjtR2oAWpqFLW9gA9jUbUcrw7DlDVxuIDaPDCQAAMwQSkw=
   </data>
  </layer>
- <layer name="Top" width="19" height="19">
+ <layer id="5" name="Top" width="19" height="19">
   <data encoding="base64" compression="zlib">
-   eJxjYKAvOCw2OMxqZaKuulEwCkbBKKAFAABwQwLB
+   eJxjYKAveCw2OMxaykRddaNgFIyCUUALAADZ4QNB
   </data>
  </layer>
- <layer name="Above_replace" width="19" height="19" visible="0">
+ <layer id="6" name="Above_replace" width="19" height="19">
   <data encoding="base64" compression="zlib">
-   eJxjYKAviGCnnlkZVDRrFIyCUTAKBiMAABS2AM8=
+   eJxjYKAvqGCnnlkdVDRrFIyCUTAKBiMAAFhFAQ8=
   </data>
  </layer>
- <layer name="Walkable" width="19" height="19" visible="0">
+ <layer id="7" name="Walkable" width="19" height="19" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzVk1sKACAIBPcU3f8K3bDfCB+j9ZMgZLhTikrSHH+6Lv++672zF0c5GYvwO6zdztgyT0e0xAiLvmXVnOnPvkX3Fof0lfaL9qJao5fXnQkrL5vdiFPZ1deszm5XuLdOWQsirp6V
+   eJzVk1sKACAIBPcU3f9K3ajfCB+j9ZMgZLhTikrSHH+6Lv++672zF0c5GYvwO6zdztgyT0e0xAiLvmXVnOnPvkX3Fof0lfaL9qJao5fXnQkrL5vdiFPZ1deszm5XuLdOWQu+E7gV
   </data>
  </layer>
- <layer name="Walkable_replace" width="19" height="19" visible="0">
+ <layer id="8" name="Walkable_replace" width="19" height="19">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo2AUjIJRMFgBAAWkAAE=
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="South" type="mapchange" x="288" y="576" width="32" height="32">
+ <objectgroup id="9" name="Mapevents">
+  <object id="1" name="South" type="mapchange" x="288" y="576" width="32" height="32">
    <properties>
     <property name="map" value="crackshot_hideout2"/>
     <property name="place" value="North"/>
    </properties>
   </object>
-  <object name="g04_package1" type="container" x="512" y="512" width="32" height="32"/>
-  <object name="guild03_hideout3_open_chest" type="script" x="512" y="480" width="32" height="32"/>
-  <object name="guild03_check_crackshot_death" type="script" x="256" y="128" width="96" height="128">
+  <object id="2" name="g04_package1" type="container" x="512" y="512" width="32" height="32"/>
+  <object id="3" name="guild03_hideout3_open_chest" type="script" x="512" y="480" width="32" height="32"/>
+  <object id="4" name="guild03_check_crackshot_death" type="script" x="256" y="128" width="96" height="128">
    <properties>
     <property name="when" value="step"/>
    </properties>
   </object>
-  <object name="guild03_hideout3_exit_select" type="script" x="288" y="544" width="32" height="32">
+  <object id="5" name="guild03_hideout3_exit_select" type="script" x="288" y="544" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
-  </object>  
+  </object>
+  <object id="17" name="North" type="mapchange" x="288" y="64" width="32" height="32">
+   <properties>
+    <property name="map" value="crackshot_hideout4"/>
+    <property name="place" value="South"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="g03_sergeant" type="spawn" x="192" y="480" width="32" height="32">
+ <objectgroup id="10" name="Spawn">
+  <object id="6" name="g03_sergeant" type="spawn" x="192" y="480" width="32" height="32">
    <properties>
     <property name="spawngroup" value="g03_sergeant"/>
    </properties>
   </object>
-  <object name="crackshot_dying" type="spawn" x="0" y="0" width="32" height="32">
+  <object id="7" name="crackshot_dying" type="spawn" x="0" y="0" width="32" height="32">
    <properties>
     <property name="spawngroup" value="crackshot_dying"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys">
-  <object name="Object" type="key" x="288" y="32" width="32" height="64">
+ <objectgroup id="11" name="Keys">
+  <object id="9" name="Object" type="key" x="288" y="32" width="32" height="64">
    <properties>
-    <property name="phrase" value="guild03_hideout3_lock"/>
-    <property name="requireId" value="thieves_hidden"/>
+    <property name="phrase" value="tt_guild03_hideout3_lock"/>
+    <property name="requireId" value="troubling_times_nd"/>
     <property name="requireType" value="questProgress"/>
-    <property name="requireValue" value="70"/>
+    <property name="requireValue" value="20"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Replace">
-  <object name="thieves_hidden:60" type="replace" x="512" y="512" width="32" height="32">
+ <objectgroup id="12" name="Replace">
+  <object id="10" name="thieves_hidden:60" type="replace" x="512" y="512" width="32" height="32">
    <properties>
     <property name="Objects" value="Objects_replace"/>
    </properties>
   </object>
-  <object name="thieves_hidden:70" type="replace" x="288" y="32" width="32" height="64">
+  <object id="11" name="thieves_hidden:70" type="replace" x="288" y="32" width="32" height="64">
    <properties>
     <property name="Above" value="Above_replace"/>
     <property name="Walkable" value="Walkable_replace"/>
-    <property name="requireId" value="thieves_hidden"/>
+    <property name="requireId" value="troubling_times_nd"/>
     <property name="requireType" value="questProgress"/>
-    <property name="requireValue" value="70"/>
+    <property name="requireValue" value="20"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Enemies">
-  <object name="g03_hideout3_reb1" type="spawn" x="32" y="192" width="160" height="128">
+ <objectgroup id="13" name="Enemies">
+  <object id="12" name="g03_hideout3_reb1" type="spawn" x="32" y="192" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="guild03_rebthief_1"/>
    </properties>
   </object>
-  <object name="g03_hideout3_reb2" type="spawn" x="416" y="256" width="160" height="128">
+  <object id="13" name="g03_hideout3_reb2" type="spawn" x="416" y="256" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="guild03_rebthief_1"/>
    </properties>
   </object>
-  <object name="g03_hideout3_reb3" type="spawn" x="512" y="480" width="32" height="32">
+  <object id="14" name="g03_hideout3_reb3" type="spawn" x="512" y="480" width="32" height="32">
    <properties>
     <property name="spawngroup" value="guild03_rebthief_2"/>
    </properties>
   </object>
-  <object name="g03_hideout3_reb4" type="spawn" x="192" y="224" width="224" height="224">
+  <object id="15" name="g03_hideout3_reb4" type="spawn" x="192" y="224" width="224" height="224">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="guild03_rebthief_3"/>
    </properties>
   </object>
-  <object name="g03_hideout_reb5" type="spawn" x="288" y="128" width="32" height="64">
+  <object id="16" name="g03_hideout_reb5" type="spawn" x="288" y="128" width="32" height="64">
    <properties>
     <property name="spawngroup" value="g03_crackshot"/>
    </properties>
   </object>
  </objectgroup>
+ <objectgroup id="14" name="Spawn2">
+  <object id="8" name="tt_seraphina2" type="spawn" x="288" y="96" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="tt_seraphina2"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>

AndorsTrail/res/xml/crackshot_hideout4.tmx

@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="19" height="19" tilewidth="32" tileheight="32" infinite="0" nextlayerid="23" nextobjectid="49">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
+ </tileset>
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer id="15" name="Ground" width="19" height="19">
+  <data encoding="base64" compression="zlib">
+   eJzNlDsOwjAMhq1uXCB3B1aWwo4EHKChKxPQG5TmCAhHsoWxEid0aqVPef3++khUAADfADyIXN9a84In8iK86A+inxozd6q7IhPyJjy18QpiPhISuciIdOS6rb4Marx2ABtk6+xcyhXUuEXHHjk4O5dyaU7oOCMXZ+dqXLUs2RX3dkfMcXAtny8+c9OfvlHU8jvymZvzXFy75G9fcvXNb1vaRyvD9+oKOfnfya1Ll5XTHAU8p125XA0pV44Pklwv4A==
+  </data>
+ </layer>
+ <layer id="16" name="Objects" width="19" height="19">
+  <data encoding="base64" compression="zlib">
+   eJxjYKA+YOdnYLgjwMBwiglCI4N4NlQ+LnXIZr2BqgHR/5gg4u2CDAz5bBAaBP4xoarTA9LJTAhz/kPZfwRQaQZmBoY2oBlhLBAaxMem7i+SWdhACZJ8Ggt+tZZIan8KIklA7RYRZMAK4OLMCLEbfKhqWtDcWcqK3y3I4AWSWfEk6AOBFDR7kd2Vj8WsZALhictdMLAUj35NLHKLcaj/hMVsYsB3NH02UPP/k+AvEAClK1sgZuJHFWfhx66+TBCVBoEpaHZeIdJPO5hQaWzgKhaz0NMYPuAgiEjvl5DMeiyGYCO7fyua2cjqAgRxq9sO5J9iRWB0eWR1yACXusEEACeENro=
+  </data>
+ </layer>
+ <layer id="17" name="Above" width="19" height="19">
+  <data encoding="base64" compression="zlib">
+   eJw7wcRAdfBYjDCbkBwIfBbDVNPERJ5ZILFPONSAxLNZUPmEzELnswhiqgMBZHFizPqERQ02gE0dNvPJBYPVLGoCZHd9ptCN6OmJWmZRCuhpFiwMkcMyAke+2E6g3IHZRUgdMWCohicMAAC1GipM
+  </data>
+ </layer>
+ <layer id="18" name="Top" width="19" height="19">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRMFgBAAWkAAE=
+  </data>
+ </layer>
+ <layer id="7" name="Walkable" width="19" height="19" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJy7KMbAcHGEYBDAxydWHTJA5+MC2PShm4dsFz4z0PVgcxc5AFs4DEazyDGTmLQxWMwipB6ZJmTmQJuFK63iS+PoeY4YswjlL2LUkVOGULM8woUBfkStQQ==
+  </data>
+ </layer>
+ <objectgroup id="19" name="Mapevents">
+  <object id="32" name="South" type="mapchange" x="288" y="576" width="32" height="32">
+   <properties>
+    <property name="map" value="crackshot_hideout3"/>
+    <property name="place" value="North"/>
+   </properties>
+  </object>
+  <object id="33" name="tt_sly_attack0" type="script" x="288" y="544" width="32" height="32"/>
+  <object id="34" name="tt_sly_attack1" type="script" x="288" y="480" width="32" height="32">
+   <properties>
+    <property name="when" value="always"/>
+   </properties>
+  </object>
+  <object id="35" name="tt_sly_attack2" type="script" x="288" y="448" width="32" height="32">
+   <properties>
+    <property name="when" value="always"/>
+   </properties>
+  </object>
+  <object id="36" name="tt_sly_attack3" type="script" x="288" y="416" width="32" height="32">
+   <properties>
+    <property name="when" value="always"/>
+   </properties>
+  </object>
+  <object id="21" name="tt_sly_attack4" type="script" x="256" y="352" width="96" height="32"/>
+  <object id="28" name="tt_loot1" type="container" x="96" y="512" width="32" height="32"/>
+  <object id="29" name="tt_loot2" type="container" x="128" y="512" width="32" height="32"/>
+  <object id="30" name="tt_loot3" type="container" x="160" y="512" width="32" height="32"/>
+  <object id="31" name="tt_loot4" type="container" x="192" y="192" width="32" height="32"/>
+  <object id="48" name="passby" type="mapchange" x="288" y="480" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup id="20" name="Spawn">
+  <object id="37" name="tt_seraphina3" type="spawn" x="288" y="384" width="32" height="96">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="tt_seraphina3"/>
+   </properties>
+  </object>
+  <object id="38" name="tt_seraphina3b" type="spawn" x="288" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="tt_seraphina3b"/>
+   </properties>
+  </object>
+  <object id="39" name="tt_seraphina4" type="spawn" x="288" y="512" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="ignoreAreas" value="true"/>
+    <property name="spawngroup" value="tt_seraphina4"/>
+   </properties>
+  </object>
+  <object id="40" name="tt_seraphina5" type="spawn" x="288" y="128" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="tt_seraphina5"/>
+   </properties>
+  </object>
+  <object id="41" name="tt_monster1" type="spawn" x="288" y="416" width="32" height="32">
+   <properties>
+    <property name="ignoreAreas" value="true"/>
+    <property name="spawngroup" value="tt_monster1"/>
+   </properties>
+  </object>
+  <object id="42" name="tt_monster2" type="spawn" x="288" y="384" width="32" height="32">
+   <properties>
+    <property name="ignoreAreas" value="true"/>
+    <property name="spawngroup" value="tt_monster2"/>
+   </properties>
+  </object>
+  <object id="43" name="tt_monster3" type="spawn" x="256" y="352" width="96" height="32">
+   <properties>
+    <property name="ignoreAreas" value="true"/>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="tt_monster3"/>
+   </properties>
+  </object>
+  <object id="44" name="spearborn_thrall_spawn" type="spawn" x="64" y="192" width="288" height="160">
+   <properties>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="spearborn_thrall"/>
+   </properties>
+  </object>
+  <object id="45" name="spearborn_thrall_spawn" type="spawn" x="352" y="192" width="128" height="256">
+   <properties>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="spearborn_thrall"/>
+   </properties>
+  </object>
+  <object id="46" name="young_spearborn_thrall_spawn" type="spawn" x="128" y="256" width="128" height="224">
+   <properties>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="young_spearborn_thrall"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="21" name="Keys">
+  <object id="47" name="tt_sly4_key" type="key" x="256" y="352" width="96" height="32">
+   <properties>
+    <property name="phrase" value="tt_sly4_key"/>
+    <property name="requireId" value="troubling_times"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="250"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="22" name="Replace"/>
+</map>

AndorsTrail/res/xml/elm_2f_2.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="9" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="7">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="9" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="7">
  <tileset firstgid="1" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
@@ -138,66 +138,66 @@
  <tileset firstgid="5581" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5709" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ <tileset firstgid="5709" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="5837" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5869" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5965" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5997" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6093" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6125" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6221" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6253" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6349" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6381" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6477" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6509" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6605" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6637" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6733" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6765" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6861" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6893" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6989" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7021" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7117" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7149" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7245" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32" tilecount="32" columns="8">
+ <tileset firstgid="7277" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32" tilecount="32" columns="8">
   <image source="../drawable/map_sign_ladder_omi2.png" width="256" height="128"/>
  </tileset>
- <tileset firstgid="7277" name="map_rock_3" tilewidth="32" tileheight="32" tilecount="30" columns="6">
+ <tileset firstgid="7309" name="map_rock_3" tilewidth="32" tileheight="32" tilecount="30" columns="6">
   <image source="../drawable/map_rock_3.png" width="192" height="160"/>
  </tileset>
  <layer id="1" name="Ground" width="8" height="9">
   <data encoding="base64" compression="zlib">
-   eAF9jjEKgDAQBNNZK1YWgj7GxtgoEm38hfh9dzEDYmFg2Nzt3iWxDiGK+YN7hrPp/oa+M5M4PiTVo7C/ZGUnat+ze/bXJoQk2uIBn/qUd/345ErNV4L3B+3Hs3aiF/wDdQ7o3XLYFpo=
+   eAHzEWFg8AHiIDQMEgNhGIgAspExTBykxheI49BwOJDvDcQg+WAoDTMTRoPkQXojofKlUgwM5UAsxw7BMHkYfypQbjoeeZg6QaB+ISCG2e8GNB8mB6IVgVgJiGHugNEgdTAMEwMAs9gXGg==
   </data>
  </layer>
  <layer id="2" name="Objects" width="8" height="9">
   <data encoding="base64" compression="zlib">
-   eAFjYICAIBEGBmTsA+SDAIiGsSEiDAwnJLGLw+Sx0YpSDAzsMhA8Eaj/ujSqqmgmCJ8JqO4aUA5ZHsYvhup5AaRvIOkH8dmgZoPs4ABiZHmQye5Af8gB7QUBPzT9EFHsJAAj3RGq
+   eAFjYICAIBEGBmTsA+SDAIiGsSEiDAwvJLGLw+Sx0Y5SDAzqMhC8Eaj/uzSqqmgmCF8JqO4bUA5ZHsafDNXDATTnB5J+EF8NajbIDg00eZDJ7kB/2AHtBYE8oF5k/RBR7CQAsqMSjA==
   </data>
  </layer>
  <layer id="3" name="Above" width="8" height="9">
   <data encoding="base64" compression="zlib">
-   eAFjYEAFb/gZGN4BMS5wCih3B4s8TN8/kJwApm508VgRTDUwM0AyIZII+XioWpgZwlIMDClQeV8s5igD5VWAGB9wxaIPm3oACJEONA==
+   eAFjYEAFb/gZGN4BMS5wCih3B4s8TN8/kJwApm508VgRTDUwM0AyJZII+XioWpgZxlIMDC1QeV8s5jgD5V2AGB9wxaIPm3oARpEO1A==
   </data>
  </layer>
  <layer id="4" name="Top" width="8" height="9">
   <data encoding="base64" compression="zlib">
-   eAFjYCAOFIvgV0eJfDPQ7CY85mMzW0QK4R5s8ghZylgAj/wD/w==
+   eAFjYCAOFIvgV0eJfDPQ7CY85mMz20QK4R5s8ghZylgAnPwEHw==
   </data>
  </layer>
  <layer id="5" name="Walkable" width="8" height="9">
@@ -237,6 +237,6 @@
   <properties>
    <property name="active" value="false"/>
   </properties>
-  <object id="6" name="elm2f2_chest" type="container" x="128" y="96" width="64" height="64"/>
+  <object id="6" name="elm2f2_chest" type="container" x="128" y="96" width="32" height="32"/>
  </objectgroup>
 </map>

AndorsTrail/res/xml/elm_4f_5.tmx

@@ -1,220 +1,220 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="20" height="21" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="9">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="20" height="21" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="9">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="545" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="621" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="653" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="729" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="761" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="869" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="965" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="997" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1093" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1125" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1221" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1253" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1349" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1381" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1477" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1509" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1605" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1637" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1733" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1765" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1861" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1893" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1989" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2021" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2117" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2149" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2245" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2277" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2373" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2405" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2501" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2533" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2629" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2661" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2757" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2789" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2885" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2917" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3013" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3045" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3141" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3173" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3269" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3301" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3397" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3429" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3525" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3557" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3653" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3685" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3781" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3813" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3909" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3941" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4037" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4069" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4165" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4197" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4293" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4325" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4421" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4453" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4549" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4581" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4677" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4709" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4805" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4837" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4933" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4965" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5061" name="map_transition_6" tilewidth="32" tileheight="32" tilecount="144" columns="18">
+ <tileset firstgid="5093" name="map_transition_6" tilewidth="32" tileheight="32" tilecount="144" columns="18">
   <image source="../drawable/map_transition_6.png" width="576" height="256"/>
  </tileset>
- <tileset firstgid="5205" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5237" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5333" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5365" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5461" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5493" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5589" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="5621" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="5709" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="5741" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="5829" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="5861" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="5949" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5981" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6077" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6109" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6205" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="6237" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="6313" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6345" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6441" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6473" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6569" name="map_rock_3" tilewidth="32" tileheight="32" tilecount="30" columns="6">
+ <tileset firstgid="6601" name="map_rock_3" tilewidth="32" tileheight="32" tilecount="30" columns="6">
   <image source="../drawable/map_rock_3.png" width="192" height="160"/>
  </tileset>
- <tileset firstgid="6599" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6631" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6727" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6759" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6855" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6887" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6983" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7015" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7111" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7143" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7239" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32" tilecount="32" columns="8">
+ <tileset firstgid="7271" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32" tilecount="32" columns="8">
   <image source="../drawable/map_sign_ladder_omi2.png" width="256" height="128"/>
  </tileset>
- <tileset firstgid="7271" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7303" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7399" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7431" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7527" name="map_cavewall_5" tilewidth="32" tileheight="32" tilecount="36" columns="6">
+ <tileset firstgid="7559" name="map_cavewall_5" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../drawable/map_cavewall_5.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="7563" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7595" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
  <layer id="1" name="Ground" width="20" height="21">
   <data encoding="base64" compression="zlib">
-   eJytlE0KwjAQhYOgUPQAttCFay+XTXWhFdpsclvd6E50YvPoY5qoiIsHbSbzzU8ysWtjrGhX/0d2PQprR7Jvi6m+4YHTinpR8yXvqATWPnKcyBOPdV8a81iOvojdqxzA8/F7Vg62TTXNgRmI7RM5tJEDNbTeZxjYi9zZx0X7Veq/icxqyFnnADvHfp0D1emozrloUY62ncob9vBticN94/2Il7LZetoPfebB51SM0meE+hoV4xdeEOrL8YLO8n8p0zXpXiDOgWdAxXyIn6nSPF0veF09MPkupubtEw/rgde9mYccj+tqf+Dp+9XFfbiX2hbihTncJs4uxYQPZkbPQ0e5cT9zTNTlongeIB9ZXD/6xO/anpiunvZC18489Okdj/1T74DmfTrr3Duga/fEeALJlch9
+   eJytlMEKwjAQRHsVCnpRVIiKoP/h2Z/LpXrQCm0u+Uw3NkOGbaIiHgZKtnm7s8nGLqvKii7mP7LLJKzdKX6ejPUND5xW1IuaL3l3JbCukeNEnngsU1fVtk57kbtXNYDn4/d+NcRO63ENzEBun6mhjRyoofW+wMC/qH1Tpz0uxueihWhXDzXrGhDn3K9zIJ+OfB5Ex1WKXVTdiIdvSxzu2z6TLxezZtwPfeZhz2OSpM8I/hqV4xdeEPyVeEFTuQezdd6T7gXy3HgGVM6tsHYFnvYLXmcGJt/F3Lx94mE98Lo381Disa/2B56+X138D/dSx0K+MIfnzNnlmNiDmdHz0FFt3M8SE75cFM8D5COL/aNP/K5dienMuBfaO/PQp3c83p97BzTv01mX3gHt3RPjCSvZ7IU=
   </data>
  </layer>
  <layer id="2" name="Objects" width="20" height="21">
   <data encoding="base64" compression="zlib">
-   eJyllLFOw0AMQL0gZWEqS6/JVPiCli8oCDZSviDNDyC6V4QuFRNSfwCJL0Cd+Ths3Vk1rn0JwpKlS2y/s8/nA4gyLQGuS3DlEI7rGfrNk+ZirgxbPQF4FbpEXaDfTdJbhzcybJ+YU4Pxz0JXEz8fzfo+j9/zcFrje6YuKTLnTYj11QNy2IR+Hz6r7QAeyVsF8JjxbdF2h7neo3449RFDCvGeKtuPeA/l6X/ZY87dYrB0mTrr9J/iv8bY48R5wXU3jvblwPMhaYXvwehBk7lDZ8VxvU+xXm/2mf6uU0xR+D6ezIyZa//BWxhzNQq/eXJP2utC1dZ3l6fKLvck3mVPvK6ZerR2zp3PQs9BI76tmj0m87o/3jO9p+YNZfIssZ+M5xmU0sfk93Jl8HjWtFhMb56Jt6tibrl3i2des34A4bJCxg==
+   eJyllEFOw0AMAH3shQd0mxyRuJcfFF7Q8oKC4EbKC9J8ANF7Reil4oTUDyDxAtQzj8HWrlXj2pugWrK0ie1Ze71egCiTAuCmAFf24bCeot8saS7m2rBVI4A3oQvUOfrdJr1zeGPD9oU51Rj/InQ58vPRrJ+z+D0LxzV+ZOqSInNeh1hf1SOHdej24bPa9OCRvJcATxnfBm33mOsD6qdTHzGkEO+5tP2I91gc/5c95twtBkubqbNK/yn+e4g9TpxXXLfDaF/0PB+SRvjujR7UmTt0PjisdynW680u099VirkY+D6eTI2Za07gzY25Goe/PLkn7XWpauu6yxNll3sS76ojXtdMPVo5585noeegFt9WzR6Tee0/75neU/P6MnmW2E/G8wxK6WLye7k0eDxrWiymN8/E25Yxt9y7xTOvWb9XNlRG
   </data>
  </layer>
  <layer id="3" name="Above" width="20" height="21">
   <data encoding="base64" compression="zlib">
-   eJzbI8lAVXAIat42POaa4ZHbQIZ73IjUUyaL312PKQyL00D9nbLEqVWWoswuSkA+EW6MB/olgcjwKCXCvHygWQU4zEMOM3xuWzSAYQYDIL+WIWFKAbJZ5VQwjxyAnue42BAYXR5ZHAZOE0gnUmwIjEuOEFiJZMdPGcLq20kMy0Ii1FPLzLlI6ZgYM7GpN0cSW4vEziUij6wlIx+R6ncYwOcebGYCAO1FIE4=
+   eJy7I8lAVfAIat41POaG4ZG7QIZ70ojUM00Wv7uYpUi3Gxm8Bpq9UpY4tc4U2kUMmIrDLf1EuLEe6JcGIsMVlz0odgLNmoDDPOQww+e2Q3QIM0IA5NdpSJhSgGzWdCqYRw5Az3NabAiMLo8sDgOvCaQTKzYExiVHCJxEskOSiHBaTmJYTqSjmXuR0jExZmJTH44kdhaJ3UtEHjlLRj4i1e8wgM892MwEAGDLJmI=
   </data>
  </layer>
- <layer id="4" name="Top" width="20" height="21">
+ <layer id="4" name="Top" width="20" height="21" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxjYBh6gFOWuuZwkGAePrt/ypBuBj67cZmH7gZi3A/Sg00dLnFyzAIBYsOAWD30MI9QesJlngw7djlCbkaWF2cnTS8h80h1y1A0rxBHfIHikRzzcAGQWdQw774kwjxS8xo6APnRUgphHqUA2QxK3YZuHjkAABKvH/I=
+   eJxjYBh6QFOWuuZokGAePrsliTQH2Qx8duMyD90NxLgfpAebOlzi5JgFAsSGAbF66GEeofSEyzwbduxyhNyMLG/OTppeQuaR6pahaN5EPPmCHPNwAUkqmfdfEmEeqXkNHYD8GCmFMI9SgGwGpW5DN48cAADZGw0r
   </data>
  </layer>
  <layer id="5" name="Walkable" width="20" height="21">
   <data encoding="base64" compression="zlib">
-   eJx7LsPA8HwUUxWDALXMgQFy9KDrI9Y8fGZgU0dIPzHuJ2QWKeGLz15qmEfIf6SGLzazqZVOBoN5tMC0cB8+86jlZ3zphhI3o6chcvyMD5BrHj5zsekHAO5WS+g=
+   eJxjl2VgYB/FVMUgQC1zYIAcPej6iDUPnxnY1BHST4z7CZlFSvjis5ca5hHyH6nhi81saqWTwWAeLTAt3IfPPGr5GV+6ocTN6GmIHD/jA+Sah89cbPoBULkuIQ==
   </data>
  </layer>
- <objectgroup id="6" name="Mapevents">
+ <objectgroup id="6" name="Mapevents" visible="0">
   <object id="1" name="east" type="mapchange" x="608" y="160" width="32" height="32">
    <properties>
     <property name="map" value="elm_4f_3"/>

AndorsTrail/res/xml/fallhaven_derelict2.tmx

@@ -1,251 +1,272 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="25" height="19" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="25" height="19" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="13">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="25" height="19">
+ <layer id="1" name="Ground" width="25" height="19">
   <data encoding="base64" compression="zlib">
-   eJzj42Jg4KMD3i5FHiZGL8yO41KoOIQVgtHF0TFILy51MHGYHZ84UXEKKwSji6NjkF5c6mDiuOwgFhOjl5i4opYd+OLSCOhnQxzhgcs92NyKHsfI6QCX+SCM7jZs4sh2IMcdsXGEnpawicPsAJmfBrUDZB8l6QBfeKKLIasrFGNgKBYj3Z/ocY4elpfxxAOhNIhNDltYEnIbtnIDX5yTE8a3gP68DcQ3WSF+BrmrjpuBoYEb4c6LrNjtcCQiznHJzwOav4AbwX+IZIcRK34zsMX5RyLKM+RwRRbzZsUUw5b3kPmGQPuNxXCrxRa/hOKckDy62pectMcAARhbrg==
+   eJzT42Jg0KMDvi5FHiZGL8yO51KouIQVgtHF0TFILy51MHGYHUJouIUVgtHF0bEeF251MHFcdhCLidFLTFxRyw58cRkE9HMgjvDA5R5sbkWPY+R0gMt8ISxuwyaObAdy3BEbR+hpCZs4zA6Q+W1QO0D2UZIO8IUnuhiyuoliDAyTxUj3J3qco4flZzzxQCgNYpPDFpaE3Iat3MAX5+SE8S+gP38D8U9WiJ9B7prHzcCwgBvhzo+s2O1IJCLOccnvA5p/gBvBZ2RD2BHEit8MbHEuyEa8n6+jhX02K6YYtryHzA8E2h8shlsttvglFOeE5NHVcnLRHgMAGWeb+w==
   </data>
  </layer>
- <layer name="Objects" width="25" height="19">
+ <layer id="2" name="Objects" width="25" height="19">
   <data encoding="base64" compression="zlib">
-   eJxjYKAfYBOD0Ff5UMVx8cPYMM14DpRT48dthxjUDk4mhFgJKwNDKSuEbcqCEAex07DYga4fHewUwxRrAZrfCrXDFWjuRaCaJhYIu5oVoe6hEANDB5DPCOWj0+SCYKgdSawQu0FAkAE7TS5IZiWsBuQ/YsBhqBsvooVlEhF24AK70fReAprtyIppBwygpztCIAdo1mmoHVOA9FQgVuZgYFAHYhUgVoViNagYDJjh8BM2cWS32rFgymMDVkBz3ND8uRRqthuB8IxDsuMINF9ZEmkvLjAFyU7kMAaZOxHoxsk44oNYgBzPMtB8+hjN/zA/EBuG6GXKaTzpBh34EWnHNjLSNswfsHh6BTTjNRC/ZMX0MwgcI5CmsJl9Ek95Sgx4xA/BjAIIMVi4o8c5rCxkZIO4ywkoL4rF/sVAcXUk/id+BK6AmgEKE1h5g5xmp2AJg0CgXcFQN0QghZs5ST6lDAAAxSc+DA==
+   eJxjYKAfUBOD0F/5UMVx8cvYMM1g52dgcOPHbYcZ1A5NJoTYFFYGhqmsEHYoC0IcxG7DYge6fnRwUwxTbAnQ/KVQO1KB5n4EqlnEAmHPZkWoYxRmYFgB5DPC+Gg0uaAYakcTK8RuEBBkwE6TC5pZCasB+Y8Y8Bjqxo9oYdlEhB24wG00vZ+AZieyYtoBA+jpjhDoAZr1GmrHFiC9FYidORgY3IHYBYhdodgNKgYDYTj8hE0c2a1xLJjy2EAU0Jw0NH8ehZqdRiA865DseALNV5FE2gsDWmjhuwXJTuQwBpm7Eah2M474IBYgx7MNNJ8ys6H6H+YHYsMQvUx5jSfdoIM8Iu24RkbahvkDFk9cQH9yAzEnG6afQeAZgTSFzeyXeMpTYgCTAAQrCiDEYOGOHuewslAR6vYkoLwpFvsPA8XVkfhCAgg8A2oGKExg5Q1ymt2CJQwKgXYVQ91QgRS35iT5lDIAAJwZPno=
   </data>
  </layer>
- <layer name="Above" width="25" height="19">
+ <layer id="3" name="Above" width="25" height="19">
   <data encoding="base64" compression="zlib">
-   eJxjYKAPOCxGe70DacdFPPphciC9uNQhi9PDH5QASsIKJvaNnXZugYkJczAwiAOxCAdCTgwqRow56HKUxtElAnagp43BFJekmIduJi3sQA9LfGGLyw3ExDmp7kIHhOKcGnaQqp6QGYPRDuRwhOUTQnFOSJ7eAADs1yvl
+   eJxjYKAPeCxGe70DacdHPPphciC9uNQhi9PDH5QASsIKJibGQTu3wMSMgXaYA7EJkl1mUDFizEGXozSOPhGwAz1tDKa4JMU8dDNpYQd6WOILW1xuICbOSXUXOiAU59Swg1T1hMwYjHYghyMsnxCKc0Ly9AYArYUxxg==
   </data>
  </layer>
- <layer name="Walkable" width="25" height="19">
+ <layer id="4" name="Walkable" width="25" height="19">
   <data encoding="base64" compression="zlib">
-   eJzdk8sNACEIRK1i+2/BDjd7I2QgD8TLknBQcD6K+1lr/yi/uI1vI+KPdNi6xbD9ncg0ZnqJR3+2ouX0Pm3P1JsprFMOgkE4fJ2E6o1mUGmIcCqzSH1M3VXmI9PV4ah6pxwKo8pB+nw94+3MHfXuz6g1xSZvHu3RvzidL5Mn7d8=
+   eJzdk8sNACEIRK1i+2/JjjZ7I2QgD8TLknBQcD6K+1lr/yi/uI1vI+KPdNi6xbD9ncg0ZnqJR3+2ouX0Pm3P1JsprFMOgkE4fJ2E6o1mUGmIcCqzSH1M3VXmI9PV4ah6pxwKo8pB+nw94+3MHfXuz6g1xSZvHu3RvzidLxDxFC4=
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="up" type="mapchange" x="64" y="64" width="32" height="32">
+ <objectgroup id="5" name="Mapevents">
+  <object id="1" name="up" type="mapchange" x="64" y="64" width="32" height="32">
    <properties>
     <property name="map" value="fallhaven_derelict"/>
     <property name="place" value="down"/>
    </properties>
   </object>
+  <object id="11" name="down" type="mapchange" x="736" y="320" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_tunnel1"/>
+    <property name="place" value="up"/>
+   </properties>
+  </object>
+  <object id="10" name="tt_start" type="script" x="160" y="128" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="tg_thief" type="spawn" x="288" y="128" width="160" height="96">
+ <objectgroup id="6" name="Spawn">
+  <object id="2" name="tg_thief" type="spawn" x="288" y="128" width="160" height="96">
    <properties>
     <property name="spawngroup" value="tg_thief"/>
    </properties>
   </object>
-  <object name="tg_cook" type="spawn" x="32" y="448" width="128" height="64">
+  <object id="3" name="tg_cook" type="spawn" x="32" y="448" width="128" height="64">
    <properties>
     <property name="spawngroup" value="tg_cook"/>
    </properties>
   </object>
-  <object name="troublemaker" type="spawn" x="544" y="96" width="224" height="96">
+  <object id="4" name="troublemaker" type="spawn" x="544" y="96" width="224" height="96">
    <properties>
     <property name="spawngroup" value="troublemaker"/>
    </properties>
   </object>
-  <object name="pickpocket" type="spawn" x="224" y="288" width="160" height="192">
+  <object id="5" name="pickpocket" type="spawn" x="224" y="288" width="160" height="192">
    <properties>
     <property name="spawngroup" value="pickpocket"/>
    </properties>
   </object>
-  <object name="farrik" type="spawn" x="384" y="480" width="32" height="32">
+  <object id="6" name="farrik" type="spawn" x="384" y="480" width="32" height="32">
    <properties>
     <property name="spawngroup" value="farrik"/>
    </properties>
   </object>
-  <object name="umar" type="spawn" x="608" y="480" width="128" height="96">
+  <object id="7" name="umar" type="spawn" x="608" y="480" width="128" height="96">
    <properties>
     <property name="spawngroup" value="umar"/>
    </properties>
   </object>
-  <object name="fanamor" type="spawn" x="96" y="288" width="32" height="32">
+  <object id="8" name="fanamor" type="spawn" x="96" y="288" width="32" height="32">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="fanamor"/>
    </properties>
   </object>
+  <object id="9" name="nanath" type="spawn" x="288" y="416" width="64" height="64">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="nanath"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="8" name="Keys">
+  <object id="12" name="Thieves03:40" type="key" x="736" y="320" width="32" height="32">
+   <properties>
+    <property name="phrase" value="fallhaven_tunnel1"/>
+    <property name="requireId" value="Thieves03"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="40"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys"/>
 </map>

AndorsTrail/res/xml/fallhaven_derelict2_t.tmx

@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="25" height="19" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="11">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="25" height="19">
+  <data encoding="base64" compression="zlib">
+   eJzj42Jg4KMD3i5FHiZGL8yO41KoOIQVgtHF0TFILy51MHGYHZ84UXEKKwSji6NjkF5c6mDiuOwgFhOjl5i4opYd+OLSCOhnQxzhgcs92NyKHsfI6QCX+SCM7jZs4sh2IMcdsXGEnpawicPsAJmfBrUDZB8l6QBfeKKLIasrFGNgKBYj3Z/ocY4elpfxxAOhNIhNDltYEnIbtnIDX5yTE8a3gP68DcQ3WSF+BrmrjpuBoYEb4c6LrNjtcCQiznHJzwOav4AbwX+IZIcRK34zsMX5RyLKM+RwRRbzZsUUw5b3kPmGQPuNxXCrxRa/hOKckDy62pectMcAARhbrg==
+  </data>
+ </layer>
+ <layer id="2" name="Objects" width="25" height="19">
+  <data encoding="base64" compression="zlib">
+   eJxjYKAfYBOD0Ff5UMVx8cPYMM14DpRT48dthxjUDk4mhFgJKwNDKSuEbcqCEAex07DYga4fHewUwxRrAZrfCrXDFWjuRaCaJhYIu5oVoe6hEANDB5DPCOWj0+SCYKgdSawQu0FAkAE7TS5IZiWsBuQ/YsBhqBsvooVlEhF24AK70fReAprtyIppBwygpztCIAdo1mmoHVOA9FQgVuZgYFAHYhUgVoViNagYDJjh8BM2cWS32rFgymMDVkBz3ND8uRRqthuB8IxDsuMINF9ZEmkvDHChhe8UJDuRwxhk7kSg2sk44oNYgBzPMtB8+hjN/zA/EBuG6GXKaTzpBh34EWnHNjLSNswfsHh6BTTjNRC/ZMX0MwgcI5CmsJl9Ek95Sgx4xA/BjAIIMVi4o8c5rCxkZIO4ywkoL4rF/sVAcXUk/id+BK6AmgEKE1h5g5xmp2AJg0CgXcFQN0QghZs5ST6lDAAAKiA+LA==
+  </data>
+ </layer>
+ <layer id="3" name="Above" width="25" height="19">
+  <data encoding="base64" compression="zlib">
+   eJxjYKAPOCxGe70DacdFPPphciC9uNQhi9PDH5QASsIKJvaNnXZugYkJczAwiAOxCAdCTgwqRow56HKUxtElAnagp43BFJekmIduJi3sQA9LfGGLyw3ExDmp7kIHhOKcGnaQqp6QGYPRDuRwhOUTQnFOSJ7eAADs1yvl
+  </data>
+ </layer>
+ <layer id="4" name="Walkable" width="25" height="19" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzdk8sNACEIRK1i+2/BDjd7I2QgD8TLknBQcD6K+1lr/yi/uI1vI+KPdNi6xbD9ncg0ZnqJR3+2ouX0Pm3P1JsprFMOgkE4fJ2E6o1mUGmIcCqzSH1M3VXmI9PV4ah6pxwKo8pB+nw94+3MHfXuz6g1xSZvHu3RvzidL5Mn7d8=
+  </data>
+ </layer>
+ <objectgroup id="5" name="Mapevents">
+  <object id="1" name="up" type="mapchange" x="64" y="64" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_derelict"/>
+    <property name="place" value="down"/>
+   </properties>
+  </object>
+  <object id="9" name="down" type="mapchange" x="736" y="320" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_tunnel1"/>
+    <property name="place" value="up"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="6" name="Spawn">
+  <object id="2" name="tg_thief" type="spawn" x="288" y="128" width="160" height="96">
+   <properties>
+    <property name="spawngroup" value="tg_thief"/>
+   </properties>
+  </object>
+  <object id="3" name="tg_cook" type="spawn" x="32" y="448" width="128" height="64">
+   <properties>
+    <property name="spawngroup" value="tg_cook"/>
+   </properties>
+  </object>
+  <object id="4" name="troublemaker" type="spawn" x="544" y="96" width="224" height="96">
+   <properties>
+    <property name="spawngroup" value="troublemaker"/>
+   </properties>
+  </object>
+  <object id="5" name="pickpocket" type="spawn" x="224" y="288" width="160" height="192">
+   <properties>
+    <property name="spawngroup" value="pickpocket"/>
+   </properties>
+  </object>
+  <object id="6" name="farrik" type="spawn" x="384" y="480" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="farrik"/>
+   </properties>
+  </object>
+  <object id="7" name="umar" type="spawn" x="608" y="480" width="128" height="96">
+   <properties>
+    <property name="spawngroup" value="umar"/>
+   </properties>
+  </object>
+  <object id="8" name="fanamor" type="spawn" x="96" y="288" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="fanamor"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="8" name="Keys">
+  <object id="10" name="Thieves03:40" type="key" x="736" y="320" width="32" height="32">
+   <properties>
+    <property name="phrase" value="fallhaven_tunnel1"/>
+    <property name="requireId" value="Thieves03"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="40"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>

AndorsTrail/res/xml/fallhaven_tunnel1.tmx

@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="28" height="10" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="16">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
+ </tileset>
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="28" height="10">
+  <data encoding="base64" compression="zlib">
+   eJw7x8TAcI5O+AGN1GLDD4H4E5Fqz0PVnqXArs9AzMKM2y/I+CFU7X0scoQwzK4rnBCMy9/IGKb+IxY5QhjZLhDG5haQX5Axsnp0OUIYWS8I43MLtfE5Jvxu2cNEPQyLL3xuoQXG5xZaYAB1Mdmc
+  </data>
+ </layer>
+ <layer id="2" name="Objects" width="28" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFIKAkRl/7jCi0j5UZtxzMLxGCCDEnJPuQxYkRO8OE3y3ofoGpZ8bjRlwA2a5HWPwBkneiQVwFS+J3y24gew8VMQzIYPHLbgLhPZQAABlRGPw=
+  </data>
+ </layer>
+ <layer id="3" name="Above" width="28" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFIPBYbGjZ90mUgeERDjOwmf2JQvuCJXHbR6nZuOzbzUR9c3EBeto1kgAAs3MKRQ==
+  </data>
+ </layer>
+ <layer id="4" name="Walkable" width="28" height="10" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJy7KMbAcHEQYhAYLvZhM5tS+2BgONqHzy5keWoCct1CjbRBrFuGIgYA70XWww==
+  </data>
+ </layer>
+ <objectgroup id="5" name="Mapevents" visible="0">
+  <object id="1" name="east" type="mapchange" x="864" y="96" width="32" height="64">
+   <properties>
+    <property name="map" value="catacombs3"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+  <object id="2" name="up" type="mapchange" x="0" y="256" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_derelict2"/>
+    <property name="place" value="down"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="6" name="Spawn rats" visible="0">
+  <object id="5" name="catacombrat1" type="spawn" x="96" y="160" width="736" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="catacombrat1"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="7" name="Spawn guards" visible="0"/>
+ <objectgroup id="9" name="Keys" visible="0">
+  <object id="12" name="fallhaven_tunnel2a" type="key" x="160" y="96" width="32" height="32">
+   <properties>
+    <property name="phrase" value="fallhaven_tunnel2a"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
+  <object id="13" name="fallhaven_tunnel2b" type="key" x="320" y="32" width="32" height="32">
+   <properties>
+    <property name="phrase" value="fallhaven_tunnel2b"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
+  <object id="15" name="fallhaven_tunnel2c" type="key" x="832" y="96" width="32" height="32">
+   <properties>
+    <property name="phrase" value="fallhaven_tunnel2c"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>

AndorsTrail/res/xml/fallhaven_tunnel2.tmx

@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="8" height="25" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="17">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
+ </tileset>
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="8" height="25">
+  <data encoding="base64" compression="zlib">
+   eJw7x8TAcA4LfoBDHITPA/EnID6LR56FGbf8QyC+woldHqT3MwF5kByt5M8RIX8ej/uoIY8vfB7iCR9kOXR5dDlkeWxyIExI7hwBuXME5NDl8cUFrrQIksOXVinFAJM3paQ=
+  </data>
+ </layer>
+ <layer id="2" name="Objects" width="8" height="25">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAPKIrhlzckIO+IRz5CEL/eM0z45SkFe2lsPq0BrvABhSu+sEOWW8lEHblHYrjlkAE+uWRJ3HKPCKQzSgEAs3wM/g==
+  </data>
+ </layer>
+ <layer id="3" name="Above" width="8" height="25">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAPPBajnfxnoNwnPPK0tJsYeRD4PMBuwBc+9AbJkrjlzjDhl38kRlh+JRNueXxy1AAAqNYTZQ==
+  </data>
+ </layer>
+ <layer id="10" name="Top" width="8" height="25">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgF6GAv00C7YGiBT6ID7QLaAQBsHwHH
+  </data>
+ </layer>
+ <layer id="4" name="Walkable" width="8" height="25" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJy7KMbAcJEMDAKDVR4GyJUfaPcPZPiQI4cMqGkfMf6kNQYADNaZZw==
+  </data>
+ </layer>
+ <objectgroup id="5" name="Mapevents">
+  <object id="2" name="up" type="mapchange" x="192" y="32" width="32" height="32">
+   <properties>
+    <property name="map" value="guildbrig1"/>
+    <property name="place" value="down"/>
+   </properties>
+  </object>
+  <object id="16" name="west" type="mapchange" x="0" y="640" width="32" height="64">
+   <properties>
+    <property name="map" value="catacombs3"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="6" name="Spawn rats" visible="0">
+  <object id="5" name="catacombrat1" type="spawn" x="96" y="160" width="128" height="480">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="catacombrat1"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="7" name="Spawn guards" visible="0"/>
+ <objectgroup id="9" name="Keys" visible="0">
+  <object id="12" name="fallhaven_tunnel2c" type="key" x="32" y="576" width="32" height="32">
+   <properties>
+    <property name="phrase" value="fallhaven_tunnel2c"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>

AndorsTrail/res/xml/guildbrig1.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="17" height="11" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="4">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="17" height="11" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="5">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
@@ -187,7 +187,7 @@
  </layer>
  <layer id="2" name="Objects" width="17" height="11">
   <data encoding="base64" compression="zlib">
-   eJxjYKAekGRiYPjMxsDgw4QQk2HCoVYWU0wcqpaZnYEhBsouwqEfF1jEimB/4WdgyAHyPwCxmzADww4+iHgykpmN/PjN+yAIZbBBqBNAM3ZwQMyFgdNCEPPhaoHglyiqOSB5ZDNPcEDYm4F6twBxqDCqGhC4ATVPVICBQYyIcACZAXILMqiCuvMRC6Z6WHggA5D+dGGIWcSAE1jMgPlpC5pbkMMMOZ6wgcNAvUegmFoAANyhH68=
+   eJxjYKAekGRiYPjMxsDgw4QQk2HCoVYWU0wcqpaZnYEhBsouwqEfF1jEimB/4WdgyAHyPwCxmzADww4+iHgykpmN/PjN+yAIZbBBqBNAM3ZwQMyFgdNCEPPhaoHglyiqOSB5ZDNPcEDYm4F6twBxqDCqGhC4ATVPVICBQYyIcACZAXLLRyS7q6DufMSCqR4WHsgApD9dGGIWMeAEFjNgfgJhZIAcZsjxhA0cBuo9AsXUAgD7KyC1
   </data>
  </layer>
  <layer id="3" name="Above" width="17" height="11">
@@ -197,7 +197,7 @@
  </layer>
  <layer id="4" name="Walkable" width="17" height="11">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsHGQYRCgVD8MEDITl1p0QMhdxJiBzTxccuhmEuMmXGLoZlDDL+SEKT6z6ZGuAKSEYfM=
+   eJzbKMbAsHGQYRCgVD8MEDITl1p0QMhdxJiBzTxccuhmEuMmXGLoZlDDL6TGEzY3YOPTEgMA/XVkSA==
   </data>
  </layer>
  <objectgroup id="5" name="Mapevents">
@@ -214,8 +214,24 @@
    </properties>
   </object>
   <object id="3" name="guildbrig_1" type="container" x="32" y="224" width="32" height="32"/>
+  <object id="4" name="down" type="mapchange" x="480" y="192" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_tunnel2"/>
+    <property name="place" value="up"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup id="6" name="Spawn"/>
- <objectgroup id="7" name="Keys"/>
+ <objectgroup id="9" name="Keys" visible="0">
+  <object id="12" name="fallhaven_tunnel3" type="key" x="384" y="160" width="32" height="32">
+   <properties>
+    <property name="phrase" value="fallhaven_tunnel3"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
+ </objectgroup>
  <objectgroup id="8" name="Replace"/>
 </map>

AndorsTrail/res/xml/stoutford_se.tmx

@@ -185,7 +185,7 @@
  </tileset>
  <layer id="1" name="Ground" width="32" height="18">
   <data encoding="base64" compression="zlib">
-   eJy9lD0OgkAQRjd20FKSeAMvg14AvRNXQEps7W2s9Do2LslsXL7szsiyQ/ESApN5+/MNY2HMyLAvl8H1inGv5mzmp/pnNSeL3z7fBB5U39TGHIlTnXaGyMv2fv/BVNta55m4gB/vhiPHuhG8G46lvfudrl/KSIq/8XKyhR+z2Xo5kXKbw89lk/uWy78GyX9V9h/KMG7v2n4f/Fc4fwdo+XFWnD+ExjpwVmL77+j9sHINPfSYZuVT/GYl5sdz4JD8XL5i5z8I/tBdpdS591/fMnCB
+   eJy9lD0OgkAQRjd20FKSeAMvg14AvRNXQEpo6W2s9Do2LslsXL7szgjsULyEwGTe/nxDnxnTMxzzZXC9YozFnN38VP8s5iTx2+dB4EH1VWnMmbiU684Qedne7z+YamvrvBI38OPdcKRYN4J3w7G0d3vQ9UsZWeOvvJzs4cds1l5OpNym8HPZ5L6l8m9B8t+V/ac8jNu7tt8H/xXO3wBafpwV5w+hsQ6cldj+G3rfbVxDCz2mWflkv1mJ+fEcOCQ/l6/Y+XeCP3RXUh33/QvdOnBv
   </data>
  </layer>
  <layer id="2" name="Objects" width="32" height="18">

AndorsTrail/res/xml/sullengard3.tmx

@@ -1,206 +1,206 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="11" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="5">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="11" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="8">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer id="1" name="Ground" width="11" height="30">
   <data encoding="base64" compression="zlib">
-   eJzbyMnAsHEUj+JRPIpHMU4MACK678U=
+   eJy7yMnAcHEUj+JRPIpHMU4MANRwGRQ=
   </data>
  </layer>
  <layer id="2" name="Objects" width="11" height="30">
   <data encoding="base64" compression="zlib">
-   eJyFlE0OgjAQhZveQDamK72N8Qie0DO4YMtPSIgXgAVrVI5gC33yGKbxbZqSr28e0wFjjLlbY65HM6s6LGsdV6iJe2aHzOjKtmwRz7Zu9Q9ne79/uS3biLqBHz3zduueM0DMfPw6CV88Q2bwJ78/Z3vfSuToyZ99uQcFZcW7pfJqudm3dTqv9Yyzcn3NF8IZmZfZ8rDvQyovC/edu4WXvkENzcGmhnIXnBfS7ngSPdN6+M9X6wPfseyb5lsKT/DwfXj24tkb5eD3mRVrNlbnkWWkOevswsu54Px5ZMOzzu6/Ua0PlfLt5070IUuzUKjJfQAP9kn/h9+9xHmoha82l/AdxP9HYzgvZ0j5fgFiXZHD
+   eJyFlE0OgjAUhJuu/QMXBlbcRG9jPIIn9Awu2PKTJsYLYOwTJkwfjzib0mY6/fra4pxzD+/c7eR+6rKx7acWClOfvf7oTFV56m2mua9izpe5n9jflqk3qHXFv4meXTn3mQFizz62B5WLMTDDf46sl3yZ2ykOYUU+53INGmLF3tZ4LW7OlVpZsmrGrLy+lQthjuZlb5st67DGy8J518Xo17miQPeA16iMs2BeyDrjQ5l6rBr+y7XqwGes62bltioTfuQ+o/cavXfi4P2I8IaCt/1gQa58D37063vB/PX0BmVs8Ms3atWhM95+XaR1AK/lhWRNrgP88L7p/4AW96FXuda9RC72qxnYw7zMsJb7BXDqbMA=
   </data>
  </layer>
  <layer id="3" name="Above" width="11" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYKAM7JNE5d8B8u9KYleLro4YNTCz7gPpB2h6sIkRYzep6pHdSqr5yAA9rIh1BywciAkzUsylBNDCXPT4xBa/uMLwPRHhRwhQO3yxuZ8YQKx7aWUuNcPhAAX+IMa95IQVOXoAnnAr2A==
+   eJxjYKAM3JNE5f8B8v9KYleLro4YNTCz/oNoKVR5bGLE2E2qemS3kmo+MkAPK2LdAQsHYsKMFHMpAbQwFz0+scUvrjDkl8IuDgLUTJPoAJ+52NxPDCDWvbQyl5rh8IACfxDjXnLCihw9ABX4K54=
   </data>
  </layer>
- <layer id="4" name="Walkable" width="11" height="30" visible="0">
+ <layer id="4" name="Walkable" width="11" height="30">
   <data encoding="base64" compression="zlib">
-   eJzbKMZAFNgoBsGUqEUXg6lDFselD5taXHbiMhcbn5C5pLiBmuYS8icx8vR0L6lqiYlHYs3GpQ9f/BNrLjHqSDUXXxon1fyBSsfY8hql5pKb94lxL7IacswFAJbOaCs=
+   eJy7KMZAFLgoBsGUqEUXg6lDFselD5taXHbiMhcbn5C5pLiBmuYS8icx8vR0L6lqiYlHYs3GpQ9f/BNrLjHqSDUXXxon1fyBSsfY8hql5pKb94lxL7IacswFAIg1eOs=
   </data>
  </layer>
  <objectgroup id="5" name="Mapevents">
@@ -228,7 +228,30 @@
     <property name="spawngroup" value="deathcob"/>
    </properties>
   </object>
+  <object id="5" name="tt_seraphina" type="spawn" x="256" y="448" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+	<property name="ignoreAreas" value="true"/>
+    <property name="spawngroup" value="tt_seraphina"/>
+   </properties>
+  </object>
+  <object id="6" name="tt_guys" type="spawn" x="192" y="416" width="96" height="160">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="5"/>
+    <property name="spawngroup" value="tt_guys"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="7" name="Keys">
+  <object id="7" name="dummy_key" type="key" x="256" y="448" width="32" height="32">
+   <properties>
+    <property name="phrase" value="dummy_key_noPhrase"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup id="7" name="Keys"/>
  <objectgroup id="8" name="Replace"/>
 </map>

AndorsTrail/res/xml/sullengard_inn.tmx

@@ -1,213 +1,220 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="14" height="8" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="14" height="8" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="12">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="14" height="8">
+ <layer id="1" name="Ground" width="14" height="8">
   <data encoding="base64" compression="zlib">
-   eJzbIM3AsIFMHEwihulLIhHD9MlwkYZh+nS4SMMgPUFk2BcC1JNIhn3JQD3vOLFjkDwuORAGAJk4M64=
+   eJy7IM3AcIFMXEwihulrIhHD9NlwkYZh+ny4SMMgPUVk2FcC1NNIhn3NQD18XNixDw5xGAYAc1Q0uw==
   </data>
  </layer>
- <layer name="Objects" width="14" height="8">
-  <data encoding="base64" compression="zlib">eJxjYBg4wIRH7hE/A8NDfggNA0JoNDJYxgahPwHVf+SH0DCghEYfZ0fVe4gFO9sISpvi0HcJqPYpC4INA05Q2hVKX0fTNw9J7QIWBooAAKPsD7o=</data>
+ <layer id="2" name="Objects" width="14" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYBg4wIRPToCBgVEAQsOAEBqNDI6xQeWA6gUFIDQMKKHRz9lR9T5iwc42gtKmOPR9AqplZUWwYcAJSrtC6e9o+vYhqT3AwkARAACFSgrh
+  </data>
  </layer>
- <layer name="Above" width="14" height="8">
-  <data encoding="base64" compression="zlib">eJxjYCAfHBaD0AqyEPotHwPDOz5UNRICCHl0fdjANDZU/kl+4vQR405kcJkIs7DpQxazZ0Gw45HYl7DowyZGDQAALU8Mgw==</data>
+ <layer id="3" name="Above" width="14" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAfPBaD0A6yEJqXn4GBjx9VjYUAQh4GmPCYuY0Nlf8SyTyYfaQCbPo+E2EWNn3IYvEsCHY9EvsTFn3YxKgBAEjVC84=
+  </data>
  </layer>
- <layer name="Top" width="14" height="8">
-  <data encoding="base64" compression="zlib">eJxjYBic4Cz/QLtgaAAAACAA3Q==</data>
+ <layer id="4" name="Top" width="14" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYKA/eCxGWM1bftq7YzgAAGgFAfY=
+  </data>
  </layer>
- <layer name="Walkable" width="14" height="8" visible="0">
-  <data encoding="base64" compression="zlib">eJzbKMbAsHGIYHwAJk+MPmLMQtaLTmMzh1r2YXM7PnkA98c5hw==</data>
+ <layer id="5" name="Walkable" width="14" height="8" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJy7KMbAcHGIYHwAJk+MPmLMQtaLTmMzh1r2YXM7PnkASt1Cxw==
+  </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="door" type="mapchange" x="192" y="224" width="32" height="32">
+ <objectgroup id="6" name="Mapevents">
+  <object id="1" name="door" type="mapchange" x="192" y="224" width="32" height="32">
    <properties>
     <property name="map" value="sullengard1"/>
     <property name="place" value="sullengard_inn_outside"/>
    </properties>
   </object>
-  <object name="bed1" type="rest" x="32" y="96" width="32" height="32"/>
-  <object name="bed2" type="rest" x="96" y="96" width="32" height="32"/>
-  <object name="bed1_key" type="key" x="32" y="96" width="32" height="32">
+  <object id="2" name="bed1" type="rest" x="32" y="96" width="32" height="32"/>
+  <object id="3" name="bed2" type="rest" x="96" y="96" width="32" height="32"/>
+  <object id="4" name="bed1_key" type="key" x="32" y="96" width="32" height="32">
    <properties>
     <property name="phrase" value="sullengard_inn_bed"/>
     <property name="requireId" value="sullengard_hidden"/>
@@ -215,7 +222,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object name="bed2_key" type="key" x="96" y="96" width="32" height="32">
+  <object id="5" name="bed2_key" type="key" x="96" y="96" width="32" height="32">
    <properties>
     <property name="phrase" value="sullengard_inn_bed"/>
     <property name="requireId" value="sullengard_hidden"/>
@@ -223,9 +230,9 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object name="bed3" type="rest" x="32" y="192" width="32" height="32"/>
-  <object name="bed4" type="rest" x="96" y="192" width="32" height="32"/>
-  <object name="bed3_key" type="key" x="32" y="192" width="32" height="32">
+  <object id="6" name="bed3" type="rest" x="32" y="192" width="32" height="32"/>
+  <object id="7" name="bed4" type="rest" x="96" y="192" width="32" height="32"/>
+  <object id="8" name="bed3_key" type="key" x="32" y="192" width="32" height="32">
    <properties>
     <property name="phrase" value="sullengard_inn_bed"/>
     <property name="requireId" value="sullengard_hidden"/>
@@ -233,7 +240,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object name="bed4_key" type="key" x="96" y="192" width="32" height="32">
+  <object id="9" name="bed4_key" type="key" x="96" y="192" width="32" height="32">
    <properties>
     <property name="phrase" value="sullengard_inn_bed"/>
     <property name="requireId" value="sullengard_hidden"/>
@@ -242,18 +249,18 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="sullengard_innkeeper_spawn" type="spawn" x="288" y="96" width="96" height="128">
+ <objectgroup id="7" name="Spawn">
+  <object id="10" name="sullengard_innkeeper_spawn" type="spawn" x="288" y="96" width="96" height="128">
    <properties>
     <property name="spawngroup" value="sullengard_innkeeper"/>
    </properties>
   </object>
-  <object name="sullengard_inn_traveler_spawn" type="spawn" x="384" y="128" width="32" height="32">
+  <object id="11" name="sullengard_inn_traveler_spawn" type="spawn" x="384" y="128" width="32" height="32">
    <properties>
     <property name="spawngroup" value="sullengard_inn_traveler"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
- <objectgroup name="Replace"/>
+ <objectgroup id="8" name="Keys"/>
+ <objectgroup id="9" name="Replace"/>
 </map>

AndorsTrail/res/xml/sullengard_pond_east.tmx

@@ -1,248 +1,249 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="5" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="7">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="5" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer id="1" name="Ground" width="5" height="30">
+ <layer name="Ground" width="5" height="30">
   <data encoding="base64" compression="zlib">
-   eJzbyMnAsHEUj2Is+AQUYxNDlsMmBgCxhm3j
+   eJy7yMnAcHEUj2Is+AUUYxNDlsMmBgDRUICj
   </data>
  </layer>
- <layer id="2" name="Objects" width="5" height="30">
+ <layer name="Objects" width="5" height="30">
   <data encoding="base64" compression="zlib">
-   eJy7IMnAwCDEwHABSH8C0vJATAp4RKJ6SgGx9r0UxC5+D+jPt5KoYu8kMcWJVfcGi7pXQP5LSQgNczOMjyz+GsoH0beh4rfR+BjmIfkfX1i8wOH/Z0Dxl2IQ9nMkNa+AYi/EEHIgs38A2bfFMOW+iSHkToihmn8cKgYA2QM5hQ==
+   eJz7IMnAoCDEwPABSAsJMzDYA9mkACZh0tRTCoi1jxOHP/4B/ckrhSrGJ4UpTqw6HilMdVxAPqcUhIa5GcZHFueG8kH0b0mIOIhG5qObp4DkL3xhwYHD/2xAcU5xCJsdSQ0XUIxDHCEHMlsCyP4thiknJo6QeyGGav5zqBgAfuQVUQ==
   </data>
  </layer>
- <layer id="3" name="Above" width="5" height="30">
+ <layer name="Above" width="5" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBi+4I4kA8NdSeLFyVF3Cyh/UxJCwwCMjyyOzEcXHwzgpiB1zQMADHwS/g==
+   eJxjYBi+4I8kA8NfSeLFyVH3Cyj/UxJCwwCMjyyOzEcXHwzgpyB1zQMArpoVfg==
   </data>
  </layer>
- <layer id="4" name="Walkable" width="5" height="30" visible="0">
+ <layer name="Walkable" width="5" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsBEND2eAzY/Y/E4rdcji6GLYMC691AbYzMUlRshvIAwAVoAkig==
+   eJy7KMbAcBEND2eAzY/Y/E4rdcji6GLYMC691AbYzMUlRshvIAwA3Esqag==
   </data>
  </layer>
- <objectgroup id="5" name="Mapevents">
-  <object id="1" name="west" type="mapchange" x="0" y="32" width="32" height="352">
+ <objectgroup name="Mapevents">
+  <object name="west" type="mapchange" x="0" y="32" width="32" height="352">
    <properties>
     <property name="map" value="sullengard_pond"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object id="2" name="pond" type="mapchange" x="0" y="704" width="32" height="128">
+  <object name="pond" type="mapchange" x="0" y="704" width="32" height="128">
    <properties>
     <property name="map" value="sullengard_pond"/>
     <property name="place" value="southeast"/>
    </properties>
   </object>
-  <object id="3" name="east" type="mapchange" x="128" y="32" width="32" height="576">
+  <object name="east" type="mapchange" x="128" y="32" width="32" height="576">
    <properties>
     <property name="map" value="way_to_sullengard_east11"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object id="4" name="southeast" type="mapchange" x="128" y="640" width="32" height="288">
+  <object name="southeast" type="mapchange" x="128" y="640" width="32" height="288">
    <properties>
     <property name="map" value="way_to_sullengard_east11"/>
     <property name="place" value="pond"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="6" name="Spawn" visible="0">
-  <object id="5" name="preabola_fly_spawn1" type="spawn" x="64" y="32" width="32" height="352">
+ <objectgroup name="Spawn">
+  <object name="preabola_fly_spawn1" type="spawn" x="64" y="32" width="32" height="352">
    <properties>
     <property name="quantity" value="4"/>
     <property name="spawngroup" value="preabola_fly"/>
    </properties>
   </object>
-  <object id="6" name="sullengard_snapper" type="spawn" x="32" y="768" width="64" height="128">
+  <object name="sullengard_snapper" type="spawn" x="64" y="736" width="32" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="sullengard_snapper"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="7" name="Keys"/>
- <objectgroup id="8" name="Replace"/>
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace"/>
 </map>

AndorsTrail/res/xml/vilegard_s.tmx

@@ -1,211 +1,211 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="23" height="26" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="12">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="23" height="26" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="15">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6609" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6737" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6865" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="6953" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6985" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7073" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7105" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7193" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7225" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7353" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7481" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <layer id="1" name="Ground" width="23" height="26">
   <data encoding="base64" compression="zlib">
-   eJzbyMnAsBELPiJMGGPTRwzeIkwYk2s2Td0tRRiTa/ZhKQR+yIbKh2FyzX6HhFu4UPkwTK7ZyBhkNjXMGUx4mzB2TK4+ZP3HhLFjQmbj0oesP1AKOyZkNi59yPoTgTQzO4RGxoTMRlePbsZAxzW90gYxmNy0QQwmN20Qg4dL3I7iUUwJBgARxK/B
+   eJy7yMnAcBELfiJMGGPTRwy+IkwYk2s2Td0tRRiTa/ZjKQRmZEflwzC5ZvNxIfASLlQ+DJNrNjJeQiVzBhO+Jowdk6sPWf8zYeyYkNm49CHrL5TCjgmZjUsfsv5GIK3MDqGRMSGz0dWjmzHQcU2vtEEMJjdtEIPJTRvE4OESt6N4FFOCAVOw8Yo=
   </data>
  </layer>
  <layer id="2" name="Objects" width="23" height="26">
   <data encoding="base64" compression="zlib">
-   eJyVVbtKA0EUXQKrVsJsNDbZziIQyxht4wMFC9msIfkC8YMU/AF/wMJEbLXZdCkSbC0W7QR7cS6Zw56dzIR4YZjMnbnnvs7eJHEQdPWaqSAY1oKgvxEEX/r3KiI2ibHHLoLfx6QD9n9EcFJjn5OvFukzins3Xg23Q3GmJs7U5JB44m6Zc70+3ydr5TN2xDhWBS7jyXmqythjc96rl+PEmfVTtRg3/MJPTjWpGOydymIdWJdTzxNH3NilDsCOlN8efXIJ7tum3jOyHWnsJ2u914rcIWzDcbbiMi9ZJO59HXd7yTogjiZL+PSxXq7R0MQofLwNi3e/Vb+9TxKrtxnV4qVWvNvc8mOI/GiOvm2XdR1Hb2fERxcGy9iaDcwhfD+pVTfwUSS1OC72l6ST/n0bH4Ow3Mfc+qbgB9hie6dtHkI3j5hLyL8fFfOLcbFnDoyRo04smKdS6yPzHUjdeE66vmHkch36sXl2dS2OP1Md7LmM+Z5R/+zecq2bcYHnEvvOxR0R8GOi7680Zo/moF1rrsVU+XuAHt6EizMWuS7Dd/mzee2a3Yee/w288XGIMVz9l/M5+XD9pzYcer5HbDZGX6+BXo/Ex4R8VqNyXswn2ErPuHf3dG5Ytg3yKQKf0PEdREWL/j/VPC7YI69XVfjm99A1Sd8jO84n0v4u6B3ndqL3M1ObUytefrdMxO4PXDO7bw==
+   eJyVVb1OAkEQ3pAcYuedSsVZ+AAmYmFjaUGCJaIt/kQTC3OcBJ7A+ECa+AK+gIVgbLWBjgJi507cL/ftskt0ks0yszvfzM58N2SpUl295rFSw6pS/YpSq4n6k4hPZvyxi+D3OdmA/R8RnNz4l5MCt0X2MeV9mP4Nt0N55ibP3LwhC+TdMvpB7Xeflm0dO3KcxAUu44k+i23sidGPanae0Nk+ixfzRlzEkVoBe9tg75cW68C2MvU88+SNXeoA7Hoc9keffILztqn3nHBGGvvNWd/V4u0Q9uE8W6nNSxbJ+1jn3V6yToij2RI+lSp2jYYmR+HjY1Tc29oI+4ckc3o7plp8VIt7OwFsyPqKUl+btq3j6e2c+OjDYJnEts4cwveTO3UDH0Vyh+Pif0s26d+a4dIgsvsoOPxNIQ6wxfdJ+7xEfh4xl/D+flLML8bFPvZgjDx1YsE8lVqfme9A6sZz0vcN4y33URibZ1fX4fg71cGdy5jvY+qf21uudTMt8Hzinvm4IwJ+TPX5ncbs0Rx0a821mMXhHqCHD9HijMVbl+H74rm89s3u08D/Bu6EOMQYvv6Lfk0xfP+pDY+dz5Gbi9HXa6DXK/Exo5h7if0u5hN8pWfcu2fSG45vg2KKICZsfAbZTRbjV0xe8Me7PuMiNt+HrUn2HvmJgPt1jX1D9/htF3q/MrW5dPLle8tE/H4A8gnbEA==
   </data>
  </layer>
  <layer id="3" name="Above" width="23" height="26">
   <data encoding="base64" compression="zlib">
-   eJylVMtOwzAQDLmUO6IXkluF+ASOJC0qN9THR/Ff3FBPfAAS/ZJ6Va86TMd2Ekay4qx3Z9e7k3RtVfVhIW5uq0Gog19H8f6+ELyG39kw7uPsLx8+u8j7n7pVbWbbCvsYfM7Pz07wpOoey81gvkWB33hwTobvBPdjq++SQooHdeI5WTtTUKoNtZPCz921zWrMaTWXd4jGc1qt4WyKxmvyeWku+5SGEMvgvwrr6/6aw+JRX+/Npb84+1TfLXbfVBKsHfXtM6boB3k2pEnFr+6hZuw6OtKZxW5EH9jHUdKG+z6I/+5QHOJsfdYGm+0qcLzCf8p4l2HtWt2LXN5dc541z7FUJ8865c96sB4/iV6XwPdiXjzrYw6GsuV8cL+O+22ir8+ZflvsW5wZzu6D3hlrYXcufxr2mV7koHK7zXWLPt4PzF3i47rRj+seA++lAmrZ8/ZQu8edAH6OTTk=
+   eJylVLtuwzAMdDNlD9LJHurfyBoE/YSOcR5wtiKPj+p/dQs69QOKiLCIsJejZDsHCJYp8kiRZzdVUWzCsnibFr1QB78G4vV9SXgFLz25J9P/fPbZRN5n6ma1ie1E7EPw/do9G8Lj1T2UG4F8ywy/8Ng5CX4d7lXF7+LB47E60ZyonTHI1Wa14+Fv9miTGlNaTeXto/GUVmtzNkbjNfisy/ve05DFNvjvwrrOHzkk3urrs7z3187e67vEXsqCArXDvn3EGP1YniNokvGze7AZq44mcCaxR9IH9FHktKG+C/Lf7YufOFudtUBmuwsce/OfEt5tWOeK9yKV91x2s8Y55urEWXv+qAfp8TvpdQ54L+S1Z5uYA8FsKR+7b+P+5PT1I9FviT3EmdnZfcE7oiV25dKn4JLoRQost9pUt9Yn17/cXQ7AiXUPgfaSwWpZ82o/WhN3A7BtXhY=
   </data>
  </layer>
  <layer id="4" name="Top" width="23" height="26">
   <data encoding="base64" compression="zlib">
-   eJxjYBh6wEl2oF0wCkbBKBgFo4BU4DhadlMduAzBMAWlg6Fcj8PcD6JB4e8K9YsHlAYAuzgEHw==
+   eJxjYBh6IEl2oF0wCkbBKBgFo4BUkDhadlMdpAzBMAWlg6Fcj8PcD6JB4Z8K9UsGlAYAptYFfw==
   </data>
  </layer>
- <layer id="5" name="Walkable" width="23" height="26" visible="0">
+ <layer id="5" name="Walkable" width="23" height="26">
   <data encoding="base64" compression="zlib">
-   eJzdklEOwCAIQz2F978CN9z2YUKIFk2LH2vij2OPFrTemr1nyLr+VLG9/uQb3e/4YdiIP775mplW3BWfFcrmPaNs7N5RPtVbucE/+Y/1He+YXc1YSMz8q/dQsUMm++5MYy07i6yvcvbsDk76VHFV3hFHlSF7O8o+0TfLzvTVPAgWWTQ=
+   eJzdUkEOwCAM8hX+/0v90XYxaUxFDbDDSHrRSqEYvbV4ayC6vlzcGX/Sjc5P9DDciH/c5Z4KK94VPwvkLWtG3tjckT/VX/mC/+Ydq3s+Y7KquBCY/btzcGTIeD/d6dzL7mI3V7l7NoObOS5elXbEo/Kw+zvKOdU8Rw65HhtSlh4=
   </data>
  </layer>
  <objectgroup id="6" name="Mapevents" visible="0">
@@ -247,7 +247,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="7" name="Spawn" visible="0">
+ <objectgroup id="7" name="Spawn">
   <object id="8" name="fallhaven_priest" type="spawn" x="224" y="192" width="32" height="32">
    <properties>
     <property name="spawngroup" value="fallhaven_priest"/>
@@ -268,6 +268,29 @@
     <property name="spawngroup" value="gabriel"/>
    </properties>
   </object>
+  <object id="12" name="tt_seraphina" type="spawn" x="672" y="736" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="ignoreAreas" value="true"/>
+    <property name="spawngroup" value="tt_seraphina"/>
+   </properties>
+  </object>
+  <object id="13" name="tt_guys" type="spawn" x="448" y="736" width="256" height="64">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="5"/>
+    <property name="spawngroup" value="tt_guys"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="8" name="Keys">
+  <object id="14" name="dummy_key" type="key" x="672" y="736" width="32" height="32">
+   <properties>
+    <property name="phrase" value="dummy_key_noPhrase"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup id="8" name="Keys" visible="0"/>
 </map>

AndorsTrail/res/xml/waterway6.tmx

@@ -1,278 +1,306 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="15">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="30" height="30" opacity="0.99">
+ <layer id="1" name="Ground" width="30" height="30" opacity="0.99">
   <data encoding="base64" compression="zlib">
-   eJzt1cENwjAMBdCUGyNkHTaOcioTVIIZMgIzAFIjRW4SbH9jCYnDv1SoD3+3TTqHsDGSgKynEK4k7+uZ4WbAvb2cO0lizovaiFttxG8jcanfxsNt/cvi7267q33urVxuqst5l77hIjNr3EfEbY1b4tGW+tp5S8eV+Nr99uaV2Fq3dj2be+Yj+x3tmfMfLPYrsRPg0m6lc7ffZ+Sc4uyZulZno7RrTXq9juaV9GDZq3UPHr1yu/YyLXdnvd9/fne/mjNpds9Pv3kC5ZqwGg==
+   eJzt1UEKgzAQBdDYnRv39ni9cXBVTxBozyAqNDCMJp2ZPwYKXfxNkT7nT9rEPoQkSATyvIUws+yfTwJ3AtzX5rxZonBe1EbcbCM+jcblPk0Ll/qPrr2bPq713Hu50mRX8lu6wkVmtrjDHbct7jIeba1vnXe3kfNm3e/ZvBrb6uaua3PXfGS/pT1L3sFjvxo7Ai7vVjs3/X9G7inJnrnrdTdqu7bkrNfSvJoePHv17qFFr9KuW5meu/Pe7z+/u1/LnVT7zm/PrBuiCME=
   </data>
  </layer>
- <layer name="Objects" width="30" height="30">
-  <data encoding="base64" compression="zlib">eJy9Vz1Pw0AMjbJ1DBJBmeB/U0ZWFiQ6IAYY2oQIpK6NVFZAzYpgQHBWYvXl1ZcvtX2S1eR65/dsny9JEQfBp7MPZxa+3HhBc9Ko+l2ebOf9Rrtr1zT2Bvfnbu2Fs9TDK1jU/ym3+kvJL/MIXhO/z9tJO6/GrNzvlB+MVXlw7DoMgrOwup6E/XmZG/nRrFpxTlRPX17l/ib+BocxrrnnfA/h7eLX+lt7DDW8RON4mV+gOqz8W2b1yViojj72kFQxC++YmMeiiPYb81Agt68nDsnN++PQ/KWrcxZVfc78h+DeQD/Pqe+OmfsyaWqwcn+M/KfEv+/6S5wbPkMh7xlccw4Efc4oNOVcec5UgegpQdMCnikMOXP7mPjLo61/jJ/jFOBzjXlXA87JO7D7eDfXGB+Dz+OfuKmzUScjX4oZ6Jd4ua90HDF3a5anti6G9XwUf7N4t5YKKw+s9Q/8plC7Ln/ig99LfD70embsLYVVn8zQ8Ez17mN53NQ2RIMC86Hx8H7me4aVV363wjrrXO1j1u/T2xYHa8T6oz7matsT1riC/fhqkLdo5l7S+HznSVcdfL3kW9e1byxk4O/SfSdche3zJX7NpX4/ydiju39K/N88Au3Ldb1e+KbObmqb1vYP1p0pfg==</data>
- </layer>
- <layer name="Above" width="30" height="30">
-  <data encoding="base64" compression="zlib">eJxjYKAt2CeJXfy/IH3sQQdviVRHDQBzE4imtn/x2XkOau9ZSfr6F9l+PiHa2oHOBtlJzXC+LIYpdk4SN5ta4XwYi730AKTae3cA/UsNu8kNZ0rtHirxCwMg/96RJN/fpNp7Z5DkI3r5lxi7iQn/SxTYixzm1MrXAw12EhmG2MQoSe+4AMw8XOmb3HRPLbciu48c89DDm97pCFcaJtc/2PQR28YcaIDLz7RI1/QCMLeT4wdCetHTLiFz0NkwsBHI3wRth4Lk7wHxOyQa2Q3k+INQvYDNznvQtimutHsNrb0MAB7AZ7g=</data>
- </layer>
- <layer name="Top" width="30" height="30">
+ <layer id="2" name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzt0DERAAAIAzFs4F8XXrDA1oHEwF9blTEdCod825viZwAAuFsY4QLj
+   eJy9Vz1PwzAQtTJRRIdUwm0qIWZ+ASP8b8rIyoJEB8QAQ5MQgdS1lQo+paecX8+JG5U86VTHte+9u/NHsrXGnE+NGTnTYF3/FsYUaf27njTjriaHc3ep//wrnu/c+HtnhdV5Cfn+P+ZmfwX4RR7CTxb2+TJq5+WYmfsM8iNjZR7Z95QYc5vU7Zsknhe5Jb80rVaYE9YTy8vcM+D3OJR+zj3m+xjeLn6uv7bGpIbvtB8v8hNmYt1j/jXT9klfsI4Ye8/qmIm3T8x9sU1PG/OxsFCfIfnlOh2Kfzw3pkzrfY78/8F9MW/aKzhbhsz9eO5r0HI/RP4L4D91/SlOmXNCLvJeijbmgBBzRkljzo1ydzJIz1hoYj25cs7QmRtj5K9KG/8yfoyTIO815N3Y+HPy1Tb2Zg9zLeND4HmcTX2dXp0yvZ+wFPopXtxX3C+xcnPWl7ouhHY/kr+lPawlQ8sDar0WfgtRuy5/5APfS0I+uL1sucO0+pTKe96X9esdY5X1tR2jgSHzwfHgesZnhJZXfLeSdeaxvI9Rf0hvWxyoUdZf6kOutjWh9TPQT6gGVYtm3EscX+g86apDaC+F5nWtGw20dtnfg/tOeEzax1P8nEv+fqK+D+fnMwt/8xB4X+6yej7xLZw9722xtz8n3Kx1
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
-  <data encoding="base64" compression="zlib">eJzllcsNwDAIQzNF91+hG/aKovCJbZJDkbi0gYcd1L7PGG+SXkTv5nNoopH1VLFX51guo9vOhHBRvq1huAxfwV1552lU6mXqVx78gcvUMzOjfMV+IHyl3h02qzeboZNbjZN6PT7DnXWstCkj8upkdDE9DzOv1TN5e4kwd+p2NFTmq/Sw9bf2qHrH1X7zs4jbHVVdnXt9424tF/02R7WRr4r/CJIfxCFiiA==</data>
+ <layer id="3" name="Above" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJxjYKAtuCeJXVxeiD72oANeKeraiw/A3ASiqe1ffHa+g9r7VpK+/kW2X4+G/kWOaxgbZCc1w/mzGKbYO0ncbGqF82Ms9tIDkGrvXyLzG7XtpZbd5IYzpXYPlfiFAZB//0iS729S7f0zgOkKGdDLv8TYTUz4f6LAXuQwp1a+Hmhwk8gwxCZGSXrHBWDm4Urf5KZ7arkV2X3kmIce3vROR7jSMLn+waaP2DbmQANcfqZFuqYXgLmdHD8Q0ouedgmZg86GgYtA/iVoOxQk/w+I+aQQNLIbyPEHoXoBm53/oG1TXGn3myAqHwCCMmrD
+  </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="north" type="mapchange" x="288" y="0" width="192" height="32">
+ <layer id="4" name="Top" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJzt0EENAAAIAzFs4F8nCRb47UFr4LJVZUyHwiHf9qb4GQAA7hbJHQND
+  </data>
+ </layer>
+ <layer id="5" name="Walkable" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJzllcsNwDAIQzNF91+pG/WKovCJbZJDkbi0gYcd1L7PGG+SXkTv5nNoopH1VLFX51guo9vOhHBRvq1huAxfwV1552lU6mXqVx78gcvUMzOjfMV+IHyl3h02qzeboZNbjZN6PT7DnXWstCkj8upkdDE9DzOv1TN5e4kwd+p2NFTmq/Sw9bf2qHrH1X7zs4jbHVVdnXt9424tF/02R7WRr4r/CJIfgNGbiA==
+  </data>
+ </layer>
+ <objectgroup id="6" name="Mapevents">
+  <object id="1" name="north" type="mapchange" x="288" y="0" width="192" height="32">
    <properties>
     <property name="map" value="waterway5"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="928" y="544" width="32" height="384">
+  <object id="2" name="east" type="mapchange" x="928" y="544" width="32" height="384">
    <properties>
     <property name="map" value="waterway7"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object name="west" type="mapchange" x="0" y="608" width="32" height="32">
+  <object id="3" name="west" type="mapchange" x="0" y="608" width="32" height="32">
    <properties>
     <property name="map" value="waytobrimhaven3"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="south" type="mapchange" x="512" y="0" width="288" height="32">
+  <object id="4" name="south" type="mapchange" x="512" y="0" width="288" height="32">
    <properties>
     <property name="map" value="waterway15"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="sign_waterway6" type="sign" x="544" y="640" width="32" height="32"/>
+  <object id="5" name="sign_waterway6" type="sign" x="544" y="640" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="izthiel_4" type="spawn" x="544" y="224" width="32" height="288">
+ <objectgroup id="7" name="Spawn">
+  <object id="6" name="izthiel_4" type="spawn" x="544" y="224" width="32" height="288">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="izthiel_4"/>
    </properties>
   </object>
-  <object name="izthiel_3" type="spawn" x="352" y="64" width="352" height="160">
+  <object id="7" name="izthiel_3" type="spawn" x="352" y="64" width="352" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
-  <object name="burrower_2" type="spawn" x="640" y="64" width="288" height="160">
+  <object id="8" name="burrower_2" type="spawn" x="640" y="64" width="288" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="burrower_2"/>
    </properties>
   </object>
-  <object name="izthiel_3_1" type="spawn" x="32" y="64" width="320" height="384">
+  <object id="9" name="izthiel_3_1" type="spawn" x="32" y="64" width="320" height="384">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
-  <object name="izthiel_2" type="spawn" x="224" y="448" width="320" height="160">
+  <object id="10" name="izthiel_2" type="spawn" x="224" y="448" width="320" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
-  <object name="izthiel_2_1" type="spawn" x="576" y="448" width="320" height="160">
+  <object id="11" name="izthiel_2_1" type="spawn" x="576" y="448" width="320" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
-  <object name="erumen_1" type="spawn" x="160" y="640" width="736" height="288">
+  <object id="12" name="erumen_1" type="spawn" x="160" y="640" width="736" height="288">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
+  <object id="13" name="tt_seraphina" type="spawn" x="64" y="832" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="ignoreAreas" value="true"/>
+    <property name="spawngroup" value="tt_seraphina"/>
+   </properties>
+  </object>
+  <object id="14" name="tt_guys" type="spawn" x="64" y="768" width="96" height="160">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="5"/>
+    <property name="spawngroup" value="tt_guys"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="9" name="Keys">
+  <object id="21" name="dummy_key" type="key" x="64" y="832" width="32" height="32">
+   <properties>
+    <property name="phrase" value="dummy_key_noPhrase"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys"/>
 </map>

AndorsTrail/res/xml/waytobrimhaven0.tmx

@@ -1,210 +1,213 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="32" height="23" tilewidth="32" tileheight="32" infinite="0" nextobjectid="13">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="32" height="23" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="13">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="32" height="23">
+ <tileset firstgid="7609" name="map_tree_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_4.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="32" height="23">
   <data encoding="base64" compression="zlib">
-   eJyT42JgkMOBN3LSHuOyG2Y/PnlS8UDYr4uE6WU/ITupab8uFkxO/OMyB5s4uXZhw9QyZxSPYnKw7ACnPVDekyUTU8t+cjE13ETN+gXdTYTsvidJfftJccs7SfLjnlpphZL0NxzsH+zhT4/ybyDtH2gMANrHX4k=
+   eJyz42JgsMOBL3LSHuOyG2Y/PnlS8UDY74uE6WU/ITupab8vFkxO/OMyB5s4uXZhw9QyZxSPYnKw7QCnPVDesyUTU8t+cjE13ETN+gXdTYTs/idJfftJcQufFPlxT620Qkn6Gw72D/bwp0f5N5D2DzQGADEruoo=
   </data>
  </layer>
- <layer name="Objects" width="32" height="23">
+ <layer id="2" name="Objects" width="32" height="23">
   <data encoding="base64" compression="zlib">
-   eJytVkFqwzAQFIFArurBoGM/0R+0P2jz04TSe1r10KODg5MXOKZPqLbO4vUykuXYC4PxRtqZHW1s25Ux6weMfWHM68aYp4XwEtA4Y64BHJrTrob8j7ccXediu+l5L0FDG3C0HVdlcf9yP61FdatIHvH/uM4D4iYNMe8Rv0Sdyfks/H8L8GHfwfYaEC97ovlTfbI3tEZzUpQh/2XNIJqR/n2if9Sf5kTxqTSsgeYpIC5dk+/5qmeegr1I1eE4gLz2kuIU2Z+KXRFHVXRrysw8/0baSrX2vRjy/t7mUD4bUL8n5SWHvOf1yBMvcshf0vgx4zlHuktV1084hzas/U6cQQox3ewl9yv9lLNIfrUK9KzVuRiQbq1JniuHnNMxjipTC9KEtPDZ8KxMrY9wjHiotWyBF7EaCFPORmOv+BuX5/9SYH45f//voDv6kmcW26v9lP3Xgfc80n/OeeSA9TF/7fpvj7ObP2spbyS88J+/Pa5uvO6978XYu5KC+0f+a/3oPzMnLqr/HM3SsyWvFH8L6IrK
+   eJytVkFuwjAQXHHiEFDDIVJy5wE8oZ/gB/QHlJ8WVb3Tuoceg4KgwqswYrNaG4dkpVGUxd6ZHRs7qwnRcmFjXxBtp0TrkfDmkVVEMw+E5lxNuvyvtxw/h2I3vfP+l0Rzr+OYt1xNbvcv5/NYq24TyFv8f2XrAXOzhpD3Fr/EOZFzI/x/93B+3iG/a7B44Ynmj/UJb3iM5uSoff4np05kAX7ARfq3+tOcVnwrDUtDcx8wl66Jdzz1nueAF7E6iIOR115ynALzY/FRhNEU7Zg6MY/fWFutxn4WXd6XRduXPBusfk/KS4R8x3jLEydylr+s8WvAOce6a1XX9ViHuffhN7IGMYR0w0v0K/2Ue5H9Yn4JPmt1LgRLt9Yk1xUh9+kjjsbQmKrJ0uLUXulb38JR1YCHWsvO8CJUw0KftdHYK/6sSvN/LGh+aHimL7lmobnaT8l/9vfupYz3n7IeKYA+8DM3vj1Yw9C9FvNGwt345bfHrHpc99l7MXRXcqB/y3+t3/rPDAlwo/8UzdKzMZ9c9wquEfZ0
   </data>
  </layer>
- <layer name="Above" width="32" height="23">
+ <layer id="3" name="Above" width="32" height="23">
   <data encoding="base64" compression="zlib">
-   eJxjYKAveCMJoe8A6btAnCFAX/v3SULsphSkE3A3Of4iZCYyKKdBuNHCzMEAYGltFIyCgQbDIS2SUk7RAlCrnMJWD9DLb7jqIFqXwUMx/Q2X9DYKUNM9sekQlmapQQ8mAHITANQ7J2c=
+   eJxjYKAv4JGC0H8kGRj+AnGHAH3tvycJsZtS0E7A3eT4i5CZyGA6DcKNFmYOBgBLa6NgFAw0GA5pkZRyihaAWuUUtnqAXn7DVQfRsgzeKcvAsAuId8vSzg584CTQ3lNAfJpE+6kdJ6TmQWrGCczu4VAOkAOQ0z2x/kcPM0poXG4ZCAByEwAu+Dbt
   </data>
  </layer>
- <layer name="Walkable" width="32" height="23" visible="0">
+ <layer id="4" name="Walkable" width="32" height="23" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztldEJACAIRJui/Vdww/5DPU2toAT/zHenQtSbGtTrc+ZxGjJCY0cYVs3Ie5Qp1Ul+LbP3Mj0eM/ZquanVHiv3q/VH7BfjFv+V+0fcCt2oHr2P+PbMp/IvsWjJ5iPWLjanJWvvEf6p/Pyz/J98DoNvS/0=
+   eJztlcsNACAIQ53C/VdyI6/GIAX5aKIk3NTXFhJbLWy1Gt8zj9LgURzbwpBqRt6tzNW5lV9J9lqmxqPHXCU7tfvGzv5y7yP2i3WL/8j5I26EbnQe3bf41uQT+ZdItHjzESuLTWnxmruFf0oDlX+mhpFPZZKZ/+97ugM/EHol
   </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
-  <object id="1" name="east" type="mapchange" x="992" y="160" width="32" height="288">
+ <objectgroup id="5" name="Mapevents">
+  <object id="1" name="east" type="mapchange" x="992" y="160" width="32" height="448">
    <properties>
     <property name="map" value="waytobrimhaven1"/>
     <property name="place" value="west"/>
@@ -235,7 +238,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
+ <objectgroup id="6" name="Spawn" visible="0">
   <object id="3" name="fieldcritter_0" type="spawn" x="288" y="192" width="352" height="160">
    <properties>
     <property name="quantity" value="2"/>
@@ -247,5 +250,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" visible="0"/>
+ <objectgroup id="7" name="Keys" visible="0"/>
 </map>

AndorsTrail/res/xml/waytobrimhaven1.tmx

@@ -1,260 +1,282 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="30" height="27" tilewidth="32" tileheight="32">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="27" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="13">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="30" height="27">
+ <layer id="1" name="Ground" width="30" height="27">
   <data encoding="base64" compression="zlib">
-   eJztVkEOgCAM48oT/P8L+JBP8A16IRKkpZvzYMKhIQE61m26lZzSvqV0XCj5Rt0bre290V5/NloRd8bp/Ru9y+xULuIxoBh8DW8MPPrQ22rOI3TN4u/JmaIrMudvY2SNTVRNKHrVOlF4Fr2KrpkNj+9KHpkN5FOEXnYP+eTRi/4/kTXIepDK93xzrAd5+Ja6s/r6R7TaUY5YrtVZhMVXmXFQPbFZJLoHLywsPHECnVFzkA==
+   eJztVkEOgCAM25WLd/3/h/iQ8UQkSEuZ82DCoSEBOtZtuuVkdu5m22GW042y11vre7299qy3Iu6I0/rXe5fZKVzEY0Ax+BreGHj0obfVnEfoGsXfkzNFV2TO38ZoNjZRNaHoVetE4c3oVXSNbHh8V/LIbCCfIvSye8gnj170/4msQdaDVL7nm2M9yMOfqbtZX/+IWjvKEcu1Oouw+CozDqonNotE9+CFhYUnLgFskxY=
   </data>
  </layer>
- <layer name="Objects" width="30" height="27">
+ <layer id="2" name="Objects" width="30" height="27">
   <data encoding="base64" compression="zlib">
-   eJytVstuhDAM3F9Ib/mL/r9Ez1zKF+xyDHtg0f5Bi7VxO4xsJ1QdCQFJ7NgzzmPLlx/M+/djf77SJYSMGfZnzce2Z3q1PajPwky2729tG8E9iG2sfZGfLf/OicC4rTdD2kYjlh4/Qz7GG+XWwwliqT6ET/lWLZeGpgrMi/X12gZoU9vZ4U1QUpyX1oLaR5qzPlsHX1YOU4cda67cSt1rvmOy/SOnzEtJR38eN8XgweOY4XFo1bDn++mMtfLFsfjNPpkvBeuhY5ADrhMvNu7Hfyv2FoRLzMnzIfGdAfpdiUdLp2gdcUyfwfpV9O4RCK15rzZUxyXFWrX2Odx/rLh7dCzJ5zM6O6SvxY2eYeiL15xXdwvtDd4eMUFN8JhirDcdw3Xo5XgGnt4e9M6A/wJrjfCe2fKL2lg68n0m2uuHev85e+4ilPeB9Lzm1zmxGe9bXUfRGO+NGGudYA2uDftbbo+x3lh/I9w1RNMP4PG/50YbgdSi1r9q28Pj2blZQ8W1+vLmtO6B04m5rTi1zlp2JR3ji+Js5Tt32rdq/S/5fgNM53fA
+   eJy1VjFyhDAMpDIpLgxxKtPwguQt/H+GPk14Qe4m7BDl1opkm5vJNgYjydKubDNM3S9uqeue9/c5dkXAZt1tL1M+N8ZjDs/8zQLWYt8l1n2Ap0JuHy/HWIozTPc1GZy3NWpgTtY7G2dNeb6l2lo4YfQ/McAnnkXLvqKpgOvS+npzK2kpvtJLFkJF6yXmfJU01/oMDXxZNWzJtmVozYVb9L3Ui+9WfOZU8xJiHs/jJhg8eBxreBxaPezFHp0YVr1sy886puZLoPUQG+ZA94mXm/7O71buNYBLrsmLsTTuOSvuRfFo6VTaRzqnz1TOFWg9IxjS815viI59RavaOcfnj5V3i44h+nyW7g58q3EjdxjH0nvO67ueNPfuHOQuXI4Gl8HYb2Kj+9Cr8Qw8vT3IPwO/A9Ye0WdmLS5rY+mo/2dKZz1ynBv/RTwI72vK9fxKxz2BO0qP13TkXrLxRgZibCnvQaxf8r+muo01cv9hPeFZNJ3/aW32AdCL8fWvtmfitNbL+njaW356b28n1rbytM4JbQM/nAvIGc88PlLvjfxl7bc9/nus+z2qr8x9A/IOqho=
   </data>
  </layer>
- <layer name="Above" width="30" height="27">
+ <layer id="3" name="Above" width="30" height="27">
   <data encoding="base64" compression="zlib">
-   eJzlVtsNwCAIdI3uv4eT1F0ak5IYeogUtCa9T/FxB4ea0hPnAQY3QLl5tfzKIq69nNRYJI/eftYcaNwo7q356DkSKJaFOZaaR/lklz6QuHN+Xk8gvbweoznhZyCumset0PS/qWdEXxAqp+z0ppS3qPsH6UVcpbxE3c2zek/zJQfSkA3rR+esQKud7nyur30PtFhvbrtGAuoFy3rEjYOP9fxr8St/MzWfzMSqPxBC9N/HCu/Znhp9qftvuAB7jGXG
+   eJzNVlsOwCAI8xq7/708yUwWk5EYVgQmPvopOFsoupS+uC+weADKy6vlVxZx7dWkxiJ59L7nrYHGjeKjPbeeI4FiWcjx9DzKJ6fMgcSd8xv1BNLL+2GtCT8DcdU87oWm/08/I+aCUDnlQW9KdYu6f5BexFWqS9TdPGv2NF9yIA3Zsd+aswKtdrrzub72PdBivdx2jwQ0C579iBsHX+v51+NX/mZqPpmJVf9ACFLdd2u3+maEZzH4fzZ2nO2Z/yg8/7SBHw==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="27" visible="0">
+ <layer id="4" name="Walkable" width="30" height="27">
   <data encoding="base64" compression="zlib">
-   eJzllDsOwCAMQzlF738Fblh1qJQhws8pn6GWMrQksQ2BfrXWJ8WDlbVvTszN4HDSmiynwh09EBDNqt7lGnFTP0qb2kvqN9NMa8iZqP3PeKpn5sxZpkH1J6Az7taMtDn3U/Wsfjt+lX6lUf1Xa07v6htGeCg38eTcU4eTwJ0Hol3lUL9KZ0XXl/ehAud+kzU6w6pG5Tg9HO7Z4Xpfxb3bd+Q/xX2C949xA1ftc6I=
+   eJzFlMsNwDAIQzNF918pG1U9VIoqhJ9pPkgc2gC2CaRfrfVJ/tjK3DdmjI3MwaQ5UUwFe9RAjHBW+S5Whk31KG6ql1RvxJnmkDtR/Y9wqnfmzFnEQdUnRmfczcm4Ofupala/Hb2Kv+Ko/qszp3b1DSM4FJtocvbUwSTmzgPhrmKoXsWzwuvP+1AxZ7/JGZ1hlaNinBoO9myPtO/ik+Hu6MUXO9qRldin736n3pN+AwAXodk=
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="west" type="mapchange" x="0" y="288" width="32" height="288">
+ <objectgroup id="5" name="Mapevents">
+  <object id="1" name="west" type="mapchange" x="0" y="288" width="32" height="448">
    <properties>
     <property name="map" value="waytobrimhaven0"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="928" y="96" width="32" height="160">
+  <object id="2" name="east" type="mapchange" x="928" y="96" width="32" height="160">
    <properties>
     <property name="map" value="waytobrimhaven2"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object name="north" type="mapchange" x="608" y="0" width="32" height="32">
+  <object id="3" name="north" type="mapchange" x="608" y="0" width="32" height="32">
    <properties>
     <property name="map" value="waterwayb1"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="east2" type="mapchange" x="928" y="704" width="32" height="64">
+  <object id="4" name="east2" type="mapchange" x="928" y="704" width="32" height="64">
    <properties>
     <property name="map" value="waytobrimhaven4"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object name="brv_ctrl_flood" type="script" x="896" y="96" width="32" height="192"/>
-  <object name="brv_crime_scene" type="script" x="288" y="96" width="32" height="32">
+  <object id="5" name="brv_ctrl_flood" type="script" x="896" y="96" width="32" height="192"/>
+  <object id="6" name="brv_crime_scene" type="script" x="288" y="96" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="erumen_1" type="spawn" x="736" y="96" width="160" height="480">
+ <objectgroup id="6" name="Spawn">
+  <object id="7" name="erumen_1" type="spawn" x="736" y="96" width="160" height="480">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
-  <object name="fieldcritter_1" type="spawn" x="64" y="64" width="128" height="544">
+  <object id="8" name="fieldcritter_1" type="spawn" x="64" y="64" width="128" height="544">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="fieldcritter_1"/>
    </properties>
   </object>
-  <object name="forestwolf2" type="spawn" x="224" y="96" width="512" height="512">
+  <object id="9" name="forestwolf2" type="spawn" x="224" y="96" width="512" height="512">
    <properties>
     <property name="quantity" value="5"/>
     <property name="spawngroup" value="forestwolf2"/>
    </properties>
   </object>
+  <object id="10" name="tt_seraphina" type="spawn" x="128" y="800" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="ignoreAreas" value="true"/>
+    <property name="spawngroup" value="tt_seraphina"/>
+   </properties>
+  </object>
+  <object id="11" name="tt_guys" type="spawn" x="64" y="672" width="96" height="160">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="5"/>
+    <property name="spawngroup" value="tt_guys"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="7" name="Keys">
+  <object id="12" name="dummy_key" type="key" x="128" y="800" width="32" height="32">
+   <properties>
+    <property name="phrase" value="dummy_key_noPhrase"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys"/>
 </map>

AndorsTrail/res/xml/waytobrimhaven3.tmx

@@ -1,239 +1,239 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="29" tilewidth="32" tileheight="32" infinite="0" nextlayerid="15" nextobjectid="19">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="29" tilewidth="32" tileheight="32" infinite="0" nextlayerid="15" nextobjectid="22">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1361" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1489" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1617" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1745" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1873" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2001" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2129" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2257" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2385" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2513" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2641" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2769" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2897" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3025" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3153" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3281" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3409" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3537" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3665" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3793" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3921" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4049" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4177" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4305" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4433" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4561" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4689" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4817" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4945" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5073" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5201" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5329" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5457" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5585" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5713" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5841" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5969" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6097" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6225" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6353" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6481" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6609" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6737" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6865" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="6953" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6985" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7073" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7105" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7193" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7225" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7353" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7481" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_guynmart" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7609" name="map_guynmart" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_guynmart.png" width="512" height="256"/>
  </tileset>
  <layer id="1" name="Ground" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJztlkEOwCAIBI03n2P6iX658Qlt/9SY1ItZERr20njYI06ABckphLy09COVGMLV6YhcZmXcgHuS+fXtLWE1PoO9d0J8BlvDZbC13Mb24kocJO8+9++PasDwtobLmqsZlznXsx4z5roIewT52yP38u5Mi789crcyPfaKpr6MnTbKFXncs+ez3cTquSfXUncU12IsszWqu3THjGIkn2v+M3THzNjSPaLlojete/JLv63/muQzixcR9wF0a/Jc
+   eJztlkEOwCAIBI03n2f6iX658Qlt/9CY1ItZERr20njYI06ABckphLy09COVGMLV6YhcZmXcgHuS+fXtLWE1PoO9d0J8BlvDZbC13Mb24kocJO8+9++PasDwtobLmqsZlznXsx4z5roIewT52yP38u5Mi789crcyPfaKpr6MnTbKFXncs+ez3cTquSfXUncU12IsszWqu3THjGIkn2v+M3THzNjSPaLlojete/JLv63/muQzixcR9wGiR18r
   </data>
  </layer>
  <layer id="2" name="Ground_3" width="30" height="29" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzt1sEJwCAMBdDgzXHcwpWLKzhU6a1I1fwmH0E8/KN9DUnEFEXSyclGKUGkNrkC13yMHL/D9HvmOwxb4zJsrettI25eVK+ni/o7zbbWZu31ivkug/uLVTtqetX+17TYllot9mhfURvp+eyOYNXOcDX26Iy197N3TO+Mx7y13/TeJW3QPfb6P6TnnrN4A4Qs9Sw=
+   eJzt1sEJwCAMBdDgzfHcwpWLKzhE6a1I1fwmH0E8/KN9DUnEFEXSyclGKUGkNrkC13yMHL/D9HvmOwxb4zJsrettI25eVK+ni/o7zbbWZu31ivkug/uLVTtqetX+17TYllot9mhfURvp+eyOYNXOcDX26Iy197N3TO+Mx7y13/TeJW3QPfb6P6TnnrN4A7IIYfs=
   </data>
  </layer>
  <layer id="3" name="Ground_9" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJztlkEOwCAIBI03n2P6iX658Qlt/9SY1ItZERr20njYI06ABckphLy09COVGMLV6YhcZmXcgHuS+fXtLWE1PoO9d0J8BlvDZbC13Mb24kocJO8+9++PasDwtobLmqsZlznXsx4z5roIewT52yP38u5Mi789crcyPfaKpr6MnTbKFXncs+ez3cTquSfXUncU12IsszWqu3THjGIkn2v+M3THzNjSPaLlojete/JLv63/muQzixcR9wF0a/Jc
+   eJztlkEOwCAIBI03n2f6iX658Qlt/9CY1ItZERr20njYI06ABckphLy09COVGMLV6YhcZmXcgHuS+fXtLWE1PoO9d0J8BlvDZbC13Mb24kocJO8+9++PasDwtobLmqsZlznXsx4z5roIewT52yP38u5Mi789crcyPfaKpr6MnTbKFXncs+ez3cTquSfXUncU12IsszWqu3THjGIkn2v+M3THzNjSPaLlojete/JLv63/muQzixcR9wGiR18r
   </data>
  </layer>
  <layer id="4" name="Objects" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJylV8Fq20AUFPmCqgeV/EgCKfhSkKyGiJxi49aG5lTcxOCceusXtF9R95xP7A7soNHobVrIwBJZ+7SzM+/tk9LVVbU4r6qHNB7T+JzGNo023Sd0XuNegz6tP6Q1lpmH6wK7fD3IfhBf4uS+Sr9LUI2uX/cTcXEOa3hsxO3rd9n31vQ/BN76Pvp6+rszHfrc4ny6PjDkvy95+5hzw+eWgVcA7ruGIQ/uCzHcc1fPa8g9fUlfNK+aMPelmc/fN6Pm/0Ur+3d4vRLvzqbD+QH3VtdzLvdagfvg+HNWzXASfnBHtfwvqO9XaY0LGd9lfEpjlWKfJf4k3K6N63rdOJDLy+wbPD5YTGd5vqvn3CWol7xWjdd53+AE99dmHN+akctB7hupx6GgjaBGP2Pgvi3wrOX+SnTfBFyRv1dZY7Qn1jPyc8wx3MdGcq5QjdF5Ya6pdbCaZn61Px6FY5mvNefwQOtLebxngNf7xk7y6/0Z3Fh/LzkHPO+lGqOuj2n+PfdeT2vqkPu/vl+j3qbwcw301ks68Vpzwfcq3xGDxGvP9JrTWjsFPY18veW4F70/0/WvevQXiPo08FzwINKu0HP0+83Ua/rD+kDPLJ1hwD1AbNTTAM1xa9wL0Rr1ad3Dxs7VKvAd3No/L/WMCLe+fxXw9ik/w/O1z/W9DuJVN/mpmb2S2sHN/FLrytbciW+bgM9995wvpZ/qHpiPSAPnfqjXdTn/pfcYEH3T4O+HZv7sfTN+j7D+Fe6N4xTUi37HbPM7VftkpB9wr9nHtZffmu7oO8bPkXLzGeSePqDWNIb9VHsqod5Rh+afZ0l7dOQhODXG1y7lfRN40dbj/yHs2dt8rrn2XT5T7OMH416LF9r/jvk7Yi9eQM/T26r6Cxf7xqI=
+   eJylV8Fq20AUFPmCqgdBvqR/kkAKvhQkKyUip9i4taE5FTcxOKfe+gXtV9Q955O6AztoNHqbFjKwRNY+7ezMe/ukdHVVLc6r6iGNxzQ+p7FNo033CZ3XuNegT+sPaY1l5uG6wC5fD7IfxJc4ua/S7xJUo+vX/URcnMMaHhtx+/pd9r01/Q+Bt76Pvp7+7kyHPrc4n64PDPnvS94+5tzwuWXgFYD7rmHIg/tCDPfc1fMack9f0hfNqybMfWnm8/fNqPl/0cr+HV6vxLuz6XB+wL3V9ZzLvVbgPjj+nFUznIQf3FEt/wvq+1Va40LGdxmf0lil2GeJPwm3a+O6XjcO5PIy+waPDxbTWZ7v6jl3Ceolr1Xjx7xvcIL7azOOb83I5SD3jdTjUNBGUKOfMXDfFnjWcn8lum8Crsjfq6wx2hPrGfk55hjuYyM5V6jG6Lww19Q6WE0zv9ofj8KxzNeac3ig9aU83jPA631jJ/n1/gxurL+XnAOe91KNUdd1mn/PvdfTmjrk/q/v16i3KfxcA731kk681lzwvcp3xCDx2jO95rTWTkFPI19vOe5F7890/ase/QWiPg08FzyItCv0HP1+M/Wa/rA+0DNLZxhwDxAb9TRAc9wa90K0Rn1a97Cxc7UKfAe39s9LPSPCre9fBbx9ys/wfO1zfa+DeNVNfmpmr6R2cDO/1LqyNXfi2ybgc98950vpp7oH5iPSwLkf6nVdzn/pPQZE3zT4+6GZP3vfjN8jrH+Fe+M4BfWi3zHb/E7VPhnpB9xr9nHt5bemO/qO8XOk3HwGuacPqDWNYT/Vnkqod9Sh+edZ0h4deQhOjfG1S3nfBF609fh/CHv2Np9rrn2XzxT7+MG41+KF9r9j/o7YixfQ8/S2qv4Ccfz+Ag==
   </data>
  </layer>
  <layer id="5" name="Objects_3" width="30" height="29" visible="0">
   <data encoding="base64" compression="zlib">
-   eJylV21qwkAUDJ6g6Q/Bi1Sw4J9CEi3mBDVQf6vQXsATtKdoe87uwA6ZPN/mQweC0d28eTP79m0s8yxbL7LsGK5TuN7CtQ9XEX4ndFzn3YNNiF+HGFXkYVygife15IP5KU7mlfqegmq0+jUfj4tjiGHnetw2fhl9L4z+o+OtzWOTd7+XRoc+t1504wN1/Ozz9hTXhs9VjlcAfrca6ngxL8xhzmV+XUPW0z593rhqwtj7/Hr8MG81j0Uh+VvYegX+ZtfzfmddfsB6q/Esl/Va4dWnxw/uMXMt1PdViPEkF7BzfPG4rTbGtXVjgbVcRi54fJ6ggdwpqJe8V42vMW9wNhO9A/dO6rFOaCOo0e6xKXqJnfOM5+8qavRyol6sz0ePhwrV6O0XrjW11qamub7aH8dwa30pj+0Z4LV9o5H1tf15iNvb1wrq2obx53mbk9bUOfZ/PV+93pbiJ/fG9JJSvNa14LnKM6KW+V7P7OMGDqKLeZBX84LOr3D/nbf+AuD0euYYfs933Uc/D12v6Q/8voXTcqvfusaF4V6L1ntBbu2fS4mrunn+elo/4zNj9za5Afq+lV5J7eDW9fXQLG47i6i9kn6qOaTOEIBjl5F7K8UNeO80+HxJvHOk3kemcNuYAH2unD7JZ+6p81Qeuo+AoRpCrU2psz5wLw31aHCO7eNDKPL2fwh79j7ua40NTvbxc4Jb8wKS+T9m2T8SI5+l
+   eJylV21qwkAUDJ6g6Q/Bi1Ww4J9CEi3mBDVQf6vQXsATtKdoe67uwA6ZPN/mQweC0d28eTP79m0s8yxbL7LsGK5TuN7CtQ9XEX4ndFzn3YNNiF+HGFXkYVygife15IP5KU7mlfqegmq0+jUfj4tjiGHnetw2fhl9L4z+o+OtzWOTd7+XRoc+t1504wN1/Ozz9hTXhs9VjlcAfrca6ngxL8xhzmV+XUPW0z593rhqwtj7/Hr8MG81j0Uh+VvYegX+ZtfzfmddfsB6q/Esl/Va4dWnxw/uMXMt1PdViPEkF7BzfPG4rTbGtXVjgbVcRi54fJ6ggdwpqJe8V42vMW9wNhO9A/dO6rFOaCOo0e6xKXqJnfOM5+8qavRyol6sz0ePhwrV6O0XrjW11qamub7aH8dwa30pj+0Z4LV9o5H1tf15iNvb1wrq2obx53mbk9bUOfZ/PV+93pbiJ/fG9JJSvNa14LnKM6KW+V7P7OMGDqKLeZBX84LOr3D/nbf+AuD0euYYfs933Uc/D12v6Q/8voXTcqvfusaF4V6L1ntBbu2fS4mrunn+elo/4zNj9za5Afq+lV5J7eDW9fXQLG47i6i9kn6qOaTOEIBjl5F7K8UNeO80+HxJvHOk3kemcNuYAH2unD7JZ+6p81Qeuo+AoRpCrU2psz5wLw31aHCO7eNDKPL2fwh79j7ua40NTvbxc4Jb8wKS+T9m2T+Ctstl
   </data>
  </layer>
  <layer id="6" name="Objects_9" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJylV8Fq20AUFPmCqgeV/EgCKfhSkKyGiJxi49aG5lTcxOCceusXtF9R95xP7A7soNHobVrIwBJZ+7SzM+/tk9LVVbU4r6qHNB7T+JzGNo023Sd0XuNegz6tP6Q1lpmH6wK7fD3IfhBf4uS+Sr9LUI2uX/cTcXEOa3hsxO3rd9n31vQ/BN76Pvp6+rszHfrc4ny6PjDkvy95+5hzw+eWgVcA7ruGIQ/uCzHcc1fPa8g9fUlfNK+aMPelmc/fN6Pm/0Ur+3d4vRLvzqbD+QH3VtdzLvdagfvg+HNWzXASfnBHtfwvqO9XaY0LGd9lfEpjlWKfJf4k3K6N63rdOJDLy+wbPD5YTGd5vqvn3CWol7xWjdd53+AE99dmHN+akctB7hupx6GgjaBGP2Pgvi3wrOX+SnTfBFyRv1dZY7Qn1jPyc8wx3MdGcq5QjdF5Ya6pdbCaZn61Px6FY5mvNefwQOtLebxngNf7xk7y6/0Z3Fh/LzkHPO+lGqOuj2n+PfdeT2vqkPu/vl+j3qbwcw301ks68Vpzwfcq3xGDxGvP9JrTWjsFPY18veW4F70/0/WvevQXiPo08FzwINKu0HP0+83Ua/rD+kDPLJ1hwD1AbNTTAM1xa9wL0Rr1ad3Dxs7VKvAd3No/L/WMCLe+fxXw9ik/w/O1z/W9DuJVN/mpmb2S2sHN/FLrytbciW+bgM9995wvpZ/qHpiPSAPnfqjXdTn/pfcYEH3T4O+HZv7sfTN+j7D+Fe6N4xTUi37HbPM7VftkpB9wr9nHtZffmu7oO8bPkXLzGeSePqDWNIb9VHsqod5Rh+afZ0l7dOQhODXG1y7lfRN40dbj/yHs2dt8rrn2XT5T7OMH416LF9r/jvk7Yi9eQM/T26r6Cxf7xqI=
+   eJylV8Fq20AUFPmCqgdBvqR/kkAKvhQkKyUip9i4taE5FTcxOKfe+gXtV9Q955O6AztoNHqbFjKwRNY+7ezMe/ukdHVVLc6r6iGNxzQ+p7FNo033CZ3XuNegT+sPaY1l5uG6wC5fD7IfxJc4ua/S7xJUo+vX/URcnMMaHhtx+/pd9r01/Q+Bt76Pvp7+7kyHPrc4n64PDPnvS94+5tzwuWXgFYD7rmHIg/tCDPfc1fMack9f0hfNqybMfWnm8/fNqPl/0cr+HV6vxLuz6XB+wL3V9ZzLvVbgPjj+nFUznIQf3FEt/wvq+1Va40LGdxmf0lil2GeJPwm3a+O6XjcO5PIy+waPDxbTWZ7v6jl3Ceolr1Xjx7xvcIL7azOOb83I5SD3jdTjUNBGUKOfMXDfFnjWcn8lum8Crsjfq6wx2hPrGfk55hjuYyM5V6jG6Lww19Q6WE0zv9ofj8KxzNeac3ig9aU83jPA631jJ/n1/gxurL+XnAOe91KNUdd1mn/PvdfTmjrk/q/v16i3KfxcA731kk681lzwvcp3xCDx2jO95rTWTkFPI19vOe5F7890/ase/QWiPg08FzyItCv0HP1+M/Wa/rA+0DNLZxhwDxAb9TRAc9wa90K0Rn1a97Cxc7UKfAe39s9LPSPCre9fBbx9ys/wfO1zfa+DeNVNfmpmr6R2cDO/1LqyNXfi2ybgc98950vpp7oH5iPSwLkf6nVdzn/pPQZE3zT4+6GZP3vfjN8jrH+Fe+M4BfWi3zHb/E7VPhnpB9xr9nHt5bemO/qO8XOk3HwGuacPqDWNYT/Vnkqod9Sh+edZ0h4deQhOjfG1S3nfBF609fh/CHv2Np9rrn2XzxT7+MG41+KF9r9j/o7YixfQ8/S2qv4Ccfz+Ag==
   </data>
  </layer>
  <layer id="7" name="Above" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJztlTEOwjAMRXMFFqRchoWZBdaWE4RK3H8BJCxFkb/t2AldeEvapsnPdxwnJcySU1oz7r+/+7bc30pzLkIf0iTQO7WPrHvivBdGS8PqF41dv2slTW7dyAtpnzp1uZj24tGMUMegzp3bUdbcmnHcM9Jpv9dcga4nhyRKxzxF8UZYzkb9z+VgX0MErSZI1PnYm5ujsdaeX9LGJBJrr7+IppdZmiP2WKpdXix+zxN0CbrPWj5eUc204Il3VNPLzPgikNcReSrVU86r9X6OoMV41h48d9LV2CPP/+ho5+8FmqY4vw==
+   eJztlUEOAiEMRbmCGxMu58a1G93OeAKcxBuriU0I6W9LC87Gt2FmGPj8UkpKmCWntGbcf3/3bbm/leZchD6kSaB3ah9Z98R5L4yWhtUvGrt+10qa3LqRF9I+depyMe3FoxmhjkGdO7ejrLk147hnpNN+r7kCXU8OSZSOeYrijbCcjfqfy8G+hghaTZCo87E3N0djrT2/pI1JJNZefxFNL7M0R+yxVLu8WPyeJ+gSdJ+1fLyimmnBE++oppeZ8UUgryPyVKqnnFfr/RxBi/GsPXjupKuxR57/0dHO3wt+YUg/
   </data>
  </layer>
  <layer id="8" name="Above_3" width="30" height="29" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzFlUsOwjAMRHOKSllwFTbcgG5bNt1CJS7LeQCplqzgz9gpMFLVT5K+jDtJS9E11VLmqrdfXm1rjZ+td05Gm8Ykafd0vlXfk+T9KrA8oX61sfM2V2JK89a8EPsY5Eo1jSrD7BGvAc/OMtjMtRknXWuc9jmiTIa895Eeh89D6utlH1kb1EdiavxeTY5Xi83zGM0mF8L1fKN7T4abrXlbEynPKDvjT2Oi7KyQdZvhZmvANQ7/8Xs2uL18+p+1WgCmxc7Ue9z+DZG1tceehtR3b7aUpbfQfdxiW/vpSeDy729lvMe3xPXa9+DfHW7m20ekjftF3izut+eBjMmyI3xkflze+nsC1rgahQ==
+   eJzFlUsOwjAMRHOKSllwNTbcgG5bNt1CJS7LGpBqyQr+jJ0CI1X9JOnLuJO0FF1TLWWuevvl1bbW+Nl652S0aUySdk/nW/U9Sd6vAssT6lcbO29zJaY0b80LsY9BrlTTqDLMHvEa8Owsg81cm3HStcZpnyPKZMh7H+lx+Dykvl72kbVBfSSmxu/V5Hi12DyP0WxyIVzPN7r3ZLjZmrc1kfKMsjP+NCbKzgpZtxlutgZc4/Afv2eD28un/1mrBWBa7Ey9x+3fEFlbe+xpSH33ZktZegvdxy22tZ+eBC7//lbGe3xLXK99D/7d4Wa+fUTauF/kzeJ+ex7ImCw7wkfmx+WtvyfvCkdF
   </data>
  </layer>
  <layer id="9" name="Above_9" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJztlTEOwjAMRXMFFqRchoWZBdaWE4RK3H8BJCxFkb/t2AldeEvapsnPdxwnJcySU1oz7r+/+7bc30pzLkIf0iTQO7WPrHvivBdGS8PqF41dv2slTW7dyAtpnzp1uZj24tGMUMegzp3bUdbcmnHcM9Jpv9dcga4nhyRKxzxF8UZYzkb9z+VgX0MErSZI1PnYm5ujsdaeX9LGJBJrr7+IppdZmiP2WKpdXix+zxN0CbrPWj5eUc204Il3VNPLzPgikNcReSrVU86r9X6OoMV41h48d9LV2CPP/+ho5+8FmqY4vw==
+   eJztlUEOAiEMRbmCGxMu58a1G93OeAKcxBuriU0I6W9LC87Gt2FmGPj8UkpKmCWntGbcf3/3bbm/leZchD6kSaB3ah9Z98R5L4yWhtUvGrt+10qa3LqRF9I+depyMe3FoxmhjkGdO7ejrLk147hnpNN+r7kCXU8OSZSOeYrijbCcjfqfy8G+hghaTZCo87E3N0djrT2/pI1JJNZefxFNL7M0R+yxVLu8WPyeJ+gSdJ+1fLyimmnBE++oppeZ8UUgryPyVKqnnFfr/RxBi/GsPXjupKuxR57/0dHO3wt+YUg/
   </data>
  </layer>
  <layer id="10" name="Walkable" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJztVLkRwCAMY4rskf2XS5UOW9ZDqviOIkcsCQt0X2vd/5LWW9X3CS5Uac4df6Xpy3MmuJ1KzxbNFPFP9CULYTL8E30KXtJjp0fRoehn7xDCYfoUrR1nlTudVracfFB53Vyq/lXfkOIz05PMYWdOiTycYiQ5d5iuxlOep3krTDbjUp6z+67/3R3qcNP3bfqO1FxydEx6nFLOPvEF6X8AlyZxKQ==
+   eJztVLkRwCAMY4rslf2XSZUOW9ZDqviOIkcsCQt0X2vd/5LWW9X3CS5Uac4df6Xpy3MmuJ1KzxbNFPFP9CULYTL8E30KXtJjp0fRoehn7xDCYfoUrR1nlTudVracfFB53Vyq/lXfkOIz05PMYWdOiTycYiQ5d5iuxlOep3krTDbjUp6z+67/3R3qcNP3bfqO1FxydEx6nFLOPvEF6X8AnNqkKQ==
   </data>
  </layer>
  <objectgroup id="11" name="Mapevents">
@@ -299,7 +299,7 @@
     <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
-  <object id="14" name="forestwolf2" type="spawn" x="448" y="96" width="384" height="480">
+  <object id="14" name="forestwolf2" type="spawn" x="448" y="128" width="384" height="448">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="forestwolf2"/>
@@ -317,8 +317,31 @@
     <property name="spawngroup" value="forenza_waytobrimhaven3"/>
    </properties>
   </object>
+  <object id="19" name="tt_seraphina" type="spawn" x="640" y="64" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="ignoreAreas" value="true"/>
+    <property name="spawngroup" value="tt_seraphina"/>
+   </properties>
+  </object>
+  <object id="20" name="tt_guys" type="spawn" x="544" y="64" width="256" height="64">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="5"/>
+    <property name="spawngroup" value="tt_guys"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="13" name="Keys">
+  <object id="21" name="dummy_key" type="key" x="640" y="64" width="32" height="32">
+   <properties>
+    <property name="phrase" value="dummy_key_noPhrase"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup id="13" name="Keys" visible="0"/>
  <objectgroup id="14" name="Replace" visible="0">
   <object id="17" name="brv_nondisplay:83" type="replace" x="0" y="224" width="960" height="704">
    <properties>

AndorsTrail/res/xml/wild21.tmx

@@ -1,265 +1,279 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="16">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="20">
+ <layer id="1" name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJzbyMnAsHEUj2Ii8Uom6pq3ggbmUdONu4Bm7Qbi7cLEYxjAJjcNaNZZID4uTBoGAWziMP8u5aQOhpnXxEMdDAs/dhncuIkLvzwyvgcNPzEZ3LiRC788Ml4JNQ9fGgCZR838sRmKh0P+AAAdDwuf
+   eJy7yMnAcHEUj2Ii8Ukm6pp3ggbmUdONt4Bm3Qbi68LEYxjAJrcNaNZbIH4uTBoGAWziMP8e5aQOhpm3iIc6GBZ+6jK48SIu/PLI+B80/MxkcOOFXPjlkfFJqHn40gDIPGrmj8tQPBzyBwC8pD0/
   </data>
  </layer>
- <layer name="Objects" width="20" height="20">
+ <layer id="2" name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJytVL1KA0EQXtKIpPB2IasXUgmCguBD+AbGJ1AsNPgE4nPkOWJhCis9MCYcwSqSS5FOTez96ZzJzrBz691VfjDs7vx883OTZFqpRazUMnbnBwhip6lUCra+VepF520pnDPxRkj7FPzv4f4gOGeUYwh8x0appyCvPBOQMcUkIpZzM+eYdSIf6/iNmGnPIbkYmagFubTxPYVz2Wr691x7LszLObG3Bgnj0XoZC85d4Ntr+rqYg98j4mhQTW04n7WbIwtiVDBPRLfmc6Wi723t4ybAcRvIHfFiD+y7oPgD43PIOa/6FLwInIUxbo+G2ukb9P0ZiRVv6vO8rtRFgXTqrh7kywQHfjf+9hO49wr2KtP5eicUjzvWp37l3oZ7sppH7a+OEQe2Mt9uiZ79DytyMNhnKmZw08r74NvWqu1V7/+EoTo6dIazkrgEW2vN3blPW+J/FejXC/yuQbdPfG1h34T7D+3bUeRlA3SnkZNX2ot3OBe0wwjeFwn+fcyB9yTyguD9Hoi4pXW8KG8gZybvy0goZiD0XMcn2L4L5KugvqGI78W+Zvn/XAbsV/52uJZfbfGxPA==
+   eJytVL1KA0EQXlIYk2uyJ9y5wcLWSgxcVLASBAXBh/ANjE+gWGjwCcTnyHPEwhRWepAYCcEqkksRZ9wZdm6TS+UHw+7Ozzc/u3eZVqpSV6pat2sAgjiBdQS2XqTUj87bRkapmXFnhLRPwf8d7B/G6dEfcwyB7zpU6tPLK9cUfMeUIzUulnMzJ/r86UQ+1vEZMdOOQ3IxMlELcu2Frid/LgfiPNd5Ls6JvSUkjH7kZCx6OAU5E3XJuhFfxJFQTS1Yv7WdIwv7+XNEdEou10jwHmsXNwGOV0/eiBd7YN8KcV6ELodfb1/wInAWjdC+o6G2+oTun5FG7rxNfd4HSj0skXZg60G+THDgvfHdT2DfNYvzyHS+3gnF4xvrRfk7lDOUSEqLOsahZyvy7RTo2f9yRQ4G+0zFDF628j54bpZW21ed/xMNqqNNqz8riUewHZXtnvtsFvg/efqdJX7PoDsnvpaw78PebNj9Vc3JLrzB25qVtdja12GtxPYNI/i9SPD3MQfem5oTBL/vgYirxpYXpQxyF+Z9GSnFDISe64ggbnOJxPFifUMR3zWuZvl/LgL2K78druUX72qGIw==
   </data>
  </layer>
- <layer name="Above" width="20" height="20">
+ <layer id="3" name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJytlL8OgjAQxquJ0RVMSOpI9MUw8ZV8Du3gQjro4K6TbI76FPZSvnieLQjySy6lf/i+9riilGenldpr/1y59qZ9K8Ec7xsXth4z4t2SrbXsGX4Y4/4EPG6BPXBvDny5v9FhDfLlnpPERwjL8kLoxbsPjVi+wDLxsRIeMp84B1E26G1SpQoX6/RznJ9B6lb6O899uGb/vQ+Q1+3Yt/L75Ynfb16fCa0J1JHMP+0xdE6sgwavSVm74D7tdq7D3EeM0aybHnFu0COO2TABCj1MgFNLzXStqTa92Dz/vrgf5N2md4nMP5zGU9QLacXW9wH3gwj942I03fVf7of0sGKM+i+w6ndj
+   eJytlDsOwjAMhgMTsLVIldKNgUOwVnCxInElzgEZWKoMMLDDVCZiuRbGJCmBfpKVZ/3biVOlkINW6qix/3Btq7GV0BofG2e2mzPi24bttaxPejTH9QHSaD0xcG0O6XJ9o8M+uOYyQ/Nh2bkAq/I1lnGHWGdoG6Ehz5Pn0UT87nKlamfb/H2e5yD9psQb41789z1B57ofYyvvr8ow3qrLiVrjqSNZrxCjL0/aRz54TcraJUaTtLxOc7QQi0R/wDXiDzgXwxhR62GMuPTUTGpN9fkLrfP7pfcB2n3+boH1qfsXzMpP7dD+X6D3Afj+cSFib/2b9yE1rJiD8RM5dYW9
   </data>
  </layer>
- <layer name="Top" width="20" height="20">
+ <layer id="4" name="Top" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUDHUwkZM6NAwsBPKTODHpxVB1i3DIo9OjYHgDAJuXDsA=
+   eJxjYBgFo2AUDHWwkZM6NAwcBPKbODHpw1B1h3DIo9OjYHgDAIsAEgA=
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer id="5" name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJytk8ERADAEBFWR/lvQoa8H5sSa8WOdi/gz8yZzdDXbvDCrngur0kLsXPEIvzptmxm5VonJe0Wnyid8Ie6SvHGCdb2T37egeep/obygZqg7TnzCQyoUnzZaAuxVwMk=
+   eJytkrERACAIA5nC/VdiI1sKQCKfOzoMT8SPmRcVVfWotfHM3my8MpYfvsyD5qt41Rmxd6Iue4V3ssc2H+IuyRsnvKh7Uf+C9nux01lQM6Y7dv5EhpQmOSksF0BR3C0=
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="stoutford_guard1a" type="spawn" x="320" y="384" width="288" height="32">
+ <objectgroup id="6" name="Mapevents">
+  <object id="1" name="stoutford_guard1a" type="spawn" x="320" y="384" width="288" height="32">
    <properties>
     <property name="spawngroup" value="stoutford_guard1a"/>
    </properties>
   </object>
-  <object name="stoutford_guard1" type="spawn" x="64" y="384" width="224" height="32">
+  <object id="2" name="stoutford_guard1" type="spawn" x="64" y="384" width="224" height="32">
    <properties>
     <property name="spawngroup" value="stoutford_guard1"/>
    </properties>
   </object>
-  <object name="south" type="mapchange" x="416" y="608" width="64" height="32">
+  <object id="3" name="south" type="mapchange" x="416" y="608" width="64" height="32">
    <properties>
     <property name="map" value="stoutford_nw"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="north" type="mapchange" x="224" y="0" width="96" height="32">
+  <object id="4" name="north" type="mapchange" x="224" y="0" width="96" height="32">
    <properties>
     <property name="map" value="wild23"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="east1" type="mapchange" x="608" y="224" width="32" height="32">
+  <object id="5" name="east1" type="mapchange" x="608" y="224" width="32" height="32">
    <properties>
     <property name="map" value="wild20"/>
     <property name="place" value="west1"/>
    </properties>
   </object>
-  <object name="east2" type="mapchange" x="608" y="544" width="32" height="64">
+  <object id="6" name="east2" type="mapchange" x="608" y="544" width="32" height="64">
    <properties>
     <property name="map" value="wild20"/>
     <property name="place" value="west2"/>
    </properties>
   </object>
-  <object name="wall_south" type="mapchange" x="448" y="480" width="32" height="32">
+  <object id="7" name="wall_south" type="mapchange" x="448" y="480" width="32" height="32">
    <properties>
     <property name="map" value="wild21a"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="wall_north" type="mapchange" x="416" y="320" width="64" height="32">
+  <object id="8" name="wall_north" type="mapchange" x="416" y="320" width="64" height="32">
    <properties>
     <property name="map" value="wild21a"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="stoutford_grave_1" type="sign" x="192" y="160" width="32" height="32"/>
-  <object name="stoutford_grave_2" type="sign" x="224" y="160" width="32" height="32"/>
-  <object name="stoutford_grave_3" type="sign" x="192" y="224" width="32" height="32"/>
-  <object name="stoutford_grave_4" type="sign" x="544" y="224" width="32" height="32"/>
-  <object name="stoutford_grave_5" type="sign" x="512" y="224" width="32" height="32"/>
+  <object id="9" name="stoutford_grave_1" type="sign" x="192" y="160" width="32" height="32"/>
+  <object id="10" name="stoutford_grave_2" type="sign" x="224" y="160" width="32" height="32"/>
+  <object id="11" name="stoutford_grave_3" type="sign" x="192" y="224" width="32" height="32"/>
+  <object id="12" name="stoutford_grave_4" type="sign" x="544" y="224" width="32" height="32"/>
+  <object id="13" name="stoutford_grave_5" type="sign" x="512" y="224" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" visible="0"/>
- <objectgroup name="Keys"/>
- <objectgroup name="Replace"/>
+ <objectgroup id="7" name="Spawn">
+  <object id="14" name="tt_seraphina" type="spawn" x="32" y="128" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="ignoreAreas" value="true"/>
+    <property name="spawngroup" value="tt_seraphina"/>
+   </properties>
+  </object>
+  <object id="15" name="tt_guys" type="spawn" x="64" y="64" width="96" height="160">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="5"/>
+    <property name="spawngroup" value="tt_guys"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="8" name="Keys"/>
+ <objectgroup id="9" name="Replace"/>
 </map>