Merge branch 'skills' into 'master'

Skills update

See merge request themanaworld/evolved/clientdata!24

4 files changed, 61 insertions, 54 deletions

diff --git a/graphics/particles/knife.particle.xml b/graphics/particles/knife.particle.xml
new file mode 100644
index 00000000..0228284f
--- /dev/null
+++ b/graphics/particles/knife.particle.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="32" lifetime="128">
+    <rotation imageset="graphics/particles/knifeh.png" width="16" height="16">
+      <sequence start="0" end="7"/>
+    </rotation>
+  </particle>
+</effect>
diff --git a/graphics/particles/knifeh.png b/graphics/particles/knifeh.png
new file mode 100644
index 00000000..b2d37567
--- /dev/null
+++ b/graphics/particles/knifeh.png
diff --git a/license.md b/license.md
index 00bde3be..d39075fe 100644
--- a/license.md
+++ b/license.md
@@ -606,6 +606,7 @@ File | Artists | Licenses
 `graphics/particles/glow-small.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/particles/gloworb-medium.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/particles/gloworb-small.png` | Crush | GPLv2, CC BY-SA 3.0
+`graphics/particles/knifeh.png` | Micksha | MIT
 `graphics/particles/leaf.png` | Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/particles/mist-face-a.png` | Nmaligec | GPLv2
 `graphics/particles/mist-face-b.png` | Nmaligec | GPLv2
diff --git a/skills.xml b/skills.xml
index 3a345a61..1074eedd 100644
--- a/skills.xml
+++ b/skills.xml
@@ -6,10 +6,10 @@
   <set name="Basic">
     <!-- Basic Skills are available right from the start. -->
     <skill id="1" name="Social Skills" icon="graphics/skills/basic/emote.png" description="Charisma not included." alwaysVisible="true"/>
-    <skill id="20002" name="Resync" icon="graphics/skills/basic/party.png" description="Desesperate attempt to lower desync." alwaysVisible="true"/>
-    <skill id="243" name="Call Homun" icon="graphics/skills/basic/trade.png" description="Create or awake an Homunculus."/>
+    <skill id="20002" name="Resync" icon="graphics/skills/basic/party.png" description="Desesperate attempt to lower desync." alwaysVisible="true" srcEffectId="10"/>
+    <skill id="243" name="Call Homun" icon="graphics/skills/basic/trade.png" description="Create or awake an Homunculus." castingSrcEffectId="10"/>
     <skill id="244" name="Rest Homun" icon="graphics/skills/basic/trade.png" description="Temporarily hide an Homunculus."/>
-    <skill id="247" name="Revive Homun" icon="graphics/skills/basic/trade.png" description="Revive an Homunculus."/>
+    <skill id="247" name="Revive Homun" icon="graphics/skills/basic/trade.png" description="Revive an Homunculus."  castingDstEffectId="3"/>
     <skill id="37" name="Discount" icon="graphics/skills/basic/trade.png" description="Buy things for less."/>
     <skill id="38" name="Barter" icon="graphics/skills/basic/trade.png" description="Sell things for more."/>
 
@@ -21,10 +21,10 @@
     <skill id="20010" name="Magic" level="4" icon="graphics/skills/magic/basic.png" description="Cast Lvl 4 magic spells."/>
     <skill id="20010" name="Magic" level="5" icon="graphics/skills/magic/basic.png" description="Cast Lvl 5 magic spells."/>
 
-    <skill id="20021" name="Abizit" icon="graphics/skills/magic/basic.png" description="Detects magical prowess."/>
-    <skill id="20023" name="Confringo" icon="graphics/skills/magic/basic.png" description="Basic wand attack."/>
-    <skill id="20024" name="Miteyo" icon="graphics/skills/magic/basic.png" description="Obtains monster info."/>
-    <skill id="20045" name="Joyplim" icon="graphics/skills/magic/basic.png" description="Brings happiness. Req. 1x Ginger Bread Man"/>
+    <skill id="20021" name="Abizit" icon="graphics/skills/magic/basic.png" description="Detects magical progress." castingAction="attack_wand" srcEffectId="10"/>
+    <skill id="20023" name="Confringo" icon="graphics/skills/magic/basic.png" description="Basic wand attack." castingAction="attack_wand"/>
+    <skill id="20024" name="Miteyo" icon="graphics/skills/magic/basic.png" description="Obtains monster info." castingAction="attack_wand" srcEffectId="10"/>
+    <skill id="20045" name="Joyplim" icon="graphics/skills/magic/basic.png" description="Brings happiness. Req. 1x Ginger Bread Man" castingAction="attack_wand" srcEffectId="6"/>
   </set>
 
   <!-- ********************************************************************** -->
@@ -41,29 +41,29 @@
 
   <!-- ********************************************************************** -->
   <set name="Life">
-    <skill id="20011" name="Life Magic" level="1" icon="graphics/skills/magic/life.png" description="Cast Lvl 1 Life Magic spells."/>
-    <skill id="20011" name="Life Magic" level="2" icon="graphics/skills/magic/life.png" description="Cast Lvl 2 Life Magic spells."/>
-    <skill id="20011" name="Life Magic" level="3" icon="graphics/skills/magic/life.png" description="Cast Lvl 3 Life Magic spells."/>
-    <skill id="20011" name="Life Magic" level="4" icon="graphics/skills/magic/life.png" description="Cast Lvl 4 Life Magic spells."/>
-    <skill id="20011" name="Life Magic" level="5" icon="graphics/skills/magic/life.png" description="Cast Lvl 5 Life Magic spells."/>
-
-    <skill id="20029" name="Lum" icon="graphics/skills/magic/life.png" description="Lesser Heal. Req. 1x Lifestone"/>
-    <skill id="20030" name="Inma" icon="graphics/skills/magic/life.png" description="Lay on Hands, first-aid for allies."/>
+    <skill id="20011" name="Life Magic" level="1" icon="graphics/skills/magic/life.png" description="Cast Lvl 1 Life Magic spells." castingAction="attack_wand"/>
+    <skill id="20011" name="Life Magic" level="2" icon="graphics/skills/magic/life.png" description="Cast Lvl 2 Life Magic spells." castingAction="attack_wand"/>
+    <skill id="20011" name="Life Magic" level="3" icon="graphics/skills/magic/life.png" description="Cast Lvl 3 Life Magic spells." castingAction="attack_wand"/>
+    <skill id="20011" name="Life Magic" level="4" icon="graphics/skills/magic/life.png" description="Cast Lvl 4 Life Magic spells." castingAction="attack_wand"/>
+    <skill id="20011" name="Life Magic" level="5" icon="graphics/skills/magic/life.png" description="Cast Lvl 5 Life Magic spells." castingAction="attack_wand"/>
+
+    <skill id="20029" name="Lum" icon="graphics/skills/magic/life.png" description="Lesser Heal. Req. 1x Lifestone" castingAction="attack_wand" srcEffectId="3" dstEffectId="3"/>
+    <skill id="20030" name="Inma" icon="graphics/skills/magic/life.png" description="Lay on Hands, first-aid for allies." castingAction="attack_wand" srcEffectId="3" dstEffectId="3"/>
   </set>
 
   <!-- ********************************************************************** -->
   <set name="War">
-    <skill id="20012" name="War Magic" level="1" icon="graphics/skills/magic/war.png" description="Cast Lvl 1 War Magic spells."/>
-    <skill id="20012" name="War Magic" level="2" icon="graphics/skills/magic/war.png" description="Cast Lvl 2 War Magic spells."/>
-    <skill id="20012" name="War Magic" level="3" icon="graphics/skills/magic/war.png" description="Cast Lvl 3 War Magic spells."/>
-    <skill id="20012" name="War Magic" level="4" icon="graphics/skills/magic/war.png" description="Cast Lvl 4 War Magic spells."/>
-    <skill id="20012" name="War Magic" level="5" icon="graphics/skills/magic/war.png" description="Cast Lvl 5 War Magic spells."/>
-
-    <skill id="20022" name="Flar" icon="graphics/skills/magic/war.png" description="Fire dart. Req. 1x Sulphur Powder"/>
-    <skill id="20040" name="Chiza" icon="graphics/skills/magic/war.png" description="????. Req. 1x Knife?"/>
-    <skill id="20041" name="Ingrav" icon="graphics/skills/magic/war.png" description="Lightning. Req. 1x Iron Powder"/>
-    <skill id="20042" name="Upmarmu" icon="graphics/skills/magic/war.png" description="Magic Knuckle. Req. 1x Beer, disarmed"/>
-    <skill id="20044" name="Frillyar" icon="graphics/skills/magic/war.png" description="AOE Arrow Hail. Req. 15x Arrow + 1x Sulphur Powder"/>
+    <skill id="20012" name="War Magic" level="1" icon="graphics/skills/magic/war.png" description="Cast Lvl 1 War Magic spells." castingAction="attack_wand"/>
+    <skill id="20012" name="War Magic" level="2" icon="graphics/skills/magic/war.png" description="Cast Lvl 2 War Magic spells." castingAction="attack_wand"/>
+    <skill id="20012" name="War Magic" level="3" icon="graphics/skills/magic/war.png" description="Cast Lvl 3 War Magic spells." castingAction="attack_wand"/>
+    <skill id="20012" name="War Magic" level="4" icon="graphics/skills/magic/war.png" description="Cast Lvl 4 War Magic spells." castingAction="attack_wand"/>
+    <skill id="20012" name="War Magic" level="5" icon="graphics/skills/magic/war.png" description="Cast Lvl 5 War Magic spells." castingAction="attack_wand"/>
+
+    <skill id="20022" name="Flar" icon="graphics/skills/magic/war.png" description="Fire dart. Req. 1x Sulphur Powder" castingAction="attack_wand" srcEffectId="4" hitEffectId="26" missile-particle="attack.particle.xml"/>
+    <skill id="20040" name="Chiza" icon="graphics/skills/magic/war.png" description="????. Req. 1x Knife?" castingAction="attack_wand" srcEffectId="4" hitEffectId="26" missile-particle="knife.particle.xml"/>
+    <skill id="20041" name="Ingrav" icon="graphics/skills/magic/war.png" description="Lightning. Req. 1x Iron Powder" castingAction="attack_wand" srcEffectId="4" dstEffectId="17"/>
+    <skill id="20042" name="Upmarmu" icon="graphics/skills/magic/war.png" description="Magic Knuckle. Req. 1x Beer, disarmed" castingAction="attack" srcEffectId="4" hitEffectId="26"/>
+    <skill id="20044" name="Frillyar" icon="graphics/skills/magic/war.png" description="AOE Arrow Hail. Req. 15x Arrow + 1x Sulphur Powder" castingAction="attack_wand" srcEffectId="4" dstEffectId="27"/>
   </set>
 
   <!-- ********************************************************************** -->
@@ -74,15 +74,15 @@
     <skill id="20013" name="Transmutation Magic" level="4" icon="graphics/skills/magic/transmutation.png" description="Cast Lvl 4 Transmut. Magic spells."/>
     <skill id="20013" name="Transmutation Magic" level="5" icon="graphics/skills/magic/transmutation.png" description="Cast Lvl 5 Transmut. Magic spells."/>
 
-    <skill id="20047" name="Parum" icon="graphics/skills/magic/transmutation.png" description="Mouboo Figurine. Req. 1x Raw Log."/>
-    <skill id="20048" name="Kularzufrill" icon="graphics/skills/magic/transmutation.png" description="Arrows. Req. 1x Raw Log."/>
-    <skill id="20049" name="Zukminbirf" icon="graphics/skills/magic/transmutation.png" description="Iron Powder. Req. 1x Iron Ore."/>
-    <skill id="20053" name="Gole" icon="graphics/skills/magic/transmutation.png" description="Sulphur Powder. Req. 1x Pile of Ash."/>
+    <skill id="20047" name="Parum" icon="graphics/skills/magic/transmutation.png" description="Mouboo Figurine. Req. 1x Raw Log." castingAction="attack_wand" srcEffectId="5"/>
+    <skill id="20048" name="Kularzufrill" icon="graphics/skills/magic/transmutation.png" description="Arrows. Req. 1x Raw Log." castingAction="attack_wand" srcEffectId="5"/>
+    <skill id="20049" name="Zukminbirf" icon="graphics/skills/magic/transmutation.png" description="Iron Powder. Req. 1x Iron Ore." castingAction="attack_wand" srcEffectId="5"/>
+    <skill id="20053" name="Gole" icon="graphics/skills/magic/transmutation.png" description="Sulphur Powder. Req. 1x Pile of Ash." castingAction="attack_wand" srcEffectId="5"/>
     <!-- "Unfortunately, you can't make out what the transmutation is for or even whether it requires any materials..." -->
-    <skill id="20054" name="Manpahil" icon="graphics/skills/magic/transmutation.png" description="?????"/>
-    <skill id="20050" name="Patmuploo" icon="graphics/skills/magic/transmutation.png" description="Cotton Shirt. Req. 5x Cotton Cloth."/>
-    <skill id="20051" name="Patvirolee" icon="graphics/skills/magic/transmutation.png" description="Short Tanktop. Req. 3x Cotton Cloth."/>
-    <skill id="20052" name="Patloree" icon="graphics/skills/magic/transmutation.png" description="Tanktop. Req. 4x Cotton Cloth."/>
+    <skill id="20054" name="Manpahil" icon="graphics/skills/magic/transmutation.png" description="?????" castingAction="attack_wand" srcEffectId="2"/>
+    <skill id="20050" name="Patmuploo" icon="graphics/skills/magic/transmutation.png" description="Cotton Shirt. Req. 5x Cotton Cloth." castingAction="attack_wand" srcEffectId="5"/>
+    <skill id="20051" name="Patvirolee" icon="graphics/skills/magic/transmutation.png" description="Short Tanktop. Req. 3x Cotton Cloth." castingAction="attack_wand" srcEffectId="5"/>
+    <skill id="20052" name="Patloree" icon="graphics/skills/magic/transmutation.png" description="Tanktop. Req. 4x Cotton Cloth." castingAction="attack_wand" srcEffectId="5"/>
   </set>
 
   <!-- ********************************************************************** -->
@@ -93,16 +93,15 @@
     <skill id="20014" name="Nature Magic" level="4" icon="graphics/skills/magic/nature.png" description="Cast Lvl 4 Nature Magic spells."/>
     <skill id="20014" name="Nature Magic" level="5" icon="graphics/skills/magic/nature.png" description="Cast Lvl 5 Nature Magic spells."/>
 
-    <skill id="20020" name="Itenplz" icon="graphics/skills/magic/nature.png" description="Aggravate monsters, so they attack you."/>
-    <skill id="20055" name="Chipchip" icon="graphics/skills/magic/nature.png" description="Attempt to shear monsters."/>
-    <skill id="20037" name="Kaflosh" icon="graphics/skills/magic/nature.png" description="Map-wide rain. Req. 1x Bottle of Water."/>
-    <skill id="20038" name="Betsanc" icon="graphics/skills/magic/nature.png" description="Increase DEF at cost of ASPD. Req. 1x Hard Spike"/>
-    <skill id="20025" name="Modriphoo" icon="graphics/skills/magic/nature.png" description="Spawn Alizarin Plant. 1x Alizarin + 1x Root."/>
-    <skill id="20026" name="Modridump" icon="graphics/skills/magic/nature.png" description="Spawn Cobalt Plant. 1x Cobalt + 1x Root."/>
-    <skill id="20027" name="Modriykikam" icon="graphics/skills/magic/nature.png" description="Spawn Gamboge Plant. 1x Gamboge + 1x Root."/>
-    <skill id="20028" name="Modrilax" icon="graphics/skills/magic/nature.png" description="Spawn Mauve Plant. 1x Mauve + 1x Root."/>
-
-    <skill id="681" name="Plugh" icon="graphics/skills/basic/trade.png" description="Makes you as light as a feather."/>
+    <skill id="20020" name="Itenplz" icon="graphics/skills/magic/nature.png" description="Aggravate monsters, so they attack you." castingAction="attack_wand" srcEffectId="6" dstEffectId="10"/>
+    <skill id="20055" name="Chipchip" icon="graphics/skills/magic/nature.png" description="Attempt to shear monsters." castingAction="attack_wand" srcEffectId="6" dstEffectId="6"/>
+    <skill id="20037" name="Kaflosh" icon="graphics/skills/magic/nature.png" description="Map-wide rain. Req. 1x Bottle of Water." castingAction="attack_wand" srcEffectId="6" dstEffectId="25"/>
+    <skill id="20038" name="Betsanc" icon="graphics/skills/magic/nature.png" description="Increase DEF at cost of ASPD. Req. 1x Hard Spike" castingAction="attack_wand" srcEffectId="11"/>
+    <skill id="20025" name="Modriphoo" icon="graphics/skills/magic/nature.png" description="Spawn Alizarin Plant. 1x Alizarin + 1x Root." castingAction="attack_wand" srcEffectId="6" dstEffectId="22"/>
+    <skill id="20026" name="Modridump" icon="graphics/skills/magic/nature.png" description="Spawn Cobalt Plant. 1x Cobalt + 1x Root." castingAction="attack_wand" srcEffectId="6" dstEffectId="22"/>
+    <skill id="20027" name="Modriykikam" icon="graphics/skills/magic/nature.png" description="Spawn Gamboge Plant. 1x Gamboge + 1x Root." castingAction="attack_wand" srcEffectId="6" dstEffectId="22"/>
+    <skill id="20028" name="Modrilax" icon="graphics/skills/magic/nature.png" description="Spawn Mauve Plant. 1x Mauve + 1x Root." castingAction="attack_wand" srcEffectId="6" dstEffectId="22"/>
+    <skill id="681" name="Plugh" icon="graphics/skills/basic/trade.png" description="Makes you as light as a feather." castingAction="attack_wand" srcEffectId="6"/>
   </set>
 
   <!-- ********************************************************************** -->
@@ -113,12 +112,12 @@
     <skill id="20015" name="Astral Magic" level="4" icon="graphics/skills/magic/astral.png" description="Cast Lvl 4 Astral Magic spells."/>
     <skill id="20015" name="Astral Magic" level="5" icon="graphics/skills/magic/astral.png" description="Cast Lvl 5 Astral Magic spells."/>
 
-    <skill id="20039" name="Asorm" icon="graphics/skills/magic/nature.png" description="Increase MDEF. Req. 1x Small Mushhroom"/>
-    <skill id="20046" name="Kalmurk" icon="graphics/skills/magic/astral.png" description="Spawn a maggot. Req. 1x Maggot Slime + 1x Root."/>
-    <skill id="20031" name="Kalakarenk" icon="graphics/skills/magic/astral.png" description="Spawn a fluffy. Req. 1x White Fur + 1x Root."/>
-    <skill id="20032" name="Kalboo" icon="graphics/skills/magic/astral.png" description="Spawn a mouboo. Req. 1x Mouboo Figurine + 1x Root."/>
-    <skill id="20033" name="Kalgina" icon="graphics/skills/magic/astral.png" description="Spawn a pinkie. Req. 1x Pink Antenna + 1x Root."/>
-    <skill id="20034" name="Kalrenk" icon="graphics/skills/magic/astral.png" description="Spawn a shroom. Req. 1x Hard Spike + 1x Root."/>
+    <skill id="20039" name="Asorm" icon="graphics/skills/magic/nature.png" description="Increase MDEF. Req. 1x Small Mushhroom" castingAction="attack_wand" srcEffectId="7" dstEffectId="10"/>
+    <skill id="20046" name="Kalmurk" icon="graphics/skills/magic/astral.png" description="Spawn a maggot. Req. 1x Maggot Slime + 1x Root." castingAction="attack_wand" srcEffectId="7" hitEffectId="22"/>
+    <skill id="20031" name="Kalakarenk" icon="graphics/skills/magic/astral.png" description="Spawn a fluffy. Req. 1x White Fur + 1x Root." castingAction="attack_wand" srcEffectId="7" hitEffectId="22"/>
+    <skill id="20032" name="Kalboo" icon="graphics/skills/magic/astral.png" description="Spawn a mouboo. Req. 1x Mouboo Figurine + 1x Root." castingAction="attack_wand" srcEffectId="7" hitEffectId="22"/>
+    <skill id="20033" name="Kalgina" icon="graphics/skills/magic/astral.png" description="Spawn a pinkie. Req. 1x Pink Antenna + 1x Root." castingAction="attack_wand" srcEffectId="7" hitEffectId="22"/>
+    <skill id="20034" name="Kalrenk" icon="graphics/skills/magic/astral.png" description="Spawn a shroom. Req. 1x Hard Spike + 1x Root." castingAction="attack_wand" srcEffectId="7" hitEffectId="22"/>
 
   <!-- ********************************************************************** -->
     <skill id="20016" name="Dark Magic" level="1" icon="graphics/skills/magic/dark.png" description="Cast Lvl 1 Dark Magic spells."/>
@@ -127,10 +126,9 @@
     <skill id="20016" name="Dark Magic" level="4" icon="graphics/skills/magic/dark.png" description="Cast Lvl 4 Dark Magic spells."/>
     <skill id="20016" name="Dark Magic" level="5" icon="graphics/skills/magic/dark.png" description="Cast Lvl 5 Dark Magic spells."/>
 
-    <skill id="20043" name="Phlex" icon="graphics/skills/magic/dark.png" description="Magic poisonous attack. Req. 1x Root."/>
-
-    <skill id="20035" name="Halhiss" icon="graphics/skills/magic/dark.png" description="Spawn a snake. Req. 1x Snake Egg + 1x Dark Crystal."/>
-    <skill id="20036" name="Helorp" icon="graphics/skills/magic/dark.png" description="Spawn a shroom. Req. 1x Small Shroom + 1x Dark Crystal."/>
+    <skill id="20043" name="Phlex" icon="graphics/skills/magic/dark.png" description="Magic poisonous attack. Req. 1x Root." castingAction="attack_wand" srcEffectId="8" hitEffectId="4"/>
+    <skill id="20035" name="Halhiss" icon="graphics/skills/magic/dark.png" description="Spawn a snake. Req. 1x Snake Egg + 1x Dark Crystal." castingAction="attack_wand" srcEffectId="8" hitEffectId="22"/>
+    <skill id="20036" name="Helorp" icon="graphics/skills/magic/dark.png" description="Spawn a shroom. Req. 1x Small Shroom + 1x Dark Crystal." castingAction="attack_wand" srcEffectId="8" hitEffectId="22"/>
   </set>
 
 <!-- ************************************************************************ -->