summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-04-01 16:05:52 -0300
committerJesusaves <cpntb1@ymail.com>2021-04-01 16:05:52 -0300
commit776d847222ddb7d85b0eb42c18bee43b871eeaab (patch)
tree9d1e710028c99bdb70fd4df2c5e110e125b9b3a9
parent18ff6087c1c604dbf55ffb18bff2b34c40c1468c (diff)
downloadclientdata-776d847222ddb7d85b0eb42c18bee43b871eeaab.tar.gz
clientdata-776d847222ddb7d85b0eb42c18bee43b871eeaab.tar.bz2
clientdata-776d847222ddb7d85b0eb42c18bee43b871eeaab.tar.xz
clientdata-776d847222ddb7d85b0eb42c18bee43b871eeaab.zip
Update several maps to comply with our "TSX only for animated tiles" policy
-rw-r--r--maps/001-3-1.tmx48
-rw-r--r--maps/001-3.tmx60
-rw-r--r--maps/001-9.tmx12
-rw-r--r--maps/003-1-3.tmx6
-rw-r--r--maps/003-2.tmx34
-rw-r--r--maps/003-3.tmx20
-rw-r--r--maps/004-2-1.tmx6
-rw-r--r--maps/005-1-1.tmx474
-rw-r--r--maps/005-6.tmx12
-rw-r--r--maps/006-2-2.tmx4
-rw-r--r--maps/006-3.tmx6
-rw-r--r--maps/006-4.tmx4
-rw-r--r--maps/009-2.tmx4
-rw-r--r--maps/009-3.tmx4
-rw-r--r--maps/011-2.tmx24
-rw-r--r--maps/012-2.tmx28
-rw-r--r--maps/012-3.tmx34
-rw-r--r--maps/012-4.tmx16
-rw-r--r--maps/014-4.tmx8
-rw-r--r--maps/015-1.tmx44
-rw-r--r--maps/015-5.tmx20
-rw-r--r--maps/017-10.tmx22
-rw-r--r--maps/018-2-1.tmx42
-rw-r--r--maps/018-4-2.tmx38
-rw-r--r--maps/019-3.tmx16
-rw-r--r--maps/020-3.tmx6
-rw-r--r--maps/021-1.tmx8
27 files changed, 613 insertions, 387 deletions
diff --git a/maps/001-3-1.tmx b/maps/001-3-1.tmx
index 5b7d7612..7510dab8 100644
--- a/maps/001-3-1.tmx
+++ b/maps/001-3-1.tmx
@@ -4,19 +4,43 @@
<property name="music" value="mythica.ogg"/>
<property name="name" value="Saulc's Palace"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
- <tileset firstgid="10" source="../graphics/tilesets/inn.tsx"/>
- <tileset firstgid="266" source="../graphics/tilesets/inn2.tsx"/>
- <tileset firstgid="522" source="../graphics/tilesets/desert_city_indoors.tsx"/>
- <tileset firstgid="672" source="../graphics/tilesets/desert_city_indoors_x3.tsx"/>
- <tileset firstgid="717" source="../graphics/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="765" source="../graphics/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="1021" source="../graphics/tilesets/desert_castle_interior.tsx"/>
- <tileset firstgid="1277" source="../graphics/tilesets/desert_castle_interior_x2.tsx"/>
- <tileset firstgid="1293" source="../graphics/tilesets/desert_castle_interior_x4.tsx"/>
- <tileset firstgid="1325" source="../graphics/tilesets/desert_castle_interior_x5.tsx"/>
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
+ <tileset firstgid="10" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="inn2" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="522" name="desert_city_indoors" tilewidth="32" tileheight="32" tilecount="150" columns="15">
+ <image source="../graphics/tilesets/desert_city_indoors.png" width="480" height="320"/>
+ </tileset>
+ <tileset firstgid="672" name="desert_city_indoors_x3" tilewidth="32" tileheight="96" tilecount="45" columns="15">
+ <image source="../graphics/tilesets/desert_city_indoors_x3.png" width="480" height="288"/>
+ </tileset>
+ <tileset firstgid="717" name="woodland_indoor_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor_x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="765" name="woodland_indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1021" name="desert_castle_interior" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/desert_castle_interior.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1277" name="desert_castle_interior_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <image source="../graphics/tilesets/desert_castle_interior_x2.png" width="512" height="64"/>
+ </tileset>
+ <tileset firstgid="1293" name="desert_castle_interior_x4" tilewidth="32" tileheight="128" tilecount="32" columns="16">
+ <image source="../graphics/tilesets/desert_castle_interior_x4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1325" name="desert_castle_interior_x5" tilewidth="32" tileheight="160" tilecount="16" columns="16">
+ <image source="../graphics/tilesets/desert_castle_interior_x5.png" width="512" height="160"/>
+ </tileset>
<tileset firstgid="1341" source="../graphics/tilesets/wood_lab.tsx"/>
- <tileset firstgid="1353" source="../graphics/tilesets/inn_x2.tsx"/>
+ <tileset firstgid="1353" name="inn_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/inn_x2.png" width="512" height="192"/>
+ </tileset>
<tileset firstgid="1401" name="Throne_x2" tilewidth="32" tileheight="64" tilecount="3" columns="3">
<image source="../graphics/tilesets/Throne_x2.png" width="96" height="64"/>
</tileset>
diff --git a/maps/001-3.tmx b/maps/001-3.tmx
index 09766bf7..0cdd90f3 100644
--- a/maps/001-3.tmx
+++ b/maps/001-3.tmx
@@ -7,22 +7,52 @@
<property name="music" value="mythica.ogg"/>
<property name="name" value="Saulc's Home"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/trans_woodland_desert.tsx"/>
- <tileset firstgid="129" source="../graphics/tilesets/desert_castle2.tsx"/>
- <tileset firstgid="385" source="../graphics/tilesets/desert_castle.tsx"/>
- <tileset firstgid="641" source="../graphics/tilesets/docks.tsx"/>
- <tileset firstgid="801" source="../graphics/tilesets/desert2.tsx"/>
- <tileset firstgid="1057" source="../graphics/tilesets/desert1.tsx"/>
- <tileset firstgid="1313" source="../graphics/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="1569" source="../graphics/tilesets/desert3.tsx"/>
- <tileset firstgid="1649" source="../graphics/tilesets/desert_x2.tsx"/>
+ <tileset firstgid="1" name="trans_woodland_desert" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <image source="../graphics/tilesets/trans_woodland_desert.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="desert_castle2" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/desert_castle2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="385" name="desert_castle" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/desert_castle.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="641" name="docks" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+ <image source="../graphics/tilesets/docks.png" width="512" height="320"/>
+ </tileset>
+ <tileset firstgid="801" name="desert2" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/desert2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1057" name="desert1" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/desert1.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1313" name="woodland_indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1569" name="desert3" tilewidth="32" tileheight="32" tilecount="80" columns="10">
+ <image source="../graphics/tilesets/desert3.png" width="320" height="256"/>
+ </tileset>
+ <tileset firstgid="1649" name="desert_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/desert_x2.png" width="512" height="192"/>
+ </tileset>
<tileset firstgid="1697" source="../graphics/tilesets/water_overflow.tsx"/>
- <tileset firstgid="1769" source="../graphics/tilesets/desert_x5.tsx"/>
- <tileset firstgid="1771" source="../graphics/tilesets/desert_castle_x2.tsx"/>
- <tileset firstgid="1899" source="../graphics/tilesets/desert_castle_x3.tsx"/>
- <tileset firstgid="1931" source="../graphics/tilesets/docks_x2.tsx"/>
- <tileset firstgid="2011" source="../graphics/tilesets/desert_city.tsx"/>
- <tileset firstgid="2267" source="../graphics/tilesets/collision.tsx"/>
+ <tileset firstgid="1769" name="desert_x5" tilewidth="96" tileheight="160" tilecount="2" columns="2">
+ <image source="../graphics/tilesets/desert_x5.png" width="192" height="160"/>
+ </tileset>
+ <tileset firstgid="1771" name="desert_castle_x2" tilewidth="32" tileheight="64" tilecount="128" columns="16">
+ <image source="../graphics/tilesets/desert_castle_x2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1899" name="desert_castle_x3" tilewidth="32" tileheight="96" tilecount="32" columns="16">
+ <image source="../graphics/tilesets/desert_castle_x3.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="1931" name="docks_x2" tilewidth="32" tileheight="64" tilecount="80" columns="16">
+ <image source="../graphics/tilesets/docks_x2.png" width="512" height="320"/>
+ </tileset>
+ <tileset firstgid="2011" name="desert_city" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/desert_city.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="2267" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
<layer id="1" name="Ground 0" width="200" height="200">
<data encoding="csv">
1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,
diff --git a/maps/001-9.tmx b/maps/001-9.tmx
index 4a3f98cb..7df0929c 100644
--- a/maps/001-9.tmx
+++ b/maps/001-9.tmx
@@ -10,9 +10,15 @@
<property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
<property name="overlay0keepratio" value="true"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
- <tileset firstgid="10" source="../graphics/tilesets/cave2.tsx"/>
- <tileset firstgid="138" source="../graphics/tilesets/cave.tsx"/>
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
+ <tileset firstgid="10" name="cave2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <image source="../graphics/tilesets/cave2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="138" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <image source="../graphics/tilesets/cave.png" width="512" height="256"/>
+ </tileset>
<layer id="1" name="Ground" width="500" height="500">
<data encoding="csv">
158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,
diff --git a/maps/003-1-3.tmx b/maps/003-1-3.tmx
index 2870b83c..8d707c4c 100644
--- a/maps/003-1-3.tmx
+++ b/maps/003-1-3.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="110" height="110" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="43">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="110" height="110" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="43">
<properties>
<property name="license" value="CC BY-SA 3.0"/>
<property name="manaplus version" value="2"/>
@@ -10,7 +10,9 @@
<tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
<image source="../graphics/tilesets/collision.png" width="96" height="96"/>
</tileset>
- <tileset firstgid="10" source="../graphics/tilesets/cave.tsx"/>
+ <tileset firstgid="10" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <image source="../graphics/tilesets/cave.png" width="512" height="256"/>
+ </tileset>
<layer id="1" name="Ground1" width="110" height="110">
<data encoding="csv">
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
diff --git a/maps/003-2.tmx b/maps/003-2.tmx
index 2b20b8ff..6c33604c 100644
--- a/maps/003-2.tmx
+++ b/maps/003-2.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="34">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="34">
<properties>
<property name="license" value="CC BY-SA 3.0"/>
<property name="manaplus version" value="2"/>
@@ -13,11 +13,19 @@
<tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
</tileset>
- <tileset firstgid="266" source="../graphics/tilesets/inn.tsx"/>
- <tileset firstgid="522" source="../graphics/tilesets/inn2.tsx"/>
- <tileset firstgid="778" source="../graphics/tilesets/inn_x2.tsx"/>
- <tileset firstgid="826" source="../graphics/tilesets/castle2.tsx"/>
- <layer name="Ground1" width="70" height="68">
+ <tileset firstgid="266" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="522" name="inn2" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="778" name="inn_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/inn_x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="826" name="castle2" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/castle2.png" width="512" height="512"/>
+ </tileset>
+ <layer id="1" name="Ground1" width="70" height="68">
<data encoding="csv">
58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,
58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,
@@ -89,7 +97,7 @@
58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58
</data>
</layer>
- <layer name="Ground2" width="70" height="68">
+ <layer id="2" name="Ground2" width="70" height="68">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -161,7 +169,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
</data>
</layer>
- <layer name="Ground3" width="70" height="68">
+ <layer id="3" name="Ground3" width="70" height="68">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -233,7 +241,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
</data>
</layer>
- <layer name="Fringe" width="70" height="68">
+ <layer id="4" name="Fringe" width="70" height="68">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -305,7 +313,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
</data>
</layer>
- <layer name="Over1" width="70" height="68">
+ <layer id="5" name="Over1" width="70" height="68">
<data encoding="csv">
58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,
58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,
@@ -377,7 +385,7 @@
58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58
</data>
</layer>
- <layer name="Collision" width="70" height="68" visible="0">
+ <layer id="6" name="Collision" width="70" height="68" 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,
@@ -449,7 +457,7 @@
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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>
- <layer name="Heights" width="70" height="68" visible="0">
+ <layer id="7" name="Heights" width="70" height="68" visible="0">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -521,7 +529,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
</data>
</layer>
- <objectgroup name="Objects">
+ <objectgroup id="8" name="Objects">
<object id="25" name="To Outside" type="warp" x="1024" y="1312" width="32" height="32">
<properties>
<property name="dest_map" value="003-1"/>
diff --git a/maps/003-3.tmx b/maps/003-3.tmx
index f7116db2..b21c2a34 100644
--- a/maps/003-3.tmx
+++ b/maps/003-3.tmx
@@ -13,11 +13,21 @@
<tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
</tileset>
- <tileset firstgid="266" source="../graphics/tilesets/inn.tsx"/>
- <tileset firstgid="522" source="../graphics/tilesets/inn2.tsx"/>
- <tileset firstgid="778" source="../graphics/tilesets/inn_x2.tsx"/>
- <tileset firstgid="826" source="../graphics/tilesets/desert_city_indoors.tsx"/>
- <tileset firstgid="976" source="../graphics/tilesets/cave2_sewer_mine.tsx"/>
+ <tileset firstgid="266" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="522" name="inn2" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="778" name="inn_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/inn_x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="826" name="desert_city_indoors" tilewidth="32" tileheight="32" tilecount="150" columns="15">
+ <image source="../graphics/tilesets/desert_city_indoors.png" width="480" height="320"/>
+ </tileset>
+ <tileset firstgid="976" name="cave2_sewer_mine" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/cave2_sewer_mine.png" width="512" height="512"/>
+ </tileset>
<layer id="1" name="Ground1" width="70" height="68">
<data encoding="csv">
58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,
diff --git a/maps/004-2-1.tmx b/maps/004-2-1.tmx
index 427bdf8f..abf2a511 100644
--- a/maps/004-2-1.tmx
+++ b/maps/004-2-1.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="110" height="110" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="50">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="110" height="110" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="50">
<properties>
<property name="author" value="Pookie, Saulc"/>
<property name="license" value="CC BY-SA 3.0"/>
@@ -11,7 +11,9 @@
<tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
<image source="../graphics/tilesets/collision.png" width="96" height="96"/>
</tileset>
- <tileset firstgid="10" source="../graphics/tilesets/cave.tsx"/>
+ <tileset firstgid="10" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <image source="../graphics/tilesets/cave.png" width="512" height="256"/>
+ </tileset>
<tileset firstgid="138" source="../graphics/tilesets/evol/candle-x1x2.tsx"/>
<tileset firstgid="150" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/cave.png" width="512" height="256"/>
diff --git a/maps/005-1-1.tmx b/maps/005-1-1.tmx
index eb524af7..cfb2cd12 100644
--- a/maps/005-1-1.tmx
+++ b/maps/005-1-1.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="65" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="16" nextobjectid="100">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="65" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="16" nextobjectid="100">
<properties>
<property name="author" value="Saulc, Jesusalva"/>
<property name="license" value="CC BY-SA 3.0"/>
@@ -35,102 +35,114 @@
</tileset>
<tileset firstgid="541" source="../graphics/tilesets/ship-flags-x3x2.tsx"/>
<tileset firstgid="555" source="../graphics/tilesets/waterflow.tsx"/>
- <tileset firstgid="627" source="../graphics/tilesets/woodland_village.tsx"/>
- <tileset firstgid="883" source="../graphics/tilesets/woodland_ground.tsx"/>
- <tileset firstgid="1139" source="../graphics/tilesets/trans_woodland_desert.tsx"/>
- <tileset firstgid="1267" source="../graphics/tilesets/docks.tsx"/>
- <tileset firstgid="1427" source="../graphics/tilesets/woodland_x2.tsx"/>
- <tileset firstgid="1459" source="../graphics/tilesets/woodland_x3.tsx"/>
- <tileset firstgid="1491" source="../graphics/tilesets/docks_x2.tsx"/>
- <tileset firstgid="1571" source="../graphics/tilesets/woodland_village_x3.tsx"/>
- <tileset firstgid="1637" source="../graphics/tilesets/woodland_village_x2.tsx"/>
- <tileset firstgid="1653" source="../graphics/tilesets/water3.tsx"/>
- <tileset firstgid="1818" name="christmas" tilewidth="32" tileheight="32" tilecount="304" columns="16">
+ <tileset firstgid="627" name="woodland_village" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/woodland_village.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="883" name="woodland_ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/woodland_ground.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1139" name="trans_woodland_desert" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <image source="../graphics/tilesets/trans_woodland_desert.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1267" name="docks" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+ <image source="../graphics/tilesets/docks.png" width="512" height="320"/>
+ </tileset>
+ <tileset firstgid="1427" name="woodland_x2" tilewidth="32" tileheight="64" tilecount="32" columns="16">
+ <image source="../graphics/tilesets/woodland_x2.png" width="512" height="128"/>
+ </tileset>
+ <tileset firstgid="1459" name="woodland_x3" tilewidth="32" tileheight="96" tilecount="32" columns="16">
+ <image source="../graphics/tilesets/woodland_x3.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="1491" name="docks_x2" tilewidth="32" tileheight="64" tilecount="80" columns="16">
+ <image source="../graphics/tilesets/docks_x2.png" width="512" height="320"/>
+ </tileset>
+ <tileset firstgid="1571" source="../graphics/tilesets/water3.tsx"/>
+ <tileset firstgid="1736" name="christmas" tilewidth="32" tileheight="32" tilecount="304" columns="16">
<image source="../graphics/tilesets/christmas.png" width="512" height="608"/>
</tileset>
- <tileset firstgid="2122" name="artis-house" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="2040" name="artis-house" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/evol/artis-house.png" width="512" height="512"/>
</tileset>
- <tileset firstgid="2378" name="artis-blockwall" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="2296" name="artis-blockwall" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/evol/artis-blockwall.png" width="512" height="512"/>
</tileset>
- <tileset firstgid="2634" name="signs_x2" tilewidth="32" tileheight="64" tilecount="36" columns="9">
+ <tileset firstgid="2552" name="signs_x2" tilewidth="32" tileheight="64" tilecount="36" columns="9">
<image source="../graphics/tilesets/signs_x2.png" width="288" height="256"/>
</tileset>
- <tileset firstgid="2670" name="artis-pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2588" name="artis-pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/evol/artis-pavement.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="2798" name="artis-accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2716" name="artis-accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/evol/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="2926" name="artis-fountain-x1x4" tilewidth="32" tileheight="128" tilecount="11" columns="11">
+ <tileset firstgid="2844" name="artis-fountain-x1x4" tilewidth="32" tileheight="128" tilecount="11" columns="11">
<image source="../graphics/tilesets/evol/artis-fountain-x1x4.png" width="352" height="128"/>
</tileset>
- <tileset firstgid="2937" name="night" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="2855" name="night" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/night.png" width="512" height="512"/>
</tileset>
- <tileset firstgid="3193" name="artis lamps" tilewidth="32" tileheight="96" tilecount="20" columns="10">
+ <tileset firstgid="3111" name="artis lamps" tilewidth="32" tileheight="96" tilecount="20" columns="10">
<image source="../graphics/tilesets/evol/artis-lamps-x1x3.png" width="320" height="192"/>
</tileset>
- <tileset firstgid="3213" name="artis-fountain" tilewidth="32" tileheight="32" tilecount="55" columns="11">
+ <tileset firstgid="3131" name="artis-fountain" tilewidth="32" tileheight="32" tilecount="55" columns="11">
<image source="../graphics/tilesets/evol/artis-fountain.png" width="352" height="160"/>
</tileset>
- <tileset firstgid="3268" name="artis-archway-x1x5" tilewidth="32" tileheight="160" tilecount="7" columns="7">
+ <tileset firstgid="3186" name="artis-archway-x1x5" tilewidth="32" tileheight="160" tilecount="7" columns="7">
<image source="../graphics/tilesets/evol/artis-archway-x1x5.png" width="224" height="160"/>
</tileset>
<layer id="1" name="Ground" width="65" height="60">
<data encoding="csv">
-883,883,883,883,984,936,969,969,969,969,969,969,969,969,969,969,969,970,883,883,883,883,883,972,973,973,973,974,883,883,984,936,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,970,883,883,883,883,883,883,883,883,1157,1157,1168,1169,1169,1169,1169,1169,1816,
-883,883,883,883,883,968,969,969,969,969,969,969,969,969,969,969,969,970,883,883,883,883,883,972,973,973,973,974,883,883,883,968,969,969,969,969,969,969,1025,969,969,969,969,969,969,969,969,921,954,883,883,883,883,883,883,883,1157,1157,1168,1169,1169,1169,1169,1816,1816,
-883,883,883,883,883,984,936,969,969,969,969,969,969,969,969,969,969,921,954,883,883,883,883,972,973,973,973,974,883,883,883,984,936,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,970,883,883,883,883,883,883,883,1157,1157,1168,1169,1169,1169,1816,1816,1816,
-883,883,883,1061,883,883,984,936,969,969,969,969,969,969,969,969,969,969,970,883,883,883,883,988,926,973,973,974,883,883,883,883,968,969,969,969,969,969,969,969,969,969,969,969,969,969,969,937,986,883,883,883,883,883,883,883,883,1157,1168,1169,1169,1816,1816,1816,1816,
-883,883,1061,1092,883,883,883,984,936,969,969,969,969,969,969,969,969,969,921,954,883,883,883,883,988,926,925,990,883,883,883,883,984,936,969,969,969,969,969,969,969,969,969,969,969,969,969,970,883,883,883,883,883,883,883,883,883,1157,1816,1169,1816,1816,1816,1816,1816,
-883,1061,1092,1079,1131,883,883,883,984,985,985,936,969,969,969,969,969,937,985,986,883,883,883,883,883,972,974,883,883,883,883,883,883,984,985,936,969,969,969,969,969,969,969,969,969,969,937,986,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,563,
-1061,1092,1079,1109,883,2782,2783,2784,883,883,883,984,985,936,969,969,937,986,883,883,883,883,883,883,883,972,974,883,883,883,883,883,883,883,883,984,985,936,969,969,969,969,969,969,969,937,986,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,563,563,
-1092,1079,1109,883,2782,2783,2784,2784,2782,2783,2784,2784,883,984,985,985,986,883,883,883,883,883,883,883,956,942,974,883,883,883,883,883,883,883,883,883,883,984,985,936,969,969,937,985,985,986,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,563,563,563,
-1079,1109,883,2782,2783,2784,2784,2782,2782,2783,2784,2784,883,883,883,883,883,883,883,883,883,883,883,883,972,925,990,883,883,883,883,883,883,883,883,883,883,883,883,984,985,985,986,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,563,563,563,563,
-1109,883,2782,2783,2784,2784,2784,2784,2784,2784,2784,2784,2784,2783,2783,2782,2783,2784,2782,2783,2784,883,883,883,972,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,563,563,563,563,563,
-883,2782,2783,2784,2784,2784,2783,2784,2784,2782,2783,2784,2784,2784,2784,2784,2782,2783,2784,2783,2784,883,883,883,972,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,563,563,563,563,563,
-2782,2783,2784,2784,2784,2784,2783,2784,2784,2784,2784,2784,2784,2782,2783,2784,2782,2704,2705,2783,2784,883,883,883,972,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,563,563,563,563,563,563,
-2783,2784,2784,2784,2782,2782,2783,2784,2782,2783,2784,2784,2784,2784,2783,2784,2782,2772,2740,2783,2784,883,883,956,942,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,563,563,563,563,563,563,
-2784,2784,2783,2782,2782,2782,2704,2705,2783,2784,2784,2784,2783,2784,2783,2784,2782,2772,2740,2783,2784,883,883,972,925,990,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,563,563,563,563,563,563,563,
-2784,2784,2784,2784,2783,2782,2772,2740,2783,2784,2783,2784,2784,2782,2783,2784,2782,2788,2756,2783,2784,883,956,942,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,563,563,563,563,563,563,563,
-2784,2784,2782,2783,2784,2784,2772,2740,2782,2783,2784,2784,2704,2705,2783,2784,2782,2720,2721,2783,2784,883,972,925,990,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,563,563,563,563,563,563,563,563,
-2784,2783,2784,2782,2783,2784,2788,2756,2784,2782,2782,2783,2772,2740,2784,2784,2782,2783,2784,2783,2784,883,972,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,563,563,563,563,563,563,563,563,
-2782,2783,2784,2782,2783,2784,2720,2721,2784,2784,2784,2784,2772,2740,2784,2784,2784,2783,2784,2783,2784,883,972,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,563,563,563,563,563,563,563,563,563,
-2783,2784,2784,2783,2784,2784,2784,2784,883,2782,2783,2784,2788,2756,2782,2783,2784,2783,2784,2783,2784,1139,942,941,957,957,957,957,957,957,958,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,563,563,563,563,563,563,563,563,563,
-2784,2784,2784,2784,2784,2784,2784,2784,2782,2783,2784,2784,2720,2721,2783,2784,2782,2783,2784,2783,2784,1155,989,989,989,989,989,989,926,973,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,563,563,563,563,563,563,563,563,563,
-2783,2734,2735,2736,2784,2784,2784,2784,2783,2784,2783,2784,2783,2784,2783,2784,2782,2783,2784,2783,2784,883,883,883,883,883,883,883,988,989,990,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,563,563,563,563,563,563,563,563,
-2783,2750,2751,2752,2784,2784,2783,2784,2784,2782,2783,2784,2784,2782,2734,2735,2736,2783,2784,2783,2784,883,704,705,705,705,705,705,705,705,705,705,705,705,705,705,706,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,563,563,563,563,563,563,563,
-2784,2766,2767,2768,2783,2784,2783,2784,2784,2782,2783,2784,2784,2782,2750,2751,2752,2783,2784,2783,2784,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,563,563,563,563,563,
-2783,2784,2782,2783,2784,2784,2783,2784,2782,2782,2782,2783,2784,2782,2766,2767,2768,2783,2784,2783,2784,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,1816,563,563,563,563,
-2782,2782,2782,2783,2782,2782,2782,2782,2782,2782,2782,2782,2782,2783,2784,2784,2782,2783,2784,2783,2784,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,563,563,563,
-2782,2782,2782,2782,2783,2784,2784,2784,2782,2782,2782,2782,2783,2784,2782,2783,2784,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,563,563,
-2782,2782,2783,2782,2783,2784,2783,2782,2782,2783,2782,2783,2784,2782,2783,2784,2784,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,563,
-2782,2783,2782,2783,2784,2784,2783,2784,2784,2784,2784,2784,2782,2783,2782,2783,2784,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,
-2783,2784,2784,2784,2782,2782,2783,2784,2784,2784,2784,2782,2783,2782,2783,2784,883,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,
-2784,2784,2783,2782,2783,2784,2782,2782,2782,2782,2782,2783,2784,2784,883,883,883,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,
-2782,2782,2783,2784,2782,2782,2782,2783,2782,2783,2784,2784,883,883,883,883,883,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,
-2783,2784,2782,2782,2782,2783,2782,2783,2784,2784,883,883,883,883,883,883,883,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,
-2783,2782,2782,2783,2782,2783,2784,2784,2784,883,883,883,883,883,883,883,883,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1816,1816,1816,1816,1816,1816,
-2782,2783,2782,2782,2782,2783,2784,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1169,1169,1816,1816,1816,1816,1816,
-2782,2782,2782,2783,2784,2783,2784,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,736,737,737,737,737,737,737,737,737,737,737,737,737,737,738,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1816,1816,
-2782,2782,2783,2784,2784,2784,2784,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1816,
-2784,2784,2784,2784,2784,2784,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,883,883,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
-1140,1141,1141,1141,1141,1142,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1171,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,883,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
-1156,973,973,973,973,1206,1141,1142,883,883,883,883,883,1816,1816,1816,1816,883,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
-1207,973,973,973,973,973,973,1206,1142,883,883,883,1816,1816,1816,1816,1816,1816,883,883,883,883,883,883,883,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
-973,973,973,973,973,973,973,973,1816,1816,1816,1816,1816,563,563,563,1816,1816,1816,1816,1816,883,883,883,1816,1816,1816,1816,1816,1816,1816,1169,1169,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
-1816,1816,1816,1816,1816,1816,1816,1816,1816,563,563,563,563,563,563,563,1816,1816,1816,1816,1816,1816,883,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
-563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
-563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
-563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1816,
-563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1169,1169,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1816,1816,
-563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1816,1816,1816,1816,1816,1816,1816,1169,1169,1169,1169,1816,1816,1816,1816,1816,1816,1816,563,563,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,
-563,54,54,54,54,54,55,55,563,58,59,60,61,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,563,563,563,563,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,
-53,118,74,75,76,76,76,76,79,80,69,69,69,69,69,86,563,563,563,563,563,563,563,563,563,563,563,563,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,563,563,563,563,563,563,563,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,
-69,69,140,141,98,99,99,99,101,102,69,69,69,69,69,69,69,563,563,563,563,563,563,563,563,563,563,563,563,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,1816,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1816,1816,1816,1816,1816,563,563,
-69,69,140,141,142,69,69,69,123,124,69,69,69,69,69,69,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1816,1816,1816,1816,1816,1816,1816,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,
+883,883,883,883,984,936,969,969,969,969,969,969,969,969,969,969,969,970,883,883,883,883,883,972,973,973,973,974,883,883,984,936,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,970,883,883,883,883,883,883,883,883,1157,1157,1168,1169,1169,1169,1169,1169,1734,
+883,883,883,883,883,968,969,969,969,969,969,969,969,969,969,969,969,970,883,883,883,883,883,972,973,973,973,974,883,883,883,968,969,969,969,969,969,969,1025,969,969,969,969,969,969,969,969,921,954,883,883,883,883,883,883,883,1157,1157,1168,1169,1169,1169,1169,1734,1734,
+883,883,883,883,883,984,936,969,969,969,969,969,969,969,969,969,969,921,954,883,883,883,883,972,973,973,973,974,883,883,883,984,936,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,970,883,883,883,883,883,883,883,1157,1157,1168,1169,1169,1169,1734,1734,1734,
+883,883,883,1061,883,883,984,936,969,969,969,969,969,969,969,969,969,969,970,883,883,883,883,988,926,973,973,974,883,883,883,883,968,969,969,969,969,969,969,969,969,969,969,969,969,969,969,937,986,883,883,883,883,883,883,883,883,1157,1168,1169,1169,1734,1734,1734,1734,
+883,883,1061,1092,883,883,883,984,936,969,969,969,969,969,969,969,969,969,921,954,883,883,883,883,988,926,925,990,883,883,883,883,984,936,969,969,969,969,969,969,969,969,969,969,969,969,969,970,883,883,883,883,883,883,883,883,883,1157,1734,1169,1734,1734,1734,1734,1734,
+883,1061,1092,1079,1131,883,883,883,984,985,985,936,969,969,969,969,969,937,985,986,883,883,883,883,883,972,974,883,883,883,883,883,883,984,985,936,969,969,969,969,969,969,969,969,969,969,937,986,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,563,
+1061,1092,1079,1109,883,2700,2701,2702,883,883,883,984,985,936,969,969,937,986,883,883,883,883,883,883,883,972,974,883,883,883,883,883,883,883,883,984,985,936,969,969,969,969,969,969,969,937,986,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,563,563,
+1092,1079,1109,883,2700,2701,2702,2702,2700,2701,2702,2702,883,984,985,985,986,883,883,883,883,883,883,883,956,942,974,883,883,883,883,883,883,883,883,883,883,984,985,936,969,969,937,985,985,986,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,563,563,563,
+1079,1109,883,2700,2701,2702,2702,2700,2700,2701,2702,2702,883,883,883,883,883,883,883,883,883,883,883,883,972,925,990,883,883,883,883,883,883,883,883,883,883,883,883,984,985,985,986,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,563,563,563,563,
+1109,883,2700,2701,2702,2702,2702,2702,2702,2702,2702,2702,2702,2701,2701,2700,2701,2702,2700,2701,2702,883,883,883,972,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,563,563,563,563,563,
+883,2700,2701,2702,2702,2702,2701,2702,2702,2700,2701,2702,2702,2702,2702,2702,2700,2701,2702,2701,2702,883,883,883,972,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,563,563,563,563,563,
+2700,2701,2702,2702,2702,2702,2701,2702,2702,2702,2702,2702,2702,2700,2701,2702,2700,2622,2623,2701,2702,883,883,883,972,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,563,563,563,563,563,563,
+2701,2702,2702,2702,2700,2700,2701,2702,2700,2701,2702,2702,2702,2702,2701,2702,2700,2690,2658,2701,2702,883,883,956,942,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,563,563,563,563,563,563,
+2702,2702,2701,2700,2700,2700,2622,2623,2701,2702,2702,2702,2701,2702,2701,2702,2700,2690,2658,2701,2702,883,883,972,925,990,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,563,563,563,563,563,563,563,
+2702,2702,2702,2702,2701,2700,2690,2658,2701,2702,2701,2702,2702,2700,2701,2702,2700,2706,2674,2701,2702,883,956,942,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,563,563,563,563,563,563,563,
+2702,2702,2700,2701,2702,2702,2690,2658,2700,2701,2702,2702,2622,2623,2701,2702,2700,2638,2639,2701,2702,883,972,925,990,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,563,563,563,563,563,563,563,563,
+2702,2701,2702,2700,2701,2702,2706,2674,2702,2700,2700,2701,2690,2658,2702,2702,2700,2701,2702,2701,2702,883,972,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,563,563,563,563,563,563,563,563,
+2700,2701,2702,2700,2701,2702,2638,2639,2702,2702,2702,2702,2690,2658,2702,2702,2702,2701,2702,2701,2702,883,972,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,563,563,563,563,563,563,563,563,563,
+2701,2702,2702,2701,2702,2702,2702,2702,883,2700,2701,2702,2706,2674,2700,2701,2702,2701,2702,2701,2702,1139,942,941,957,957,957,957,957,957,958,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,563,563,563,563,563,563,563,563,563,
+2702,2702,2702,2702,2702,2702,2702,2702,2700,2701,2702,2702,2638,2639,2701,2702,2700,2701,2702,2701,2702,1155,989,989,989,989,989,989,926,973,974,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,563,563,563,563,563,563,563,563,563,
+2701,2652,2653,2654,2702,2702,2702,2702,2701,2702,2701,2702,2701,2702,2701,2702,2700,2701,2702,2701,2702,883,883,883,883,883,883,883,988,989,990,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,563,563,563,563,563,563,563,563,
+2701,2668,2669,2670,2702,2702,2701,2702,2702,2700,2701,2702,2702,2700,2652,2653,2654,2701,2702,2701,2702,883,704,705,705,705,705,705,705,705,705,705,705,705,705,705,706,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,563,563,563,563,563,563,563,
+2702,2684,2685,2686,2701,2702,2701,2702,2702,2700,2701,2702,2702,2700,2668,2669,2670,2701,2702,2701,2702,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,563,563,563,563,563,
+2701,2702,2700,2701,2702,2702,2701,2702,2700,2700,2700,2701,2702,2700,2684,2685,2686,2701,2702,2701,2702,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,1734,563,563,563,563,
+2700,2700,2700,2701,2700,2700,2700,2700,2700,2700,2700,2700,2700,2701,2702,2702,2700,2701,2702,2701,2702,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,563,563,563,
+2700,2700,2700,2700,2701,2702,2702,2702,2700,2700,2700,2700,2701,2702,2700,2701,2702,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,563,563,
+2700,2700,2701,2700,2701,2702,2701,2700,2700,2701,2700,2701,2702,2700,2701,2702,2702,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,563,
+2700,2701,2700,2701,2702,2702,2701,2702,2702,2702,2702,2702,2700,2701,2700,2701,2702,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,
+2701,2702,2702,2702,2700,2700,2701,2702,2702,2702,2702,2700,2701,2700,2701,2702,883,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,
+2702,2702,2701,2700,2701,2702,2700,2700,2700,2700,2700,2701,2702,2702,883,883,883,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,
+2700,2700,2701,2702,2700,2700,2700,2701,2700,2701,2702,2702,883,883,883,883,883,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,
+2701,2702,2700,2700,2700,2701,2700,2701,2702,2702,883,883,883,883,883,883,883,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,
+2701,2700,2700,2701,2700,2701,2702,2702,2702,883,883,883,883,883,883,883,883,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1734,1734,1734,1734,1734,1734,
+2700,2701,2700,2700,2700,2701,2702,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,720,721,721,721,721,721,721,721,721,721,721,721,721,721,722,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1169,1169,1734,1734,1734,1734,1734,
+2700,2700,2700,2701,2702,2701,2702,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,736,737,737,737,737,737,737,737,737,737,737,737,737,737,738,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1734,1734,
+2700,2700,2701,2702,2702,2702,2702,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1734,
+2702,2702,2702,2702,2702,2702,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,883,883,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
+1140,1141,1141,1141,1141,1142,883,883,883,883,883,883,883,883,883,883,883,883,883,883,883,1171,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,883,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
+1156,973,973,973,973,1206,1141,1142,883,883,883,883,883,1734,1734,1734,1734,883,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
+1207,973,973,973,973,973,973,1206,1142,883,883,883,1734,1734,1734,1734,1734,1734,883,883,883,883,883,883,883,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
+973,973,973,973,973,973,973,973,1734,1734,1734,1734,1734,563,563,563,1734,1734,1734,1734,1734,883,883,883,1734,1734,1734,1734,1734,1734,1734,1169,1169,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
+1734,1734,1734,1734,1734,1734,1734,1734,1734,563,563,563,563,563,563,563,1734,1734,1734,1734,1734,1734,883,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
+563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
+563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,1169,
+563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1734,
+563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1169,1169,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1734,1734,
+563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1734,1734,1734,1734,1734,1734,1734,1169,1169,1169,1169,1734,1734,1734,1734,1734,1734,1734,563,563,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,
+563,54,54,54,54,54,55,55,563,58,59,60,61,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,563,563,563,563,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,
+53,118,74,75,76,76,76,76,79,80,69,69,69,69,69,86,563,563,563,563,563,563,563,563,563,563,563,563,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,563,563,563,563,563,563,563,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,
+69,69,140,141,98,99,99,99,101,102,69,69,69,69,69,69,69,563,563,563,563,563,563,563,563,563,563,563,563,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,1734,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1734,1734,1734,1734,1734,563,563,
+69,69,140,141,142,69,69,69,123,124,69,69,69,69,69,69,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1734,1734,1734,1734,1734,1734,1734,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,
69,69,140,141,142,474,475,69,145,146,69,69,69,69,69,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,
69,69,140,141,142,69,69,69,69,168,169,170,171,172,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,
188,188,188,188,69,69,69,69,69,190,191,192,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,
@@ -147,55 +159,55 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,1450,0,1450,0,0,0,0,0,0,0,0,0,0,0,995,0,0,0,0,0,0,0,0,0,0,1072,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,0,0,
1044,1047,1047,1047,1050,0,0,1090,0,0,1071,0,1450,0,0,1074,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1090,0,0,0,0,0,0,1105,0,1090,0,1450,0,0,0,0,0,0,0,912,0,0,1236,0,0,0,0,0,0,0,0,
1060,883,883,883,1083,0,0,0,1090,1105,0,1090,0,1450,1451,1452,1453,0,0,0,995,0,0,0,0,0,0,0,0,0,997,0,0,0,1105,1105,0,0,0,0,0,1090,1090,0,1450,0,0,1450,0,0,0,0,0,0,0,0,1252,1204,0,0,0,0,0,0,0,
-883,883,0,0,1099,0,0,0,0,1090,0,1090,1090,0,1450,1451,1452,1453,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1090,1105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,1773,
-0,0,0,0,1115,0,0,0,0,1090,1090,1105,0,1071,0,1451,1452,1453,1450,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1074,0,0,0,1450,0,0,1450,1451,1452,1453,0,0,0,0,0,1014,0,0,0,0,1236,1146,0,0,0,0,1773,1792,
-911,997,0,0,0,0,1253,0,0,0,0,0,1090,1105,1451,1452,1453,0,0,0,0,0,0,0,995,0,0,997,0,0,0,0,0,0,0,0,0,0,0,0,0,1450,0,1451,1452,1453,1453,0,0,0,0,0,0,0,0,0,0,1146,1209,0,0,0,1773,1792,1797,
-0,0,0,0,0,1220,1221,1221,0,0,0,0,0,0,0,1450,0,0,0,0,0,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1451,1452,1453,1452,1453,0,0,0,0,0,1014,0,0,0,0,0,1236,0,0,0,1773,1792,1797,0,
-0,0,0,0,1220,1188,0,0,0,0,0,1222,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1454,1454,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,1773,1792,1797,0,0,
-0,0,0,1220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,911,0,0,0,0,0,0,0,0,1236,0,1773,1792,1797,0,0,0,
-0,0,1220,2298,2299,2300,2299,2301,0,0,0,0,0,0,0,0,0,0,0,0,0,2695,0,912,0,0,0,0,0,0,0,0,0,997,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,1788,1793,0,0,0,0,
-0,1220,1188,2314,2315,2316,2315,2301,0,0,0,0,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,1129,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,1773,1792,1797,0,0,0,0,
-1220,1188,0,2346,2347,2348,2348,2349,0,0,0,0,2298,2299,2300,2299,2301,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,1125,0,0,0,0,0,0,0,0,896,0,0,0,0,0,0,0,1013,0,0,0,1220,1188,1788,1793,0,0,0,0,0,
-1188,0,0,2362,2363,2364,2364,2365,0,0,0,0,2314,2315,2316,2315,2301,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,896,0,0,0,0,0,0,0,0,0,1236,1773,1792,1797,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,2346,2347,2348,2348,2349,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1129,0,0,0,0,0,0,0,0,0,0,0,0,0,1220,1188,1788,1793,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,2362,2363,2364,2364,2365,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1129,0,0,1236,1773,1792,1797,0,0,0,0,0,0,
-2300,2299,2301,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,0,0,1125,0,0,0,0,0,997,0,0,1129,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1220,1188,1788,1793,0,0,0,0,0,0,0,
-2316,2315,2301,0,0,0,0,2298,2299,2300,2299,2301,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,912,0,0,0,0,0,0,0,0,0,0,1236,1773,1792,1797,0,0,0,0,0,0,0,
-2348,2348,2349,0,0,0,0,2314,2315,2316,2315,2301,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,996,0,0,0,0,0,0,0,0,0,0,0,996,0,0,0,0,0,0,0,0,0,0,996,0,0,0,0,1236,1788,1793,0,0,0,0,0,0,0,0,
-2364,2364,2365,0,0,0,0,2346,2347,2348,2348,2349,0,0,0,0,0,0,0,0,0,2695,1156,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,1788,1793,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,2362,2363,2364,2364,2365,0,0,0,0,0,0,0,0,0,2695,1172,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,995,0,0,0,0,0,0,0,0,0,0,0,1220,1188,1788,1793,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2695,880,880,880,880,880,866,0,0,0,865,880,880,880,895,880,849,0,0,0,0,0,0,913,0,0,0,0,0,0,1014,0,1236,0,1803,1777,1782,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,912,912,0,0,1236,0,0,1803,1777,1809,1782,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,1125,0,0,997,0,0,0,0,1236,0,0,0,1803,1804,1777,1782,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1220,1188,0,0,0,0,0,1803,1777,1782,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1205,1253,1253,1253,1253,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,0,1803,1777,1782,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1238,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,914,0,0,0,0,898,0,0,0,1220,1188,0,0,0,0,0,0,0,0,1803,1777,1782,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1238,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,0,0,0,0,1803,1777,1782,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1205,1254,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,1129,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,0,0,0,0,0,1803,1777,
-0,0,0,0,0,0,0,0,0,0,0,0,0,1205,1253,1254,0,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,0,0,0,0,0,0,1803,
-2807,2808,0,0,0,0,0,0,0,0,0,1205,1253,1254,0,0,0,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,912,0,0,0,0,1220,1188,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,1205,1253,1254,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2807,2808,0,2807,2808,0,0,0,1205,1254,0,0,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,895,0,0,0,0,1129,0,0,1236,0,1180,1181,1181,1181,1181,1181,1181,1182,0,0,0,0,0,
-0,0,0,0,0,0,1205,1253,1254,0,0,0,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,1220,1188,1180,1195,0,0,0,0,0,0,1194,1182,0,0,0,0,
-0,0,0,0,0,0,1238,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,1220,1188,1180,1195,0,0,0,0,0,0,0,0,1194,1181,1181,1182,0,
-0,0,0,0,0,0,1238,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,1220,1188,1180,1195,0,0,0,0,0,0,0,0,0,0,0,0,1194,1182,
-0,0,0,0,0,1205,1254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2695,880,880,880,880,880,880,880,880,880,880,880,880,880,880,880,881,0,0,0,1129,0,0,0,0,1220,1188,0,1196,0,0,0,997,0,0,0,0,0,0,0,0,0,0,1194,
-1253,1253,1253,1253,1253,1254,0,0,0,0,0,2402,0,0,0,0,0,0,0,0,0,2695,0,0,0,0,0,1220,1221,1221,1221,1222,0,0,0,0,0,0,0,0,0,0,0,1220,1221,1221,1188,0,0,1196,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,2410,0,0,0,0,0,0,0,0,0,0,0,0,0,1220,1221,1188,0,0,0,1189,1222,0,0,0,0,0,0,0,0,0,1220,1188,0,0,0,0,0,1196,0,0,0,0,0,0,0,0,0,0,1125,0,0,0,0,
+883,883,0,0,1099,0,0,0,0,1090,0,1090,1090,0,1450,1451,1452,1453,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1090,1105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,1691,
+0,0,0,0,1115,0,0,0,0,1090,1090,1105,0,1071,0,1451,1452,1453,1450,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1074,0,0,0,1450,0,0,1450,1451,1452,1453,0,0,0,0,0,1014,0,0,0,0,1236,1146,0,0,0,0,1691,1710,
+911,997,0,0,0,0,1253,0,0,0,0,0,1090,1105,1451,1452,1453,0,0,0,0,0,0,0,995,0,0,997,0,0,0,0,0,0,0,0,0,0,0,0,0,1450,0,1451,1452,1453,1453,0,0,0,0,0,0,0,0,0,0,1146,1209,0,0,0,1691,1710,1715,
+0,0,0,0,0,1220,1221,1221,0,0,0,0,0,0,0,1450,0,0,0,0,0,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1451,1452,1453,1452,1453,0,0,0,0,0,1014,0,0,0,0,0,1236,0,0,0,1691,1710,1715,0,
+0,0,0,0,1220,1188,0,0,0,0,0,1222,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1454,1454,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,1691,1710,1715,0,0,
+0,0,0,1220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,911,0,0,0,0,0,0,0,0,1236,0,1691,1710,1715,0,0,0,
+0,0,1220,2216,2217,2218,2217,2219,0,0,0,0,0,0,0,0,0,0,0,0,0,2613,0,912,0,0,0,0,0,0,0,0,0,997,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,1706,1711,0,0,0,0,
+0,1220,1188,2232,2233,2234,2233,2219,0,0,0,0,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,1129,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,1691,1710,1715,0,0,0,0,
+1220,1188,0,2264,2265,2266,2266,2267,0,0,0,0,2216,2217,2218,2217,2219,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,1125,0,0,0,0,0,0,0,0,896,0,0,0,0,0,0,0,1013,0,0,0,1220,1188,1706,1711,0,0,0,0,0,
+1188,0,0,2280,2281,2282,2282,2283,0,0,0,0,2232,2233,2234,2233,2219,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,896,0,0,0,0,0,0,0,0,0,1236,1691,1710,1715,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,2264,2265,2266,2266,2267,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1129,0,0,0,0,0,0,0,0,0,0,0,0,0,1220,1188,1706,1711,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,2280,2281,2282,2282,2283,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1129,0,0,1236,1691,1710,1715,0,0,0,0,0,0,
+2218,2217,2219,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,0,0,1125,0,0,0,0,0,997,0,0,1129,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1220,1188,1706,1711,0,0,0,0,0,0,0,
+2234,2233,2219,0,0,0,0,2216,2217,2218,2217,2219,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,912,0,0,0,0,0,0,0,0,0,0,1236,1691,1710,1715,0,0,0,0,0,0,0,
+2266,2266,2267,0,0,0,0,2232,2233,2234,2233,2219,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,996,0,0,0,0,0,0,0,0,0,0,0,996,0,0,0,0,0,0,0,0,0,0,996,0,0,0,0,1236,1706,1711,0,0,0,0,0,0,0,0,
+2282,2282,2283,0,0,0,0,2264,2265,2266,2266,2267,0,0,0,0,0,0,0,0,0,2613,1156,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,1706,1711,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,2280,2281,2282,2282,2283,0,0,0,0,0,0,0,0,0,2613,1172,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,995,0,0,0,0,0,0,0,0,0,0,0,1220,1188,1706,1711,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2613,880,880,880,880,880,866,0,0,0,865,880,880,880,895,880,849,0,0,0,0,0,0,913,0,0,0,0,0,0,1014,0,1236,0,1721,1695,1700,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,912,912,0,0,1236,0,0,1721,1695,1727,1700,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,1125,0,0,997,0,0,0,0,1236,0,0,0,1721,1722,1695,1700,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1220,1188,0,0,0,0,0,1721,1695,1700,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1205,1253,1253,1253,1253,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,0,1721,1695,1700,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1238,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,914,0,0,0,0,898,0,0,0,1220,1188,0,0,0,0,0,0,0,0,1721,1695,1700,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1238,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,0,0,0,0,1721,1695,1700,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1205,1254,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,1129,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,0,0,0,0,0,1721,1695,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1205,1253,1254,0,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,0,0,0,0,0,0,1721,
+2725,2726,0,0,0,0,0,0,0,0,0,1205,1253,1254,0,0,0,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,912,0,0,0,0,1220,1188,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,1205,1253,1254,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2725,2726,0,2725,2726,0,0,0,1205,1254,0,0,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,895,0,0,0,0,1129,0,0,1236,0,1180,1181,1181,1181,1181,1181,1181,1182,0,0,0,0,0,
+0,0,0,0,0,0,1205,1253,1254,0,0,0,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,0,1220,1188,1180,1195,0,0,0,0,0,0,1194,1182,0,0,0,0,
+0,0,0,0,0,0,1238,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,0,1220,1188,1180,1195,0,0,0,0,0,0,0,0,1194,1181,1181,1182,0,
+0,0,0,0,0,0,1238,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,863,0,0,0,0,0,0,0,0,0,1220,1188,1180,1195,0,0,0,0,0,0,0,0,0,0,0,0,1194,1182,
+0,0,0,0,0,1205,1254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2613,880,880,880,880,880,880,880,880,880,880,880,880,880,880,880,881,0,0,0,1129,0,0,0,0,1220,1188,0,1196,0,0,0,997,0,0,0,0,0,0,0,0,0,0,1194,
+1253,1253,1253,1253,1253,1254,0,0,0,0,0,2320,0,0,0,0,0,0,0,0,0,2613,0,0,0,0,0,1220,1221,1221,1221,1222,0,0,0,0,0,0,0,0,0,0,0,1220,1221,1221,1188,0,0,1196,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,2328,0,0,0,0,0,0,0,0,0,0,0,0,0,1220,1221,1188,0,0,0,1189,1222,0,0,0,0,0,0,0,0,0,1220,1188,0,0,0,0,0,1196,0,0,0,0,0,0,0,0,0,0,1125,0,0,0,0,
0,1353,1354,1355,0,0,0,0,0,0,0,0,0,1220,1221,1221,1222,0,0,0,0,0,0,0,0,1236,0,0,0,0,0,0,1189,1221,1221,1221,1221,1221,1221,1221,1221,1221,1188,0,0,0,0,0,0,1196,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,1283,1284,1285,0,0,0,0,0,0,0,0,1220,1188,0,0,0,1222,0,0,0,0,0,0,0,1236,0,0,0,0,1180,1181,1181,1182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1196,0,0,0,0,0,996,0,0,0,0,0,0,0,0,0,
-0,1299,1300,1301,0,0,0,0,1143,1221,1221,1221,1188,1779,1779,1780,0,0,1221,1221,1222,0,0,0,1220,1188,0,0,0,1180,1195,0,0,1194,1182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1196,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1144,1144,1144,1144,1144,1144,1144,1144,1209,1779,1779,1779,1797,0,0,1796,0,0,0,0,0,1222,0,1220,1188,0,0,0,0,1196,0,0,0,0,1194,1182,0,0,0,0,0,0,0,0,0,0,0,0,0,1212,1179,0,0,0,0,0,0,0,0,0,0,0,0,1129,0,
-1779,1779,1779,1779,1779,1779,1779,1779,1797,0,0,0,0,0,0,0,1796,1779,1779,0,0,0,1221,0,0,0,0,0,0,1196,0,0,0,1129,0,1194,1182,0,0,0,0,0,0,0,0,0,0,0,0,0,1212,1179,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1299,1300,1301,0,1314,0,0,0,1298,0,0,0,0,0,0,0,0,0,1796,0,0,0,0,0,0,0,0,0,1196,0,0,0,0,0,0,1194,1182,0,0,0,0,0,0,0,0,0,0,0,0,0,1212,1213,1179,0,0,0,0,0,0,0,0,0,0,0,
-0,1315,1316,1317,0,1298,0,0,0,1298,0,0,0,0,0,0,0,0,0,0,1796,1779,1779,0,0,0,0,0,0,1212,1179,0,0,0,0,0,0,1194,1182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1212,1213,1213,1213,1179,0,0,0,0,995,0,1178,
-1288,1286,1287,1288,1286,1287,1288,1286,1287,1288,15,16,17,18,0,0,0,0,0,0,0,0,0,1796,0,0,0,0,0,0,1212,1179,0,0,1013,0,0,0,1198,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1212,1213,1179,0,0,0,1178,1214,
-1304,1302,1303,1304,1302,1303,1304,1302,1303,1304,37,38,39,40,41,42,0,0,0,0,0,0,0,0,1796,1779,0,0,0,0,0,1212,1179,0,0,0,0,1178,1214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1213,1213,1213,1214,0,
-1302,0,0,0,0,0,403,404,57,0,524,535,536,62,63,64,65,0,0,0,0,0,0,0,0,0,1796,0,0,0,0,0,1212,1213,1213,1213,1213,1214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1562,0,0,416,417,418,419,420,421,0,0,522,523,0,0,527,87,88,0,0,0,0,0,0,0,0,0,1796,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,432,433,434,0,0,0,0,0,0,0,0,0,523,0,110,0,0,0,0,0,0,0,0,0,0,1796,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1779,
-0,0,0,448,449,450,0,0,0,0,500,505,506,0,524,512,132,0,0,0,0,0,0,0,0,0,0,0,0,1796,1779,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,464,465,466,0,0,0,0,0,0,521,0,0,152,153,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1796,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,1299,1300,1301,0,0,0,0,1143,1221,1221,1221,1188,1697,1697,1698,0,0,1221,1221,1222,0,0,0,1220,1188,0,0,0,1180,1195,0,0,1194,1182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1196,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1144,1144,1144,1144,1144,1144,1144,1144,1209,1697,1697,1697,1715,0,0,1714,0,0,0,0,0,1222,0,1220,1188,0,0,0,0,1196,0,0,0,0,1194,1182,0,0,0,0,0,0,0,0,0,0,0,0,0,1212,1179,0,0,0,0,0,0,0,0,0,0,0,0,1129,0,
+1697,1697,1697,1697,1697,1697,1697,1697,1715,0,0,0,0,0,0,0,1714,1697,1697,0,0,0,1221,0,0,0,0,0,0,1196,0,0,0,1129,0,1194,1182,0,0,0,0,0,0,0,0,0,0,0,0,0,1212,1179,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,1299,1300,1301,0,1314,0,0,0,1298,0,0,0,0,0,0,0,0,0,1714,0,0,0,0,0,0,0,0,0,1196,0,0,0,0,0,0,1194,1182,0,0,0,0,0,0,0,0,0,0,0,0,0,1212,1213,1179,0,0,0,0,0,0,0,0,0,0,0,
+0,1315,1316,1317,0,1298,0,0,0,1298,0,0,0,0,0,0,0,0,0,0,1714,1697,1697,0,0,0,0,0,0,1212,1179,0,0,0,0,0,0,1194,1182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1212,1213,1213,1213,1179,0,0,0,0,995,0,1178,
+1288,1286,1287,1288,1286,1287,1288,1286,1287,1288,15,16,17,18,0,0,0,0,0,0,0,0,0,1714,0,0,0,0,0,0,1212,1179,0,0,1013,0,0,0,1198,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1212,1213,1179,0,0,0,1178,1214,
+1304,1302,1303,1304,1302,1303,1304,1302,1303,1304,37,38,39,40,41,42,0,0,0,0,0,0,0,0,1714,1697,0,0,0,0,0,1212,1179,0,0,0,0,1178,1214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1213,1213,1213,1214,0,
+1302,0,0,0,0,0,403,404,57,0,524,535,536,62,63,64,65,0,0,0,0,0,0,0,0,0,1714,0,0,0,0,0,1212,1213,1213,1213,1213,1214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1562,0,0,416,417,418,419,420,421,0,0,522,523,0,0,527,87,88,0,0,0,0,0,0,0,0,0,1714,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,432,433,434,0,0,0,0,0,0,0,0,0,523,0,110,0,0,0,0,0,0,0,0,0,0,1714,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1697,
+0,0,0,448,449,450,0,0,0,0,500,505,506,0,524,512,132,0,0,0,0,0,0,0,0,0,0,0,0,1714,1697,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,464,465,466,0,0,0,0,0,0,521,0,0,152,153,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1714,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
72,143,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,193,194,195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
206,206,206,206,206,206,206,206,211,212,213,214,215,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -213,53 +225,53 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1178,1214,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1178,1214,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1196,0,1178,1214,0,0,0,
-0,0,0,0,0,2418,2411,2417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,1212,1213,1214,0,0,0,0,
+0,0,0,0,0,2336,2329,2335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1236,1212,1213,1214,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,2418,2411,2414,2411,2417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,2336,2329,2332,2329,2335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,2418,2411,2411,2411,2411,2411,2411,2411,2411,2411,2417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,2811,2812,2813,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,2827,2828,2829,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,2843,2844,2845,0,0,0,0,0,0,2811,2812,2813,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,2827,2828,2829,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,2843,2844,2845,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,2336,2329,2329,2329,2329,2329,2329,2329,2329,2329,2335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,2729,2730,2731,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,2745,2746,2747,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,2761,2762,2763,0,0,0,0,0,0,2729,2730,2731,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,2745,2746,2747,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,2761,2762,2763,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2812,2813,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2501,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2828,2829,0,0,0,0,0,0,2811,2812,2813,0,0,0,0,0,0,0,0,0,0,2503,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2844,2845,0,0,0,0,0,0,2827,2828,2829,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,2843,2844,2845,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2730,2731,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2419,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2746,2747,0,0,0,0,0,0,2729,2730,2731,0,0,0,0,0,0,0,0,0,0,2421,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2762,2763,0,0,0,0,0,0,2745,2746,2747,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,2761,2762,2763,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,865,0,0,0,0,0,0,0,0,0,0,0,0,0,880,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3213,3214,3215,3216,3217,3218,3219,3220,3221,3222,3223,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3224,3225,3226,3227,3228,3229,3230,3231,3232,3233,3234,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3236,3237,3238,3239,3240,3241,3242,3243,3244,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3247,3248,3249,3250,3251,3252,3253,3254,3255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,3260,3261,3262,3263,3264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3131,3132,3133,3134,3135,3136,3137,3138,3139,3140,3141,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3142,3143,3144,3145,3146,3147,3148,3149,3150,3151,3152,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3154,3155,3156,3157,3158,3159,3160,3161,3162,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3165,3166,3167,3168,3169,3170,3171,3172,3173,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,3178,3179,3180,3181,3182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,880,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,2411,2411,2411,2411,2411,2411,2411,2411,2411,2417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,2401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,2418,2411,2411,2411,2411,2411,2417,1773,1774,1774,1774,1775,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1360,1376,1773,1774,1774,1774,1792,0,0,0,1790,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1774,1774,1774,1774,1774,1774,1774,1774,1792,0,0,0,0,0,0,0,1791,1774,1774,1775,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1283,1284,1285,0,1298,0,0,0,0,0,0,0,0,0,0,0,0,0,1791,1775,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1791,1774,1774,1775,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1313,1353,1354,1355,1311,1312,1333,1312,1333,1313,0,0,0,0,0,0,0,0,0,0,0,0,0,1791,1775,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,1287,1376,1360,0,1361,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1791,1774,1775,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1773,1774,1774,1775,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1791,1775,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1773,1792,1779,1779,1791,1775,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1791,1775,0,0,0,0,0,0,0,0,0,0,0,0,1773,1792,1797,0,0,1796,1791,1774,1775,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1791,1775,0,0,0,0,0,0,0,0,0,1773,1774,1792,1797,0,0,0,0,1796,1779,1791,1774,1774,1774,1774,1774,1774,1774,1774,1775,0,0,0,1773,1774,1774,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1791,1774,1775,0,0,0,0,0,1773,1774,1792,1779,1797,0,0,0,0,0,0,0,1796,1779,1779,1779,1779,1779,1779,1779,1779,1791,1774,1774,1774,1792,1779,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1791,1774,1774,1774,1774,1774,1792,1779,1797,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1796,1779,1779,1779,1797,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1779,1779,1779,1779,1779,1797,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2319,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,2329,2329,2329,2329,2329,2329,2329,2329,2329,2335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,2319,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,2336,2329,2329,2329,2329,2329,2335,1691,1692,1692,1692,1693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1360,1376,1691,1692,1692,1692,1710,0,0,0,1708,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1692,1692,1692,1692,1692,1692,1692,1692,1710,0,0,0,0,0,0,0,1709,1692,1692,1693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,1283,1284,1285,0,1298,0,0,0,0,0,0,0,0,0,0,0,0,0,1709,1693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1709,1692,1692,1693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1313,1353,1354,1355,1311,1312,1333,1312,1333,1313,0,0,0,0,0,0,0,0,0,0,0,0,0,1709,1693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1287,1376,1360,0,1361,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1709,1692,1693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1691,1692,1692,1693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1709,1693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1691,1710,1697,1697,1709,1693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1709,1693,0,0,0,0,0,0,0,0,0,0,0,0,1691,1710,1715,0,0,1714,1709,1692,1693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1709,1693,0,0,0,0,0,0,0,0,0,1691,1692,1710,1715,0,0,0,0,1714,1697,1709,1692,1692,1692,1692,1692,1692,1692,1692,1693,0,0,0,1691,1692,1692,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1709,1692,1693,0,0,0,0,0,1691,1692,1710,1697,1715,0,0,0,0,0,0,0,1714,1697,1697,1697,1697,1697,1697,1697,1697,1709,1692,1692,1692,1710,1697,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1709,1692,1692,1692,1692,1692,1710,1697,1715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1714,1697,1697,1697,1715,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1697,1697,1697,1697,1697,1715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -284,30 +296,30 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,2835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,2753,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,2894,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,2812,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2895,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,2831,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2813,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,2749,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2457,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2375,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2319,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -353,12 +365,12 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,1957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1875,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,1957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,1875,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,1875,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -414,20 +426,20 @@
0,0,0,0,0,0,0,0,0,0,0,0,1459,1460,0,995,0,0,0,0,0,0,0,0,0,0,0,0,0,1437,1489,1490,0,0,1427,1428,0,0,0,0,0,0,0,0,1477,0,0,0,0,1478,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,496,0,1491,0,0,0,0,0,0,1443,1477,496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1438,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3193,3194,0,0,0,0,0,0,0,496,0,486,0,0,0,0,0,0,0,0,494,0,0,0,0,496,0,0,486,0,0,0,0,0,0,0,1489,1490,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,2635,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1443,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,3193,3194,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1437,0,0,1443,496,0,0,0,0,486,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2635,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1443,0,0,0,0,0,0,0,0,0,496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3111,3112,0,0,0,0,0,0,0,496,0,486,0,0,0,0,0,0,0,0,494,0,0,0,0,496,0,0,486,0,0,0,0,0,0,0,1489,1490,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,2553,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1443,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,3111,3112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1437,0,0,1443,496,0,0,0,0,486,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2553,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1443,0,0,0,0,0,0,0,0,0,496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1443,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,496,0,0,0,0,0,0,1437,0,494,0,0,0,0,0,1438,0,486,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2635,0,0,0,0,0,0,0,0,0,0,0,0,0,496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2553,0,0,0,0,0,0,0,0,0,0,0,0,0,496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,486,0,0,1443,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1489,1490,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,2635,0,3193,3194,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,2553,0,3111,3112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1438,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3195,3196,3197,3198,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,486,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3113,3114,3115,3116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,486,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,488,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2926,2927,2928,2929,2930,2931,2932,2933,2934,2935,2936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1489,1490,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2844,2845,2846,2847,2848,2849,2850,2851,2852,2853,2854,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1489,1490,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,491,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -442,7 +454,7 @@
0,0,0,0,0,0,0,0,492,0,488,0,0,0,0,487,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,486,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,496,0,0,0,0,0,0,0,
-3270,3271,3272,3273,3274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,495,0,0,0,0,0,
+3188,3189,3190,3191,3192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,495,0,0,0,0,0,
0,0,0,0,0,362,363,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,378,379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,394,395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -470,42 +482,42 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,2408,2391,2425,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,2402,2395,2441,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,2421,2422,2389,2391,2425,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,2402,2395,2395,2395,2441,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,2421,2391,2391,2391,2391,2390,2391,2391,2391,2391,2425,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,2402,2395,2395,2395,2395,2395,2395,2396,2395,2396,2441,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,2652,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2647,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2485,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,2326,2309,2343,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,2320,2313,2359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,2339,2340,2307,2309,2343,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,2320,2313,2313,2313,2359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,2339,2309,2309,2309,2309,2308,2309,2309,2309,2309,2343,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,2320,2313,2313,2313,2313,2313,2313,2314,2313,2314,2359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2391,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,2570,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2565,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2585,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,2646,0,0,0,0,0,0,0,0,0,0,2423,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,2564,0,0,0,0,0,0,0,0,0,0,2341,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2133,2133,2133,2133,2134,0,0,0,0,0,0,2424,2391,2390,2389,2391,2391,2391,2391,2390,2391,2438,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2165,2165,2165,2165,2166,0,0,0,0,0,0,2402,2395,2395,2394,2395,2394,2395,2395,2394,2394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,2408,2391,2389,2391,2391,2390,0,2394,2395,2395,2395,2395,2394,2395,2395,2395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,2402,2395,2395,2395,2395,2394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,2402,2395,2395,2395,2395,2394,264,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2051,2051,2051,2051,2052,0,0,0,0,0,0,2342,2309,2308,2307,2309,2309,2309,2309,2308,2309,2356,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2083,2083,2083,2083,2084,0,0,0,0,0,0,2320,2313,2313,2312,2313,2312,2313,2313,2312,2312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,2326,2309,2307,2309,2309,2308,0,2312,2313,2313,2313,2313,2312,2313,2313,2313,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,2320,2313,2313,2313,2313,2312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,2320,2313,2313,2313,2313,2312,264,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,278,279,280,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
265,0,287,288,0,0,0,0,0,294,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
301,302,303,304,305,1282,307,308,309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -537,19 +549,19 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,2123,2124,2125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,2138,2139,2140,2141,2142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,2154,2155,2156,2157,2158,0,0,0,0,0,2123,2124,2125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,2170,2171,2172,2173,2174,0,0,0,0,2138,2139,2140,2141,2142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,2186,2187,0,2189,2190,0,0,0,0,2154,2155,2156,2157,2158,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,2202,0,0,0,2206,0,0,0,0,2170,2171,2172,2173,2174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2124,2125,0,0,0,0,0,0,0,0,0,0,2186,2187,0,2189,2190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2140,2141,2142,0,0,0,0,0,2123,2124,2125,0,2202,0,0,0,2206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2156,2157,2158,0,0,0,0,2138,2139,2140,2141,2142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2172,2173,2174,0,0,0,0,2154,2155,2156,2157,2158,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2189,2190,0,0,0,0,2170,2171,2172,2173,2174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,2206,0,0,0,0,2186,2187,0,2189,2190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,2202,0,0,0,2206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,2041,2042,2043,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,2056,2057,2058,2059,2060,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,2072,2073,2074,2075,2076,0,0,0,0,0,2041,2042,2043,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,2088,2089,2090,2091,2092,0,0,0,0,2056,2057,2058,2059,2060,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,2104,2105,0,2107,2108,0,0,0,0,2072,2073,2074,2075,2076,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,2120,0,0,0,2124,0,0,0,0,2088,2089,2090,2091,2092,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2042,2043,0,0,0,0,0,0,0,0,0,0,2104,2105,0,2107,2108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2058,2059,2060,0,0,0,0,0,2041,2042,2043,0,2120,0,0,0,2124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2074,2075,2076,0,0,0,0,2056,2057,2058,2059,2060,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2090,2091,2092,0,0,0,0,2072,2073,2074,2075,2076,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2107,2108,0,0,0,0,2088,2089,2090,2091,2092,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,2124,0,0,0,0,2104,2105,0,2107,2108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,2120,0,0,0,2124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -566,9 +578,9 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,2456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,548,0,0,0,0,0,2438,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,241,242,243,244,0,0,0,2401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,2374,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,548,0,0,0,0,0,2356,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,241,242,243,244,0,0,0,2319,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,257,258,259,260,0,0,1362,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,273,274,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,289,290,291,292,293,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -607,15 +619,15 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,1982,1983,1984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,1998,0,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,1982,1983,1984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,1998,0,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1900,1901,1902,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1916,0,1918,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1900,1901,1902,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1916,0,1918,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1983,1984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2000,0,0,0,0,0,0,1982,1983,1984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1998,0,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1901,1902,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,1918,0,0,0,0,0,0,1900,1901,1902,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1916,0,1918,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -872,17 +884,17 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3097,3098,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3015,3016,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,3097,3098,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,3015,3016,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,3097,3098,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,3015,3016,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3099,3100,3101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3017,3018,3019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/maps/005-6.tmx b/maps/005-6.tmx
index 472ce022..4ae2b2a7 100644
--- a/maps/005-6.tmx
+++ b/maps/005-6.tmx
@@ -13,10 +13,16 @@
<tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
</tileset>
- <tileset firstgid="266" source="../graphics/tilesets/inn.tsx"/>
+ <tileset firstgid="266" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn.png" width="512" height="512"/>
+ </tileset>
<tileset firstgid="522" source="../graphics/tilesets/wood_lab.tsx"/>
- <tileset firstgid="534" source="../graphics/tilesets/inn2.tsx"/>
- <tileset firstgid="790" source="../graphics/tilesets/inn_x3.tsx"/>
+ <tileset firstgid="534" name="inn2" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="790" name="inn_x3" tilewidth="32" tileheight="96" tilecount="80" columns="16">
+ <image source="../graphics/tilesets/inn_x3.png" width="512" height="480"/>
+ </tileset>
<layer id="1" name="Ground1" width="70" height="68">
<data encoding="csv">
58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,
diff --git a/maps/006-2-2.tmx b/maps/006-2-2.tmx
index c9404c36..d9347e70 100644
--- a/maps/006-2-2.tmx
+++ b/maps/006-2-2.tmx
@@ -8,7 +8,9 @@
<property name="music" value="8bit_the_hero.ogg"/>
<property name="name" value="Secret Cave"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
<tileset firstgid="10" name="concreteWalls" tilewidth="32" tileheight="32" tilecount="336" columns="16">
<image source="../graphics/tilesets/concreteWalls.png" width="512" height="672"/>
</tileset>
diff --git a/maps/006-3.tmx b/maps/006-3.tmx
index 2ad7ecde..11d5a6f4 100644
--- a/maps/006-3.tmx
+++ b/maps/006-3.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="100" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="9">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="100" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="9">
<properties>
<property name="license" value="GPL v2+"/>
<property name="manaplus version" value="2"/>
@@ -7,7 +7,9 @@
<property name="music" value="misuse.ogg"/>
<property name="name" value="Candor's Underground, B2F"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
<tileset firstgid="10" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/cave.png" width="512" height="256"/>
</tileset>
diff --git a/maps/006-4.tmx b/maps/006-4.tmx
index db629d94..85fcf5ca 100644
--- a/maps/006-4.tmx
+++ b/maps/006-4.tmx
@@ -187,7 +187,9 @@
<image source="../graphics/tilesets/evol/hurns-indoor.png" width="512" height="512"/>
</tileset>
<tileset firstgid="3719" source="../graphics/tilesets/wheel_tileset.tsx"/>
- <tileset firstgid="3724" source="../graphics/tilesets/wheel_stand.tsx"/>
+ <tileset firstgid="3724" name="wheel_stand" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/wheel_stand.png" width="512" height="512"/>
+ </tileset>
<tileset firstgid="3980" name="level-number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
<image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
</tileset>
diff --git a/maps/009-2.tmx b/maps/009-2.tmx
index 0dc93b3b..d8247e5f 100644
--- a/maps/009-2.tmx
+++ b/maps/009-2.tmx
@@ -7,7 +7,9 @@
<property name="music" value="peace2.ogg"/>
<property name="name" value="Halinarzo Library &amp; Bar"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/inn.tsx"/>
+ <tileset firstgid="1" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn.png" width="512" height="512"/>
+ </tileset>
<tileset firstgid="257" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/inn.png" width="512" height="512"/>
</tileset>
diff --git a/maps/009-3.tmx b/maps/009-3.tmx
index 79bff055..9ce05e21 100644
--- a/maps/009-3.tmx
+++ b/maps/009-3.tmx
@@ -7,7 +7,9 @@
<property name="music" value="peace2.ogg"/>
<property name="name" value="Halinarzo General Store"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/inn.tsx"/>
+ <tileset firstgid="1" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn.png" width="512" height="512"/>
+ </tileset>
<tileset firstgid="257" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/inn.png" width="512" height="512"/>
</tileset>
diff --git a/maps/011-2.tmx b/maps/011-2.tmx
index 95cf6a7f..9f4a925b 100644
--- a/maps/011-2.tmx
+++ b/maps/011-2.tmx
@@ -10,7 +10,9 @@
<tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
<image source="../graphics/tilesets/collision.png" width="96" height="96"/>
</tileset>
- <tileset firstgid="10" source="../graphics/tilesets/cave.tsx"/>
+ <tileset firstgid="10" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <image source="../graphics/tilesets/cave.png" width="512" height="256"/>
+ </tileset>
<tileset firstgid="138" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/cave.png" width="512" height="256"/>
</tileset>
@@ -20,11 +22,21 @@
<tileset firstgid="282" name="woodland_x5_fall" tilewidth="32" tileheight="160" tilecount="16" columns="16">
<image source="../graphics/tilesets/woodland_x5_fall.png" width="512" height="160"/>
</tileset>
- <tileset firstgid="298" source="../graphics/tilesets/cave_bilevel.tsx"/>
- <tileset firstgid="554" source="../graphics/tilesets/woodland_x5.tsx"/>
- <tileset firstgid="569" source="../graphics/tilesets/woodland_x3.tsx"/>
- <tileset firstgid="601" source="../graphics/tilesets/trans_woodland_desert.tsx"/>
- <tileset firstgid="729" source="../graphics/tilesets/woodland_x4.tsx"/>
+ <tileset firstgid="298" name="cave_bilevel" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/cave_bilevel.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="554" name="woodland_x5" tilewidth="32" tileheight="160" tilecount="15" columns="15">
+ <image source="../graphics/tilesets/woodland_x5.png" width="480" height="160"/>
+ </tileset>
+ <tileset firstgid="569" name="woodland_x3" tilewidth="32" tileheight="96" tilecount="32" columns="16">
+ <image source="../graphics/tilesets/woodland_x3.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="601" name="trans_woodland_desert" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <image source="../graphics/tilesets/trans_woodland_desert.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="729" name="woodland_x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <image source="../graphics/tilesets/woodland_x4.png" width="512" height="128"/>
+ </tileset>
<layer id="1" name="Ground1" width="110" height="110">
<data encoding="csv">
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
diff --git a/maps/012-2.tmx b/maps/012-2.tmx
index a7cbaae2..700d23d3 100644
--- a/maps/012-2.tmx
+++ b/maps/012-2.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="90" height="110" tilewidth="32" tileheight="32" nextobjectid="53">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="90" height="110" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="53">
<properties>
<property name="license" value="GPL v2+"/>
<property name="manaplus version" value="2"/>
@@ -13,9 +13,13 @@
<tileset firstgid="10" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/inn.png" width="512" height="512"/>
</tileset>
- <tileset firstgid="266" source="../graphics/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="522" source="../graphics/tilesets/woodland_indoor_x3.tsx"/>
- <layer name="Ground1" width="90" height="110">
+ <tileset firstgid="266" name="woodland_indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="522" name="woodland_indoor_x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor_x3.png" width="512" height="288"/>
+ </tileset>
+ <layer id="1" name="Ground1" width="90" height="110">
<data encoding="csv">
314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
@@ -129,7 +133,7 @@
314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314
</data>
</layer>
- <layer name="Ground2" width="90" height="110">
+ <layer id="2" name="Ground2" width="90" height="110">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -243,7 +247,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
</data>
</layer>
- <layer name="Ground3" width="90" height="110">
+ <layer id="3" name="Ground3" width="90" height="110">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -357,7 +361,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
</data>
</layer>
- <layer name="Fringe" width="90" height="110">
+ <layer id="4" name="Fringe" width="90" height="110">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -471,7 +475,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
</data>
</layer>
- <layer name="Over1" width="90" height="110">
+ <layer id="5" name="Over1" width="90" height="110">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -585,7 +589,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
</data>
</layer>
- <layer name="Fix It" width="90" height="110">
+ <layer id="6" name="Fix It" width="90" height="110">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -699,7 +703,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
</data>
</layer>
- <layer name="Collision" width="90" height="110" visible="0">
+ <layer id="7" name="Collision" width="90" height="110" 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,
@@ -813,7 +817,7 @@
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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>
- <layer name="Heights" width="90" height="110" visible="0">
+ <layer id="8" name="Heights" width="90" height="110" visible="0">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -927,7 +931,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
</data>
</layer>
- <objectgroup name="Objects">
+ <objectgroup id="9" name="Objects">
<object id="36" name="Margin" type="fixme" x="2240" y="2880" width="640" height="640"/>
<object id="39" name="Margin" type="fixme" x="0" y="0" width="640" height="640"/>
<object id="45" name="To Cellar" type="warp" x="1920" y="1440" width="32" height="32">
diff --git a/maps/012-3.tmx b/maps/012-3.tmx
index b22cd02e..d842f363 100644
--- a/maps/012-3.tmx
+++ b/maps/012-3.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="75" height="75" tilewidth="32" tileheight="32" nextobjectid="41">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="75" height="75" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="41">
<properties>
<property name="license" value="GPL v2+"/>
<property name="manaplus version" value="2"/>
@@ -10,11 +10,19 @@
<tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
<image source="../graphics/tilesets/collision.png" width="96" height="96"/>
</tileset>
- <tileset firstgid="10" source="../graphics/tilesets/inn.tsx"/>
- <tileset firstgid="266" source="../graphics/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="522" source="../graphics/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="570" source="../graphics/tilesets/collision.tsx"/>
- <layer name="Ground1" width="75" height="75">
+ <tileset firstgid="10" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="woodland_indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="522" name="woodland_indoor_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor_x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="570" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
+ <layer id="1" name="Ground1" width="75" height="75">
<data encoding="csv">
314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
@@ -93,7 +101,7 @@
314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314
</data>
</layer>
- <layer name="Ground2" width="75" height="75">
+ <layer id="2" name="Ground2" width="75" height="75">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -172,7 +180,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
</data>
</layer>
- <layer name="Ground3" width="75" height="75">
+ <layer id="3" name="Ground3" width="75" height="75">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -251,7 +259,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
</data>
</layer>
- <layer name="Fringe" width="75" height="75">
+ <layer id="4" name="Fringe" width="75" height="75">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -330,7 +338,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
</data>
</layer>
- <layer name="Over1" width="75" height="75">
+ <layer id="5" name="Over1" width="75" height="75">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -409,7 +417,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
</data>
</layer>
- <layer name="Collision" width="75" height="75" visible="0">
+ <layer id="6" name="Collision" width="75" height="75" 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,
@@ -488,7 +496,7 @@
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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>
- <layer name="Heights" width="75" height="75" visible="0">
+ <layer id="7" name="Heights" width="75" height="75" visible="0">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -567,7 +575,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
</data>
</layer>
- <objectgroup name="Objects">
+ <objectgroup id="8" name="Objects">
<object id="36" name="Margin" type="fixme" x="1760" y="1760" width="640" height="640"/>
<object id="39" name="Margin" type="fixme" x="0" y="0" width="640" height="640"/>
<object id="40" name="To Outside" type="warp" x="1312" y="1472" width="32" height="32">
diff --git a/maps/012-4.tmx b/maps/012-4.tmx
index e12bd70d..3b707cc5 100644
--- a/maps/012-4.tmx
+++ b/maps/012-4.tmx
@@ -10,10 +10,18 @@
<tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
<image source="../graphics/tilesets/collision.png" width="96" height="96"/>
</tileset>
- <tileset firstgid="10" source="../graphics/tilesets/inn.tsx"/>
- <tileset firstgid="266" source="../graphics/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="522" source="../graphics/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="570" source="../graphics/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="woodland_indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="522" name="woodland_indoor_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor_x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="570" name="woodland_indoor_x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor_x3.png" width="512" height="288"/>
+ </tileset>
<layer id="1" name="Ground1" width="60" height="60">
<data encoding="csv">
314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,
diff --git a/maps/014-4.tmx b/maps/014-4.tmx
index 666b2f55..6ed2c9db 100644
--- a/maps/014-4.tmx
+++ b/maps/014-4.tmx
@@ -83,8 +83,12 @@
<tileset firstgid="2309" name="magecity" tilewidth="32" tileheight="32" tilecount="360" columns="8">
<image source="../graphics/tilesets/magecity.png" width="256" height="1440"/>
</tileset>
- <tileset firstgid="2669" source="../graphics/tilesets/woodland_x2.tsx"/>
- <tileset firstgid="2701" source="../graphics/tilesets/woodland_x3.tsx"/>
+ <tileset firstgid="2669" name="woodland_x2" tilewidth="32" tileheight="64" tilecount="32" columns="16">
+ <image source="../graphics/tilesets/woodland_x2.png" width="512" height="128"/>
+ </tileset>
+ <tileset firstgid="2701" name="woodland_x3" tilewidth="32" tileheight="96" tilecount="32" columns="16">
+ <image source="../graphics/tilesets/woodland_x3.png" width="512" height="192"/>
+ </tileset>
<tileset firstgid="2733" name="Transcendence Portal" tilewidth="32" tileheight="96" tilecount="15" columns="15">
<image source="../graphics/tilesets/lof/warp_gates.png" width="480" height="96"/>
</tileset>
diff --git a/maps/015-1.tmx b/maps/015-1.tmx
index 09355450..3ba2480d 100644
--- a/maps/015-1.tmx
+++ b/maps/015-1.tmx
@@ -8,20 +8,42 @@
<property name="music" value="Deep_Cave.ogg"/>
<property name="name" value="Woodland Mines"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
- <tileset firstgid="10" source="../graphics/tilesets/cave.tsx"/>
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
+ <tileset firstgid="10" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <image source="../graphics/tilesets/cave.png" width="512" height="256"/>
+ </tileset>
<tileset firstgid="138" name="cave_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
<image source="../graphics/tilesets/cave_x2.png" width="512" height="64"/>
</tileset>
- <tileset firstgid="154" source="../graphics/tilesets/cave_bilevel.tsx"/>
- <tileset firstgid="410" source="../graphics/tilesets/woodland_ground.tsx"/>
- <tileset firstgid="666" source="../graphics/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="922" source="../graphics/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="970" source="../graphics/tilesets/woodland_indoor_x3.tsx"/>
- <tileset firstgid="1018" source="../graphics/tilesets/woodland_x2.tsx"/>
- <tileset firstgid="1050" source="../graphics/tilesets/woodland_x3.tsx"/>
- <tileset firstgid="1082" source="../graphics/tilesets/woodland_village.tsx"/>
- <tileset firstgid="1338" source="../graphics/tilesets/woodland_village_x2.tsx"/>
+ <tileset firstgid="154" name="cave_bilevel" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/cave_bilevel.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="410" name="woodland_ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/woodland_ground.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="666" name="woodland_indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="922" name="woodland_indoor_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor_x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="970" name="woodland_indoor_x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/woodland_indoor_x3.png" width="512" height="288"/>
+ </tileset>
+ <tileset firstgid="1018" name="woodland_x2" tilewidth="32" tileheight="64" tilecount="32" columns="16">
+ <image source="../graphics/tilesets/woodland_x2.png" width="512" height="128"/>
+ </tileset>
+ <tileset firstgid="1050" name="woodland_x3" tilewidth="32" tileheight="96" tilecount="32" columns="16">
+ <image source="../graphics/tilesets/woodland_x3.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="1082" name="woodland_village" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/woodland_village.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1338" name="woodland_village_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <image source="../graphics/tilesets/woodland_village_x2.png" width="512" height="64"/>
+ </tileset>
<layer id="1" name="Ground1" width="200" height="200">
<data encoding="csv">
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
diff --git a/maps/015-5.tmx b/maps/015-5.tmx
index ac483c83..68caf7cf 100644
--- a/maps/015-5.tmx
+++ b/maps/015-5.tmx
@@ -9,11 +9,21 @@
<property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
<property name="overlay0keepratio" value="true"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
- <tileset firstgid="10" source="../graphics/tilesets/cave.tsx"/>
- <tileset firstgid="138" source="../graphics/tilesets/cave_x2.tsx"/>
- <tileset firstgid="154" source="../graphics/tilesets/cave_bilevel.tsx"/>
- <tileset firstgid="410" source="../graphics/tilesets/woodland_ground.tsx"/>
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
+ <tileset firstgid="10" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <image source="../graphics/tilesets/cave.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="138" name="cave_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <image source="../graphics/tilesets/cave_x2.png" width="512" height="64"/>
+ </tileset>
+ <tileset firstgid="154" name="cave_bilevel" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/cave_bilevel.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="410" name="woodland_ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/woodland_ground.png" width="512" height="512"/>
+ </tileset>
<tileset firstgid="666" source="../graphics/tilesets/cave_ani_wetwall.tsx"/>
<layer id="1" name="Ground1" width="425" height="210">
<data encoding="csv">
diff --git a/maps/017-10.tmx b/maps/017-10.tmx
index bc5ba373..c8039417 100644
--- a/maps/017-10.tmx
+++ b/maps/017-10.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="120" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="20">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="120" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="20">
<properties>
<property name="author" value="LoF Team, Jesusalva, Xanthem"/>
<property name="license" value="GPL v2+"/>
@@ -8,11 +8,21 @@
<property name="music" value="peace2.ogg"/>
<property name="name" value="LoF Townhall"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
- <tileset firstgid="10" source="../graphics/tilesets/lof/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/tilesets/lof/woodland_indoor_x2.tsx"/>
- <tileset firstgid="298" source="../graphics/tilesets/lof/woodland_indoor_x3.tsx"/>
- <tileset firstgid="314" source="../graphics/tilesets/lof/woodland_village.tsx"/>
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
+ <tileset firstgid="10" name="LoF woodland_indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/lof/woodland_indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="LoF woodland_indoor_x2" tilewidth="32" tileheight="64" tilecount="32" columns="16">
+ <image source="../graphics/tilesets/lof/woodland_indoor_x2.png" width="512" height="128"/>
+ </tileset>
+ <tileset firstgid="298" name="LoF woodland_indoor_x3" tilewidth="32" tileheight="96" tilecount="16" columns="16">
+ <image source="../graphics/tilesets/lof/woodland_indoor_x3.png" width="512" height="96"/>
+ </tileset>
+ <tileset firstgid="314" name="LoF Woodland_village" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/lof/woodland_village.png" width="512" height="512"/>
+ </tileset>
<tileset firstgid="570" name="forge_x4" tilewidth="32" tileheight="128" tilecount="3" columns="3">
<image source="../graphics/tilesets/forge_x4.png" width="96" height="128"/>
</tileset>
diff --git a/maps/018-2-1.tmx b/maps/018-2-1.tmx
index 138601d3..a5a9aa83 100644
--- a/maps/018-2-1.tmx
+++ b/maps/018-2-1.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="80" height="50" tilewidth="32" tileheight="32" nextobjectid="3">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="80" height="50" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="3">
<properties>
<property name="author" value="Pydsigner, Jesusalva, TMW2/LoF Team"/>
<property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
@@ -8,13 +8,25 @@
<property name="music" value="Arabesque.ogg"/>
<property name="name" value="Heroes' Hold - Castle"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
- <tileset firstgid="10" source="../graphics/tilesets/lof/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/tilesets/lof/castle.tsx"/>
- <tileset firstgid="522" source="../graphics/tilesets/lof/castle2.tsx"/>
- <tileset firstgid="778" source="../graphics/tilesets/inn.tsx"/>
- <tileset firstgid="1034" source="../graphics/tilesets/lof/castle3.tsx"/>
- <layer name="Ground" width="80" height="50">
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
+ <tileset firstgid="10" name="LoF woodland_indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/lof/woodland_indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="LoF Castle" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/lof/castle_1.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="522" name="LoF Castle 2" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/lof/castle_2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="778" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1034" name="LoF Castle 3" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/lof/castle_3.png" width="512" height="512"/>
+ </tileset>
+ <layer id="1" name="Ground" width="80" height="50">
<data encoding="csv">
58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,
58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,
@@ -68,7 +80,7 @@
58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58
</data>
</layer>
- <layer name="Ground2" width="80" height="50">
+ <layer id="2" name="Ground2" width="80" height="50">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -122,7 +134,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
</data>
</layer>
- <layer name="Ground3" width="80" height="50">
+ <layer id="3" name="Ground3" width="80" height="50">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -176,7 +188,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
</data>
</layer>
- <layer name="Fringe" width="80" height="50">
+ <layer id="4" name="Fringe" width="80" height="50">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,7 +242,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
</data>
</layer>
- <layer name="Over" width="80" height="50">
+ <layer id="5" name="Over" width="80" height="50">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -284,7 +296,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
</data>
</layer>
- <layer name="Collision" width="80" height="50" visible="0">
+ <layer id="6" name="Collision" width="80" height="50" 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,
@@ -338,7 +350,7 @@
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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>
- <layer name="Heights" width="80" height="50" visible="0">
+ <layer id="7" name="Heights" width="80" height="50" visible="0">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -392,7 +404,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
</data>
</layer>
- <objectgroup name="Objects">
+ <objectgroup id="8" name="Objects">
<object id="1" name="To Heroes' Hold - Overworld" type="warp" x="800" y="1056" width="96" height="32">
<properties>
<property name="dest_map" value="018-2"/>
diff --git a/maps/018-4-2.tmx b/maps/018-4-2.tmx
index 93d62035..fabe1719 100644
--- a/maps/018-4-2.tmx
+++ b/maps/018-4-2.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="70" height="60" tilewidth="32" tileheight="32" nextobjectid="6">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="70" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="6">
<properties>
<property name="author" value="Pydsigner, Jesusalva, TMW2/LoF Team ? soren"/>
<property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
@@ -8,13 +8,25 @@
<property name="music" value="peace.ogg"/>
<property name="name" value="Secret Island House"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/lof/woodland_indoor.tsx"/>
- <tileset firstgid="257" source="../graphics/tilesets/lof/woodland_indoor_extra.tsx"/>
- <tileset firstgid="513" source="../graphics/tilesets/lof/woodland_indoor_x2.tsx"/>
- <tileset firstgid="545" source="../graphics/tilesets/lof/woodland_indoor_x3.tsx"/>
- <tileset firstgid="561" source="../graphics/tilesets/lof/woodland_indoor_x3_extra.tsx"/>
- <tileset firstgid="577" source="../graphics/tilesets/collision.tsx"/>
- <layer name="Ground" width="70" height="60">
+ <tileset firstgid="1" name="LoF woodland_indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/lof/woodland_indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="257" name="LoF woodland-indoor-extra" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/lof/woodland_indoor_extra.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="513" name="LoF woodland_indoor_x2" tilewidth="32" tileheight="64" tilecount="32" columns="16">
+ <image source="../graphics/tilesets/lof/woodland_indoor_x2.png" width="512" height="128"/>
+ </tileset>
+ <tileset firstgid="545" name="LoF woodland_indoor_x3" tilewidth="32" tileheight="96" tilecount="16" columns="16">
+ <image source="../graphics/tilesets/lof/woodland_indoor_x3.png" width="512" height="96"/>
+ </tileset>
+ <tileset firstgid="561" name="LoF woodland indoor x3 extra" tilewidth="32" tileheight="96" tilecount="16" columns="16">
+ <image source="../graphics/tilesets/lof/woodland_indoor_x3_extra.png" width="512" height="96"/>
+ </tileset>
+ <tileset firstgid="577" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
+ <layer id="1" name="Ground" width="70" height="60">
<data encoding="csv">
49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,
49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,
@@ -78,7 +90,7 @@
49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49
</data>
</layer>
- <layer name="Fringe" width="70" height="60">
+ <layer id="2" name="Fringe" width="70" height="60">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -142,7 +154,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
</data>
</layer>
- <layer name="Over" width="70" height="60">
+ <layer id="3" name="Over" width="70" height="60">
<properties>
<property name="music" value=""/>
<property name="name" value="Secret_Island_Indoor"/>
@@ -210,7 +222,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
</data>
</layer>
- <layer name="Collision" width="70" height="60" visible="0">
+ <layer id="4" name="Collision" width="70" height="60" visible="0">
<data encoding="csv">
578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,
578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,
@@ -274,7 +286,7 @@
578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578
</data>
</layer>
- <layer name="Heights" width="70" height="60" visible="0">
+ <layer id="5" name="Heights" width="70" height="60" visible="0">
<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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -338,7 +350,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
</data>
</layer>
- <objectgroup name="Objects">
+ <objectgroup id="6" name="Objects">
<object id="3" name="graphics/particles/fireplace.particle.xml" type="PARTICLE_EFFECT" x="1056" y="768" width="32" height="32"/>
<object id="4" name="graphics/particles/fireplace.particle.xml" type="PARTICLE_EFFECT" x="1088" y="768" width="32" height="32"/>
<object id="5" name="To Outside" type="warp" x="1056" y="1152" width="32" height="32">
diff --git a/maps/019-3.tmx b/maps/019-3.tmx
index ecab1389..1dae38b4 100644
--- a/maps/019-3.tmx
+++ b/maps/019-3.tmx
@@ -44,10 +44,18 @@
<property name="overlay8scrollX" value="0.3"/>
<property name="overlay8scrollY" value="0.2"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
- <tileset firstgid="10" source="../graphics/tilesets/snow.tsx"/>
- <tileset firstgid="266" source="../graphics/tilesets/snow_x2.tsx"/>
- <tileset firstgid="282" source="../graphics/tilesets/snow_tree_x3.tsx"/>
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
+ <tileset firstgid="10" name="snow" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/snow.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="snow_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <image source="../graphics/tilesets/snow_x2.png" width="512" height="64"/>
+ </tileset>
+ <tileset firstgid="282" name="snow_tree_x3" tilewidth="64" tileheight="96" tilecount="4" columns="4">
+ <image source="../graphics/tilesets/snow_tree_x3.png" width="256" height="96"/>
+ </tileset>
<layer id="1" name="Ground" width="178" height="128">
<data encoding="csv">
93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,
diff --git a/maps/020-3.tmx b/maps/020-3.tmx
index 1e3fe206..744e17c0 100644
--- a/maps/020-3.tmx
+++ b/maps/020-3.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="61" height="59" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="41">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="61" height="59" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="41">
<properties>
<property name="author" value="TMW2 Team"/>
<property name="license" value="GPL v2+"/>
@@ -11,7 +11,9 @@
<tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
<image source="../graphics/tilesets/collision.png" width="96" height="96"/>
</tileset>
- <tileset firstgid="10" source="../graphics/tilesets/inn.tsx"/>
+ <tileset firstgid="10" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/inn.png" width="512" height="512"/>
+ </tileset>
<tileset firstgid="266" name="snow_village" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/snow_village.png" width="512" height="512"/>
</tileset>
diff --git a/maps/021-1.tmx b/maps/021-1.tmx
index e2e81fbe..1f5fd48d 100644
--- a/maps/021-1.tmx
+++ b/maps/021-1.tmx
@@ -7,8 +7,12 @@
<property name="music" value="icecave.ogg"/>
<property name="name" value="Ice Labyrinth"/>
</properties>
- <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
- <tileset firstgid="10" source="../graphics/tilesets/icecave.tsx"/>
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
+ <tileset firstgid="10" name="icecave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <image source="../graphics/tilesets/icecave.png" width="512" height="256"/>
+ </tileset>
<layer id="1" name="Ground1" width="321" height="320">
<data encoding="csv">
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,