diff options
author | Jesusaves <cpntb1@ymail.com> | 2020-10-24 12:35:47 +0000 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2020-10-24 12:35:47 +0000 |
commit | 71be91b5c03b09139465723ffb56ed8fd6d5a0fe (patch) | |
tree | 852db7b591cc10c19db9c823eb361110e837039a /maps/009-1.tmx | |
parent | ea0c989f1d7166aee026318571cce15d7823372b (diff) | |
download | clientdata-71be91b5c03b09139465723ffb56ed8fd6d5a0fe.tar.gz clientdata-71be91b5c03b09139465723ffb56ed8fd6d5a0fe.tar.bz2 clientdata-71be91b5c03b09139465723ffb56ed8fd6d5a0fe.tar.xz clientdata-71be91b5c03b09139465723ffb56ed8fd6d5a0fe.zip |
CONTENT III - Super Merge Request
Part 1/2 on content for Novemember 11th deadline
Diffstat (limited to 'maps/009-1.tmx')
-rw-r--r-- | maps/009-1.tmx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/009-1.tmx b/maps/009-1.tmx index 1288140f..b349371a 100644 --- a/maps/009-1.tmx +++ b/maps/009-1.tmx @@ -2590,7 +2590,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="47" name="Collision" width="270" height="230"> + <layer id="47" name="Collision" width="270" height="230" visible="0"> <data encoding="csv"> 1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,2372,1403,1403,2372,2372,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403, 1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,2372,2372,1403,1403,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403, @@ -2647,7 +2647,7 @@ 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,2372,2372,2372,2372,1405,1405,1405,1405,2372,2372,2372,1405,1405,1405,2372,2372,2372,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,2373,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2373,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,2372,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403, 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1403,1403,1403,2372,1403,1403,1403,1405,1405,1405,1405,1405,2372,2372,2372,2372,2372,1405,1405,1405,2372,2372,2372,1405,1405,1405,2372,2372,2372,2372,2372,2372,0,2373,0,0,0,0,2372,2372,0,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,2372,0,0,0,0,0,2372,2372,2372,0,2373,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,2372,1403,2372,2372,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403, 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,2372,2372,2372,2372,2372,2372,1405,1405,2372,2372,2372,2372,2372,1405,1405,2372,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,2373,0,2373,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2373,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,2372,1403,1403,2372,2372,2372,2372,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403, -1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,2372,2372,2372,2372,1405,1405,2372,2372,2372,2372,2372,2372,1405,1405,1405,2372,2372,0,0,0,0,0,0,2375,2375,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,2372,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,2372,1403,1403,1403,2372,2372,2372,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403, +1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,2372,2372,2372,2372,1405,1405,2372,2372,2372,2372,2372,2372,1405,1405,1405,2372,2372,0,0,0,0,0,0,2375,2375,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,0,0,0,0,0,0,0,2372,0,0,0,0,2372,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,2372,1403,1403,1403,2372,2372,2372,2372,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403, 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,2372,2372,2372,1405,1405,2372,2372,2372,2372,2372,2372,1405,1405,1405,1405,1405,2373,0,0,2372,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2373,0,0,0,0,2372,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,2372,2372,2372,1403,2372,2372,1403,1403,1403,2372, 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,2372,1403,1403,1405,1405,0,0,0,0,0,0,0,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,0,0,1404,0,0,2375,2375,0,0,0,0,0,0,0,0,0,0,0,0,2373,2372,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2373,2373,2373,2373,2372,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,1403,1403,2372,2372,1403,1403,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372, 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1405,1405,1405,0,0,0,0,0,0,0,0,1405,1405,1405,1405,2373,0,0,0,0,2372,0,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,2372,2372,2372,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372, @@ -3058,7 +3058,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <objectgroup id="37" name="Objects" visible="0"> + <objectgroup id="37" name="Objects"> <object id="1" name="To West Woodland" type="warp" x="5760" y="992" width="64" height="32"> <properties> <property name="dest_map" value="008-1-1"/> |