Update the maps so they are, at very least functional

4 files changed, 60 insertions, 30 deletions

diff --git a/graphics/tilesets/ship.png b/graphics/tilesets/ship.png
index 37ae38c66..61b14dbcf 100644
--- a/graphics/tilesets/ship.png
+++ b/graphics/tilesets/ship.png
diff --git a/maps.xml b/maps.xml
index 17129cbad..0b50d66f6 100644
--- a/maps.xml
+++ b/maps.xml
@@ -2688,10 +2688,11 @@ Copyright (C) 2018-2022 TMW2: Moubootaur Legends
 	<atlas name="fi-kout">
 		<file name="graphics/tilesets/br/desert3.png"/>
 		<file name="graphics/tilesets/br/woodland_graveyard_ground.png"/>
+		<file name="graphics/tilesets/br/trans_woodland_desert.png"/>
 		<file name="graphics/tilesets/evol/artis-lamps.png"/>
 		<file name="graphics/tilesets/evol/box-x1x2.png"/>
 		<file name="graphics/tilesets/lof/castle_1.png"/>
-		<file name="graphics/tilesets/barbarians_outdoor_x2.png"/>
+		<file name="graphics/tilesets/barbarians_outdoor.png"/>
 		<file name="graphics/tilesets/blockWalls.png"/>
 		<file name="graphics/tilesets/blockWalls2.png"/>
 		<file name="graphics/tilesets/blockWalls_x2.png"/>
@@ -2700,6 +2701,7 @@ Copyright (C) 2018-2022 TMW2: Moubootaur Legends
 		<file name="graphics/tilesets/cave_bilevel.png"/>
 		<file name="graphics/tilesets/cave2_base.png"/>
 		<file name="graphics/tilesets/crypt_x8.png"/>
+		<file name="graphics/tilesets/desert_x5.png"/>
 		<file name="graphics/tilesets/pots_x2.png"/>
 		<file name="graphics/tilesets/rails.png"/>
 		<file name="graphics/tilesets/rails_x2.png"/>
diff --git a/maps/025-2-1.tmx b/maps/025-2-1.tmx
index 0890634d8..18d2a4261 100644
--- a/maps/025-2-1.tmx
+++ b/maps/025-2-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="29">
+<map version="1.8" tiledversion="1.8.0" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="30">
  <properties>
   <property name="background0image" value="graphics/images/spit23loginwallpaper_800x600.png"/>
   <property name="license" value="GPL"/>
@@ -113,8 +113,8 @@
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,22,5,5,5,66,69,50,34,37,37,38,70,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,39,38,5,5,5,5,5,5,5,5,5,5,66,36,37,18,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,22,5,5,5,5,5,66,50,53,53,54,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,55,54,5,5,5,5,5,5,5,5,5,5,5,52,53,34,41,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,22,5,5,5,5,5,66,69,69,70,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,19,37,37,37,37,38,70,5,5,5,5,5,5,5,5,5,5,5,68,69,50,57,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,22,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,39,37,35,53,53,53,53,54,5,5,5,5,5,5,5,5,5,5,5,5,5,5,66,73,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,39,38,5,5,5,5,5,5,5,5,5,20,21,22,5,5,5,5,5,5,5,36,37,41,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,55,53,51,69,69,69,69,70,5,5,5,5,20,21,21,22,5,5,5,5,5,5,5,36,37,41,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
+21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,22,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,39,37,35,62,63,64,53,54,5,5,5,5,5,5,5,5,5,5,5,5,5,5,66,73,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
+21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,39,38,5,5,5,5,5,5,5,5,5,20,21,22,5,5,5,5,5,5,5,36,37,41,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,55,53,51,78,79,80,69,70,5,5,5,5,20,21,21,22,5,5,5,5,5,5,5,36,37,41,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,55,54,5,5,5,5,5,5,5,5,5,20,21,21,22,5,5,5,5,5,5,52,53,57,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,19,37,38,69,67,5,5,5,5,5,5,5,5,5,20,21,21,21,22,5,5,5,5,5,5,52,53,57,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,71,70,5,5,5,5,5,5,5,5,5,20,21,21,22,5,5,5,5,5,5,68,69,36,18,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,39,35,53,54,5,5,5,5,5,5,5,5,5,20,21,21,21,21,21,22,5,5,5,5,5,5,68,69,73,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,22,5,5,5,5,5,5,5,5,20,21,21,21,21,22,5,5,5,5,5,5,5,5,52,34,41,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,55,51,69,70,5,5,5,5,5,5,5,5,5,20,21,21,21,21,21,21,22,5,5,5,5,5,5,5,20,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
@@ -546,7 +546,7 @@
 130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,130,130,130,130,130,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,
 130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,130,130,130,130,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,
 130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,
-130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,0,0,130,130,130,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,130,130,130,130,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,
+130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,0,0,130,130,130,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,130,130,130,0,0,0,0,130,130,130,130,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,
 130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,0,0,130,130,130,130,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,0,0,130,130,130,130,130,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,
 130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,0,0,130,130,130,130,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,0,0,130,130,130,130,130,130,130,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,
 130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,0,130,130,130,130,130,130,0,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,0,0,0,0,0,0,0,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,
@@ -758,6 +758,14 @@
     <property name="dest_y" value="99"/>
    </properties>
   </object>
+  <object id="29" name="To Fortress Island" type="warp" x="2784" y="2848" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="025-4"/>
+    <property name="dest_x" value="27"/>
+    <property name="dest_y" value="91"/>
+    <property name="npc_id" value="SCRIPT"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup color="#ffff00" id="12" name="Spawns" visible="0">
   <object id="17" name="Archant" type="spawn" x="768" y="1952" width="864" height="1824">
diff --git a/maps/025-4.tmx b/maps/025-4.tmx
index 13fd8d1a5..17ec1e583 100644
--- a/maps/025-4.tmx
+++ b/maps/025-4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.0" orientation="orthogonal" renderorder="right-down" width="160" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="50">
+<map version="1.8" tiledversion="1.8.0" orientation="orthogonal" renderorder="right-down" width="160" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="66">
  <properties>
   <property name="author" value="TMW Brazil Team"/>
   <property name="background0image" value="graphics/images/spit23loginwallpaper_800x600.png"/>
@@ -77,7 +77,7 @@
   <image source="../graphics/tilesets/castle1.png" width="544" height="704"/>
  </tileset>
  <tileset firstgid="1676" name="ship_x3" tilewidth="32" tileheight="96" tilecount="5" columns="5">
-  <image source="../graphics/tilesets/ship.png" width="160" height="128"/>
+  <image source="../graphics/tilesets/ship.png" width="160" height="96"/>
  </tileset>
  <tileset firstgid="1681" name="savannah" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/savannah.png" width="512" height="512"/>
@@ -950,9 +950,11 @@
   <object id="32" name="Border" type="fixme" x="4480" y="640" width="640" height="3840"/>
   <object id="33" name="Border" type="fixme" x="640" y="0" width="4480" height="640"/>
   <object id="34" name="Border" type="fixme" x="0" y="0" width="640" height="4480"/>
-  <object id="35" name="1 Back to Cave" type="warp" x="864" y="2880" width="32" height="32">
+  <object id="35" name="Back to Cave" type="warp" x="864" y="2880" width="32" height="32">
    <properties>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="025-2-1"/>
+    <property name="dest_x" value="87"/>
+    <property name="dest_y" value="90"/>
    </properties>
   </object>
   <object id="36" name="To Luminous Cave" type="warp" x="2080" y="2208" width="32" height="32">
@@ -983,60 +985,78 @@
     <property name="dest_y" value="57"/>
    </properties>
   </object>
-  <object id="42" name="Terranite Protector" type="spawn" x="1024" y="1824" width="64" height="64">
+ </objectgroup>
+ <objectgroup id="11" name="Spawns" visible="0">
+  <object id="57" name="Terranite Protector" type="spawn" x="2624" y="640" width="1664" height="1120">
    <properties>
     <property name="death" value="30000"/>
-    <property name="max_beings" value="3"/>
+    <property name="max_beings" value="7"/>
     <property name="monster_id" value="1212"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="43" name="Green Skull Slime" type="spawn" x="1024" y="1760" width="64" height="64">
+  <object id="58" name="Black Skull Slime" type="spawn" x="1504" y="640" width="1120" height="832">
    <properties>
     <property name="death" value="30000"/>
-    <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1405"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="1408"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="44" name="Black Skull Slime" type="spawn" x="1024" y="1888" width="64" height="64">
+  <object id="59" name="Pinkie Suseran" type="spawn" x="640" y="1472" width="1792" height="672">
    <properties>
     <property name="death" value="30000"/>
-    <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1408"/>
+    <property name="max_beings" value="5"/>
+    <property name="monster_id" value="1419"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="45" name="Nightmare Dragon" type="spawn" x="1024" y="1952" width="64" height="64">
+  <object id="60" name="Mandragora" type="spawn" x="640" y="2112" width="832" height="576">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1230"/>
+    <property name="monster_id" value="1423"/>
+    <property name="spawn" value="60000"/>
+   </properties>
+  </object>
+  <object id="61" name="Whirly Bird" type="spawn" x="1568" y="832" width="1152" height="1984">
+   <properties>
+    <property name="death" value="60000"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="1232"/>
+    <property name="spawn" value="90000"/>
+   </properties>
+  </object>
+  <object id="62" name="Gobo Bear" type="spawn" x="2432" y="1472" width="1152" height="672">
+   <properties>
+    <property name="death" value="20000"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="1214"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="46" name="Pinkie Suseran" type="spawn" x="1088" y="2016" width="64" height="64">
+  <object id="63" name="Green Skull Slime" type="spawn" x="640" y="2688" width="1376" height="416">
    <properties>
     <property name="death" value="30000"/>
-    <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1419"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="1405"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="47" name="Mandragora" type="spawn" x="1088" y="2080" width="64" height="64">
+  <object id="64" name="Nightmare Dragon" type="spawn" x="640" y="832" width="1152" height="864">
    <properties>
     <property name="death" value="30000"/>
-    <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1423"/>
+    <property name="max_beings" value="16"/>
+    <property name="monster_id" value="1230"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="48" name="Whirly Bird" type="spawn" x="896" y="1984" width="64" height="64">
+  <object id="65" name="Green Skull Slime" type="spawn" x="1472" y="2144" width="1376" height="608">
    <properties>
-    <property name="death" value="60000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1232"/>
-    <property name="spawn" value="90000"/>
+    <property name="death" value="30000"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="1405"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
  </objectgroup>