Merge branch 'master' of gitlab.com:TMW2/clientdata

Conflicts:
	maps/007-1.tmx

1 files changed, 36 insertions, 173 deletions

diff --git a/maps.xml b/maps.xml
index 83d3fffb..d5cbbec4 100644
--- a/maps.xml
+++ b/maps.xml
@@ -1,186 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144, gumi, Reid, Saulc
-Copyright (C) 2012-2017 Evol Online -->
+Copyright (C) 2018 TMW2 -->
 
 <maps>
+
+    <!-- EVOL -->
     <map name="000-0-0.tmx">
         <atlas name="ship"/>
     </map>
-    <map name="000-0-1.tmx">
-        <atlas name="ship"/>
-    </map>
     <map name="000-0.tmx">
         <atlas name="island"/>
     </map>
     <map name="000-1.tmx">
         <atlas name="island"/>
     </map>
-    <map name="000-1-1.tmx">
-        <atlas name="island"/>
-    </map>
-    <map name="000-2-0.tmx">
-        <atlas name="ship"/>
-    </map>
-    <map name="000-2-1.tmx">
-        <atlas name="ship"/>
-    </map>
-    <map name="000-2-2.tmx">
-        <atlas name="ship"/>
-    </map>
-    <map name="000-2-3.tmx">
-        <atlas name="ship"/>
-    </map>
-    <map name="000-2-4.tmx">
-        <atlas name="ship"/>
-    </map>
-    <map name="001-1.tmx">
-        <atlas name="artis-outdoor"/>
-    </map>
-    <map name="001-2-0.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-1.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-2.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-3.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-4.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-5.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-6.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-7.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-8.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-9.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-10.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-11.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-12.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-13.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-14.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-15.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-16.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-17.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-18.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-19.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-20.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-21.tmx">
-        <atlas name="ship"/>
-    </map>
-    <map name="001-2-22.tmx">
+    <map name="002-1.tmx">
         <atlas name="ship"/>
     </map>
-    <map name="001-2-23.tmx">
-        <atlas name="ship"/>
-    </map>
-    <map name="001-2-24.tmx">
-        <atlas name="ship"/>
-    </map>
-    <map name="001-2-25.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-26.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-27.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-28.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-29.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-30.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-31.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-32.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-33.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-34.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-35.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-36.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-37.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-38.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-39.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-40.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-41.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-2-42.tmx">
-        <atlas name="artis-indoor"/>
-    </map>
-    <map name="001-3-0.tmx">
-        <atlas name="artis-sewer"/>
-    </map>
-    <map name="001-3-1.tmx">
-        <atlas name="artis-sewer"/>
-    </map>
-        <map name="002-1.tmx">
-        <atlas name="ship"/>
-    </map>
-        <map name="002-2.tmx">
+    <map name="002-2.tmx">
         <atlas name="ship"/>
     </map>    
-        <map name="002-3.tmx">
+    <map name="002-3.tmx">
         <atlas name="ship"/>
     </map>
-        <map name="002-4.tmx">
+    <map name="002-4.tmx">
         <atlas name="ship"/>
     </map>    
     <map name="test.tmx">
@@ -461,8 +304,12 @@ Copyright (C) 2012-2017 Evol Online -->
     </map>
     <map name="004-2.tmx">
         <atlas name="desert"/>
-    </map>  
-    
+    </map>
+    <map name="007-1.tmx">
+        <atlas name="mine"/>
+    </map>
+
+
     <atlas name="candor">
         <file name="graphics/tilesets/trans_woodland_desert.png"/>
         <file name="graphics/tilesets/docks_x2.png"/>
@@ -486,6 +333,7 @@ Copyright (C) 2012-2017 Evol Online -->
         <file name="graphics/tilesets/woodland_x3.png"/>
         <file name="graphics/tilesets/ship-flags-x3x2.png"/>
     </atlas>
+
     <atlas name="candor-indoor">
         <file name="graphics/tilesets/woodland-indoor.png"/>
         <file name="graphics/tilesets/desert_castle2.png"/>
@@ -505,7 +353,8 @@ Copyright (C) 2012-2017 Evol Online -->
         <file name="graphics/tilesets/inn_x3.png"/>
         <file name="graphics/tilesets/wood_lab.png"/>
         <file name="graphics/tilesets/ship-glags-x3x2.png"/>
-    </atlas>    
+    </atlas>
+    
     <atlas name="tulimshar">
         <file name="graphics/tilesets/ship-base.png"/>
         <file name="graphics/tilesets/docks.png"/>
@@ -536,13 +385,27 @@ Copyright (C) 2012-2017 Evol Online -->
         <file name="graphics/tilesets/desert_city_indoors.png"/>
         <file name="graphics/tilesets/desert_city_x2.png"/>
         <file name="graphics/tilesets/inn.png"/>
+        <file name="graphics/tilesets/inn_x2.png"/>    
         <file name="graphics/tilesets/inn_x3.png"/>
         <file name="graphics/tilesets/woodland_indoor.png"/>
-        
-    </atlas>      
+    </atlas>
+
     <atlas name="cave">
         <file name="graphics/tilesets/cave.png"/>
-    </atlas>         
+    </atlas>
+
+    <atlas name="mine">
+        <file name="graphics/tilesets/cave2.png"/>
+        <file name="graphics/tilesets/cave2_x2.png"/>
+        <file name="graphics/tilesets/cave2_bilevel.png"/>
+        <file name="graphics/tilesets/cave2_sewer_mine.png"/>
+        <file name="graphics/tilesets/cave2_transistions.png"/>
+        <file name="graphics/tilesets/woodland_indoor.png"/>
+        <file name="graphics/tilesets/woodland_indoor_x2.png"/>
+        <file name="graphics/tilesets/barbarians_outdoor.png"/>
+        <file name="graphics/tilesets/cave2_sewer_mine_x2.png"/>
+    </atlas>
+
     <atlas name="tulimshar-indoor">
         <file name="graphics/tilesets/woodland-indoor.png"/>
         <file name="graphics/tilesets/inn2.png"/>
@@ -559,8 +422,8 @@ Copyright (C) 2012-2017 Evol Online -->
         <file name="graphics/tilesets/woodland_indoor.png"/>
         <file name="graphics/tilesets/cave2_sewer_mine.png"/>
         <file name="graphics/tilesets/.png"/>
-             
-    </atlas>      
+    </atlas>
+
     <atlas name="desert">
         <file name="graphics/tilesets/trans_woodland_desert.png"/>
         <file name="graphics/tilesets/desert2.png"/> 
@@ -578,6 +441,6 @@ Copyright (C) 2012-2017 Evol Online -->
         <file name="graphics/tilesets/water3.png"/>
         <file name="graphics/tilesets/desert_city.png"/>
         <file name="graphics/tilesets/desert_castle.png"/>
-        
     </atlas>      
+
 </maps>