add La Marine and some others fix, hope everything will merge without bugs

1 files changed, 4 insertions, 9 deletions

diff --git a/maps/003-1.tmx b/maps/003-1.tmx
index d53cba13..ce70b9af 100644
--- a/maps/003-1.tmx
+++ b/maps/003-1.tmx
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="140" height="180" tilewidth="32" tileheight="32" nextobjectid="91">
+<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="140" height="180" tilewidth="32" tileheight="32" infinite="0" nextobjectid="91">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/003-1.png"/>
-  <property name="music" value="bartk_adventure.ogg"/>
+  <property name="music" value="bartk - the adventure begins.ogg"/>
   <property name="name" value="Tulimshar"/>
   <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"/>
-  <property name="overlay1scrollX" value="0.2"/>
-  <property name="overlay1scrollY" value="0.1"/>
  </properties>
  <tileset firstgid="1" name="Base" tilewidth="32" tileheight="32" tilecount="220" columns="22">
   <image source="../graphics/tilesets/ship-base.png" width="704" height="320"/>
@@ -329,8 +324,8 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,0,0,0,0,0,0,0,0,897,0,0,973,0,0,0,1442,1429,1429,1429,1429,1429,1429,1429,1443,0,0,0,1446,0,1444,0,0,0,0,0,0,0,1442,1430,2385,2390,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,1446,0,0,0,0,1444,0,0,0,0,0,0,0,0,0,0,1444,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1460,1427,0,0,0,0,0,0,0,907,0,0,989,908,986,0,0,0,0,0,0,0,0,0,0,0,0,0,1446,0,1444,0,0,0,0,0,0,0,0,1446,2396,2401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,1446,0,0,0,0,1444,0,0,0,0,1366,0,1360,1361,1362,0,1444,0,0,0,0,0,0,0,0,1934,1935,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2404,2399,2383,1444,0,0,0,0,0,0,0,0,0,0,1005,0,0,986,0,0,0,0,0,0,0,891,0,0,1426,1461,1462,0,1444,0,0,0,0,0,0,0,0,1446,2396,2401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,1446,0,0,0,0,1444,0,0,0,1211,0,0,1376,1377,1378,1213,1444,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,0,0,0,0,0,0,0,0,0,0,1005,0,0,0,986,0,0,0,0,0,0,0,0,0,1446,1712,1713,0,1460,1461,1427,0,0,0,0,882,0,1446,2411,2385,2390,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,1446,0,0,0,0,1444,0,0,0,0,0,0,0,0,0,0,1444,0,0,0,0,0,0,0,0,0,0,0,0,1934,1935,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,0,0,0,0,0,0,0,0,0,0,1005,0,0,0,0,986,0,0,0,0,0,0,0,0,1446,1728,1729,0,0,0,1460,1427,0,0,0,0,0,1442,1430,2396,2401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,1446,0,0,0,0,1444,0,0,0,0,0,0,0,0,0,0,1444,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,0,0,0,0,0,0,0,0,0,0,1005,0,0,0,986,0,0,0,0,0,0,0,0,0,1446,0,0,0,1460,1461,1427,0,0,0,0,882,0,1446,2411,2385,2390,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,1446,0,0,0,0,1444,0,0,0,0,0,0,0,0,0,0,1444,0,0,0,0,0,0,0,0,0,0,0,0,1934,1935,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,0,0,0,0,0,0,0,0,0,0,1005,0,0,0,0,986,0,0,0,0,0,0,0,0,1446,0,0,0,0,0,1460,1427,0,0,0,0,0,1442,1430,2396,2401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,1446,0,0,0,0,1444,0,0,0,0,0,0,0,0,0,0,1444,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1460,1427,0,0,0,0,0,0,0,0,0,1005,0,0,0,0,0,973,0,0,0,0,0,0,0,1442,1429,1429,1429,1430,0,0,1444,0,0,0,0,0,0,1446,2396,2401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,1446,0,0,0,0,1444,0,0,0,0,0,0,0,0,0,0,1444,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1934,1935,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,0,1444,0,0,0,0,0,0,0,0,0,1005,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,1442,1430,0,1444,0,0,0,0,0,0,1446,2396,2401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,1446,0,0,0,0,1444,1131,1132,1132,1132,1132,1132,1132,1132,1132,1133,1444,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2404,2399,2383,1444,0,0,0,0,0,0,0,0,0,1037,0,1039,0,0,0,973,0,0,770,0,0,0,0,0,0,0,0,0,1446,0,1444,0,0,0,884,0,0,1446,2411,2385,2390,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2403,2398,1444,1446,0,0,0,0,1444,1163,0,0,0,0,0,0,0,0,1165,1444,0,0,0,0,0,0,1934,1935,0,0,0,0,0,0,0,0,0,0,0,0,0,0,