diff options
author | Alige <gauvain.dauchy@free.fr> | 2017-08-31 18:55:02 +0400 |
---|---|---|
committer | Alige <gauvain.dauchy@free.fr> | 2017-08-31 18:55:02 +0400 |
commit | 5602e30b28bd84b784d6e4e82b161cf1d8e02997 (patch) | |
tree | 3d8fa401a5859a40e483af9efac2619bf434ca40 | |
parent | 3b1c6516f233bad72f05d61a9f3b8061b7fbd97a (diff) | |
download | clientdata-5602e30b28bd84b784d6e4e82b161cf1d8e02997.tar.gz clientdata-5602e30b28bd84b784d6e4e82b161cf1d8e02997.tar.bz2 clientdata-5602e30b28bd84b784d6e4e82b161cf1d8e02997.tar.xz clientdata-5602e30b28bd84b784d6e4e82b161cf1d8e02997.zip |
Consistency of tileset names and authors.
-rw-r--r-- | LICENSE | 14 | ||||
-rw-r--r-- | graphics/tilesets/artis-chimney-x3x4.png (renamed from graphics/tilesets/artis-chimney.png) | bin | 30804 -> 30804 bytes | |||
-rw-r--r-- | graphics/tilesets/artis-chimney-x3x4.tsx (renamed from graphics/tilesets/artis-chimney.tsx) | 4 | ||||
-rw-r--r-- | graphics/tilesets/artis-fountain-x3x2.tsx | 2 | ||||
-rw-r--r-- | graphics/tilesets/water-calm.tsx | 2 | ||||
-rw-r--r-- | graphics/tilesets/water-raging.tsx | 2 | ||||
-rw-r--r-- | maps.xml | 2 | ||||
-rw-r--r-- | maps/001-1.tmx | 2 |
8 files changed, 14 insertions, 14 deletions
@@ -226,7 +226,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/skills/legacy/focus.png (?) (CC BY-SA 3.0) (Alige, Modanung) graphics/skills/legacy/life.png (Alige, Reid) (CC BY-SA 3.0) (-) graphics/skills/legacy/raging.png (?, Alige) (GPLv2) (-) - graphics/skills/legacy/resistpoison.png (?, Alige) (GPLv2) (-) + graphics/skills/legacy/resistpoison.png (Alige, Modanung, Var) (GPLv2) (-) # Sprites graphics/sprites/emote.png (Modanung) (CC BY-SA 3.0) (-) @@ -432,12 +432,12 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/tilesets/artis-archway-x1x5.png (IvanMorve, Reid) (CC BY-SA 3.0) (-) graphics/tilesets/artis-blockwall.png (Hal9000, Reid) (CC BY-SA 3.0) (Alige) graphics/tilesets/artis-bridge.png (Hal9000) (CC BY-SA 3.0) (Alige, EJlol, Reid) - graphics/tilesets/artis-chimney.png (Reid) (CC BY-SA 3.0) (-) + graphics/tilesets/artis-chimney-x3x4.png (Reid) (CC BY-SA 3.0) (-) graphics/tilesets/artis-dock.png (Reid) (CC BY-SA 3.0) (Alige) graphics/tilesets/artis-fence.png (Reid) (CC BY-SA 3.0) (Kestrel) - graphics/tilesets/artis-fountain-x3x2.png (Alige, IvanMorve) (CC BY-SA 3.0) (-) graphics/tilesets/artis-fountain.png (Bagzie) (CC BY-SA 3.0) (-) graphics/tilesets/artis-fountain-x1x4.png (Bagzie) (CC BY-SA 3.0) (-) + graphics/tilesets/artis-fountain-x3x2.png (Alige, IvanMorve) (CC BY-SA 3.0) (-) graphics/tilesets/artis-harbour-x4x2.png (EJlol, Reid) (CC BY-SA 3.0) (-) graphics/tilesets/artis-harbour-x4x6.png (EJlol, Reid) (CC BY-SA 3.0) (-) graphics/tilesets/artis-harbour-x6x4.png (EJlol, Reid) (CC BY-SA 3.0) (-) @@ -484,8 +484,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/legacy/tilesets/pots_x2.tsx (?) (GPLv2) (-) graphics/legacy/tilesets/woodenpump.png (Varuna) (CC BY-SA 3.0) (-) graphics/legacy/tilesets/woodenpump.tsx (Varuna) (CC BY-SA 3.0) (-) - graphics/legacy/tilesets/woodland_ground.png (Crush, Wombat, enchilado) (GPLv2) (-) - graphics/legacy/tilesets/woodland_ground.tsx (Crush, Wombat, enchilado) (GPLv2) (-) + graphics/legacy/tilesets/woodland_ground.png (Crush, enchilado, Wombat) (GPLv2) (-) + graphics/legacy/tilesets/woodland_ground.tsx (Crush, enchilado, Wombat) (GPLv2) (-) graphics/legacy/tilesets/woodland_indoor.png (Crush, Yosuhara) (GPLv2) (-) graphics/legacy/tilesets/woodland_indoor.tsx (Crush, Yosuhara) (GPLv2) (-) graphics/legacy/tilesets/woodland_indoor_x2.png (Crush) (GPLv2) (-) @@ -496,8 +496,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/legacy/tilesets/woodland_village.tsx (Crush, gumi) (GPLv2) (-) graphics/legacy/tilesets/woodland_village_x2.png (Crush) (GPLv2) (-) graphics/legacy/tilesets/woodland_village_x2.tsx (Crush) (GPLv2) (-) - graphics/legacy/tilesets/woodland_village_x3.png (wushin, gumi) (GPLv2) (-) - graphics/legacy/tilesets/woodland_village_x3.tsx (wushin, gumi) (GPLv2) (-) + graphics/legacy/tilesets/woodland_village_x3.png (gumi, wushin) (GPLv2) (-) + graphics/legacy/tilesets/woodland_village_x3.tsx (gumi, wushin) (GPLv2) (-) graphics/legacy/tilesets/woodland_x2.png (Crush, Len, Saphy) (GPLv2) (-) graphics/legacy/tilesets/woodland_x2.tsx (Crush, Len, Saphy) (GPLv2) (-) graphics/legacy/tilesets/woodland_x3.png (Crush, Len, Saphy, wushin) (GPLv2) (-) diff --git a/graphics/tilesets/artis-chimney.png b/graphics/tilesets/artis-chimney-x3x4.png Binary files differindex e0d8dcc4..e0d8dcc4 100644 --- a/graphics/tilesets/artis-chimney.png +++ b/graphics/tilesets/artis-chimney-x3x4.png diff --git a/graphics/tilesets/artis-chimney.tsx b/graphics/tilesets/artis-chimney-x3x4.tsx index cc55696c..146b4536 100644 --- a/graphics/tilesets/artis-chimney.tsx +++ b/graphics/tilesets/artis-chimney-x3x4.tsx @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<tileset name="Chimney" tilewidth="96" tileheight="128"> - <image source="artis-chimney.png" width="480" height="256"/> +<tileset name="Artis Chimney x3x4" tilewidth="96" tileheight="128"> + <image source="artis-chimney-x3x4.png" width="480" height="256"/> <tile id="0"> <properties> <property name="animation-delay0" value="12"/> diff --git a/graphics/tilesets/artis-fountain-x3x2.tsx b/graphics/tilesets/artis-fountain-x3x2.tsx index ccdf3399..1bc8bb07 100644 --- a/graphics/tilesets/artis-fountain-x3x2.tsx +++ b/graphics/tilesets/artis-fountain-x3x2.tsx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tileset name="Small Artis Fountain" tilewidth="96" tileheight="64"> +<tileset name="Artis Fountain x3x2" tilewidth="96" tileheight="64"> <image source="artis-fountain-x3x2.png" width="192" height="128"/> <tile id="0"> <properties> diff --git a/graphics/tilesets/water-calm.tsx b/graphics/tilesets/water-calm.tsx index d083ad2f..a8fc57f8 100644 --- a/graphics/tilesets/water-calm.tsx +++ b/graphics/tilesets/water-calm.tsx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="Water" tilewidth="32" tileheight="32">
+<tileset name="Water (Calm)" tilewidth="32" tileheight="32">
<image source="water.png" width="480" height="352"/>
<tile id="120">
<properties>
diff --git a/graphics/tilesets/water-raging.tsx b/graphics/tilesets/water-raging.tsx index 333f7a7d..317ee3e0 100644 --- a/graphics/tilesets/water-raging.tsx +++ b/graphics/tilesets/water-raging.tsx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tileset name="Water" tilewidth="32" tileheight="32"> +<tileset name="Water (Raging)" tilewidth="32" tileheight="32"> <image source="water.png" width="480" height="352"/> <tile id="120"> <properties> @@ -250,7 +250,7 @@ Copyright (C) 2012-2017 Evol Online --> <file name="graphics/tilesets/artis-harbour-x4x2.png"/> <file name="graphics/tilesets/artis-harbour-x4x6.png"/> <file name="graphics/tilesets/artis-harbour-x6x4.png"/> - <file name="graphics/tilesets/artis-chimney.png"/> + <file name="graphics/tilesets/artis-chimney-x3x4.png"/> <file name="graphics/tilesets/artis-indoor-fringe.png"/> <file name="graphics/tilesets/artis-shadows.png"/> <file name="graphics/tilesets/artis-lamps.png"/> diff --git a/maps/001-1.tmx b/maps/001-1.tmx index 968e206e..49d38893 100644 --- a/maps/001-1.tmx +++ b/maps/001-1.tmx @@ -91,7 +91,7 @@ <tileset firstgid="2332" name="Harbour x4x6" tilewidth="128" tileheight="192" tilecount="2" columns="2"> <image source="../graphics/tilesets/artis-harbour-x4x6.png" width="256" height="192"/> </tileset> - <tileset firstgid="2334" source="../graphics/tilesets/artis-chimney.tsx"/> + <tileset firstgid="2334" source="../graphics/tilesets/artis-chimney-x3x4.tsx"/> <tileset firstgid="2344" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/> </tileset> |