From fe1af8fc16d141d87d20f47c34fca88dc38d3e0a Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Sat, 19 Aug 2017 02:14:35 +0200
Subject: Remove the old artis-sewer and rename sewer tilesets into
 artis-sewer.

---
 LICENSE                                |   7 +++----
 graphics/tilesets/artis-sewer-x2x2.png | Bin 0 -> 9345 bytes
 graphics/tilesets/artis-sewer-x3x3.png | Bin 0 -> 13443 bytes
 graphics/tilesets/artis-sewer.png      | Bin 44865 -> 175309 bytes
 graphics/tilesets/sewer-x2x2.png       | Bin 9345 -> 0 bytes
 graphics/tilesets/sewer-x3x3.png       | Bin 13443 -> 0 bytes
 graphics/tilesets/sewer.png            | Bin 175309 -> 0 bytes
 maps.xml                               |  12 ++++++------
 maps/001-3-0.tmx                       |  22 +++++++++++-----------
 maps/001-3-1.tmx                       |   4 ++--
 10 files changed, 22 insertions(+), 23 deletions(-)
 create mode 100644 graphics/tilesets/artis-sewer-x2x2.png
 create mode 100644 graphics/tilesets/artis-sewer-x3x3.png
 delete mode 100644 graphics/tilesets/sewer-x2x2.png
 delete mode 100644 graphics/tilesets/sewer-x3x3.png
 delete mode 100644 graphics/tilesets/sewer.png

diff --git a/LICENSE b/LICENSE
index 1ac27fb5..be120e44 100644
--- a/LICENSE
+++ b/LICENSE
@@ -451,7 +451,9 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/tilesets/artis-market.png (EJlol, IvanMorve, Reid)             (CC BY-SA 3.0)        (-)
     graphics/tilesets/artis-pavement.png (IvanMorve, Reid)                  (CC BY-SA 3.0)        (-)
     graphics/tilesets/artis-pillar-x1x2.png (Reid)                          (CC BY-SA 3.0)        (Kestrel)
-    graphics/tilesets/artis-sewer.png (EJlol, Reid)                         (CC BY-SA 3.0)        (Hal9000)
+    graphics/tilesets/artis-sewer.png (EJlol, Hal9000, Micksha, Reid)       (CC BY-SA 3.0)        (-)
+    graphics/tilesets/artis-sewer-x2x2.png (EJlol, Hal9000, Micksha, Reid)  (CC BY-SA 3.0)        (-)
+    graphics/tilesets/artis-sewer-x3x3.png (EJlol, Hal9000, Micksha, Reid)  (CC BY-SA 3.0)        (-)
     graphics/tilesets/artis-shadows.png (Mikko)                             (CC BY-SA 3.0)        (-)
     graphics/tilesets/artis-windows.png (IvanMorve, Reid)                   (CC BY-SA 3.0)        (Mikko)
     graphics/tilesets/box.png (Crush, Len, Modanung, Reid, Yosuhara)        (CC BY-SA 3.0)        (Alige, Enchilado, Saweres)
@@ -461,9 +463,6 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/tilesets/collision.png (Reid)                                  (CC BY-SA 3.0)        (4144)
     graphics/tilesets/ground.png (Bagzie, IvanMorve, Len, Reid)             (CC BY-SA 3.0)        (Crush)
     graphics/tilesets/level-number.png (Reid)                               (CC BY-SA 3.0)        (-)
-    graphics/tilesets/sewer.png (EJlol, Hal9000, Micksha, Reid)             (CC BY-SA 3.0)        (-)
-    graphics/tilesets/sewer-x2x2.png (EJlol, Hal9000, Micksha, Reid)        (CC BY-SA 3.0)        (-)
-    graphics/tilesets/sewer-x3x3.png (EJlol, Hal9000, Micksha, Reid)        (CC BY-SA 3.0)        (-)
     graphics/tilesets/shadow.png (Reid)                                     (CC BY-SA 3.0)        (Hal9000)
     graphics/tilesets/ship-base.png (Lunovox)                               (GPLv2)               (Hal9000,  Reid, Saci)
     graphics/tilesets/ship-indoor.png (Lunovox)                             (GPLv2)               (Reid, Saci)
diff --git a/graphics/tilesets/artis-sewer-x2x2.png b/graphics/tilesets/artis-sewer-x2x2.png
new file mode 100644
index 00000000..4636964b
Binary files /dev/null and b/graphics/tilesets/artis-sewer-x2x2.png differ
diff --git a/graphics/tilesets/artis-sewer-x3x3.png b/graphics/tilesets/artis-sewer-x3x3.png
new file mode 100644
index 00000000..cad6bcaf
Binary files /dev/null and b/graphics/tilesets/artis-sewer-x3x3.png differ
diff --git a/graphics/tilesets/artis-sewer.png b/graphics/tilesets/artis-sewer.png
index 89dee3c5..b3a2b8b0 100644
Binary files a/graphics/tilesets/artis-sewer.png and b/graphics/tilesets/artis-sewer.png differ
diff --git a/graphics/tilesets/sewer-x2x2.png b/graphics/tilesets/sewer-x2x2.png
deleted file mode 100644
index 4636964b..00000000
Binary files a/graphics/tilesets/sewer-x2x2.png and /dev/null differ
diff --git a/graphics/tilesets/sewer-x3x3.png b/graphics/tilesets/sewer-x3x3.png
deleted file mode 100644
index cad6bcaf..00000000
Binary files a/graphics/tilesets/sewer-x3x3.png and /dev/null differ
diff --git a/graphics/tilesets/sewer.png b/graphics/tilesets/sewer.png
deleted file mode 100644
index b3a2b8b0..00000000
Binary files a/graphics/tilesets/sewer.png and /dev/null differ
diff --git a/maps.xml b/maps.xml
index c2b13854..5ebf7e1f 100644
--- a/maps.xml
+++ b/maps.xml
@@ -160,10 +160,10 @@ Copyright (C) 2012-2017 Evol Online -->
         <atlas name="artis-indoor"/>
     </map>
     <map name="001-3-0.tmx">
-        <atlas name="sewer"/>
+        <atlas name="artis-sewer"/>
     </map>
     <map name="001-3-1.tmx">
-        <atlas name="sewer"/>
+        <atlas name="artis-sewer"/>
     </map>
     <map name="test.tmx">
         <atlas name="artis-indoor"/>
@@ -271,11 +271,11 @@ Copyright (C) 2012-2017 Evol Online -->
         <file name="graphics/tilesets/artis-pillar-x1x2.png"/>
     </atlas>
 
-    <atlas name="sewer">
-        <file name="graphics/tilesets/sewer.png"/>
+    <atlas name="artis-sewer">
+        <file name="graphics/tilesets/artis-sewer.png"/>
         <file name="graphics/tilesets/artis-indoor-cellar.png"/>
-        <file name="graphics/tilesets/sewer-x2x2.png"/>
-        <file name="graphics/tilesets/sewer-x3x3.png"/>
+        <file name="graphics/tilesets/artis-sewer-x2x2.png"/>
+        <file name="graphics/tilesets/artis-sewer-x3x3.png"/>
         <file name="graphics/tilesets/shadow.png"/>
     </atlas>
     
diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx
index 971bac91..baa18d6f 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-3-0.tmx
@@ -7,17 +7,17 @@
   <property name="music" value=""/>
   <property name="name" value="Sewer"/>
  </properties>
- <tileset firstgid="1" name="sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
-  <image source="../graphics/tilesets/sewer.png" width="512" height="512"/>
+ <tileset firstgid="1" name="artis-sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="257" name="artis-indoor-cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="321" name="sewer-x2x2" tilewidth="32" tileheight="32" tilecount="8" columns="4">
-  <image source="../graphics/tilesets/sewer-x2x2.png" width="128" height="64"/>
+ <tileset firstgid="321" name="artis-sewer-x2x2" tilewidth="32" tileheight="32" tilecount="8" columns="4">
+  <image source="../graphics/tilesets/artis-sewer-x2x2.png" width="128" height="64"/>
  </tileset>
- <tileset firstgid="329" name="sewer-x3x3" tilewidth="32" tileheight="32" tilecount="36" columns="6">
-  <image source="../graphics/tilesets/sewer-x3x3.png" width="192" height="192"/>
+ <tileset firstgid="329" name="artis-sewer-x3x3" tilewidth="32" tileheight="32" tilecount="36" columns="6">
+  <image source="../graphics/tilesets/artis-sewer-x3x3.png" width="192" height="192"/>
  </tileset>
  <tileset firstgid="365" name="artis-accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
@@ -1691,11 +1691,11 @@
     <property name="dest_y" value="130"/>
    </properties>
   </object>
-  <object id="99" name="graphics/particles/sewer-pipe.xml" type="particle_effect" x="3520" y="1888" width="32" height="32"/>
-  <object id="100" name="graphics/particles/sewer-pipe.xml" type="particle_effect" x="6304" y="2432" width="32" height="32"/>
-  <object id="101" name="graphics/particles/sewer-pipe.xml" type="particle_effect" x="4320" y="4000" width="32" height="32"/>
-  <object id="102" name="graphics/particles/sewer-pipe.xml" type="particle_effect" x="1536" y="4000" width="32" height="32"/>
-  <object id="103" name="graphics/particles/sewer-pipe.xml" type="particle_effect" x="5056" y="1632" width="32" height="32"/>
+  <object id="99" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="3520" y="1888" width="32" height="32"/>
+  <object id="100" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="6304" y="2432" width="32" height="32"/>
+  <object id="101" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="4320" y="4000" width="32" height="32"/>
+  <object id="102" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="1536" y="4000" width="32" height="32"/>
+  <object id="103" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="5056" y="1632" width="32" height="32"/>
   <object id="104" name="Ratto" type="spawn" x="5536" y="960" width="192" height="160">
    <properties>
     <property name="death" value="30000"/>
diff --git a/maps/001-3-1.tmx b/maps/001-3-1.tmx
index c382a97e..9b141b19 100644
--- a/maps/001-3-1.tmx
+++ b/maps/001-3-1.tmx
@@ -7,8 +7,8 @@
   <property name="music" value=""/>
   <property name="name" value="Rivercave"/>
  </properties>
- <tileset firstgid="1" name="sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
-  <image source="../graphics/tilesets/sewer.png" width="512" height="512"/>
+ <tileset firstgid="1" name="artis-sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="257" name="artis-indoor-cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
-- 
cgit v1.2.3-60-g2f50