From b1371b4857208f90ab4a589f002e4b1b180723e5 Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Mon, 5 Nov 2018 20:45:32 +0100
Subject: update spotlight, fix a few mapbugs

---
 graphics/images/ambient/spot.png             | Bin 134317 -> 44543 bytes
 graphics/sprites/equipment/weapons/torch.xml |   4 ++++
 maps/001-3-0.tmx                             |  15 ++++++++-------
 maps/008-2-2.tmx                             |   4 ++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/graphics/images/ambient/spot.png b/graphics/images/ambient/spot.png
index b9c51abd..f3e81e9d 100644
Binary files a/graphics/images/ambient/spot.png and b/graphics/images/ambient/spot.png differ
diff --git a/graphics/sprites/equipment/weapons/torch.xml b/graphics/sprites/equipment/weapons/torch.xml
index 8bdf853b..e6bec6ad 100644
--- a/graphics/sprites/equipment/weapons/torch.xml
+++ b/graphics/sprites/equipment/weapons/torch.xml
@@ -2,6 +2,10 @@
 <!-- Author: Micksha, Reid
 Copyright (C) 2011-2018 Evol Online -->
 <sprite>
+	<saedit>
+		<layer type="repeater" file="races/human-male.xml"/>
+		<layer type="background" color="rgba(128,128,128,128)" zindex="-2"/>
+	</saedit>
     <imageset name="base"
               src="graphics/sprites/equipment/weapons/torch.png|W"
               width="64"
diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx
index 7386f7c3..08507fbe 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-3-0.tmx
@@ -7,6 +7,7 @@
   <property name="music" value=""/>
   <property name="name" value="Sewer"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
+  <property name="overlay0keepratio" value="true"/>
  </properties>
  <tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
@@ -1362,11 +1363,11 @@
 690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,690,690,690,690,690,690,0,0,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,690,690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
 690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,690,690,690,690,0,0,0,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
 690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
-690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
-690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
-690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
-690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
-690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
+690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,695,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
+690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,695,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
+690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,695,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
+690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,695,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
+690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,695,0,0,0,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
 690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,690,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
 690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
 690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
@@ -1674,7 +1675,7 @@
     <property name="dest_y" value="57"/>
    </properties>
   </object>
-  <object id="4" name="to ArtisCoast" type="warp" x="6336" y="1888" width="32" height="32">
+  <object id="4" name="to ArtisCoast" type="warp" x="6336" y="1920" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="199"/>
@@ -1820,7 +1821,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="27" name="Cave Maggot" type="spawn" x="2816" y="1984" width="224" height="352">
+  <object id="27" name="Cave Maggot" type="spawn" x="2816" y="1984" width="192" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
diff --git a/maps/008-2-2.tmx b/maps/008-2-2.tmx
index e6fcd2aa..20e99261 100644
--- a/maps/008-2-2.tmx
+++ b/maps/008-2-2.tmx
@@ -152,7 +152,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,861,814,814,814,863,0,0,0,0,0,0,0,0,0,0,845,798,798,798,798,798,798,0,0,170,171,172,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,861,814,814,814,814,814,814,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,138,139,140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183,184,185,0,0,183,185,0,0,183,185,0,0,0,0,0,154,155,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,154,155,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,858,891,860,0,846,890,892,846,846,199,201,846,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,843,890,891,892,0,846,890,892,846,846,890,892,846,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,906,907,908,878,862,906,908,862,862,906,908,862,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -344,7 +344,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,550,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,585,0,0,0,0,1334,1335,1336,1337,0,0,0,0,0,0,0,1334,1335,1336,1337,0,0,0,0,0,0,0,0,0,567,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,550,0,0,0,0,0,0,0,562,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,567,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,550,0,0,0,0,0,0,0,578,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,584,566,566,585,0,567,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,550,0,0,0,0,0,0,0,578,0,0,183,184,185,0,0,183,185,0,0,183,185,0,0,584,566,566,585,0,567,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,566,574,585,0,584,574,566,616,0,0,0,821,824,0,0,1181,0,0,0,1388,1371,0,0,567,649,649,564,566,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,649,649,590,564,566,565,590,649,550,0,0,820,0,1381,0,0,1364,824,0,0,1389,1387,0,0,567,0,0,649,649,649,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,567,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-- 
cgit v1.2.3-60-g2f50