From 8873cf7855b0ba36b11d47034b2921926d9cbaf5 Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Wed, 24 Oct 2018 21:05:46 +0200
Subject: Add a few missing NPCs. Mapfixes, mainly the collision in 008-1-1.

---
 maps/001-3-0.tmx | 103 +++++++++++++++++++++++++++----------------------------
 1 file changed, 51 insertions(+), 52 deletions(-)

(limited to 'maps/001-3-0.tmx')

diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx
index eb685d76..fd40aa25 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-3-0.tmx
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="250" height="175" tilewidth="32" tileheight="32">
+<map version="1.0" tiledversion="1.1.3" orientation="orthogonal" renderorder="right-down" width="250" height="175" tilewidth="32" tileheight="32" infinite="0" nextobjectid="39">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -8,37 +7,37 @@
   <property name="music" value=""/>
   <property name="name" value="Sewer"/>
  </properties>
- <tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Cellar" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="Indoor Cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="321" name="Sewer x2x2" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="Sewer x2x2" tilewidth="32" tileheight="32" tilecount="8" columns="4">
   <image source="../graphics/tilesets/artis-sewer-x2x2.png" width="128" height="64"/>
  </tileset>
- <tileset firstgid="329" name="Sewer x3x3" tilewidth="32" tileheight="32">
+ <tileset firstgid="329" name="Sewer x3x3" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/artis-sewer-x3x3.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="365" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="365" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="493" name="Box" tilewidth="32" tileheight="32">
+ <tileset firstgid="493" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="529" name="Box x1x2" tilewidth="32" tileheight="32">
+ <tileset firstgid="529" name="Box x1x2" tilewidth="32" tileheight="32" tilecount="16" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="545" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="673" name="Level Number" tilewidth="32" tileheight="32">
+ <tileset firstgid="673" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="689" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="689" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="698" name="Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="698" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
  <layer name="Ground" width="250" height="175">
@@ -1652,55 +1651,55 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="Object" width="0" height="0">
-  <object name="to Artis" type="warp" x="6272" y="1120" width="32" height="32">
+ <objectgroup name="Object">
+  <object id="1" name="to Artis" type="warp" x="6272" y="1120" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="197"/>
     <property name="dest_y" value="35"/>
    </properties>
   </object>
-  <object name="to RivercaveEast" type="warp" x="5504" y="1312" width="32" height="32">
+  <object id="2" name="to RivercaveEast" type="warp" x="5504" y="1312" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-3-1"/>
     <property name="dest_x" value="34"/>
     <property name="dest_y" value="58"/>
    </properties>
   </object>
-  <object name="to RivercaveWest" type="warp" x="5184" y="1280" width="32" height="32">
+  <object id="3" name="to RivercaveWest" type="warp" x="5184" y="1280" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-3-1"/>
     <property name="dest_x" value="23"/>
     <property name="dest_y" value="57"/>
    </properties>
   </object>
-  <object name="to ArtisCoast" type="warp" x="6336" y="1888" width="32" height="32">
+  <object id="4" name="to ArtisCoast" type="warp" x="6336" y="1888" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="199"/>
     <property name="dest_y" value="61"/>
    </properties>
   </object>
-  <object name="To ArtisCentral" type="warp" x="4864" y="1760" width="32" height="32">
+  <object id="5" name="To ArtisCentral" type="warp" x="4864" y="1760" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="152"/>
     <property name="dest_y" value="51"/>
    </properties>
   </object>
-  <object name="to ArtisSouth" type="warp" x="2720" y="4160" width="32" height="32">
+  <object id="6" name="to ArtisSouth" type="warp" x="2720" y="4160" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="86"/>
     <property name="dest_y" value="130"/>
    </properties>
   </object>
-  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="3520" y="1888" width="32" height="32"/>
-  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="6304" y="2432" width="32" height="32"/>
-  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="4320" y="4000" width="32" height="32"/>
-  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="1536" y="4000" width="32" height="32"/>
-  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="5056" y="1632" width="32" height="32"/>
-  <object name="Ratto" type="spawn" x="5536" y="960" width="192" height="160">
+  <object id="7" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="3520" y="1888" width="32" height="32"/>
+  <object id="8" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="6304" y="2432" width="32" height="32"/>
+  <object id="9" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="4320" y="4000" width="32" height="32"/>
+  <object id="10" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="1536" y="4000" width="32" height="32"/>
+  <object id="11" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="5056" y="1632" width="32" height="32"/>
+  <object id="12" name="Ratto" type="spawn" x="5536" y="960" width="192" height="160">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="2"/>
@@ -1708,7 +1707,7 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="6368" y="1664" width="192" height="160">
+  <object id="13" name="Ratto" type="spawn" x="6368" y="1664" width="192" height="160">
    <properties>
     <property name="death" value="10000"/>
     <property name="max_beings" value="3"/>
@@ -1716,7 +1715,7 @@
     <property name="spawn" value="25000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="4256" y="3072" width="1184" height="96">
+  <object id="14" name="Ratto" type="spawn" x="4256" y="3072" width="1184" height="96">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="3"/>
@@ -1724,7 +1723,7 @@
     <property name="spawn" value="40000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="2976" y="3456" width="576" height="224">
+  <object id="15" name="Ratto" type="spawn" x="2976" y="3456" width="576" height="224">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="4"/>
@@ -1732,7 +1731,7 @@
     <property name="spawn" value="30000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="4576" y="2112" width="192" height="160">
+  <object id="16" name="Ratto" type="spawn" x="4576" y="2112" width="192" height="160">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="2"/>
@@ -1740,7 +1739,7 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="4608" y="864" width="160" height="96">
+  <object id="17" name="Ratto" type="spawn" x="4608" y="864" width="160" height="96">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="2"/>
@@ -1748,7 +1747,7 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="2784" y="1984" width="224" height="256">
+  <object id="18" name="Ratto" type="spawn" x="2784" y="1984" width="224" height="256">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="3"/>
@@ -1756,7 +1755,7 @@
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="1536" y="1472" width="544" height="320">
+  <object id="19" name="Ratto" type="spawn" x="1536" y="1472" width="544" height="320">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="4"/>
@@ -1764,7 +1763,7 @@
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="1248" y="3168" width="224" height="256">
+  <object id="20" name="Ratto" type="spawn" x="1248" y="3168" width="224" height="256">
    <properties>
     <property name="death" value="20000"/>
     <property name="max_beings" value="3"/>
@@ -1772,7 +1771,7 @@
     <property name="spawn" value="40000"/>
    </properties>
   </object>
-  <object name="Green Slime" type="spawn" x="4960" y="2496" width="160" height="160">
+  <object id="21" name="Green Slime" type="spawn" x="4960" y="2496" width="160" height="160">
    <properties>
     <property name="death" value="80000"/>
     <property name="max_beings" value="3"/>
@@ -1780,7 +1779,7 @@
     <property name="spawn" value="15000"/>
    </properties>
   </object>
-  <object name="Cave Maggot" type="spawn" x="5984" y="1248" width="256" height="1280">
+  <object id="22" name="Cave Maggot" type="spawn" x="5984" y="1248" width="256" height="1280">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="7"/>
@@ -1788,7 +1787,7 @@
     <property name="spawn" value="5000"/>
    </properties>
   </object>
-  <object name="Cave Maggot" type="spawn" x="5472" y="1408" width="96" height="160">
+  <object id="23" name="Cave Maggot" type="spawn" x="5472" y="1408" width="96" height="160">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="3"/>
@@ -1796,7 +1795,7 @@
     <property name="spawn" value="5000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="5600" y="1472" width="64" height="288">
+  <object id="24" name="Ratto" type="spawn" x="5600" y="1472" width="64" height="288">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="2"/>
@@ -1804,7 +1803,7 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object name="Cave Maggot" type="spawn" x="5504" y="1984" width="256" height="160">
+  <object id="25" name="Cave Maggot" type="spawn" x="5504" y="1984" width="256" height="160">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="4"/>
@@ -1812,7 +1811,7 @@
     <property name="spawn" value="5000"/>
    </properties>
   </object>
-  <object name="Cave Maggot" type="spawn" x="1792" y="1024" width="3136" height="2816">
+  <object id="26" name="Cave Maggot" type="spawn" x="1792" y="1024" width="3136" height="2816">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="25"/>
@@ -1820,7 +1819,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object 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="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1828,7 +1827,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Green Slime" type="spawn" x="4000" y="2592" width="224" height="352">
+  <object id="28" name="Green Slime" type="spawn" x="4000" y="2592" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1836,7 +1835,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Green Slime" type="spawn" x="1248" y="3136" width="224" height="352">
+  <object id="29" name="Green Slime" type="spawn" x="1248" y="3136" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1844,7 +1843,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Little Green Slime" type="spawn" x="3616" y="2656" width="480" height="192">
+  <object id="30" name="Little Green Slime" type="spawn" x="3616" y="2656" width="480" height="192">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1852,7 +1851,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Green Slime" type="spawn" x="4608" y="3744" width="224" height="352">
+  <object id="31" name="Green Slime" type="spawn" x="4608" y="3744" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1860,7 +1859,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Green Slime" type="spawn" x="4608" y="3744" width="224" height="352">
+  <object id="32" name="Green Slime" type="spawn" x="4608" y="3744" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1868,7 +1867,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Green Slime" type="spawn" x="3072" y="3232" width="224" height="352">
+  <object id="33" name="Green Slime" type="spawn" x="3072" y="3232" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1876,7 +1875,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Little Green Slime" type="spawn" x="4128" y="896" width="672" height="288">
+  <object id="34" name="Little Green Slime" type="spawn" x="4128" y="896" width="672" height="288">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1884,7 +1883,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Little Green Slime" type="spawn" x="2624" y="4128" width="288" height="192">
+  <object id="35" name="Little Green Slime" type="spawn" x="2624" y="4128" width="288" height="192">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1892,7 +1891,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Little Green Slime" type="spawn" x="5472" y="928" width="288" height="192">
+  <object id="36" name="Little Green Slime" type="spawn" x="5472" y="928" width="288" height="192">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1900,7 +1899,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Little Green Slime" type="spawn" x="4576" y="2080" width="288" height="192">
+  <object id="37" name="Little Green Slime" type="spawn" x="4576" y="2080" width="288" height="192">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1908,7 +1907,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Poison Skull" type="spawn" x="1568" y="1600" width="352" height="224">
+  <object id="38" name="Poison Skull" type="spawn" x="1568" y="1600" width="352" height="224">
    <properties>
     <property name="death" value="60000"/>
     <property name="max_beings" value="1"/>
-- 
cgit v1.2.3-70-g09d2


From 8201f92e7838145383536ea65defd5cd75d57048 Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Sun, 28 Oct 2018 10:13:05 +0100
Subject: Add the torch, add the spotlight overlay, improve Wand

---
 graphics/images/ambient/spot.png                   | Bin 0 -> 134317 bytes
 graphics/items/equipment/weapons/torch.png         | Bin 0 -> 847 bytes
 graphics/sprites/equipment/weapons/torch.png       | Bin 0 -> 32359 bytes
 graphics/sprites/equipment/weapons/torch.xml       |  11 +++++++++++
 .../sprites/equipment/weapons/trainingwand.png     | Bin 14046 -> 73352 bytes
 items.xml                                          |  22 ++++++++++++++++-----
 maps/001-3-0.tmx                                   |   1 +
 maps/001-3-1.tmx                                   |   1 +
 maps/008-3-1.tmx                                   |   3 ++-
 9 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 graphics/images/ambient/spot.png
 create mode 100644 graphics/items/equipment/weapons/torch.png
 create mode 100644 graphics/sprites/equipment/weapons/torch.png
 create mode 100644 graphics/sprites/equipment/weapons/torch.xml

(limited to 'maps/001-3-0.tmx')

diff --git a/graphics/images/ambient/spot.png b/graphics/images/ambient/spot.png
new file mode 100644
index 00000000..b9c51abd
Binary files /dev/null and b/graphics/images/ambient/spot.png differ
diff --git a/graphics/items/equipment/weapons/torch.png b/graphics/items/equipment/weapons/torch.png
new file mode 100644
index 00000000..638f2426
Binary files /dev/null and b/graphics/items/equipment/weapons/torch.png differ
diff --git a/graphics/sprites/equipment/weapons/torch.png b/graphics/sprites/equipment/weapons/torch.png
new file mode 100644
index 00000000..16f430b7
Binary files /dev/null and b/graphics/sprites/equipment/weapons/torch.png differ
diff --git a/graphics/sprites/equipment/weapons/torch.xml b/graphics/sprites/equipment/weapons/torch.xml
new file mode 100644
index 00000000..8bdf853b
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/torch.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha, Reid
+Copyright (C) 2011-2018 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/weapons/torch.png|W"
+              width="64"
+              height="64"/>
+
+    <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/trainingwand.png b/graphics/sprites/equipment/weapons/trainingwand.png
index 190d4377..f41aedd1 100644
Binary files a/graphics/sprites/equipment/weapons/trainingwand.png and b/graphics/sprites/equipment/weapons/trainingwand.png differ
diff --git a/items.xml b/items.xml
index d444829e..8ec3a1c1 100644
--- a/items.xml
+++ b/items.xml
@@ -1610,7 +1610,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/weapons/woodensword.png"
         name="Wooden Sword"
         description="For sword training. Do not show-off with it."
-        attack="40"
+        attack="75"
         attack-range="1"
         level="5"
         type="equip-1hand"
@@ -1624,7 +1624,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/weapons/backsword.png"
         name="Artis Backsword"
         description="An engraved backsword with the symbole of Artis on its brass hilt."
-        attack="800"
+        attack="500"
         attack-range="1"
         level="15"
         type="equip-1hand"
@@ -1638,7 +1638,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/weapons/wand.png"
         name="Training Wand"
         description="A simple wand for your first steps in handling magic."
-        attack="150"
+        attack="75"
         attack-range="2"
         level="10"
         type="equip-1hand"
@@ -1650,7 +1650,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/weapons/wand.png|W:#ece96e"
         name="Mana Torch"
         description="A simple wand imbued with a fire spell, it can provide lighting and will never run out on you!"
-        attack="200"
+        attack="100"
         attack-range="2"
         level="10"
         type="equip-1hand"
@@ -1662,7 +1662,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/weapons/scythe.png"
         name="Scythe"
         description="A farmer's scythe, not new but still deadly."
-        attack="1000"
+        attack="750"
         attack-range="2"
         level="15"
         type="equip-2hand"
@@ -1712,6 +1712,18 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         weight="250">
         <sprite>equipment/weapons/pickaxe.xml</sprite>
     </item>
+    <item id="3511"
+        image="equipment/weapons/torch.png"
+        name="Torch"
+        description="A burning Torch. Handle with care."
+        attack="150"
+        attack-range="1"
+        level="15"
+        type="equip-2hand"
+        attack-action="attack"
+        weight="100">
+        <sprite>equipment/weapons/torch.xml</sprite>
+    </item>
 
 
     <!-- Pets -->
diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx
index fd40aa25..7386f7c3 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-3-0.tmx
@@ -6,6 +6,7 @@
   <property name="minimap" value=""/>
   <property name="music" value=""/>
   <property name="name" value="Sewer"/>
+  <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
  </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"/>
diff --git a/maps/001-3-1.tmx b/maps/001-3-1.tmx
index 0dfa6a9c..0dff6ca5 100644
--- a/maps/001-3-1.tmx
+++ b/maps/001-3-1.tmx
@@ -6,6 +6,7 @@
   <property name="minimap" value=""/>
   <property name="music" value=""/>
   <property name="name" value="Rivercave"/>
+  <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
  </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"/>
diff --git a/maps/008-3-1.tmx b/maps/008-3-1.tmx
index 0232c925..e504f39e 100644
--- a/maps/008-3-1.tmx
+++ b/maps/008-3-1.tmx
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="80" height="80" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
+<map version="1.0" tiledversion="1.1.3" orientation="orthogonal" renderorder="right-down" width="80" height="80" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="name" value="Bat Cave"/>
+  <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
  </properties>
  <tileset firstgid="1" name="hurns-cave" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/hurns-cave.png" width="512" height="512"/>
-- 
cgit v1.2.3-70-g09d2


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(-)

(limited to 'maps/001-3-0.tmx')

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-70-g09d2