diff options
| author | Micksha <ms-shaman@gmx.de> | 2021-06-09 19:35:07 +0000 |
|---|---|---|
| committer | Micksha <ms-shaman@gmx.de> | 2021-06-09 19:35:07 +0000 |
| commit | 687ebf3bac31c103421eae740ebc0d7184d4cd15 (patch) | |
| tree | 78424d62151f58365907b4d0c50b9a4f8da047b3 | |
| parent | ac731c06903505066aaf8e9f7e94199674859f9e (diff) | |
| parent | 16a97b47d3a2f301f3c1cb04f66fe5c176e3fde1 (diff) | |
| download | clientdata-687ebf3bac31c103421eae740ebc0d7184d4cd15.tar.gz clientdata-687ebf3bac31c103421eae740ebc0d7184d4cd15.tar.bz2 clientdata-687ebf3bac31c103421eae740ebc0d7184d4cd15.tar.xz clientdata-687ebf3bac31c103421eae740ebc0d7184d4cd15.zip | |
Merge branch 'testsession1' into 'master'
Testsession1
See merge request themanaworld/evolved/clientdata!16
28 files changed, 367 insertions, 367 deletions
diff --git a/graphics/sprites/hairstyles/hairstyle00.xml b/graphics/sprites/hairstyles/hairstyle00.xml index c9e45a9a..761b1386 100644 --- a/graphics/sprites/hairstyles/hairstyle00.xml +++ b/graphics/sprites/hairstyles/hairstyle00.xml @@ -249,7 +249,7 @@ Copyright (C) 2020-2021 The Mana World --> <action name="sit" imageset="base"> <animation direction="down"> - <frame index="0" offsetY="-22"/> + <frame index="0" offsetY="-17"/> </animation> <animation direction="left"> <frame index="1" offsetX="4" offsetY="-20"/> diff --git a/graphics/sprites/hairstyles/hairstyle01.png b/graphics/sprites/hairstyles/hairstyle01.png Binary files differindex 10436264..9cb45067 100644 --- a/graphics/sprites/hairstyles/hairstyle01.png +++ b/graphics/sprites/hairstyles/hairstyle01.png diff --git a/graphics/sprites/hairstyles/hairstyle02.png b/graphics/sprites/hairstyles/hairstyle02.png Binary files differindex ec54f804..10436264 100644 --- a/graphics/sprites/hairstyles/hairstyle02.png +++ b/graphics/sprites/hairstyles/hairstyle02.png diff --git a/graphics/sprites/hairstyles/hairstyle03.png b/graphics/sprites/hairstyles/hairstyle03.png Binary files differindex 570333b0..ec54f804 100644 --- a/graphics/sprites/hairstyles/hairstyle03.png +++ b/graphics/sprites/hairstyles/hairstyle03.png diff --git a/graphics/sprites/hairstyles/hairstyle04.png b/graphics/sprites/hairstyles/hairstyle04.png Binary files differindex ff7a9050..570333b0 100644 --- a/graphics/sprites/hairstyles/hairstyle04.png +++ b/graphics/sprites/hairstyles/hairstyle04.png diff --git a/graphics/sprites/hairstyles/hairstyle05.png b/graphics/sprites/hairstyles/hairstyle05.png Binary files differindex 5e598ec4..ff7a9050 100644 --- a/graphics/sprites/hairstyles/hairstyle05.png +++ b/graphics/sprites/hairstyles/hairstyle05.png diff --git a/graphics/sprites/hairstyles/hairstyle06.png b/graphics/sprites/hairstyles/hairstyle06.png Binary files differindex 432daff7..5e598ec4 100644 --- a/graphics/sprites/hairstyles/hairstyle06.png +++ b/graphics/sprites/hairstyles/hairstyle06.png diff --git a/graphics/sprites/hairstyles/hairstyle07.png b/graphics/sprites/hairstyles/hairstyle07.png Binary files differindex 55e8089c..432daff7 100644 --- a/graphics/sprites/hairstyles/hairstyle07.png +++ b/graphics/sprites/hairstyles/hairstyle07.png diff --git a/graphics/sprites/hairstyles/hairstyle08.png b/graphics/sprites/hairstyles/hairstyle08.png Binary files differindex 30ff5161..55e8089c 100644 --- a/graphics/sprites/hairstyles/hairstyle08.png +++ b/graphics/sprites/hairstyles/hairstyle08.png diff --git a/graphics/sprites/hairstyles/hairstyle09.png b/graphics/sprites/hairstyles/hairstyle09.png Binary files differindex b6672277..30ff5161 100644 --- a/graphics/sprites/hairstyles/hairstyle09.png +++ b/graphics/sprites/hairstyles/hairstyle09.png diff --git a/graphics/sprites/hairstyles/hairstyle10.png b/graphics/sprites/hairstyles/hairstyle10.png Binary files differindex 97914980..b6672277 100644 --- a/graphics/sprites/hairstyles/hairstyle10.png +++ b/graphics/sprites/hairstyles/hairstyle10.png diff --git a/graphics/sprites/hairstyles/hairstyle11.png b/graphics/sprites/hairstyles/hairstyle11.png Binary files differindex b9bf5306..97914980 100644 --- a/graphics/sprites/hairstyles/hairstyle11.png +++ b/graphics/sprites/hairstyles/hairstyle11.png diff --git a/graphics/sprites/hairstyles/hairstyle12.png b/graphics/sprites/hairstyles/hairstyle12.png Binary files differindex 7cfaf9f7..b9bf5306 100644 --- a/graphics/sprites/hairstyles/hairstyle12.png +++ b/graphics/sprites/hairstyles/hairstyle12.png diff --git a/graphics/sprites/hairstyles/hairstyle12.xml b/graphics/sprites/hairstyles/hairstyle12.xml index 04a9f54c..b3e4adc4 100644 --- a/graphics/sprites/hairstyles/hairstyle12.xml +++ b/graphics/sprites/hairstyles/hairstyle12.xml @@ -1,335 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Author: Micksha, Reid Copyright (C) 2012-2016 Evol Online -Copyright (C) 2021 The Mana World --> - +Copyright (C) 2020-2021 The Mana World --> <sprite> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle12.png|R" - width="32" - height="32"/> - - <action name="stand" imageset="base"> - <animation direction="down"> - <frame index="0" offsetX="3" offsetY="-33"/> - </animation> - <animation direction="left"> - <frame index="3" offsetX="3" offsetY="-33"/> - </animation> - <animation direction="up"> - <frame index="6" offsetX="3" offsetY="-33"/> - </animation> - <animation direction="right"> - <frame index="9" offsetX="3" offsetY="-33"/> - </animation> - </action> - - <action name="walk" imageset="base"> - <animation direction="down"> - <frame index="0" offsetX="3" offsetY="-32" delay="80"/> - <frame index="1" offsetX="3" offsetY="-33" delay="160"/> - <frame index="0" offsetX="3" offsetY="-32" delay="80"/> - <frame index="2" offsetX="3" offsetY="-33" delay="160"/> - </animation> - <animation direction="left"> - <frame index="3" offsetX="3" offsetY="-33" delay="80"/> - <frame index="4" offsetX="3" offsetY="-32" delay="80"/> - <frame index="4" offsetX="3" offsetY="-33" delay="80"/> - <frame index="3" offsetX="3" offsetY="-33" delay="80"/> - <frame index="5" offsetX="3" offsetY="-32" delay="80"/> - <frame index="5" offsetX="3" offsetY="-33" delay="80"/> - </animation> - <animation direction="up"> - <frame index="6" offsetX="3" offsetY="-33" delay="80"/> - <frame index="7" offsetX="3" offsetY="-34" delay="160"/> - <frame index="6" offsetX="3" offsetY="-33" delay="80"/> - <frame index="8" offsetX="3" offsetY="-34" delay="160"/> - </animation> - <animation direction="right"> - <frame index="9" offsetX="3" offsetY="-33" delay="80"/> - <frame index="10" offsetX="3" offsetY="-32" delay="80"/> - <frame index="10" offsetX="3" offsetY="-33" delay="80"/> - <frame index="9" offsetX="3" offsetY="-33" delay="80"/> - <frame index="11" offsetX="3" offsetY="-32" delay="80"/> - <frame index="11" offsetX="3" offsetY="-33" delay="80"/> - </animation> - </action> - - <action name="attack" imageset="base"> - <animation direction="down"> - <frame index="0" offsetX="3" offsetY="-30" delay="80"/> - <frame index="0" offsetX="3" offsetY="-31" delay="80"/> - <frame index="0" offsetX="3" offsetY="-28" delay="80"/> - <frame index="0" offsetX="3" offsetY="-27" delay="80"/> - <end /> - </animation> - <animation direction="left"> - <frame index="3" offsetX="7" offsetY="-34" delay="80"/> - <frame index="3" offsetX="7" offsetY="-35" delay="80"/> - <frame index="3" offsetX="3" offsetY="-32" delay="80"/> - <frame index="3" offsetX="2" offsetY="-31" delay="80"/> - <end /> - </animation> - <animation direction="up"> - <frame index="6" offsetX="2" offsetY="-33" delay="240"/> - <frame index="6" offsetX="2" offsetY="-31" delay="80"/> - <end /> - </animation> - <animation direction="right"> - <frame index="9" offsetY="-34" delay="80"/> - <frame index="9" offsetY="-35" delay="80"/> - <frame index="9" offsetX="3" offsetY="-32" delay="80"/> - <frame index="9" offsetX="4" offsetY="-31" delay="80"/> - <end /> - </animation> - </action> - - <action name="attack_bow" imageset="base"> - <animation direction="down"> - <frame index="0" offsetX="3" offsetY="-32" delay="240"/> - <frame index="0" offsetX="3" offsetY="-31" delay="80"/> - <frame index="0" offsetX="3" offsetY="-32" delay="80"/> - <end /> - </animation> - <animation direction="left"> - <frame index="3" offsetX="6" offsetY="-33" delay="240"/> - <frame index="3" offsetX="8" offsetY="-34" delay="160"/> - <end /> - </animation> - <animation direction="up"> - <frame index="6" offsetX="3" offsetY="-33" delay="160"/> - <frame index="6" offsetX="2" offsetY="-33" delay="80"/> - <frame index="6" offsetX="2" offsetY="-32" delay="80"/> - <frame index="6" offsetX="2" offsetY="-33" delay="80"/> - <end /> - </animation> - <animation direction="right"> - <frame index="9" offsetY="-33" delay="240"/> - <frame index="9" offsetX="-2" offsetY="-34" delay="160"/> - <end /> - </animation> - </action> - - <action name="attack_wand" imageset="base"> - <animation direction="down"> - <frame index="0" offsetX="3" offsetY="-30" delay="80"/> - <frame index="0" offsetX="3" offsetY="-31" delay="80"/> - <frame index="0" offsetX="3" offsetY="-32" delay="90"/> - <frame index="0" offsetX="3" offsetY="-31" delay="70"/> - <frame index="0" offsetX="3" offsetY="-28" delay="70"/> - <frame index="0" offsetX="3" offsetY="-27" delay="70"/> - <end /> - </animation> - <animation direction="left"> - <frame index="3" offsetX="7" offsetY="-34" delay="80"/> - <frame index="3" offsetX="6" offsetY="-33" delay="240"/> - <frame index="3" offsetX="7" offsetY="-35" delay="70"/> - <frame index="3" offsetX="3" offsetY="-32" delay="70"/> - <frame index="3" offsetX="2" offsetY="-31" delay="70"/> - <end /> - </animation> - <animation direction="up"> - <frame index="6" offsetX="2" offsetY="-33" delay="90"/> - <frame index="6" offsetX="3" offsetY="-33" delay="90"/> - <frame index="6" offsetX="2" offsetY="-32" delay="160"/> - <frame index="6" offsetX="2" offsetY="-31" delay="80"/> - <end /> - </animation> - <animation direction="right"> - <frame index="9" offsetY="-34" delay="80"/> - <frame index="9" offsetY="-33" delay="240"/> - <frame index="9" offsetY="-35" delay="70"/> - <frame index="9" offsetX="3" offsetY="-32" delay="70"/> - <frame index="9" offsetX="4" offsetY="-31" delay="70"/> - <end /> - </animation> - </action> - - <action name="attack_scythe" imageset="base"> - <animation direction="down"> - <frame index="0" offsetX="3" offsetY="-32" delay="100"/> - <frame index="0" offsetX="3" offsetY="-31" delay="100"/> - <frame index="0" offsetX="3" offsetY="-28" delay="90"/> - <frame index="0" offsetX="3" offsetY="-30" delay="90"/> - <frame index="0" offsetX="3" offsetY="-27" delay="85"/> - <frame index="0" offsetX="3" offsetY="-30" delay="90"/> - <frame index="0" offsetX="3" offsetY="-28" delay="90"/> - <frame index="0" offsetX="3" offsetY="-31" delay="100"/> - <end /> - </animation> - <animation direction="left"> - <frame index="3" offsetX="6" offsetY="-33" delay="100"/> - <frame index="3" offsetX="7" offsetY="-34" delay="90"/> - <frame index="3" offsetX="7" offsetY="-35" delay="90"/> - <frame index="3" offsetX="3" offsetY="-32" delay="80"/> - <frame index="3" offsetX="2" offsetY="-31" delay="90"/> - <frame index="3" offsetX="3" offsetY="-32" delay="80"/> - <frame index="3" offsetX="7" offsetY="-35" delay="90"/> - <frame index="3" offsetX="7" offsetY="-34" delay="90"/> - <end /> - </animation> - <animation direction="up"> - <frame index="6" offsetX="3" offsetY="-33" delay="100"/> - <frame index="6" offsetX="2" offsetY="-31" delay="90"/> - <frame index="6" offsetX="2" offsetY="-33" delay="450"/> - <frame index="6" offsetX="2" offsetY="-31" delay="90"/> - <end /> - </animation> - <animation direction="right"> - <frame index="9" offsetY="-33" delay="100"/> - <frame index="9" offsetY="-34" delay="90"/> - <frame index="9" offsetY="-35" delay="90"/> - <frame index="9" offsetX="3" offsetY="-32" delay="80"/> - <frame index="9" offsetX="4" offsetY="-31" delay="90"/> - <frame index="9" offsetX="3" offsetY="-32" delay="90"/> - <frame index="9" offsetY="-35" delay="100"/> - <frame index="9" offsetY="-34" delay="90"/> - <end /> - </animation> - </action> - - <action name="attack_chop" imageset="base"> - <animation direction="down"> - <frame index="0" offsetX="3" offsetY="-30" delay="100"/> - <frame index="0" offsetX="3" offsetY="-31" delay="220"/> - <frame index="0" offsetX="3" offsetY="-28" delay="90"/> - <frame index="0" offsetX="3" offsetY="-27" delay="70"/> - <end /> - </animation> - <animation direction="left"> - <frame index="3" offsetX="7" offsetY="-34" delay="100"/> - <frame index="3" offsetX="7" offsetY="-35" delay="100"/> - <frame index="3" offsetX="6" offsetY="-33" delay="120"/> - <frame index="3" offsetX="3" offsetY="-32" delay="90"/> - <frame index="3" offsetX="2" offsetY="-31" delay="70"/> - <end /> - </animation> - <animation direction="up"> - <frame index="6" offsetX="2" offsetY="-33" delay="320"/> - <frame index="6" offsetX="2" offsetY="-31" delay="90"/> - <frame index="6" offsetX="3" offsetY="-33" delay="70"/> - <end /> - </animation> - <animation direction="right"> - <frame index="9" offsetY="-34" delay="100"/> - <frame index="9" offsetY="-35" delay="100"/> - <frame index="9" offsetY="-33" delay="120"/> - <frame index="9" offsetX="3" offsetY="-32" delay="90"/> - <frame index="9" offsetX="4" offsetY="-31" delay="70"/> - <end /> - </animation> - </action> - - <action name="attack_chop_long" imageset="base"> - <animation direction="down"> - <frame index="0" offsetX="3" offsetY="-31" delay="250"/> - <frame index="0" offsetX="3" offsetY="-30" delay="70"/> - <frame index="0" offsetX="3" offsetY="-27" delay="70"/> - <frame index="0" offsetX="3" offsetY="-28" delay="90"/> - <end /> - </animation> - <animation direction="left"> - <frame index="3" offsetX="7" offsetY="-34" delay="120"/> - <frame index="3" offsetX="6" offsetY="-33" delay="130"/> - <frame index="3" offsetX="2" offsetY="-31" delay="80"/> - <frame index="3" offsetX="3" offsetY="-32" delay="100"/> - <frame index="3" offsetX="7" offsetY="-35" delay="80"/> - <end /> - </animation> - <animation direction="up"> - <frame index="6" offsetX="2" offsetY="-33" delay="330"/> - <frame index="6" offsetX="2" offsetY="-31" delay="70"/> - <frame index="6" offsetX="3" offsetY="-33" delay="100"/> - <end /> - </animation> - <animation direction="right"> - <frame index="9" offsetY="-34" delay="120"/> - <frame index="9" offsetY="-33" delay="130"/> - <frame index="9" offsetX="4" offsetY="-31" delay="80"/> - <frame index="9" offsetX="3" offsetY="-32" delay="100"/> - <frame index="9" offsetY="-35" delay="80"/> - <end /> - </animation> - </action> - - <action name="sit" imageset="base"> - <animation direction="down"> - <frame index="0" offsetY="-26" offsetX="3"/> - </animation> - <animation direction="left"> - <frame index="3" offsetX="7" offsetY="-24"/> - </animation> - <animation direction="up"> - <frame index="6" offsetX="4" offsetY="-25"/> - </animation> - <animation direction="right"> - <frame index="9" offsetX="-3" offsetY="-24"/> - </animation> - </action> - - <action name="sittop" imageset="base"> - <animation direction="down"> - <frame index="0" offsetY="-21" offsetX="3"/> - </animation> - <animation direction="left"> - <frame index="3" offsetX="7" offsetY="-24"/> - </animation> - <animation direction="up"> - <frame index="6" offsetX="4" offsetY="-25"/> - </animation> - <animation direction="right"> - <frame index="9" offsetX="-3" offsetY="-24"/> - </animation> - </action> - - <action name="standride" imageset="base"> - <animation direction="down"> - <frame index="0" offsetY="-21" offsetX="3"/> - </animation> - <animation direction="left"> - <frame index="3" offsetX="7" offsetY="-24"/> - </animation> - <animation direction="up"> - <frame index="6" offsetX="4" offsetY="-25"/> - </animation> - <animation direction="right"> - <frame index="9" offsetX="-3" offsetY="-24"/> - </animation> - </action> - - <action name="spawnride" imageset="base"> - <animation direction="down"> - <frame index="0" offsetY="-21" offsetX="3"/> - </animation> - <animation direction="left"> - <frame index="3" offsetX="7" offsetY="-24"/> - </animation> - <animation direction="up"> - <frame index="6" offsetX="4" offsetY="-25"/> - </animation> - <animation direction="right"> - <frame index="9" offsetX="-3" offsetY="-24"/> - </animation> - </action> - - <action name="ride" imageset="base"> - <animation direction="down"> - <frame index="0" offsetY="-21" offsetX="3"/> - </animation> - <animation direction="left"> - <frame index="3" offsetX="7" offsetY="-24"/> - </animation> - <animation direction="up"> - <frame index="6" offsetX="4" offsetY="-25"/> - </animation> - <animation direction="right"> - <frame index="9" offsetX="-3" offsetY="-24"/> - </animation> - </action> + width="40" + height="50"/> - <action name="dead" imageset="base"> - <animation direction="default"> - <frame index="12" offsetX="23" offsetY="2"/> - </animation> - </action> + <include file="hairstyles/hairstyle00.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle13.png b/graphics/sprites/hairstyles/hairstyle13.png Binary files differindex 2e42b341..7cfaf9f7 100644 --- a/graphics/sprites/hairstyles/hairstyle13.png +++ b/graphics/sprites/hairstyles/hairstyle13.png diff --git a/graphics/sprites/hairstyles/hairstyle13.xml b/graphics/sprites/hairstyles/hairstyle13.xml index 1177f520..639e1ca7 100644 --- a/graphics/sprites/hairstyles/hairstyle13.xml +++ b/graphics/sprites/hairstyles/hairstyle13.xml @@ -1,12 +1,335 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Author: Micksha, Reid Copyright (C) 2012-2016 Evol Online -Copyright (C) 2020-2021 The Mana World --> +Copyright (C) 2021 The Mana World --> + <sprite> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle13.png|R" - width="40" - height="50"/> + width="32" + height="32"/> + + <action name="stand" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="3" offsetY="-33"/> + </animation> + <animation direction="left"> + <frame index="3" offsetX="3" offsetY="-33"/> + </animation> + <animation direction="up"> + <frame index="6" offsetX="3" offsetY="-33"/> + </animation> + <animation direction="right"> + <frame index="9" offsetX="3" offsetY="-33"/> + </animation> + </action> + + <action name="walk" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="3" offsetY="-32" delay="80"/> + <frame index="1" offsetX="3" offsetY="-33" delay="160"/> + <frame index="0" offsetX="3" offsetY="-32" delay="80"/> + <frame index="2" offsetX="3" offsetY="-33" delay="160"/> + </animation> + <animation direction="left"> + <frame index="3" offsetX="3" offsetY="-33" delay="80"/> + <frame index="4" offsetX="3" offsetY="-32" delay="80"/> + <frame index="4" offsetX="3" offsetY="-33" delay="80"/> + <frame index="3" offsetX="3" offsetY="-33" delay="80"/> + <frame index="5" offsetX="3" offsetY="-32" delay="80"/> + <frame index="5" offsetX="3" offsetY="-33" delay="80"/> + </animation> + <animation direction="up"> + <frame index="6" offsetX="3" offsetY="-33" delay="80"/> + <frame index="7" offsetX="3" offsetY="-34" delay="160"/> + <frame index="6" offsetX="3" offsetY="-33" delay="80"/> + <frame index="8" offsetX="3" offsetY="-34" delay="160"/> + </animation> + <animation direction="right"> + <frame index="9" offsetX="3" offsetY="-33" delay="80"/> + <frame index="10" offsetX="3" offsetY="-32" delay="80"/> + <frame index="10" offsetX="3" offsetY="-33" delay="80"/> + <frame index="9" offsetX="3" offsetY="-33" delay="80"/> + <frame index="11" offsetX="3" offsetY="-32" delay="80"/> + <frame index="11" offsetX="3" offsetY="-33" delay="80"/> + </animation> + </action> + + <action name="attack" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="3" offsetY="-30" delay="80"/> + <frame index="0" offsetX="3" offsetY="-31" delay="80"/> + <frame index="0" offsetX="3" offsetY="-28" delay="80"/> + <frame index="0" offsetX="3" offsetY="-27" delay="80"/> + <end /> + </animation> + <animation direction="left"> + <frame index="3" offsetX="7" offsetY="-34" delay="80"/> + <frame index="3" offsetX="7" offsetY="-35" delay="80"/> + <frame index="3" offsetX="3" offsetY="-32" delay="80"/> + <frame index="3" offsetX="2" offsetY="-31" delay="80"/> + <end /> + </animation> + <animation direction="up"> + <frame index="6" offsetX="2" offsetY="-33" delay="240"/> + <frame index="6" offsetX="2" offsetY="-31" delay="80"/> + <end /> + </animation> + <animation direction="right"> + <frame index="9" offsetY="-34" delay="80"/> + <frame index="9" offsetY="-35" delay="80"/> + <frame index="9" offsetX="3" offsetY="-32" delay="80"/> + <frame index="9" offsetX="4" offsetY="-31" delay="80"/> + <end /> + </animation> + </action> + + <action name="attack_bow" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="3" offsetY="-32" delay="240"/> + <frame index="0" offsetX="3" offsetY="-31" delay="80"/> + <frame index="0" offsetX="3" offsetY="-32" delay="80"/> + <end /> + </animation> + <animation direction="left"> + <frame index="3" offsetX="6" offsetY="-33" delay="240"/> + <frame index="3" offsetX="8" offsetY="-34" delay="160"/> + <end /> + </animation> + <animation direction="up"> + <frame index="6" offsetX="3" offsetY="-33" delay="160"/> + <frame index="6" offsetX="2" offsetY="-33" delay="80"/> + <frame index="6" offsetX="2" offsetY="-32" delay="80"/> + <frame index="6" offsetX="2" offsetY="-33" delay="80"/> + <end /> + </animation> + <animation direction="right"> + <frame index="9" offsetY="-33" delay="240"/> + <frame index="9" offsetX="-2" offsetY="-34" delay="160"/> + <end /> + </animation> + </action> + + <action name="attack_wand" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="3" offsetY="-30" delay="80"/> + <frame index="0" offsetX="3" offsetY="-31" delay="80"/> + <frame index="0" offsetX="3" offsetY="-32" delay="90"/> + <frame index="0" offsetX="3" offsetY="-31" delay="70"/> + <frame index="0" offsetX="3" offsetY="-28" delay="70"/> + <frame index="0" offsetX="3" offsetY="-27" delay="70"/> + <end /> + </animation> + <animation direction="left"> + <frame index="3" offsetX="7" offsetY="-34" delay="80"/> + <frame index="3" offsetX="6" offsetY="-33" delay="240"/> + <frame index="3" offsetX="7" offsetY="-35" delay="70"/> + <frame index="3" offsetX="3" offsetY="-32" delay="70"/> + <frame index="3" offsetX="2" offsetY="-31" delay="70"/> + <end /> + </animation> + <animation direction="up"> + <frame index="6" offsetX="2" offsetY="-33" delay="90"/> + <frame index="6" offsetX="3" offsetY="-33" delay="90"/> + <frame index="6" offsetX="2" offsetY="-32" delay="160"/> + <frame index="6" offsetX="2" offsetY="-31" delay="80"/> + <end /> + </animation> + <animation direction="right"> + <frame index="9" offsetY="-34" delay="80"/> + <frame index="9" offsetY="-33" delay="240"/> + <frame index="9" offsetY="-35" delay="70"/> + <frame index="9" offsetX="3" offsetY="-32" delay="70"/> + <frame index="9" offsetX="4" offsetY="-31" delay="70"/> + <end /> + </animation> + </action> + + <action name="attack_scythe" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="3" offsetY="-32" delay="100"/> + <frame index="0" offsetX="3" offsetY="-31" delay="100"/> + <frame index="0" offsetX="3" offsetY="-28" delay="90"/> + <frame index="0" offsetX="3" offsetY="-30" delay="90"/> + <frame index="0" offsetX="3" offsetY="-27" delay="85"/> + <frame index="0" offsetX="3" offsetY="-30" delay="90"/> + <frame index="0" offsetX="3" offsetY="-28" delay="90"/> + <frame index="0" offsetX="3" offsetY="-31" delay="100"/> + <end /> + </animation> + <animation direction="left"> + <frame index="3" offsetX="6" offsetY="-33" delay="100"/> + <frame index="3" offsetX="7" offsetY="-34" delay="90"/> + <frame index="3" offsetX="7" offsetY="-35" delay="90"/> + <frame index="3" offsetX="3" offsetY="-32" delay="80"/> + <frame index="3" offsetX="2" offsetY="-31" delay="90"/> + <frame index="3" offsetX="3" offsetY="-32" delay="80"/> + <frame index="3" offsetX="7" offsetY="-35" delay="90"/> + <frame index="3" offsetX="7" offsetY="-34" delay="90"/> + <end /> + </animation> + <animation direction="up"> + <frame index="6" offsetX="3" offsetY="-33" delay="100"/> + <frame index="6" offsetX="2" offsetY="-31" delay="90"/> + <frame index="6" offsetX="2" offsetY="-33" delay="450"/> + <frame index="6" offsetX="2" offsetY="-31" delay="90"/> + <end /> + </animation> + <animation direction="right"> + <frame index="9" offsetY="-33" delay="100"/> + <frame index="9" offsetY="-34" delay="90"/> + <frame index="9" offsetY="-35" delay="90"/> + <frame index="9" offsetX="3" offsetY="-32" delay="80"/> + <frame index="9" offsetX="4" offsetY="-31" delay="90"/> + <frame index="9" offsetX="3" offsetY="-32" delay="90"/> + <frame index="9" offsetY="-35" delay="100"/> + <frame index="9" offsetY="-34" delay="90"/> + <end /> + </animation> + </action> + + <action name="attack_chop" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="3" offsetY="-30" delay="100"/> + <frame index="0" offsetX="3" offsetY="-31" delay="220"/> + <frame index="0" offsetX="3" offsetY="-28" delay="90"/> + <frame index="0" offsetX="3" offsetY="-27" delay="70"/> + <end /> + </animation> + <animation direction="left"> + <frame index="3" offsetX="7" offsetY="-34" delay="100"/> + <frame index="3" offsetX="7" offsetY="-35" delay="100"/> + <frame index="3" offsetX="6" offsetY="-33" delay="120"/> + <frame index="3" offsetX="3" offsetY="-32" delay="90"/> + <frame index="3" offsetX="2" offsetY="-31" delay="70"/> + <end /> + </animation> + <animation direction="up"> + <frame index="6" offsetX="2" offsetY="-33" delay="320"/> + <frame index="6" offsetX="2" offsetY="-31" delay="90"/> + <frame index="6" offsetX="3" offsetY="-33" delay="70"/> + <end /> + </animation> + <animation direction="right"> + <frame index="9" offsetY="-34" delay="100"/> + <frame index="9" offsetY="-35" delay="100"/> + <frame index="9" offsetY="-33" delay="120"/> + <frame index="9" offsetX="3" offsetY="-32" delay="90"/> + <frame index="9" offsetX="4" offsetY="-31" delay="70"/> + <end /> + </animation> + </action> + + <action name="attack_chop_long" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="3" offsetY="-31" delay="250"/> + <frame index="0" offsetX="3" offsetY="-30" delay="70"/> + <frame index="0" offsetX="3" offsetY="-27" delay="70"/> + <frame index="0" offsetX="3" offsetY="-28" delay="90"/> + <end /> + </animation> + <animation direction="left"> + <frame index="3" offsetX="7" offsetY="-34" delay="120"/> + <frame index="3" offsetX="6" offsetY="-33" delay="130"/> + <frame index="3" offsetX="2" offsetY="-31" delay="80"/> + <frame index="3" offsetX="3" offsetY="-32" delay="100"/> + <frame index="3" offsetX="7" offsetY="-35" delay="80"/> + <end /> + </animation> + <animation direction="up"> + <frame index="6" offsetX="2" offsetY="-33" delay="330"/> + <frame index="6" offsetX="2" offsetY="-31" delay="70"/> + <frame index="6" offsetX="3" offsetY="-33" delay="100"/> + <end /> + </animation> + <animation direction="right"> + <frame index="9" offsetY="-34" delay="120"/> + <frame index="9" offsetY="-33" delay="130"/> + <frame index="9" offsetX="4" offsetY="-31" delay="80"/> + <frame index="9" offsetX="3" offsetY="-32" delay="100"/> + <frame index="9" offsetY="-35" delay="80"/> + <end /> + </animation> + </action> + + <action name="sit" imageset="base"> + <animation direction="down"> + <frame index="0" offsetY="-26" offsetX="3"/> + </animation> + <animation direction="left"> + <frame index="3" offsetX="7" offsetY="-24"/> + </animation> + <animation direction="up"> + <frame index="6" offsetX="4" offsetY="-25"/> + </animation> + <animation direction="right"> + <frame index="9" offsetX="-3" offsetY="-24"/> + </animation> + </action> + + <action name="sittop" imageset="base"> + <animation direction="down"> + <frame index="0" offsetY="-21" offsetX="3"/> + </animation> + <animation direction="left"> + <frame index="3" offsetX="7" offsetY="-24"/> + </animation> + <animation direction="up"> + <frame index="6" offsetX="4" offsetY="-25"/> + </animation> + <animation direction="right"> + <frame index="9" offsetX="-3" offsetY="-24"/> + </animation> + </action> + + <action name="standride" imageset="base"> + <animation direction="down"> + <frame index="0" offsetY="-21" offsetX="3"/> + </animation> + <animation direction="left"> + <frame index="3" offsetX="7" offsetY="-24"/> + </animation> + <animation direction="up"> + <frame index="6" offsetX="4" offsetY="-25"/> + </animation> + <animation direction="right"> + <frame index="9" offsetX="-3" offsetY="-24"/> + </animation> + </action> + + <action name="spawnride" imageset="base"> + <animation direction="down"> + <frame index="0" offsetY="-21" offsetX="3"/> + </animation> + <animation direction="left"> + <frame index="3" offsetX="7" offsetY="-24"/> + </animation> + <animation direction="up"> + <frame index="6" offsetX="4" offsetY="-25"/> + </animation> + <animation direction="right"> + <frame index="9" offsetX="-3" offsetY="-24"/> + </animation> + </action> + + <action name="ride" imageset="base"> + <animation direction="down"> + <frame index="0" offsetY="-21" offsetX="3"/> + </animation> + <animation direction="left"> + <frame index="3" offsetX="7" offsetY="-24"/> + </animation> + <animation direction="up"> + <frame index="6" offsetX="4" offsetY="-25"/> + </animation> + <animation direction="right"> + <frame index="9" offsetX="-3" offsetY="-24"/> + </animation> + </action> - <include file="hairstyles/hairstyle00.xml"/> + <action name="dead" imageset="base"> + <animation direction="default"> + <frame index="12" offsetX="23" offsetY="2"/> + </animation> + </action> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle14.png b/graphics/sprites/hairstyles/hairstyle14.png Binary files differindex 867ffb55..2e42b341 100644 --- a/graphics/sprites/hairstyles/hairstyle14.png +++ b/graphics/sprites/hairstyles/hairstyle14.png diff --git a/graphics/sprites/hairstyles/hairstyle15.png b/graphics/sprites/hairstyles/hairstyle15.png Binary files differindex 07810c2d..867ffb55 100644 --- a/graphics/sprites/hairstyles/hairstyle15.png +++ b/graphics/sprites/hairstyles/hairstyle15.png diff --git a/graphics/sprites/hairstyles/hairstyle16.png b/graphics/sprites/hairstyles/hairstyle16.png Binary files differindex ddc6af4c..07810c2d 100644 --- a/graphics/sprites/hairstyles/hairstyle16.png +++ b/graphics/sprites/hairstyles/hairstyle16.png diff --git a/graphics/sprites/hairstyles/hairstyle17.png b/graphics/sprites/hairstyles/hairstyle17.png Binary files differindex 6ce95d44..ddc6af4c 100644 --- a/graphics/sprites/hairstyles/hairstyle17.png +++ b/graphics/sprites/hairstyles/hairstyle17.png diff --git a/graphics/sprites/hairstyles/hairstyle18.png b/graphics/sprites/hairstyles/hairstyle18.png Binary files differindex 60884cee..6ce95d44 100644 --- a/graphics/sprites/hairstyles/hairstyle18.png +++ b/graphics/sprites/hairstyles/hairstyle18.png diff --git a/graphics/sprites/hairstyles/hairstyle19.png b/graphics/sprites/hairstyles/hairstyle19.png Binary files differindex f75a34f1..60884cee 100644 --- a/graphics/sprites/hairstyles/hairstyle19.png +++ b/graphics/sprites/hairstyles/hairstyle19.png diff --git a/graphics/sprites/hairstyles/hairstyle20.png b/graphics/sprites/hairstyles/hairstyle20.png Binary files differindex f3950f79..f75a34f1 100644 --- a/graphics/sprites/hairstyles/hairstyle20.png +++ b/graphics/sprites/hairstyles/hairstyle20.png diff --git a/graphics/sprites/hairstyles/hairstyle21.png b/graphics/sprites/hairstyles/hairstyle21.png Binary files differindex c262280b..f3950f79 100644 --- a/graphics/sprites/hairstyles/hairstyle21.png +++ b/graphics/sprites/hairstyles/hairstyle21.png diff --git a/graphics/sprites/hairstyles/hairstyle22.png b/graphics/sprites/hairstyles/hairstyle22.png Binary files differindex 9cb45067..c262280b 100644 --- a/graphics/sprites/hairstyles/hairstyle22.png +++ b/graphics/sprites/hairstyles/hairstyle22.png diff --git a/items/equip-1hand.xml b/items/equip-1hand.xml index ebdab13a..88339d28 100644 --- a/items/equip-1hand.xml +++ b/items/equip-1hand.xml @@ -23,7 +23,7 @@ weight="120" attack-action="attack" attack-range="2"> - <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> <sound event="strike">weapons/knives/knife-miss1.ogg</sound> <sound event="hit">weapons/knives/knife-hit1.ogg</sound> </item> @@ -37,7 +37,7 @@ attack-range="2" weight="1" sellProtected="true"> - <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> </item> <item id="521" image="equipment/weapon/dagger-dagger.png" @@ -48,7 +48,7 @@ attack="15" attack-range="2" weight="200"> - <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> <sound event="strike">weapons/knives/knife-miss1.ogg</sound> <sound event="hit">weapons/knives/knife-hit1.ogg</sound> </item> @@ -61,7 +61,7 @@ attack-action="attack" attack-range="2" weight="150"> - <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> <sound event="strike">weapons/knives/knife-miss1.ogg</sound> <sound event="hit">weapons/knives/knife-hit1.ogg</sound> </item> @@ -89,7 +89,7 @@ attack-action="attack" attack-range="2" weight="2000"> - <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> <sound event="strike">weapons/knives/knife-miss1.ogg</sound> <sound event="hit">weapons/knives/knife-hit1.ogg</sound> </item> @@ -113,7 +113,7 @@ attack-action="attack" attack-range="2" weight="450"> - <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> <sound event="strike">weapons/knives/knife-miss1.ogg</sound> <sound event="hit">weapons/knives/knife-hit1.ogg</sound> </item> @@ -127,7 +127,7 @@ attack-range="2" weight="900" sellProtected="true"> - <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound> <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound> <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound> @@ -184,7 +184,7 @@ vit="3" weight="500" sellProtected="true"> - <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> <sound event="strike">weapons/miss1.ogg</sound> <sound event="strike">weapons/miss2.ogg</sound> <sound event="strike">weapons/miss3.ogg</sound> @@ -200,7 +200,7 @@ attack-action="attack_chop" attack-range="2" weight="200"> - <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> </item> <item id="591" image="equipment/weapon/sword-longsword.png" @@ -211,7 +211,7 @@ attack-action="attack_chop" attack-range="2" weight="10"> - <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> </item> <item id="599" image="equipment/weapon/sword-firesword.png" @@ -222,7 +222,7 @@ attack-action="attack_chop" attack-range="2" weight="10"> - <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> </item> <item id="867" image="equipment/weapon/sword-ice.png" @@ -234,7 +234,7 @@ attack-range="2" luk="1" weight="1000"> - <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit1.ogg</sound> <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit2.ogg</sound> <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit3.ogg</sound> diff --git a/items/equip-2hand.xml b/items/equip-2hand.xml index 9031d428..5328c33e 100644 --- a/items/equip-2hand.xml +++ b/items/equip-2hand.xml @@ -68,7 +68,7 @@ attack-action="attack_chop" attack-range="2" weight="10"> - <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#8c4b41,da9041,ffffff</sprite> </item> <item id="594" image="equipment/weapon/polearm-spear.png" diff --git a/items/hairsprite.xml b/items/hairsprite.xml index 61a7e217..e9fd5889 100644 --- a/items/hairsprite.xml +++ b/items/hairsprite.xml @@ -12,7 +12,7 @@ </item> <item id="-2" type="hairsprite" - name="Bowl Cut"> + name="Flat Ponytail"> <sprite race="0">hairstyles/hairstyle01.xml</sprite> <sprite race="1">hairstyles/hairstyle01.xml</sprite> <sprite race="2">hairstyles/hairstyle01b.xml</sprite> @@ -21,7 +21,7 @@ </item> <item id="-3" type="hairsprite" - name="Combed Back"> + name="Bowl Cut"> <sprite race="0">hairstyles/hairstyle02.xml</sprite> <sprite race="1">hairstyles/hairstyle02.xml</sprite> <sprite race="2">hairstyles/hairstyle02b.xml</sprite> @@ -30,7 +30,7 @@ </item> <item id="-4" type="hairsprite" - name="Emo"> + name="Combed back"> <sprite race="0">hairstyles/hairstyle03.xml</sprite> <sprite race="1">hairstyles/hairstyle03.xml</sprite> <sprite race="2">hairstyles/hairstyle03b.xml</sprite> @@ -39,7 +39,7 @@ </item> <item id="-5" type="hairsprite" - name="Mohawk"> + name="Emo"> <sprite race="0">hairstyles/hairstyle04.xml</sprite> <sprite race="1">hairstyles/hairstyle04.xml</sprite> <sprite race="2">hairstyles/hairstyle04b.xml</sprite> @@ -48,7 +48,7 @@ </item> <item id="-6" type="hairsprite" - name="Pompadour"> + name="Mohawk"> <sprite race="0">hairstyles/hairstyle05.xml</sprite> <sprite race="1">hairstyles/hairstyle05.xml</sprite> <sprite race="2">hairstyles/hairstyle05b.xml</sprite> @@ -57,7 +57,7 @@ </item> <item id="-7" type="hairsprite" - name="Center Parting"> + name="Pompadour"> <sprite race="0">hairstyles/hairstyle06.xml</sprite> <sprite race="1">hairstyles/hairstyle06.xml</sprite> <sprite race="2">hairstyles/hairstyle06b.xml</sprite> @@ -66,7 +66,7 @@ </item> <item id="-8" type="hairsprite" - name="Long and slick"> + name="Center parting"> <sprite race="0">hairstyles/hairstyle07.xml</sprite> <sprite race="1">hairstyles/hairstyle07.xml</sprite> <sprite race="2">hairstyles/hairstyle07b.xml</sprite> @@ -75,7 +75,7 @@ </item> <item id="-9" type="hairsprite" - name="Short and Curly"> + name="Long and Slick"> <sprite race="0">hairstyles/hairstyle08.xml</sprite> <sprite race="1">hairstyles/hairstyle08.xml</sprite> <sprite race="2">hairstyles/hairstyle08.xml</sprite> @@ -84,7 +84,7 @@ </item> <item id="-10" type="hairsprite" - name="Pigtails"> + name="Short and Curly"> <sprite race="0">hairstyles/hairstyle09.xml</sprite> <sprite race="1">hairstyles/hairstyle09.xml</sprite> <sprite race="2">hairstyles/hairstyle09.xml</sprite> @@ -93,7 +93,7 @@ </item> <item id="-11" type="hairsprite" - name="Long and Curly"> + name="Pigtails"> <sprite race="0">hairstyles/hairstyle10.xml</sprite> <sprite race="1">hairstyles/hairstyle10.xml</sprite> <sprite race="2">hairstyles/hairstyle10.xml</sprite> @@ -102,7 +102,7 @@ </item> <item id="-12" type="hairsprite" - name="Parted"> + name="Long and Curly"> <sprite race="0">hairstyles/hairstyle11.xml</sprite> <sprite race="1">hairstyles/hairstyle11.xml</sprite> <sprite race="2">hairstyles/hairstyle11.xml</sprite> @@ -111,7 +111,7 @@ </item> <item id="-13" type="hairsprite" - name="Perky Ponytail"> + name="Parted"> <sprite race="0">hairstyles/hairstyle12.xml</sprite> <sprite race="1">hairstyles/hairstyle12.xml</sprite> <sprite race="2">hairstyles/hairstyle12.xml</sprite> @@ -120,7 +120,7 @@ </item> <item id="-14" type="hairsprite" - name="Wave"> + name="Perky Ponytail"> <sprite race="0">hairstyles/hairstyle13.xml</sprite> <sprite race="1">hairstyles/hairstyle13.xml</sprite> <sprite race="2">hairstyles/hairstyle13.xml</sprite> @@ -129,7 +129,7 @@ </item> <item id="-15" type="hairsprite" - name="Mane"> + name="Wave"> <sprite race="0">hairstyles/hairstyle14.xml</sprite> <sprite race="1">hairstyles/hairstyle14.xml</sprite> <sprite race="2">hairstyles/hairstyle14.xml</sprite> @@ -138,7 +138,7 @@ </item> <item id="-16" type="hairsprite" - name="Bun"> + name="Mane"> <sprite race="0">hairstyles/hairstyle15.xml</sprite> <sprite race="1">hairstyles/hairstyle15.xml</sprite> <sprite race="2">hairstyles/hairstyle15.xml</sprite> @@ -147,7 +147,7 @@ </item> <item id="-17" type="hairsprite" - name="Shoulder length flick"> + name="Bun"> <sprite race="0">hairstyles/hairstyle16.xml</sprite> <sprite race="1">hairstyles/hairstyle16.xml</sprite> <sprite race="2">hairstyles/hairstyle16.xml</sprite> @@ -156,7 +156,7 @@ </item> <item id="-18" type="hairsprite" - name="Fizzy"> + name="Shoulder length and Flick"> <sprite race="0">hairstyles/hairstyle17.xml</sprite> <sprite race="1">hairstyles/hairstyle17.xml</sprite> <sprite race="2">hairstyles/hairstyle17.xml</sprite> @@ -165,7 +165,7 @@ </item> <item id="-19" type="hairsprite" - name="Long and Clipped"> + name="Fizzy"> <sprite race="0">hairstyles/hairstyle18.xml</sprite> <sprite race="1">hairstyles/hairstyle18.xml</sprite> <sprite race="2">hairstyles/hairstyle18.xml</sprite> @@ -174,7 +174,7 @@ </item> <item id="-20" type="hairsprite" - name="Bunches"> + name="Long and Clipped"> <sprite race="0">hairstyles/hairstyle19.xml</sprite> <sprite race="1">hairstyles/hairstyle19.xml</sprite> <sprite race="2">hairstyles/hairstyle19.xml</sprite> @@ -183,7 +183,7 @@ </item> <item id="-21" type="hairsprite" - name="Long Ponytail"> + name="Bunches"> <sprite race="0">hairstyles/hairstyle20.xml</sprite> <sprite race="1">hairstyles/hairstyle20.xml</sprite> <sprite race="2">hairstyles/hairstyle20.xml</sprite> @@ -192,7 +192,7 @@ </item> <item id="-22" type="hairsprite" - name="Infinitely Long"> + name="Long Ponytail"> <sprite race="0">hairstyles/hairstyle21.xml</sprite> <sprite race="1">hairstyles/hairstyle21.xml</sprite> <sprite race="2">hairstyles/hairstyle21.xml</sprite> @@ -201,7 +201,7 @@ </item> <item id="-23" type="hairsprite" - name="Flat Ponytail"> + name="Indefinitely long"> <sprite race="0">hairstyles/hairstyle22.xml</sprite> <sprite race="1">hairstyles/hairstyle22.xml</sprite> <sprite race="2">hairstyles/hairstyle22.xml</sprite> |
