Commit more map property fixes, and some other stuff

24 files changed, 37 insertions, 24 deletions

diff --git a/maps/001-2.tmx b/maps/001-2.tmx
index c4f8f559..55c28366 100644
--- a/maps/001-2.tmx
+++ b/maps/001-2.tmx
@@ -3,7 +3,7 @@
 <map version="1.0" orientation="orthogonal" width="160" height="100" tilewidth="32" tileheight="32">
  <properties>
   <property name="music" value="The Mana World - Snow Village.ogg"/>
-  <property name="name" value="Tulimshar indoor"/>
+  <property name="name" value="Tulimshar"/>
  </properties>
  <tileset name="INN Tilleset" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png"/>
diff --git a/maps/002-1.tmx b/maps/002-1.tmx
index db19aad4..b983e46c 100644
--- a/maps/002-1.tmx
+++ b/maps/002-1.tmx
@@ -2,9 +2,9 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="136" height="128" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/minimaps/002-1"/>
+  <property name="minimap" value="graphics/minimaps/002-1.png"/>
   <property name="music" value="Faith.ogg"/>
-  <property name="name" value="Sandstorm, south of Tulimshar"/>
+  <property name="name" value="Sandstorm"/>
   <property name="overlay0image" value="graphics/images/ambient/sandstorm.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="4"/>
diff --git a/maps/002-3.tmx b/maps/002-3.tmx
index c21b6e9f..03686e96 100644
--- a/maps/002-3.tmx
+++ b/maps/002-3.tmx
@@ -4,7 +4,7 @@
  <properties>
   <property name="minimap" value="graphics/minimaps/002-3.png"/>
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
-  <property name="name" value="Desert mines, level 1"/>
+  <property name="name" value="Desert mines"/>
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
  </properties>
  <tileset name="cave" firstgid="1" tilewidth="32" tileheight="32">
diff --git a/maps/002-4.tmx b/maps/002-4.tmx
index 85dea73c..6d834da4 100644
--- a/maps/002-4.tmx
+++ b/maps/002-4.tmx
@@ -2,9 +2,9 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="128" height="128" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/minimaps/002-4"/>
+  <property name="minimap" value="graphics/minimaps/002-4.png"/>
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
-  <property name="name" value="Desert mines, level 2"/>
+  <property name="name" value="Desert mines"/>
  </properties>
  <tileset name="cave" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" trans="ff00ff"/>
diff --git a/maps/003-1.tmx b/maps/003-1.tmx
index d967137d..af7f5c8e 100644
--- a/maps/003-1.tmx
+++ b/maps/003-1.tmx
@@ -2,9 +2,9 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="190" height="138" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/minimaps/003-1"/>
+  <property name="minimap" value="graphics/minimaps/003-1.png"/>
   <property name="music" value="Faith.ogg"/>
-  <property name="name" value="Beach leading to woodlands"/>
+  <property name="name" value="Beach"/>
  </properties>
  <tileset name="Desert1" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png"/>
diff --git a/maps/004-1.tmx b/maps/004-1.tmx
index 56c941f5..0fd1bf36 100644
--- a/maps/004-1.tmx
+++ b/maps/004-1.tmx
@@ -4,7 +4,7 @@
  <properties>
   <property name="minimap" value="graphics/minimaps/004-1.png"/>
   <property name="music" value="Faith.ogg"/>
-  <property name="name" value="Beach west of Tulimshar"/>
+  <property name="name" value="Beach"/>
  </properties>
  <tileset name="Desert1" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png"/>
diff --git a/maps/006-3.tmx b/maps/006-3.tmx
index 33f367fd..d943984a 100644
--- a/maps/006-3.tmx
+++ b/maps/006-3.tmx
@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="150" height="150" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/minimaps/006-1"/>
+  <property name="minimap" value="graphics/minimaps/006-1.png"/>
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
   <property name="name" value="Desert mountain caves"/>
  </properties>
diff --git a/maps/007-1.tmx b/maps/007-1.tmx
index e227a1d0..5a8a24df 100644
--- a/maps/007-1.tmx
+++ b/maps/007-1.tmx
@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="144" height="124" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/minimaps/007-1"/>
+  <property name="minimap" value="graphics/minimaps/007-1.png"/>
   <property name="music" value="The Mana World - The Forest.ogg"/>
   <property name="name" value="Woodland"/>
   <property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
diff --git a/maps/009-2.tmx b/maps/009-2.tmx
index c743197d..2743e93f 100644
--- a/maps/009-2.tmx
+++ b/maps/009-2.tmx
@@ -3,7 +3,7 @@
 <map version="1.0" orientation="orthogonal" width="200" height="120" tilewidth="32" tileheight="32">
  <properties>
   <property name="music" value="Magick - Real.ogg"/>
-  <property name="name" value="Tulimshar indoor"/>
+  <property name="name" value="Hurnscald"/>
  </properties>
  <tileset name="Woodland indoor" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png"/>
diff --git a/maps/012-3.tmx b/maps/012-3.tmx
index 50722dc7..b50a1ede 100644
--- a/maps/012-3.tmx
+++ b/maps/012-3.tmx
@@ -4,7 +4,7 @@
  <properties>
   <property name="minimap" value="graphics/minimaps/012-3.png"/>
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
-  <property name="name" value="North woodland caves"/>
+  <property name="name" value="Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
  </properties>
  <tileset name="Cave" firstgid="1" tilewidth="32" tileheight="32">
diff --git a/maps/013-1.tmx b/maps/013-1.tmx
index 41cffee9..295ad7f4 100644
--- a/maps/013-1.tmx
+++ b/maps/013-1.tmx
@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="154" height="124" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_28-1.png"/>
+  <property name="minimap" value="graphics/minimaps/013-1.png"/>
   <property name="music" value="Magick - Small grass.ogg"/>
   <property name="name" value="Woodland hills"/>
   <property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
diff --git a/maps/013-3.tmx b/maps/013-3.tmx
index 36fe84c7..f6ab93ad 100644
--- a/maps/013-3.tmx
+++ b/maps/013-3.tmx
@@ -1,6 +1,11 @@
 <?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="200" height="200" tilewidth="32" tileheight="32">
+ <properties>
+  <property name="minimap" value="graphics/minimaps/013-3.png"/>
+  <property name="music" value=" finalman_and_yakslem-cavesong.ogg"/>
+  <property name="name" value="Cave"/>
+ </properties>
  <tileset name="Cave" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png"/>
  </tileset>
diff --git a/maps/014-1.tmx b/maps/014-1.tmx
index fff8f7bf..ea6315fb 100644
--- a/maps/014-1.tmx
+++ b/maps/014-1.tmx
@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="140" height="120" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_29-1.png"/>
+  <property name="minimap" value="graphics/minimaps/014-1.png"/>
   <property name="music" value="The Mana World - The Forest.ogg"/>
   <property name="name" value="Woodland"/>
   <property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
diff --git a/maps/014-3.tmx b/maps/014-3.tmx
index 5bc6e228..1a7ffb02 100644
--- a/maps/014-3.tmx
+++ b/maps/014-3.tmx
@@ -2,8 +2,9 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="140" height="200" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_30-1.png"/>
+  <property name="minimap" value="graphics/minimaps/014-3.png"/>
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
+  <property name="name" value="Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
  </properties>
  <tileset name="Cave" firstgid="1" tilewidth="32" tileheight="32">
diff --git a/maps/015-1.tmx b/maps/015-1.tmx
index a0a29bc9..24f0ad36 100644
--- a/maps/015-1.tmx
+++ b/maps/015-1.tmx
@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="140" height="120" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_31-1.png"/>
+  <property name="minimap" value="graphics/minimaps/015-1.png"/>
   <property name="music" value="The Mana World - The Forest.ogg"/>
   <property name="name" value="Woodland"/>
   <property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
diff --git a/maps/016-1.tmx b/maps/016-1.tmx
index cc74aec2..ef90bd26 100644
--- a/maps/016-1.tmx
+++ b/maps/016-1.tmx
@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="140" height="120" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_32-1.png"/>
+  <property name="minimap" value="graphics/minimaps/016-1.png"/>
   <property name="music" value="The Mana World - The Forest.ogg"/>
   <property name="name" value="Woodland"/>
   <property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
diff --git a/maps/017-1.tmx b/maps/017-1.tmx
index 55d1e68b..50f6e182 100644
--- a/maps/017-1.tmx
+++ b/maps/017-1.tmx
@@ -2,8 +2,9 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="154" height="124" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_33-1.png"/>
+  <property name="minimap" value="graphics/minimaps/017-1.png"/>
   <property name="music" value="Magick - Small grass.ogg"/>
+  <property name="name" value="Woodland hills"/>
   <property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
diff --git a/maps/018-1.tmx b/maps/018-1.tmx
index e1c31eab..889b9c25 100644
--- a/maps/018-1.tmx
+++ b/maps/018-1.tmx
@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="200" height="120" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap/018-1.png"/>
+  <property name="minimap" value="graphics/minimaps/018-1.png"/>
   <property name="music" value="The Mana World - The Forest.ogg"/>
   <property name="name" value="Woodland mining camp"/>
   <property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
diff --git a/maps/018-2.tmx b/maps/018-2.tmx
index 3d383b5d..8e71f636 100644
--- a/maps/018-2.tmx
+++ b/maps/018-2.tmx
@@ -2,6 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="146" height="70" tilewidth="32" tileheight="32">
  <properties>
+  <property name="music" value="Magick - Real.ogg"/>
   <property name="name" value="Woodland minning camp"/>
  </properties>
  <tileset name="Woodland Indoor" firstgid="1" tilewidth="32" tileheight="32">
diff --git a/maps/018-3.tmx b/maps/018-3.tmx
index d5e9e7f2..a4b85720 100644
--- a/maps/018-3.tmx
+++ b/maps/018-3.tmx
@@ -1,6 +1,11 @@
 <?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="200" height="200" tilewidth="32" tileheight="32">
+ <properties>
+  <property name="minimap" value="graphics/minimaps/018-3.png"/>
+  <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
+  <property name="name" value="Cave"/>
+ </properties>
  <tileset name="Cave" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png"/>
  </tileset>
diff --git a/maps/019-1.tmx b/maps/019-1.tmx
index a5fc607c..9c24851f 100644
--- a/maps/019-1.tmx
+++ b/maps/019-1.tmx
@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="138" height="128" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_10-1.png"/>
+  <property name="minimap" value="graphics/minimaps/019-1.png"/>
   <property name="music" value="The Mana World - Snow Village.ogg"/>
   <property name="name" value="Snow field"/>
  </properties>
diff --git a/maps/020-1.tmx b/maps/020-1.tmx
index 32248392..c2868888 100644
--- a/maps/020-1.tmx
+++ b/maps/020-1.tmx
@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="128" height="148" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_11-1.png"/>
+  <property name="minimap" value="graphics/minimaps/020-1.png"/>
   <property name="music" value="The Mana World - Snow Village.ogg"/>
  </properties>
  <tileset name="snow" firstgid="1" tilewidth="32" tileheight="32">
diff --git a/maps/020-3.tmx b/maps/020-3.tmx
index f5a10c2b..8f47b6e5 100644
--- a/maps/020-3.tmx
+++ b/maps/020-3.tmx
@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="80" height="80" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_12-1.png"/>
+  <property name="minimap" value="graphics/minimaps/020-3.png"/>
   <property name="music" value="The Mana World - Snow Village.ogg"/>
   <property name="name" value="Ice cave"/>
  </properties>
diff --git a/maps/020-4.tmx b/maps/020-4.tmx
index 6eb1f178..fa1a2964 100644
--- a/maps/020-4.tmx
+++ b/maps/020-4.tmx
@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="100" height="100" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_21-1.png"/>
+  <property name="minimap" value="graphics/minimaps/020-4.png"/>
   <property name="music" value="The Mana World - Snow Village.ogg"/>
   <property name="name" value="Ice cave"/>
  </properties>