Merge branch 'setzer' into 'master'

Setzer

See merge request legacy/clientdata!565

14 files changed, 85 insertions, 6 deletions

diff --git a/graphics/sprites/equipment/weapons/dagger-setzer.png b/graphics/sprites/equipment/weapons/dagger-setzer.png
new file mode 100644
index 00000000..2e9120cc
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/dagger-setzer.png
diff --git a/graphics/sprites/equipment/weapons/dagger-setzer.xml b/graphics/sprites/equipment/weapons/dagger-setzer.xml
new file mode 100644
index 00000000..99da95d8
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/dagger-setzer.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" ?>
+<sprite>
+  <imageset name="sword" src="graphics/sprites/equipment/weapons/dagger-setzer.png" width="64" height="64" />
+  <action name="default" imageset="sword" />
+  <action name="stand" imageset="sword">
+    <animation direction="down">
+      <frame index="0" />
+    </animation>
+    <animation direction="left">
+      <frame index="18" />
+    </animation>
+    <animation direction="up">
+      <frame index="36" />
+    </animation>
+    <animation direction="right">
+      <frame index="54" />
+    </animation>
+  </action>
+  <action name="walk" imageset="sword">
+    <animation direction="down">
+      <sequence start="1" end="6" delay="75" />
+    </animation>
+    <animation direction="left">
+      <sequence start="19" end="24" delay="75" />
+    </animation>
+    <animation direction="up">
+      <sequence start="37" end="42" delay="75" />
+    </animation>
+    <animation direction="right">
+      <sequence start="55" end="60" delay="75" />
+    </animation>
+  </action>
+  <action name="sit" imageset="sword">
+    <animation direction="down">
+      <frame index="7" />
+    </animation>
+    <animation direction="left">
+      <frame index="25" />
+    </animation>
+    <animation direction="up">
+      <frame index="43" />
+    </animation>
+    <animation direction="right">
+      <frame index="61" />
+    </animation>
+  </action>
+  <action name="dead" imageset="sword">
+    <animation direction="down">
+      <frame index="8" offsetX="0" offsetY="32" />
+    </animation>
+    <animation direction="left">
+      <frame index="8" offsetX="0" offsetY="32" />
+    </animation>
+    <animation direction="up">
+      <frame index="8" offsetX="0" offsetY="32" />
+    </animation>
+    <animation direction="right">
+      <frame index="8" offsetX="0" offsetY="32" />
+    </animation>
+  </action>
+  <action name="attack" imageset="sword">
+    <animation direction="down">
+      <sequence start="9" end="12" delay="75" />
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="27" end="30" delay="75" />
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="45" end="48" delay="75" />
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="63" end="66" delay="75" />
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/dragon-sword.png b/graphics/sprites/equipment/weapons/dragon-sword.png
deleted file mode 100644
index 91a27abd..00000000
--- a/graphics/sprites/equipment/weapons/dragon-sword.png
+++ /dev/null
diff --git a/graphics/sprites/equipment/weapons/jackal.png b/graphics/sprites/equipment/weapons/jackal.png
deleted file mode 100644
index ee74ee54..00000000
--- a/graphics/sprites/equipment/weapons/jackal.png
+++ /dev/null
diff --git a/graphics/sprites/equipment/weapons/beheader.png b/graphics/sprites/equipment/weapons/sword-beheader.png
index ba576dbb..ba576dbb 100644
--- a/graphics/sprites/equipment/weapons/beheader.png
+++ b/graphics/sprites/equipment/weapons/sword-beheader.png
diff --git a/graphics/sprites/equipment/weapons/beheader.xml b/graphics/sprites/equipment/weapons/sword-beheader.xml
index 75fe84fd..ee887553 100644
--- a/graphics/sprites/equipment/weapons/beheader.xml
+++ b/graphics/sprites/equipment/weapons/sword-beheader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="sword" src="graphics/sprites/equipment/weapons/beheader.png" width="64" height="64"/>
+  <imageset name="sword" src="graphics/sprites/equipment/weapons/sword-beheader.png" width="64" height="64"/>
   <action name="default" imageset="sword">
   </action>
   <action name="stand" imageset="sword">
diff --git a/graphics/sprites/equipment/weapons/sword-dragon.png b/graphics/sprites/equipment/weapons/sword-dragon.png
new file mode 100644
index 00000000..ccf40930
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-dragon.png
diff --git a/graphics/sprites/equipment/weapons/dragon-sword.xml b/graphics/sprites/equipment/weapons/sword-dragon.xml
index 1f980832..b46fda5c 100644
--- a/graphics/sprites/equipment/weapons/dragon-sword.xml
+++ b/graphics/sprites/equipment/weapons/sword-dragon.xml
@@ -3,9 +3,9 @@
 Copyright (C) 2020 Evol Online -->
 <sprite>
     <imageset name="base"
-              src="graphics/sprites/equipment/weapons/dragon-sword.png"
+              src="graphics/sprites/equipment/weapons/sword-dragon.png"
               width="128"
               height="128"/>
 
-    <include file="equipment/weapons/lidersword.xml"/>
+    <include file="equipment/weapons/sword-lider.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-jackal.png b/graphics/sprites/equipment/weapons/sword-jackal.png
new file mode 100644
index 00000000..0d578e2b
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-jackal.png
diff --git a/graphics/sprites/equipment/weapons/jackal.xml b/graphics/sprites/equipment/weapons/sword-jackal.xml
index d8cdf3f9..9360042d 100644
--- a/graphics/sprites/equipment/weapons/jackal.xml
+++ b/graphics/sprites/equipment/weapons/sword-jackal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- (C) The Mana World Brazil Team -->
 <sprite>
-  <imageset name="sword" src="graphics/sprites/equipment/weapons/jackal.png" width="128" height="128" />
+  <imageset name="sword" src="graphics/sprites/equipment/weapons/sword-jackal.png" width="128" height="128" />
 
   <action name="default" imageset="sword">
   </action>
diff --git a/graphics/sprites/equipment/weapons/lidersword.png b/graphics/sprites/equipment/weapons/sword-lider.png
index f3ca961c..f3ca961c 100644
--- a/graphics/sprites/equipment/weapons/lidersword.png
+++ b/graphics/sprites/equipment/weapons/sword-lider.png
diff --git a/graphics/sprites/equipment/weapons/lidersword.xml b/graphics/sprites/equipment/weapons/sword-lider.xml
index 2002cf58..7581c078 100644
--- a/graphics/sprites/equipment/weapons/lidersword.xml
+++ b/graphics/sprites/equipment/weapons/sword-lider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="lider" src="graphics/sprites/equipment/weapons/lidersword.png" width="128" height="128"/>
+  <imageset name="lider" src="graphics/sprites/equipment/weapons/sword-lider.png" width="128" height="128"/>
 
   <action name="default" imageset="lider">
   </action>
diff --git a/graphics/sprites/equipment/weapons/sandcutter.png b/graphics/sprites/equipment/weapons/sword-sandcutter.png
index fc1e909e..fc1e909e 100644
--- a/graphics/sprites/equipment/weapons/sandcutter.png
+++ b/graphics/sprites/equipment/weapons/sword-sandcutter.png
diff --git a/graphics/sprites/equipment/weapons/sandcutter.xml b/graphics/sprites/equipment/weapons/sword-sandcutter.xml
index b61cebda..d200855f 100644
--- a/graphics/sprites/equipment/weapons/sandcutter.xml
+++ b/graphics/sprites/equipment/weapons/sword-sandcutter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="sword" src="graphics/sprites/equipment/weapons/sandcutter.png" width="64" height="64"/>
+  <imageset name="sword" src="graphics/sprites/equipment/weapons/sword-sandcutter.png" width="64" height="64"/>
   <action name="default" imageset="sword">
   </action>
   <action name="stand" imageset="sword">