diff options
author | Led Mitz <smoothshifter@tuta.io> | 2023-04-08 02:18:02 +0000 |
---|---|---|
committer | Led Mitz <smoothshifter@tuta.io> | 2023-04-08 02:18:02 +0000 |
commit | c18664a43c474bd9a623f1513180fb132abd9cd4 (patch) | |
tree | ab8efc9c73149306da14d04687804f94b05e6948 /maps/015-1.tmx | |
parent | 53f03e240acc174fce201e95f7a59dcf153fd210 (diff) | |
parent | a71e0c767bfdb96c2ca7ba18b844ad61e9bb9da4 (diff) | |
download | clientdata-c18664a43c474bd9a623f1513180fb132abd9cd4.tar.gz clientdata-c18664a43c474bd9a623f1513180fb132abd9cd4.tar.bz2 clientdata-c18664a43c474bd9a623f1513180fb132abd9cd4.tar.xz clientdata-c18664a43c474bd9a623f1513180fb132abd9cd4.zip |
Merge branch 'map_fixes' into 'master'
map fixes
See merge request legacy/clientdata!512
Diffstat (limited to 'maps/015-1.tmx')
-rw-r--r-- | maps/015-1.tmx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/maps/015-1.tmx b/maps/015-1.tmx index 68931cd8..41130a36 100644 --- a/maps/015-1.tmx +++ b/maps/015-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="140" height="120" tilewidth="32" tileheight="32" nextobjectid="14"> +<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="140" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="14"> <properties> <property name="minimap" value="graphics/minimaps/015-1.png"/> <property name="music" value="the-forest.ogg"/> @@ -15,7 +15,7 @@ <tileset firstgid="291" source="../tilesets/woodland_x3.tsx"/> <tileset firstgid="323" source="../tilesets/woodland_village.tsx"/> <tileset firstgid="579" source="../tilesets/woodland_x5.tsx"/> - <layer name="Ground1" width="140" height="120"> + <layer id="1" name="Ground1" width="140" height="120"> <data encoding="csv"> 35,3,35,35,19,3,51,3,3,35,19,3,35,35,35,19,51,51,3,51,35,3,51,19,35,19,19,19,35,19,19,35,35,3,51,35,19,19,3,51,35,35,19,35,35,19,3,35,19,19,19,19,51,35,19,51,3,51,3,51,51,3,51,51,51,3,51,3,51,19,19,19,19,51,51,51,19,19,51,3,51,51,51,51,51,85,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,87,19,19,19,19,19,3,3,3,3,3,3,3,3,3,101,102,102,102,102,102,102,102,102,102,102,103,3,3,3,3,3,3,3,3,3,3,3, 3,35,35,19,51,3,51,35,35,3,51,35,19,19,19,51,19,19,3,51,51,3,51,19,19,19,35,19,35,19,51,35,19,3,3,51,51,35,3,51,35,19,35,35,19,51,3,35,19,19,51,3,51,35,19,3,51,51,51,19,19,51,19,19,19,51,19,51,19,35,19,19,35,19,51,19,51,51,19,3,51,51,51,51,51,85,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,87,19,19,19,19,19,3,3,3,3,3,3,122,73,73,73,128,128,129,73,73,128,129,73,73,130,3,3,3,3,3,3,3,3,3,3,3,3, @@ -139,7 +139,7 @@ 3,3,3,35,3,3,3,35,3,3,35,67,67,35,3,3,3,51,35,19,3,51,3,67,19,67,3,51,19,67,35,35,19,35,35,67,35,67,67,35,51,3,19,3,67,35,35,91,93,107,51,35,3,3,51,67,35,3,67,35,51,67,3,35,35,3,19,3,3,3,121,40,89,89,89,140,177,178,67,35,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,51,51,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3 </data> </layer> - <layer name="Ground2" width="140" height="120"> + <layer id="2" name="Ground2" width="140" height="120"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,187,0,0,0,32,32,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,230,180,203,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,53,4,4,4,4,4,4,4,4,4,0, @@ -263,7 +263,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,37,4,4,4,4,4,4,0,0,0,4,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0 </data> </layer> - <layer name="Fringe" width="140" height="120"> + <layer id="3" name="Fringe" width="140" height="120"> <data encoding="csv"> 292,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,0,0,0,293,294,0,0,0,0,293,294,0,0,0,293,294,0,0,0,291,292,0,0,291,292,0,291,292,0,0,0,0,291,292,0,0,293,294,293,294,291,292,0,0,291,292,0,0,0,0,291,292,0,291,292,0,0,291,292,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,293,294,293,294,0,0,0,293,294,0,0,0,0,0,0,293,294,0,0,293,294,291,292,0,293,294,0,0,0,291,292,0,293,294,0,0,0,0,291,292,0,291,292,291,292,291,292,0,0,293,294,291,292,291,292,0,0,0,0,291,292,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -349,7 +349,7 @@ 0,0,0,293,294,0,0,0,291,292,0,291,292,0,0,0,0,0,0,293,294,0,293,294,0,0,0,0,0,0,0,0,291,292,0,291,292,0,0,0,291,292,0,0,291,292,293,294,291,292,0,0,0,0,0,291,292,0,0,293,294,0,293,294,0,291,292,0,291,292,0,0,0,0,0,0,0,291,292,0,0,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268,268,268,268, 0,0,0,291,292,0,291,292,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,291,292,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,293,294,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268,268,268, 0,0,295,296,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,266,267,0,0,0,0,0,0,0,0,0,291,292,291,292,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,293,294,293,294,0,293,294,0,0,0,0,0,0,0,0,0,293,294,0,0,293,294,291,292,0,0,0,0,0,291,292,0,0,0,0,291,292,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268,268, -292,0,0,0,0,0,0,293,294,0,0,0,0,0,0,291,292,0,0,0,291,292,266,267,0,0,0,0,293,294,0,293,294,293,294,0,0,291,292,0,293,294,0,0,291,292,266,267,0,0,0,0,0,0,0,0,0,0,0,266,267,0,263,0,0,293,294,0,0,291,292,0,0,0,0,0,0,0,0,0,293,294,0,293,294,0,291,292,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268, +292,0,0,0,0,0,0,293,294,0,0,0,0,0,0,291,292,0,0,0,291,292,266,267,0,0,0,0,293,294,0,293,294,293,294,0,0,291,292,0,293,294,259,260,291,292,266,267,0,0,0,0,0,0,0,0,0,0,0,266,267,0,263,0,0,293,294,0,0,291,292,0,0,0,0,0,0,0,0,0,293,294,0,293,294,0,291,292,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268, 0,293,294,0,291,292,0,293,294,291,292,293,294,291,292,0,0,293,294,0,0,293,294,267,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,263,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,291,292,293,294,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268, 0,293,294,0,0,0,0,0,0,0,0,293,294,0,0,293,294,0,0,293,294,0,291,292,0,0,0,0,0,293,294,291,292,0,0,0,0,0,291,292,293,294,0,293,294,0,0,0,293,294,0,0,0,291,292,293,294,0,293,294,0,0,293,294,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268, 293,294,291,292,293,294,0,293,294,0,0,291,292,293,294,293,294,0,0,291,292,0,293,294,0,0,0,0,0,0,293,294,293,294,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,291,292,291,292,0,0,0,0,293,294,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268, @@ -387,7 +387,7 @@ 584,0,0,0,0,0,0,293,294,0,291,292,0,0,0,0,0,293,294,291,292,582,583,584,0,0,293,294,0,293,294,0,0,291,292,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,579,580,581,0,291,292,582,583,584,0,293,294,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,291,292,0,293,294,291,292,0,0,291,292,291,292,293,294,293,294,291,292,293,294,291,292,293,294,291,292,291,292,293,294,0,293,294,291,292,293,294,293,294,293,294,293,294,0,0,293,294,0,293,294,0,0,0,0,0,0 </data> </layer> - <layer name="Over1" width="140" height="120"> + <layer id="4" name="Over1" width="140" height="120"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,7,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,23,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -511,7 +511,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 </data> </layer> - <layer name="Collision" width="140" height="120"> + <layer id="5" name="Collision" width="140" height="120" visible="0"> <data encoding="csv"> 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -635,22 +635,22 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 </data> </layer> - <objectgroup name="Objects"> - <object id="1" name="To Woodland" type="warp" x="2976" y="1728" width="32" height="64"> + <objectgroup id="6" name="Objects" visible="0"> + <object id="1" name="To Woodland" class="warp" x="2976" y="1728" width="32" height="64"> <properties> <property name="dest_map" value="010-1"/> <property name="dest_tile_x" value="14"/> <property name="dest_tile_y" value="54"/> </properties> </object> - <object id="2" name="To Cat's Cave" type="warp" x="1888" y="992" width="32" height="32"> + <object id="2" name="To Cat's Cave" class="warp" x="1888" y="992" width="32" height="32"> <properties> <property name="dest_map" value="015-3"/> <property name="dest_tile_x" value="31"/> <property name="dest_tile_y" value="42"/> </properties> </object> - <object id="3" name="CloverPatch" type="spawn" x="0" y="0"> + <object id="3" name="CloverPatch" class="spawn" x="0" y="0"> <properties> <property name="eA_death" value="1000"/> <property name="eA_spawn" value="100000"/> @@ -658,14 +658,14 @@ <property name="monster_id" value="35"/> </properties> </object> - <object id="4" name="To Woodland Swamp" type="warp" x="1824" y="3232" width="128" height="32"> + <object id="4" name="To Woodland Swamp" class="warp" x="1824" y="3232" width="128" height="32"> <properties> <property name="dest_map" value="025-1"/> <property name="dest_tile_x" value="89"/> <property name="dest_tile_y" value="20"/> </properties> </object> - <object id="5" name="Butterfly" type="spawn" x="0" y="0"> + <object id="5" name="Butterfly" class="spawn" x="0" y="0"> <properties> <property name="eA_death" value="20"/> <property name="eA_spawn" value="30"/> @@ -673,7 +673,7 @@ <property name="monster_id" value="53"/> </properties> </object> - <object id="6" name="Squirrel" type="spawn" x="0" y="0"> + <object id="6" name="Squirrel" class="spawn" x="0" y="0"> <properties> <property name="eA_death" value="10"/> <property name="eA_spawn" value="20"/> @@ -681,7 +681,7 @@ <property name="monster_id" value="36"/> </properties> </object> - <object id="7" name="LogHead" type="spawn" x="0" y="0"> + <object id="7" name="LogHead" class="spawn" x="0" y="0"> <properties> <property name="eA_death" value="0"/> <property name="eA_spawn" value="0"/> @@ -689,7 +689,7 @@ <property name="monster_id" value="23"/> </properties> </object> - <object id="8" name="SpikyMushroom" type="spawn" x="0" y="0"> + <object id="8" name="SpikyMushroom" class="spawn" x="0" y="0"> <properties> <property name="eA_death" value="0"/> <property name="eA_spawn" value="0"/> @@ -697,7 +697,7 @@ <property name="monster_id" value="17"/> </properties> </object> - <object id="9" name="PinkFlower" type="spawn" x="0" y="0"> + <object id="9" name="PinkFlower" class="spawn" x="0" y="0"> <properties> <property name="eA_death" value="0"/> <property name="eA_spawn" value="0"/> @@ -705,7 +705,7 @@ <property name="monster_id" value="12"/> </properties> </object> - <object id="10" name="GambogePlant" type="spawn" x="0" y="0"> + <object id="10" name="GambogePlant" class="spawn" x="0" y="0"> <properties> <property name="eA_death" value="0"/> <property name="eA_spawn" value="0"/> @@ -713,7 +713,7 @@ <property name="monster_id" value="29"/> </properties> </object> - <object id="11" name="AlizarinPlant" type="spawn" x="0" y="0"> + <object id="11" name="AlizarinPlant" class="spawn" x="0" y="0"> <properties> <property name="eA_death" value="0"/> <property name="eA_spawn" value="0"/> @@ -721,7 +721,7 @@ <property name="monster_id" value="30"/> </properties> </object> - <object id="12" name="Silkworm" type="spawn" x="0" y="0"> + <object id="12" name="Silkworm" class="spawn" x="0" y="0"> <properties> <property name="eA_death" value="7000"/> <property name="eA_spawn" value="15000"/> @@ -729,7 +729,7 @@ <property name="monster_id" value="33"/> </properties> </object> - <object id="13" name="MauvePlant" type="spawn" x="0" y="0"> + <object id="13" name="MauvePlant" class="spawn" x="0" y="0"> <properties> <property name="eA_death" value="180000"/> <property name="eA_spawn" value="270000"/> |