Merge branch 'jesusalva/v20221111' into 'master'

v2022.11.11 Update Alpha 1

See merge request legacy/clientdata!479

14 files changed, 509 insertions, 0 deletions

diff --git a/graphics/items/equipment/ammo/cursedarrow.png b/graphics/items/equipment/ammo/cursedarrow.png
new file mode 100644
index 00000000..cef5eca8
--- /dev/null
+++ b/graphics/items/equipment/ammo/cursedarrow.png
diff --git a/graphics/items/equipment/ammo/silverarrow.png b/graphics/items/equipment/ammo/silverarrow.png
new file mode 100644
index 00000000..70665766
--- /dev/null
+++ b/graphics/items/equipment/ammo/silverarrow.png
diff --git a/graphics/items/equipment/ammo/thornarrow.png b/graphics/items/equipment/ammo/thornarrow.png
new file mode 100644
index 00000000..2a25757c
--- /dev/null
+++ b/graphics/items/equipment/ammo/thornarrow.png
diff --git a/graphics/items/equipment/weapon/bow-life.png b/graphics/items/equipment/weapon/bow-life.png
new file mode 100644
index 00000000..6650e0bc
--- /dev/null
+++ b/graphics/items/equipment/weapon/bow-life.png
diff --git a/graphics/items/equipment/weapon/sword-dragon.png b/graphics/items/equipment/weapon/sword-dragon.png
new file mode 100644
index 00000000..ca3147eb
--- /dev/null
+++ b/graphics/items/equipment/weapon/sword-dragon.png
diff --git a/graphics/items/generic/naftalin.png b/graphics/items/generic/naftalin.png
new file mode 100644
index 00000000..0c3de3d4
--- /dev/null
+++ b/graphics/items/generic/naftalin.png
diff --git a/graphics/sprites/equipment/weapons/bow-life.png b/graphics/sprites/equipment/weapons/bow-life.png
new file mode 100644
index 00000000..64d43fd7
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/bow-life.png
diff --git a/graphics/sprites/equipment/weapons/bow-life.xml b/graphics/sprites/equipment/weapons/bow-life.xml
new file mode 100644
index 00000000..02ba8cb8
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/bow-life.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Author: Micksha
+Copyright (C) 2021 The Mana World -->
+
+<sprite>
+
+    <imageset name="base" 
+        src="graphics/sprites/equipment/weapons/bow-life.png" 
+        width="64" 
+        height="64"/>
+
+    <include file="model/base2.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/model/base2.xml b/graphics/sprites/model/base2.xml
new file mode 100644
index 00000000..b689c8e4
--- /dev/null
+++ b/graphics/sprites/model/base2.xml
@@ -0,0 +1,485 @@
+<?xml version="1.0"?>
+
+  <!-- uses the male model because otherwise the neutral tank top shows on some npcs -->
+
+<sprite variants="144" variant_offset="1">
+
+    <imageset name="base"
+              src="graphics/sprites/model/talpan-male.png|W;B;R"
+              width="64"
+              height="64"/>
+
+    <action name="stand" imageset="base">
+        <animation direction="down">
+            <frame index="0"/>
+        </animation>
+        <animation direction="left">
+            <frame index="16"/>
+        </animation>
+        <animation direction="up">
+            <frame index="32"/>
+        </animation>
+        <animation direction="right">
+            <frame index="48"/>
+        </animation>
+    </action>
+
+    <action name="walk" imageset="base">
+        <animation direction="down">
+            <sequence start="1" end="6" delay="80"/>
+        </animation>
+        <animation direction="left">
+            <sequence start="17" end="22" delay="80"/>
+        </animation>
+        <animation direction="up">
+            <sequence start="33" end="38" delay="80"/>
+        </animation>
+        <animation direction="right">
+            <sequence start="49" end="54" delay="80"/>
+        </animation>
+    </action>
+
+    <action name="attack" imageset="base">
+        <animation direction="down">
+            <sequence start="7" end="10" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <sequence start="23" end="26" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <sequence start="39" end="42" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <sequence start="55" end="58" delay="80"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="attack_bow" imageset="base">
+        <animation direction="down">
+            <sequence start="11" end="15" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <sequence start="27" end="31" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <sequence start="43" end="47" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <sequence start="59" end="63" delay="80"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="attack_wand" imageset="base">
+        <animation direction="down">
+            <frame index="7" delay="80"/>
+            <frame index="8" delay="80"/>
+            <frame index="11" delay="90"/>
+            <sequence start="9" end="10" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="left">
+             <frame index="23" delay="80"/>
+             <frame index="28" delay="80"/>
+             <frame index="27" delay="90"/>
+            <sequence start="24" end="26" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="39" delay="90"/>
+            <frame index="43" delay="90"/>
+            <sequence start="40" end="42" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="55" delay="80"/>
+            <frame index="60" delay="80"/>
+            <frame index="59" delay="90"/>
+            <sequence start="56" end="58" delay="70"/>
+            <end />
+        </animation>
+    </action>
+
+   <action name="attack_scythe" imageset="base">
+        <animation direction="down">
+            <frame index="11" delay="100"/>
+            <frame index="8" delay="100"/>
+            <frame index="9" delay="90"/>
+            <frame index="7" delay="90"/>
+            <frame index="10" delay="85"/>
+            <frame index="7" delay="90"/>
+            <frame index="9" delay="90"/>
+            <frame index="8" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="27" delay="100"/>
+            <frame index="23" delay="90"/>
+            <frame index="24" delay="90"/>
+            <frame index="25" delay="80"/>
+            <frame index="26" delay="90"/>
+            <frame index="25" delay="90"/>
+            <frame index="24" delay="100"/>
+            <frame index="23" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="43" delay="100"/>
+            <frame index="42" delay="90"/>
+            <frame index="41" delay="90"/>
+            <frame index="40" delay="80"/>
+            <frame index="39" delay="90"/>
+            <frame index="40" delay="90"/>
+            <frame index="41" delay="100"/>
+            <frame index="42" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="59" delay="100"/>
+            <frame index="55" delay="90"/>
+            <frame index="56" delay="90"/>
+            <frame index="57" delay="80"/>
+            <frame index="58" delay="90"/>
+            <frame index="57" delay="90"/>
+            <frame index="56" delay="100"/>
+            <frame index="55" delay="90"/>
+            <end />
+        </animation>
+    </action>
+
+   <action name="attack_chop" imageset="base">
+        <animation direction="down">
+            <frame index="7" delay="100"/>
+            <frame index="8" delay="100"/>
+            <frame index="11" delay="120"/>
+            <frame index="9" delay="90"/>
+            <frame index="10" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="23" delay="100"/>
+            <frame index="24" delay="100"/>
+            <frame index="27" delay="120"/>
+            <frame index="25" delay="90"/>
+            <frame index="26" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="39" delay="100"/>
+            <frame index="40" delay="100"/>
+            <frame index="41" delay="120"/>
+            <frame index="42" delay="90"/>
+            <frame index="44" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="55" delay="100"/>
+            <frame index="56" delay="100"/>
+            <frame index="59" delay="120"/>
+            <frame index="57" delay="90"/>
+            <frame index="58" delay="70"/>
+            <end />
+        </animation>
+    </action>
+
+   <action name="attack_chop_long" imageset="base">
+        <animation direction="down">
+            <frame index="8" delay="120"/>
+            <frame index="11" delay="130"/>
+            <frame index="7" delay="70"/>
+            <frame index="10" delay="70"/>
+            <frame index="9" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="23" delay="120"/>
+            <frame index="27" delay="130"/>
+            <frame index="26" delay="80"/>
+            <frame index="25" delay="100"/>
+            <frame index="24" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="39" delay="120"/>
+            <frame index="40" delay="80"/>
+            <frame index="41" delay="130"/>
+            <frame index="42" delay="70"/>
+            <frame index="44" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="55" delay="120"/>
+            <frame index="59" delay="130"/>
+            <frame index="58" delay="80"/>
+            <frame index="57" delay="100"/>
+            <frame index="56" delay="80"/>
+            <end />
+        </animation>
+    </action>
+
+   <action name="attack_stab_long" imageset="base">
+        <animation direction="down">
+            <frame index="6" delay="140"/>
+            <frame index="8" delay="90"/>
+            <frame index="11" delay="110"/>
+            <frame index="13" delay="140"/>
+            <frame index="14" delay="70"/>
+            <frame index="13" delay="90"/>
+            <frame index="11" delay="110"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="23" delay="210"/>
+            <frame index="30" delay="140"/>
+            <frame index="29" delay="110"/>
+            <frame index="25" delay="70"/>
+            <frame index="28" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="39" delay="140"/>
+            <frame index="40" delay="120"/>
+            <frame index="46" delay="90"/>
+            <frame index="42" delay="70"/>
+            <frame index="46" delay="120"/>
+            <frame index="40" delay="140"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="55" delay="210"/>
+            <frame index="62" delay="140"/>
+            <frame index="61" delay="110"/>
+            <frame index="57" delay="70"/>
+            <frame index="60" delay="90"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="sit" imageset="base">
+        <animation direction="down">
+            <frame index="64"/>
+        </animation>
+        <animation direction="left">
+            <frame index="65"/>
+        </animation>
+        <animation direction="up">
+            <frame index="66"/>
+        </animation>
+        <animation direction="right">
+            <frame index="67"/>
+        </animation>
+    </action>
+
+
+    <action name="dead" imageset="base">
+        <animation direction="down">
+            <frame index="72"/>
+        </animation>
+        <animation direction="left">
+            <frame index="72"/>
+        </animation>
+        <animation direction="up">
+            <frame index="72"/>
+        </animation>
+        <animation direction="right">
+            <frame index="72"/>
+        </animation>
+    </action>
+
+<!-- UNUSED, evol-based moves using incomplete equipment sprites, and riding -->
+
+    <action name="sittop" imageset="base">
+        <animation direction="down">
+            <frame index="68"/>
+        </animation>
+        <animation direction="left">
+            <frame index="69"/>
+        </animation>
+        <animation direction="up">
+            <frame index="70"/>
+        </animation>
+        <animation direction="right">
+            <frame index="71"/>
+        </animation>
+    </action>
+
+    <action name="standride" imageset="base">
+        <animation direction="down">
+            <frame index="64"/>
+        </animation>
+        <animation direction="left">
+            <frame index="65"/>
+        </animation>
+        <animation direction="up">
+            <frame index="66"/>
+        </animation>
+        <animation direction="right">
+            <frame index="67"/>
+        </animation>
+    </action>
+
+    <action name="spawnride" imageset="base">
+        <animation direction="down">
+            <frame index="64"/>
+        </animation>
+        <animation direction="left">
+            <frame index="65"/>
+        </animation>
+        <animation direction="up">
+            <frame index="66"/>
+        </animation>
+        <animation direction="right">
+            <frame index="67"/>
+        </animation>
+    </action>
+
+    <action name="ride" imageset="base">
+        <animation direction="down">
+            <frame index="64"/>
+        </animation>
+        <animation direction="left">
+            <frame index="65"/>
+        </animation>
+        <animation direction="up">
+            <frame index="66"/>
+        </animation>
+        <animation direction="right">
+            <frame index="67"/>
+        </animation>
+    </action>
+
+    <action name="attackride" imageset="base">
+        <animation direction="down">
+            <frame index="64"/>
+        </animation>
+        <animation direction="left">
+            <frame index="65"/>
+        </animation>
+        <animation direction="up">
+            <frame index="66"/>
+        </animation>
+        <animation direction="right">
+            <frame index="67"/>
+        </animation>
+    </action>
+
+
+
+    <action name="cast" imageset="base">
+        <animation direction="down">
+            <frame index="7" delay="80"/>
+            <frame index="8" delay="80"/>
+            <frame index="11" delay="90"/>
+            <sequence start="8" end="10" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="left">
+             <frame index="23" delay="80"/>
+             <frame index="28" delay="80"/>
+             <frame index="27" delay="90"/>
+             <frame index="28" delay="70"/>
+            <sequence start="24" end="26" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="39" delay="90"/>
+            <frame index="43" delay="90"/>
+            <sequence start="40" end="42" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="55" delay="80"/>
+            <frame index="60" delay="80"/>
+            <frame index="59" delay="90"/>
+            <frame index="60" delay="70"/>
+            <sequence start="56" end="58" delay="70"/>
+            <end />
+        </animation>
+    </action>
+
+<!-- UNUSED, old additional moves using incomplete equipment sprites -->
+
+    <action name="attack_sword_stab" imageset="base">
+        <animation direction="down">
+            <sequence start="7" end="10" delay="100"/>
+            <end/>
+        </animation>
+        <animation direction="left">
+            <sequence start="23" end="26" delay="100"/>
+            <end/>
+        </animation>
+        <animation direction="up">
+            <sequence start="39" end="42" delay="100"/>
+            <end/>
+        </animation>
+        <animation direction="right">
+            <sequence start="55" end="58" delay="100"/>
+            <end/>
+        </animation>
+    </action>
+
+    <action name="attack_spear" imageset="base">
+        <animation direction="down">
+            <sequence start="80" end="83" delay="140"/>
+            <end/>
+        </animation>
+        <animation direction="left">
+            <sequence start="96" end="99" delay="140"/>
+            <end/>
+        </animation>
+        <animation direction="up">
+            <sequence start="112" end="115" delay="140"/>
+            <end/>
+        </animation>
+        <animation direction="right">
+            <sequence start="128" end="131" delay="140"/>
+            <end/>
+        </animation>
+    </action>
+
+    <action name="attack_chop_old" imageset="base">
+        <animation direction="down">
+            <sequence start="84" end="87" delay="140"/>
+            <end/>
+        </animation>
+        <animation direction="left">
+            <sequence start="100" end="103" delay="140"/>
+            <end/>
+        </animation>
+        <animation direction="up">
+            <sequence start="116" end="119" delay="140"/>
+            <end/>
+        </animation>
+        <animation direction="right">
+            <sequence start="132" end="135" delay="140"/>
+            <end/>
+        </animation>
+    </action>
+
+    <action name="attack_2hand" imageset="base">
+        <animation direction="down">
+            <sequence start="88" end="91" delay="140"/>
+            <end/>
+        </animation>
+        <animation direction="left">
+            <sequence start="104" end="107" delay="140"/>
+            <end/>
+        </animation>
+        <animation direction="up">
+            <sequence start="120" end="123" delay="140"/>
+            <end/>
+        </animation>
+        <animation direction="right">
+            <sequence start="136" end="139" delay="140"/>
+            <end/>
+        </animation>
+    </action>
+
+</sprite>
diff --git a/graphics/sprites/model/talpan-male.png b/graphics/sprites/model/talpan-male.png
new file mode 100644
index 00000000..137d0d34
--- /dev/null
+++ b/graphics/sprites/model/talpan-male.png
diff --git a/graphics/sprites/npcs/griffen-meway-gpl.png b/graphics/sprites/npcs/griffen-meway-gpl.png
new file mode 100644
index 00000000..087ff74d
--- /dev/null
+++ b/graphics/sprites/npcs/griffen-meway-gpl.png
diff --git a/graphics/sprites/npcs/griffen-meway-gpl.xml b/graphics/sprites/npcs/griffen-meway-gpl.xml
new file mode 100644
index 00000000..fc58e478
--- /dev/null
+++ b/graphics/sprites/npcs/griffen-meway-gpl.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<sprite variants="1" variant_offset="1">
+  <imageset name="base" src="graphics/sprites/npcs/griffen-meway-gpl.png" width="96" height="64"/>
+  <action name="stand" imageset="base">
+    <animation direction="default">
+      <frame index="0"/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/tiles/desert-piramide.png b/graphics/tiles/desert-piramide.png
new file mode 100644
index 00000000..c7e695af
--- /dev/null
+++ b/graphics/tiles/desert-piramide.png
diff --git a/graphics/tiles/ukarWalls.png b/graphics/tiles/ukarWalls.png
new file mode 100644
index 00000000..32ce8e3c
--- /dev/null
+++ b/graphics/tiles/ukarWalls.png