diff options
| author | Reid <reidyaro@gmail.com> | 2012-06-09 03:06:45 +0200 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-06-09 03:06:45 +0200 |
| commit | f6b918e20c6d0f1bbfc8f1cba86dc8240dd312f2 (patch) | |
| tree | 612e8fa4a916bd577bb9bcf4702b7055feaef5f6 | |
| parent | 505d1310b35c708fd65e983970ce05df2890676d (diff) | |
| download | clientdata-f6b918e20c6d0f1bbfc8f1cba86dc8240dd312f2.tar.gz clientdata-f6b918e20c6d0f1bbfc8f1cba86dc8240dd312f2.tar.bz2 clientdata-f6b918e20c6d0f1bbfc8f1cba86dc8240dd312f2.tar.xz clientdata-f6b918e20c6d0f1bbfc8f1cba86dc8240dd312f2.zip | |
Merge hairstyle #28 with hairstyle #25.
| -rw-r--r-- | graphics/sprites/hairstyles/hairstyle25.png | bin | 4622 -> 1725 bytes | |||
| -rw-r--r-- | graphics/sprites/hairstyles/hairstyle25.xml | 2 | ||||
| -rw-r--r-- | graphics/sprites/hairstyles/hairstyle28.png | bin | 1684 -> 0 bytes | |||
| -rw-r--r-- | graphics/sprites/hairstyles/hairstyle28.xml | 8 | ||||
| -rw-r--r-- | items.xml | 5 |
5 files changed, 2 insertions, 13 deletions
diff --git a/graphics/sprites/hairstyles/hairstyle25.png b/graphics/sprites/hairstyles/hairstyle25.png Binary files differindex 1e8bc518..09ed1281 100644 --- a/graphics/sprites/hairstyles/hairstyle25.png +++ b/graphics/sprites/hairstyles/hairstyle25.png diff --git a/graphics/sprites/hairstyles/hairstyle25.xml b/graphics/sprites/hairstyles/hairstyle25.xml index 3cf98780..a83320b0 100644 --- a/graphics/sprites/hairstyles/hairstyle25.xml +++ b/graphics/sprites/hairstyles/hairstyle25.xml @@ -2,7 +2,7 @@ <!-- Author from The Mana World Copyright (C) 2010-2012 Evol Online --> <sprite> - <imageset name="base" src="graphics/sprites/hairstyles/hairstyle25.png|W" width="40" height="40"/> + <imageset name="base" src="graphics/sprites/hairstyles/hairstyle25.png|S" width="40" height="40"/> <include file="hairstyles/hairstyle01.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle28.png b/graphics/sprites/hairstyles/hairstyle28.png Binary files differdeleted file mode 100644 index 837683f5..00000000 --- a/graphics/sprites/hairstyles/hairstyle28.png +++ /dev/null diff --git a/graphics/sprites/hairstyles/hairstyle28.xml b/graphics/sprites/hairstyles/hairstyle28.xml deleted file mode 100644 index 04dafa34..00000000 --- a/graphics/sprites/hairstyles/hairstyle28.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<!-- Author from The Mana World -Copyright (C) 2010-2012 Evol Online --> -<sprite> - <imageset name="base" src="graphics/sprites/hairstyles/hairstyle28.png|S" width="40" height="40"/> - - <include file="hairstyles/hairstyle01.xml"/> -</sprite> @@ -108,7 +108,7 @@ Colors for dyable equipments or items are now set up by itemcolors.xml. <item id="-24" type="hairsprite" name="Imperial" colors="hairS"> <sprite>hairstyles/hairstyle24.xml</sprite> </item> - <item id="-25" type="hairsprite" name="Tousled Layers" colors="hair"> + <item id="-25" type="hairsprite" name="Side Strand" colors="hairS"> <sprite>hairstyles/hairstyle25.xml</sprite> </item> <item id="-26" type="hairsprite" name="Messy" colors="hairS"> @@ -117,9 +117,6 @@ Colors for dyable equipments or items are now set up by itemcolors.xml. <item id="-27" type="hairsprite" name="Flat Ponytail" colors="hairS"> <sprite>hairstyles/hairstyle27.xml</sprite> </item> - <item id="-28" type="hairsprite" name="Side Strand" colors="hairS"> - <sprite>hairstyles/hairstyle28.xml</sprite> - </item> <!-- Races --> <item id="-100" type="racesprite" name="Human"> |
