Fix stuff, add warps, wait for pipeline

10 files changed, 83 insertions, 47 deletions

diff --git a/graphics/minimaps/018-1-1.png b/graphics/minimaps/018-1-1.png
index fa45e17a..62c2c6d7 100644
--- a/graphics/minimaps/018-1-1.png
+++ b/graphics/minimaps/018-1-1.png
diff --git a/graphics/minimaps/018-1.png b/graphics/minimaps/018-1.png
index a5f5c339..d6201ddc 100644
--- a/graphics/minimaps/018-1.png
+++ b/graphics/minimaps/018-1.png
diff --git a/graphics/tilesets/lof/warp_gates.png b/graphics/tilesets/lof/warp_gates.png
index 5b5fd971..278b95f7 100644
--- a/graphics/tilesets/lof/warp_gates.png
+++ b/graphics/tilesets/lof/warp_gates.png
diff --git a/maps.xml b/maps.xml
index 07837e44..34df4983 100644
--- a/maps.xml
+++ b/maps.xml
@@ -277,6 +277,12 @@ Copyright (C) 2018 TMW2 -->
     <map name="017-1.tmx">
         <atlas name="lof"/>
     </map>
+    <map name="017-2.tmx">
+        <atlas name="lof-indoor"/>
+    </map>
+    <map name="018-4-2.tmx">
+        <atlas name="lof-indoor"/>
+    </map>
     <map name="botcheck.tmx">
         <atlas name="botcheck"/>
     </map>
@@ -575,6 +581,7 @@ Copyright (C) 2018 TMW2 -->
     </atlas>
 
     <atlas name="lof">
+        <file name="graphics/tilesets/christmas.png"/>
         <file name="graphics/tilesets/trans_woodland_desert.png"/>
         <file name="graphics/tilesets/woodland_ground.png"/>
         <file name="graphics/tilesets/water.png"/>
@@ -594,6 +601,17 @@ Copyright (C) 2018 TMW2 -->
         <file name="graphics/tilesets/br/hole.png"/>
         <file name="graphics/tilesets/box.png"/>
         <file name="graphics/tilesets/crypt_blockwall.png"/>
+        <file name="graphics/tilesets/lof/warp_gates.png"/>
+    </atlas>
+
+    <atlas name="lof-indoor">
+        <file name="graphics/tilesets/christmas.png"/>
+        <file name="graphics/tilesets/inn.png"/>
+        <file name="graphics/tilesets/lof/woodland_indoor.png"/>
+        <file name="graphics/tilesets/lof/woodland_indoor_extra.png"/>
+        <file name="graphics/tilesets/lof/woodland_indoor_x2.png"/>
+        <file name="graphics/tilesets/lof/woodland_indoor_x3.png"/>
+        <file name="graphics/tilesets/lof/woodland_indoor_x3_extra.png"/>
     </atlas>
 
     <atlas name="magic-forest">
diff --git a/maps/017-1.tmx b/maps/017-1.tmx
index 8926a6dc..b5c6f4ef 100644
--- a/maps/017-1.tmx
+++ b/maps/017-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="291" height="266" tilewidth="32" tileheight="32" nextobjectid="20">
+<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="291" height="266" tilewidth="32" tileheight="32" nextobjectid="24">
  <properties>
   <property name="author" value="Jesusalva, Jefferson, Ernando, Diogo, et al: TMW BR v2 Team, TMW-BR Team, TMW2, LoF Team"/>
   <property name="license" value="GPL v2+"/>
@@ -7,12 +7,10 @@
   <property name="minimap" value="graphics/minimaps/017-1.png"/>
   <property name="music" value="Unforgiving_Lands.ogg"/>
   <property name="name" value="Land Of Fire Village"/>
-
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
-
   <property name="overlay1image" value="graphics/images/ambient/darkness2.png"/>
   <property name="overlay1mask" value="2"/>
   <property name="overlay1parallax" value="1.0"/>
@@ -917,7 +915,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="top" width="291" height="266">
+ <layer name="top" width="291" height="266" visible="0">
   <data encoding="csv">
 787,788,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,991,992,993,0,0,0,0,0,0,0,0,991,992,993,0,0,1006,1007,1008,0,0,0,0,991,992,993,0,1006,1007,1008,0,0,0,0,0,0,694,695,696,0,0,0,0,0,0,0,0,0,0,0,946,947,948,0,0,946,947,948,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,771,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,991,992,993,991,992,993,0,0,0,0,0,991,992,993,0,991,992,993,0,0,991,992,993,0,0,0,1006,1007,1008,0,0,0,0,0,0,0,0,1006,1007,1008,0,0,1021,1022,1023,0,0,0,0,1006,1007,1008,0,1021,1022,1023,0,0,0,0,694,709,710,711,712,713,696,0,0,0,0,0,0,879,0,0,961,962,963,0,0,961,962,963,0,879,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,771,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,772,773,0,994,995,996,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1187,7 +1185,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="top1" width="291" height="266">
+ <layer name="top1" width="291" height="266" 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,991,992,993,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,838,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,844,0,0,0,0,0,0,0,0,0,774,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,991,992,993,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,991,992,993,0,0,0,0,0,0,0,0,0,991,992,993,0,0,0,0,991,992,993,0,1006,1007,1008,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1721,1722,0,0,0,1721,1722,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,838,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,844,0,0,0,0,0,0,0,0,0,774,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1457,7 +1455,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="top2" width="291" height="266">
+ <layer name="top2" width="291" height="266" 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,771,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,774,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,991,992,993,991,992,993,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,771,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,774,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1727,7 +1725,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="top3" width="291" height="266">
+ <layer name="top3" width="291" height="266" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -2537,7 +2535,36 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="Warps" visible="0"/>
+ <objectgroup color="#7f7fff" name="Warps">
+  <object id="20" name="Heroes Hold" type="warp" x="5632" y="6304" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="018-2"/>
+    <property name="dest_x" value="63"/>
+    <property name="dest_y" value="105"/>
+   </properties>
+  </object>
+  <object id="21" name="Somber Cave" type="warp" x="5920" y="6304" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="018-3"/>
+    <property name="dest_x" value="114"/>
+    <property name="dest_y" value="24"/>
+   </properties>
+  </object>
+  <object id="22" name="Sincerity" type="warp" x="5728" y="6304" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="018-1"/>
+    <property name="dest_x" value="32"/>
+    <property name="dest_y" value="66"/>
+   </properties>
+  </object>
+  <object id="23" name="Secret Island" type="warp" x="5824" y="6304" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="018-4"/>
+    <property name="dest_x" value="164"/>
+    <property name="dest_y" type="int" value="104"/>
+   </properties>
+  </object>
+ </objectgroup>
  <objectgroup name="Margin" visible="0">
   <object id="13" name="N" type="fixme" x="0" y="0" width="9312" height="640"/>
   <object id="14" name="S" type="fixme" x="0" y="7840" width="9312" height="640"/>
diff --git a/maps/018-1.tmx b/maps/018-1.tmx
index 66f9ad98..e3053824 100644
--- a/maps/018-1.tmx
+++ b/maps/018-1.tmx
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" nextobjectid="8">
+<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" nextobjectid="9">
  <properties>
-  <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="author" value="Pydsigner, Jesusalva, TMW2/LoF Team"/>
+  <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/018-1.png"/>
   <property name="music" value="dariunas_forest.ogg"/>
   <property name="name" value="Sincerity"/>
-
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
-
   <property name="overlay1image" value="graphics/images/ambient/darkness2.png"/>
   <property name="overlay1mask" value="2"/>
   <property name="overlay1parallax" value="1.0"/>
@@ -728,5 +726,12 @@
     <property name="dest_y" value="77"/>
    </properties>
   </object>
+  <object id="8" name="To LoF" type="warp" x="1024" y="2144" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="018-1"/>
+    <property name="dest_x" value="179"/>
+    <property name="dest_y" value="196"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/018-2-1.tmx b/maps/018-2-1.tmx
index c28530b4..ab786709 100644
--- a/maps/018-2-1.tmx
+++ b/maps/018-2-1.tmx
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="51" height="50" tilewidth="32" tileheight="32" nextobjectid="3">
  <properties>
-  <property name="name" value="Heroes' Hold - Castle"/>
-  <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="author" value="Pydsigner, Jesusalva, TMW2/LoF Team"/>
+  <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/018-2-1.png"/>
-
+  <property name="name" value="Heroes' Hold - Castle"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
-
   <property name="overlay1image" value="graphics/images/ambient/darkness2.png"/>
   <property name="overlay1mask" value="2"/>
   <property name="overlay1parallax" value="1.0"/>
@@ -430,12 +428,12 @@
  <objectgroup 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="hh-outside"/>
+    <property name="dest_map" value="018-2"/>
     <property name="dest_x" value="72"/>
     <property name="dest_y" value="65"/>
    </properties>
   </object>
-  <object id="2" name="To Heroes' Hold - Main Cave" type="warp" x="800" y="1056" width="96" height="32">
+  <object id="2" name="To Heroes' Hold - Main Cave" type="warp" x="800" y="864" width="96" height="32">
    <properties>
     <property name="dest_map" value="018-2"/>
     <property name="dest_x" value="0"/>
diff --git a/maps/018-2.tmx b/maps/018-2.tmx
index 213f3c30..4be43638 100644
--- a/maps/018-2.tmx
+++ b/maps/018-2.tmx
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" nextobjectid="23">
  <properties>
-  <property name="minimap" value="graphics/minimaps/018-2.png"/>
-  <property name="music" value="Richard_Wagner_-_Ride_of_the_Valkyries.ogg"/>
-  <property name="name" value="Heroes' Hold - Outside"/>
-  <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="author" value="Pydsigner, Jesusalva, TMW2/LoF Team"/>
+  <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/018-2.png"/>
-
+  <property name="music" value="Richard_Wagner_-_Ride_of_the_Valkyries.ogg"/>
+  <property name="name" value="Heroes' Hold - Outside"/>
   <property name="overlay0image" value="graphics/images/ambient/fog.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.307"/>
   <property name="overlay0scrollY" value="0.211"/>
-
   <property name="overlay1image" value="graphics/images/ambient/darkness2.png"/>
   <property name="overlay1mask" value="2"/>
   <property name="overlay1parallax" value="1.0"/>
@@ -929,9 +926,9 @@
  <objectgroup name="Objects">
   <object id="1" name="To LoF" type="warp" x="2016" y="3392" width="32" height="32">
    <properties>
-    <property name="dest_map" value="000-1"/>
-    <property name="dest_x" value="22"/>
-    <property name="dest_y" value="22"/>
+    <property name="dest_map" value="017-1"/>
+    <property name="dest_x" value="176"/>
+    <property name="dest_y" value="196"/>
    </properties>
   </object>
   <object id="2" name="Spawn Area 1" type="spawn" x="2022" y="948" width="1902" height="704">
diff --git a/maps/018-3.tmx b/maps/018-3.tmx
index 41bc145f..7e165481 100644
--- a/maps/018-3.tmx
+++ b/maps/018-3.tmx
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" nextobjectid="2">
  <properties>
-  <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
-  <property name="name" value="Somber Cave"/>
-  <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="author" value="Pydsigner, Jesusalva, TMW2/LoF Team"/>
+  <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/018-3.png"/>
-
+  <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
+  <property name="name" value="Somber Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
   <property name="overlay0keepratio" value="true"/>
   <property name="overlay0parallax" value="0.0"/>
-
   <property name="overlay1image" value="graphics/images/ambient/darkness2.png"/>
   <property name="overlay1mask" value="2"/>
   <property name="overlay1parallax" value="1.0"/>
@@ -1130,8 +1128,8 @@
   <object id="1" name="Somber Cave Exit" type="warp" x="3648" y="736" width="32" height="32">
    <properties>
     <property name="dest_map" value="017-1"/>
-    <property name="dest_x" value="1"/>
-    <property name="dest_y" value="1"/>
+    <property name="dest_x" value="185"/>
+    <property name="dest_y" value="196"/>
    </properties>
   </object>
   <object id="2" name="Dark Lizard" type="spawn" x="2560" y="2880" width="128" height="128">
diff --git a/maps/018-4.tmx b/maps/018-4.tmx
index 5a719f59..e3d9e57e 100644
--- a/maps/018-4.tmx
+++ b/maps/018-4.tmx
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="180" height="120" tilewidth="32" tileheight="32" nextobjectid="15">
  <properties>
-  <property name="minimap" value="graphics/minimaps/018-4.png"/>
-  <property name="music" value="mystique-forest.ogg"/>
-  <property name="name" value="Secret Island"/>
-  <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
-  <property name="overlay0parallax" value="1.0"/>
-  <property name="overlay0scrollX" value="0.2"/>
-  <property name="overlay0scrollY" value="0.1"/>
-  <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="author" value="Pydsigner, Jesusalva, TMW2/LoF Team"/>
+  <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/000-1.png"/>
-
+  <property name="music" value="mystique-forest.ogg"/>
+  <property name="name" value="Secret Island"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
-
   <property name="overlay1image" value="graphics/images/ambient/darkness2.png"/>
   <property name="overlay1mask" value="2"/>
   <property name="overlay1parallax" value="1.0"/>
@@ -833,7 +826,7 @@
   <object id="1" name="graphics/particles/bonfire.particle.xml" type="PARTICLE_EFFECT" x="2144" y="736" width="32" height="32"/>
   <object id="10" name="To Cave" type="warp" x="3008" y="2848" width="32" height="32">
    <properties>
-    <property name="dest_map" value="si-cave"/>
+    <property name="dest_map" value="018-4-1"/>
     <property name="dest_x" type="int" value="102"/>
     <property name="dest_y" type="int" value="84"/>
    </properties>
@@ -841,8 +834,8 @@
   <object id="3" name="To LoF" type="warp" x="5248" y="3360" width="32" height="32">
    <properties>
     <property name="dest_map" value="017-1"/>
-    <property name="dest_x" type="int" value="0"/>
-    <property name="dest_y" type="int" value="0"/>
+    <property name="dest_x" type="int" value="182"/>
+    <property name="dest_y" type="int" value="196"/>
    </properties>
   </object>
   <object id="9" name="To House" type="warp" x="2336" y="768" width="32" height="32">