From 4203652b65c5b28dfc9f9787b537767ea950d23a Mon Sep 17 00:00:00 2001
From: Alige <aligetmw@hotmail.fr>
Date: Sat, 9 Mar 2013 00:50:22 +0400
Subject: Renamed 2 tilesets and fixed few issues in the LICENSE and maps.xml
 files.

---
 LICENSE                         |  17 +++++++++--------
 graphics/tilesets/ship-base.png | Bin 0 -> 170994 bytes
 graphics/tilesets/ship-mast.png | Bin 0 -> 137590 bytes
 graphics/tilesets/ship_base.png | Bin 170994 -> 0 bytes
 graphics/tilesets/ship_mast.png | Bin 137590 -> 0 bytes
 maps.xml                        |  18 +++++++++---------
 maps/000-0.tmx                  |   4 ++--
 maps/000-1.tmx                  |   4 ++--
 8 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 graphics/tilesets/ship-base.png
 create mode 100644 graphics/tilesets/ship-mast.png
 delete mode 100644 graphics/tilesets/ship_base.png
 delete mode 100644 graphics/tilesets/ship_mast.png

diff --git a/LICENSE b/LICENSE
index 7828e70f..abdbff3d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -142,7 +142,7 @@ http://www.gnu.org/licenses/gpl-2.0.html
 	graphics/sprites/hairstyles/hairstyle09.png (Saphy)			(GPLv2)
 	graphics/sprites/hairstyles/hairstyle10.png (Saphy)			(GPLv2)
 	graphics/sprites/hairstyles/hairstyle11.png (Saphy)			(GPLv2)
-	graphics/sprites/hairstyles/hairstyle12.png (????)			(GPLv2)
+	graphics/sprites/hairstyles/hairstyle12.png (Modanung)			(CC BY-SA 3.0)
 	graphics/sprites/hairstyles/hairstyle13.png (Modanung)			(CC BY-SA 3.0)
 	graphics/sprites/hairstyles/hairstyle14.png (????)			(GPLv2)
 	graphics/sprites/hairstyles/hairstyle15.png (Slave)			(GPLv2)
@@ -212,19 +212,20 @@ http://www.gnu.org/licenses/gpl-2.0.html
 # Tilesets
 	graphics/tilesets/accessories.png (Hal9000, Reid)			(CC BY-SA 3.0)
 	graphics/tilesets/box.png (Crush, Len, Modanung, Reid, Yosuhara)	(GPLv2)
-	graphics/tilesets/box_x2.png (Len, Reid)				(CC BY-SA 3.0)
+	graphics/tilesets/box-x1x2.png (Len, Reid)				(CC BY-SA 3.0)
 	graphics/tilesets/candle.png (Crush, Reid)				(CC BY-SA 3.0)
 	graphics/tilesets/carpet.png (Irukard, Reid)				(GPLv2)
 	graphics/tilesets/collision.png (Reid)					(CC BY-SA 3.0)
 	graphics/tilesets/ground.png (Crush, FotherJ, IvanMorve, Len, Reid)	(CC BY-SA 3.0)
 	graphics/tilesets/shadow.png (Hal9000, Reid)				(CC BY-SA 3.0)
-	graphics/tilesets/ship_base.png (TMW_BR(????), Hal9000, Reid)		(GPLv2)
+	graphics/tilesets/ship-base.png (TMW_BR(????), Hal9000, Reid)		(GPLv2)
 	graphics/tilesets/ship-indoor.png (Lunovox, Saci, Reid)			(GPLv2)
-	graphics/tilesets/ship-indoor_x4.png (TMW_BR(????), Reid)		(CC BY-SA 3.0)
-	graphics/tilesets/ship_mast.png (TMW_BR(????), Hal9000, Reid)		(GPLv2)
-	graphics/tilesets/ship-sunlight_x5.png (Len, Reid)			(CC BY-SA 3.0)
-	graphics/tilesets/tree_x3.png (Hal9000)					(CC BY-SA 3.0)
-	graphics/tilesets/tree_x4.png (????, Len, Reid, Saphy)			(GPLv2)
+	graphics/tilesets/ship-indoor-x2x4.png (TMW_BR(????), Reid)		(CC BY-SA 3.0)
+	graphics/tilesets/ship-mast.png (TMW_BR(????), Hal9000, Reid)		(GPLv2)
+	graphics/tilesets/ship-sunlight-x1x5.png (Len, Reid)			(CC BY-SA 3.0)
+	graphics/tilesets/tree-x3x3.png (Hal9000)				(CC BY-SA 3.0)
+	graphics/tilesets/tree-x3x4.png (????, Len, Modanung Reid, Saphy)	(GPLv2)
+	graphics/tilesets/tree-x4x5.png (????, Reid)				(GPLv2)
 	graphics/tilesets/village-indoor2.png (Crush, Reid, Yosuhara)		(GPLv2)
 	graphics/tilesets/water.png (Len, Reid)					(CC BY-SA 3.0)
 
diff --git a/graphics/tilesets/ship-base.png b/graphics/tilesets/ship-base.png
new file mode 100644
index 00000000..784c3e73
Binary files /dev/null and b/graphics/tilesets/ship-base.png differ
diff --git a/graphics/tilesets/ship-mast.png b/graphics/tilesets/ship-mast.png
new file mode 100644
index 00000000..1ffa0360
Binary files /dev/null and b/graphics/tilesets/ship-mast.png differ
diff --git a/graphics/tilesets/ship_base.png b/graphics/tilesets/ship_base.png
deleted file mode 100644
index 784c3e73..00000000
Binary files a/graphics/tilesets/ship_base.png and /dev/null differ
diff --git a/graphics/tilesets/ship_mast.png b/graphics/tilesets/ship_mast.png
deleted file mode 100644
index 1ffa0360..00000000
Binary files a/graphics/tilesets/ship_mast.png and /dev/null differ
diff --git a/maps.xml b/maps.xml
index be2bb33a..4a0fc436 100644
--- a/maps.xml
+++ b/maps.xml
@@ -3,13 +3,13 @@
 Copyright (C) 2012 Evol Online -->
 <maps>
     <map name="000-0.tmx">
-        <atlas name="000-1"/>
+        <atlas name="island"/>
     </map>
     <map name="000-0-0.tmx">
         <atlas name="ship"/>
     </map>
     <map name="000-1.tmx">
-        <atlas name="000-1"/>
+        <atlas name="island"/>
     </map>
     <map name="000-2-0.tmx">
         <atlas name="ship"/>
@@ -26,20 +26,20 @@ Copyright (C) 2012 Evol Online -->
     <map name="000-2-3.tmx">
         <atlas name="ship"/>
     </map>
-    <atlas name="000-1">
+    <atlas name="island">
         <file name="graphics/tilesets/accessory.png"/>
         <file name="graphics/tilesets/box.png"/>
-        <file name="graphics/tilesets/box-x1-x2.png"/>
+        <file name="graphics/tilesets/box-x1x2.png"/>
         <file name="graphics/tilesets/ground.png"/>
-        <file name="graphics/tilesets/ship_base.png"/>
-        <file name="graphics/tilesets/ship_mast.png"/>
-        <file name="graphics/tilesets/tree_x3x3.png"/>
-        <file name="graphics/tilesets/tree_x3x4.png"/>
+        <file name="graphics/tilesets/ship-base.png"/>
+        <file name="graphics/tilesets/ship-mast.png"/>
+        <file name="graphics/tilesets/tree-x3x3.png"/>
+        <file name="graphics/tilesets/tree-x3x4.png"/>
         <file name="graphics/tilesets/water.png"/>
     </atlas>
     <atlas name="ship">
         <file name="graphics/tilesets/box.png"/>
-        <file name="graphics/tilesets/box-x1-x2.png"/>
+        <file name="graphics/tilesets/box-x1x2.png"/>
         <file name="graphics/tilesets/candle.png"/>
         <file name="graphics/tilesets/carpet.png"/>
         <file name="graphics/tilesets/shadow.png"/>
diff --git a/maps/000-0.tmx b/maps/000-0.tmx
index cf9b47d3..751c5338 100644
--- a/maps/000-0.tmx
+++ b/maps/000-0.tmx
@@ -17,10 +17,10 @@
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/water-raging.tsx"/>
  <tileset firstgid="241" name="Ship Base" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/ship_base.png" width="704" height="320"/>
+  <image source="../graphics/tilesets/ship-base.png" width="704" height="320"/>
  </tileset>
  <tileset firstgid="461" name="Ship Mast" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/ship_mast.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/ship-mast.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="717" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
diff --git a/maps/000-1.tmx b/maps/000-1.tmx
index 90e9d661..d7a96e8e 100644
--- a/maps/000-1.tmx
+++ b/maps/000-1.tmx
@@ -9,10 +9,10 @@
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/water-calm.tsx"/>
  <tileset firstgid="241" name="Ship Base" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/ship_base.png" width="704" height="320"/>
+  <image source="../graphics/tilesets/ship-base.png" width="704" height="320"/>
  </tileset>
  <tileset firstgid="461" name="Ship Mast" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/ship_mast.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/ship-mast.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="717" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
-- 
cgit v1.2.3-70-g09d2