Candor Domain, C006-4

Also contains:
* Self-Made-Problems :tm: , moves all evol tilesets to evol/
* Voice effects for Candor Gates

1 files changed, 32 insertions, 32 deletions

diff --git a/maps/guilds.tmx b/maps/guilds.tmx
index fda49895..807159d0 100644
--- a/maps/guilds.tmx
+++ b/maps/guilds.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="70" height="70" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="6">
+<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="70" height="70" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="6">
  <properties>
   <property name="license" value="GPL 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -8,7 +8,7 @@
   <property name="name" value="Guild Hall"/>
  </properties>
  <tileset firstgid="1" name="artis-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
-  <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/evol/artis-indoor.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="257" name="level-number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
@@ -17,25 +17,25 @@
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
  <tileset firstgid="282" name="artis-accessory-x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
+  <image source="../graphics/tilesets/evol/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="330" name="artis-accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
+  <image source="../graphics/tilesets/evol/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="458" name="artis-indoor-fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/evol/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="714" name="artis-indoor-x1x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/evol/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="730" name="artis-indoor-x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/evol/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="778" name="artis-indoor-x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/evol/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="794" name="artis-indoor-x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/evol/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="802" name="fire-cauldron" tilewidth="32" tileheight="64" tilecount="10" columns="10">
   <image source="../graphics/tilesets/evol/fire-cauldron.png" width="320" height="64"/>
@@ -70,8 +70,8 @@
  <tileset firstgid="1084" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/evol/hurns-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1340" name="fire" tilewidth="32" tileheight="64" tilecount="10" columns="10">
-  <image source="../graphics/tilesets/evol/fire.png" width="320" height="64"/>
+ <tileset firstgid="1340" name="fire" tilewidth="32" tileheight="64" tilecount="14" columns="14">
+  <image source="../graphics/tilesets/evol/fire.png" width="448" height="64"/>
   <tile id="0">
    <animation>
     <frame tileid="0" duration="100"/>
@@ -82,7 +82,7 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="1350" name="hurns_wood_lab" tilewidth="96" tileheight="96" tilecount="12" columns="4">
+ <tileset firstgid="1354" name="hurns_wood_lab" tilewidth="96" tileheight="96" tilecount="12" columns="4">
   <image source="../graphics/tilesets/evol/hurns_wood_lab.png" width="384" height="288"/>
   <tile id="0">
    <animation>
@@ -98,8 +98,8 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="1362" name="candle-x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
-  <image source="../graphics/tilesets/candle-x1x2.png" width="96" height="256"/>
+ <tileset firstgid="1366" name="candle-x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
+  <image source="../graphics/tilesets/evol/candle-x1x2.png" width="96" height="256"/>
   <tile id="3">
    <animation>
     <frame tileid="3" duration="100"/>
@@ -129,7 +129,7 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="1386" name="hurns-teacup-vapor" tilewidth="32" tileheight="32" tilecount="8" columns="4">
+ <tileset firstgid="1390" name="hurns-teacup-vapor" tilewidth="32" tileheight="32" tilecount="8" columns="4">
   <image source="../graphics/tilesets/evol/hurns-teacup-vapor.png" width="128" height="64"/>
   <tile id="0">
    <animation>
@@ -148,11 +148,11 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="1394" name="ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
-  <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
+ <tileset firstgid="1398" name="ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/evol/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1650" name="sunlight-x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
-  <image source="../graphics/tilesets/sunlight-x1x5.png" width="128" height="160"/>
+ <tileset firstgid="1654" name="sunlight-x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+  <image source="../graphics/tilesets/evol/sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
  <layer id="1" name="Ground 1" width="70" height="70">
   <data encoding="csv">
@@ -178,8 +178,8 @@
 112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
 112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
 112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,14,14,14,214,214,214,214,214,214,214,214,214,214,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,214,1084,1088,1591,1085,1134,1135,1085,1591,1088,1086,214,214,214,214,1084,1088,1088,1085,1591,1088,1088,1088,1085,1591,1088,1086,214,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,214,1084,1088,214,1085,1150,1151,1085,214,1166,1167,214,214,214,214,1084,1088,1088,1085,1591,1088,1088,1088,1085,1591,1088,1086,214,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,214,1084,1088,1595,1085,1134,1135,1085,1595,1088,1086,214,214,214,214,1084,1088,1088,1085,1595,1088,1088,1088,1085,1595,1088,1086,214,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,214,1084,1088,214,1085,1150,1151,1085,214,1166,1167,214,214,214,214,1084,1088,1088,1085,1595,1088,1088,1088,1085,1595,1088,1086,214,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
 112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,214,1100,1104,1104,1101,1104,1104,1101,1104,1182,1183,214,214,214,214,1100,1104,1104,1101,1104,1104,1104,1104,1101,1104,1104,1102,214,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
 112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,214,214,214,214,214,214,214,214,214,214,1117,214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
 112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,214,214,214,214,214,214,214,214,214,214,214,1084,1088,1088,1086,214,214,214,214,214,214,214,214,214,214,214,214,214,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
@@ -266,7 +266,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,230,0,1322,1304,0,0,0,0,0,1304,1322,0,0,230,0,0,230,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1322,1304,0,0,942,943,0,1304,1322,0,0,0,0,0,0,0,769,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,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,0,0,1322,1304,0,0,950,951,0,1304,1322,0,0,230,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,719,1350,0,0,0,0,230,0,0,1338,1304,0,0,0,0,0,1304,1338,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,719,1354,0,0,0,0,230,0,0,1338,1304,0,0,0,0,0,1304,1338,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,766,0,0,0,0,0,1318,1271,1271,1271,1271,1271,1320,0,0,0,230,0,0,0,0,1186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,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,230,230,0,1337,1334,1287,1287,1287,1287,1287,1336,1337,230,0,230,0,0,1224,0,1202,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 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,0,0,0,0,230,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1240,0,1218,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -405,24 +405,24 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1154,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1340,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1650,1651,1652,1653,0,1650,1651,1652,1653,0,0,0,0,0,0,0,1650,1651,1652,1653,0,1650,1651,1652,1653,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1654,1655,1656,1657,0,1654,1655,1656,1657,0,0,0,0,0,0,0,1654,1655,1656,1657,0,1654,1655,1656,1657,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,736,737,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,779,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,779,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1365,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1369,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1390,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,978,979,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,802,803,0,1365,0,0,0,0,0,285,286,287,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,802,803,0,1369,0,0,0,0,0,285,286,287,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1390,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,778,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1390,1380,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1368,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1383,0,0,0,0,0,0,0,0,0,0,0,0,0,0,497,1371,512,517,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1394,1384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1387,0,0,0,0,0,0,0,0,0,0,0,0,0,0,497,1375,512,517,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1390,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,778,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -556,7 +556,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1377,502,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1381,502,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,514,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -568,7 +568,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1368,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,