summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicksha <ms-shaman@gmx.de>2021-06-12 12:38:49 +0000
committerMicksha <ms-shaman@gmx.de>2021-06-12 12:38:49 +0000
commit7ad28766158eb06072623feda0760bf827b36880 (patch)
treea1b5eaea021e1b9950a33b07250cd4884de7b6bd
parent57c9f510c8558f2b2734a9fb9893bf6b96399d7e (diff)
parent4cf0c92536d10320e96674f3d34fa42d7826d61d (diff)
downloadclientdata-7ad28766158eb06072623feda0760bf827b36880.tar.gz
clientdata-7ad28766158eb06072623feda0760bf827b36880.tar.bz2
clientdata-7ad28766158eb06072623feda0760bf827b36880.tar.xz
clientdata-7ad28766158eb06072623feda0760bf827b36880.zip
Merge branch 'wand' into 'master'
add updated wand attack to hairstyle00 and headmodel See merge request themanaworld/evolved/clientdata!19
-rw-r--r--graphics/sprites/hairstyles/hairstyle00.xml6
-rw-r--r--graphics/sprites/model/headmodel.xml13
2 files changed, 9 insertions, 10 deletions
diff --git a/graphics/sprites/hairstyles/hairstyle00.xml b/graphics/sprites/hairstyles/hairstyle00.xml
index 761b1386..cd45fa89 100644
--- a/graphics/sprites/hairstyles/hairstyle00.xml
+++ b/graphics/sprites/hairstyles/hairstyle00.xml
@@ -111,14 +111,14 @@ Copyright (C) 2020-2021 The Mana World -->
<action name="attack_wand" imageset="base">
<animation direction="down">
<frame index="0" offsetY="-27" delay="80"/>
- <frame index="0" offsetY="-28" delay="240"/>
+ <frame index="0" offsetY="-28" delay="170"/>
<frame index="0" offsetY="-25" delay="70"/>
<frame index="0" offsetY="-24" delay="70"/>
<end />
</animation>
<animation direction="left">
<frame index="1" offsetX="4" offsetY="-30" delay="80"/>
- <frame index="1" offsetX="3" offsetY="-29" delay="240"/>
+ <frame index="1" offsetX="3" offsetY="-29" delay="170"/>
<frame index="1" offsetX="4" offsetY="-31" delay="70"/>
<frame index="1" offsetY="-28" delay="70"/>
<frame index="1" offsetX="-1" offsetY="-27" delay="70"/>
@@ -133,7 +133,7 @@ Copyright (C) 2020-2021 The Mana World -->
</animation>
<animation direction="right">
<frame index="3" offsetX="-3" offsetY="-30" delay="80"/>
- <frame index="3" offsetX="-3" offsetY="-29" delay="240"/>
+ <frame index="3" offsetX="-3" offsetY="-29" delay="170"/>
<frame index="3" offsetX="-3" offsetY="-31" delay="70"/>
<frame index="3" offsetY="-28" delay="70"/>
<frame index="3" offsetX="1" offsetY="-27" delay="70"/>
diff --git a/graphics/sprites/model/headmodel.xml b/graphics/sprites/model/headmodel.xml
index c7ca3300..2b4e40ba 100644
--- a/graphics/sprites/model/headmodel.xml
+++ b/graphics/sprites/model/headmodel.xml
@@ -113,14 +113,14 @@ Copyright (C) 2021 The Mana World-->
<action name="attack_wand" imageset="base">
<animation direction="down">
<frame index="0" offsetX="-1" offsetY="-24" delay="80"/>
- <frame index="0" offsetX="-1" offsetY="-25" delay="240"/>
+ <frame index="0" offsetX="-1" offsetY="-25" delay="170"/>
<frame index="0" offsetX="-1" offsetY="-22" delay="70"/>
<frame index="0" offsetX="-1" offsetY="-21" delay="70"/>
<end />
</animation>
<animation direction="left">
<frame index="1" offsetX="3" offsetY="-27" delay="80"/>
- <frame index="1" offsetX="2" offsetY="-26" delay="240"/>
+ <frame index="1" offsetX="2" offsetY="-26" delay="170"/>
<frame index="1" offsetX="3" offsetY="-28" delay="70"/>
<frame index="1" offsetX="-1" offsetY="-25" delay="70"/>
<frame index="1" offsetX="-2" offsetY="-24" delay="70"/>
@@ -135,11 +135,10 @@ Copyright (C) 2021 The Mana World-->
</animation>
<animation direction="right">
<frame index="3" offsetX="-2" offsetY="-27" delay="80"/>
- <frame index="3" offsetX="-2" offsetY="-26" delay="160"/>
- <frame index="3" offsetX="-2" offsetY="-25" delay="80"/>
- <frame index="3" offsetX="-2" offsetY="-29" delay="70"/>
- <frame index="3" offsetX="2" offsetY="-25" delay="70"/>
- <frame index="3" offsetX="3" offsetY="-24" delay="70"/>
+ <frame index="3" offsetX="-2" offsetY="-26" delay="170"/>
+ <frame index="3" offsetX="-2" offsetY="-28" delay="70"/>
+ <frame index="3" offsetX="1" offsetY="-25" delay="70"/>
+ <frame index="3" offsetX="2" offsetY="-24" delay="70"/>
<end />
</animation>
</action>