Fixed an arithmetic exception in ItemShortcutContainer::draw.

Changed default sitting key back to 's'.
Fixed a problem with all equipment being interpreted as weapon sprite.

1 files changed, 151 insertions, 150 deletions

diff --git a/equipment.xml b/equipment.xml
index 97459675..cf70bcbd 100644
--- a/equipment.xml
+++ b/equipment.xml
@@ -1,150 +1,151 @@
-<?xml version="1.0"?>

-<!--

-    This file maps the server sided visible equipment ID numbers to the

-    animation files.

--->

-<equipments>

-    <equipment id="1" slot="0">

-        <sprite gender="male">chest-cotton-male.xml</sprite>

-        <sprite gender="female">chest-cotton-female.xml</sprite>

-    </equipment>

-    <equipment id="2" slot="0">

-        <sprite>item002.xml</sprite>

-    </equipment>

-    <equipment id="3" slot="0">

-        <sprite gender="male">chest-leather-male.xml</sprite>

-        <sprite gender="female">chest-leather-female.xml</sprite>

-    </equipment>

-    <equipment id="4" slot="0">

-        <sprite gender="male">leg-cotton-male.xml</sprite>

-        <sprite gender="female">leg-cotton-female.xml</sprite>

-    </equipment>

-    <equipment id="5" slot="0">

-        <sprite gender="male">leg-jeans-male.xml</sprite>

-        <sprite gender="female">leg-jeans-female.xml</sprite>

-    </equipment>

-    <equipment id="6" slot="0">

-        <sprite>item006.xml</sprite>

-    </equipment>

-    <equipment id="7" slot="0">

-        <sprite>item007.xml</sprite>

-    </equipment>

-    <equipment id="8" slot="0">

-        <sprite>item008.xml</sprite>

-    </equipment>

-    <equipment id="9" slot="0">

-        <sprite>item009.xml</sprite>

-    </equipment>

-    <equipment id="10" slot="0">

-        <sprite>item010.xml</sprite>

-    </equipment>

-    <equipment id="11" slot="0">

-        <sprite>item011.xml</sprite>

-    </equipment>

-    <equipment id="12" slot="0">

-        <sprite>item012.xml</sprite>

-    </equipment>

-    <equipment id="13" slot="0">

-        <sprite>item013.xml</sprite>

-    </equipment>

-    <equipment id="14" slot="0">

-        <sprite>item014.xml</sprite>

-    </equipment>

-    <equipment id="15" slot="0">

-        <sprite>item015.xml</sprite>

-    </equipment>

-    <equipment id="16" slot="0">

-        <sprite>item016.xml</sprite>

-    </equipment>

-    <equipment id="17" slot="0">

-        <sprite>item017.xml</sprite>

-    </equipment>

-    <equipment id="18" slot="0">

-        <sprite>item018.xml</sprite>

-    </equipment>

-    <equipment id="19" slot="0">

-        <sprite gender="male">chest-vnecksweater-male.xml</sprite>

-        <sprite gender="female">chest-vnecksweater-female.xml</sprite>

-    </equipment>

-    <equipment id="20" slot="0">

-        <sprite gender="male">chest-tnecksweater-male.xml</sprite>

-        <sprite gender="female">chest-tnecksweater-female.xml</sprite>

-    </equipment>

-    <equipment id="21" slot="0">

-        <sprite>head-rangerhat.xml</sprite>

-    </equipment>

-    <equipment id="22" slot="0">

-        <sprite>head-antlerhat.xml</sprite>

-    </equipment>

-    <equipment id="23" slot="0">

-        <sprite>head-christmastree.xml</sprite>

-    </equipment>

-    <equipment id="24" slot="0">

-        <sprite>head-santabeardhat.xml</sprite>

-    </equipment>

-    <equipment id="25" slot="0">

-        <sprite gender="male">chest-chainmail-male.xml</sprite>

-        <sprite gender="female">chest-chainmail-female.xml</sprite>

-    </equipment>

-    <equipment id="26" slot="0">

-        <sprite gender="male">chest-lightplatemail-male.xml</sprite>

-        <sprite gender="female">chest-lightplatemail-female.xml</sprite>

-    </equipment>

-

-    <!--

-    eAthenas equipment IDs for the local characters weapons

-    -->

-    <equipment id="623" slot="0" attacktype="swing">

-        <sprite>weapon-scythe.xml</sprite>

-    </equipment>

-

-    <equipment id="1200" slot="0" attacktype="bow">

-        <sprite>weapon-bow.xml</sprite>

-        <sound event="swing">bow_shoot_1.ogg</sound>

-    </equipment>

-    <equipment id="530" slot="0" attacktype="bow">

-        <sprite>weapon-bow.xml</sprite>

-        <sound event="swing">bow_shoot_1.ogg</sound>

-    </equipment>

-    <equipment id="545" slot="0" attacktype="bow">

-        <sprite>weapon-bow.xml</sprite>

-        <sound event="swing">bow_shoot_1.ogg</sound>

-    </equipment>

-

-    <equipment id="521" slot="0" attacktype="stab">

-        <sprite>weapon-dagger.xml</sprite>

-        <sound event="strike">short-sword-miss1.ogg</sound>

-        <sound event="hit">short-sword-hit1.ogg</sound>

-    </equipment>

-    <equipment id="522" slot="0" attacktype="stab">

-        <sprite>weapon-dagger.xml</sprite>

-        <sound event="strike">short-sword-miss1.ogg</sound>

-        <sound event="hit">short-sword-hit1.ogg</sound>

-    </equipment>

-    <equipment id="536" slot="0" attacktype="stab">

-        <sprite>weapon-dagger.xml</sprite>

-        <sound event="strike">short-sword-miss1.ogg</sound>

-        <sound event="hit">short-sword-hit1.ogg</sound>

-    </equipment>

-    <equipment id="1201" slot="0" attacktype="stab">

-        <sprite>weapon-dagger.xml</sprite>

-        <sound event="strike">short-sword-miss1.ogg</sound>

-        <sound event="hit">short-sword-hit1.ogg</sound>

-    </equipment>

-

-    <!--

-    eAthenas equipment IDs for remote characters weapons

-    All numbers are * 10.000 to avoid collisions with the lower ID

-    equipment pieces

-    -->

-    <equipment id="10000" slot="0" attacktype="stab">

-        <sprite>weapon-dagger.xml</sprite>

-    </equipment>

-    <equipment id="20000" slot="0" attacktype="bow">

-        <sprite>weapon-bow.xml</sprite>

-    </equipment>

-    <equipment id="30000" slot="0" attacktype="swing">

-        <sprite>weapon-scythe.xml</sprite>

-    </equipment>

-

-</equipments>

+<?xml version="1.0"?>
+<!--
+    This file maps the server sided visible equipment ID numbers to the
+    animation files.
+-->
+<equipments>
+    <equipment id="1" slot="0">
+        <sprite gender="male">chest-cotton-male.xml</sprite>
+        <sprite gender="female">chest-cotton-female.xml</sprite>
+    </equipment>
+    <equipment id="2" slot="0">
+        <sprite>item002.xml</sprite>
+    </equipment>
+    <equipment id="3" slot="0">
+        <sprite gender="male">chest-leather-male.xml</sprite>
+        <sprite gender="female">chest-leather-female.xml</sprite>
+    </equipment>
+    <equipment id="4" slot="0">
+        <sprite gender="male">leg-cotton-male.xml</sprite>
+        <sprite gender="female">leg-cotton-female.xml</sprite>
+    </equipment>
+    <equipment id="5" slot="0">
+        <sprite gender="male">leg-jeans-male.xml</sprite>
+        <sprite gender="female">leg-jeans-female.xml</sprite>
+    </equipment>
+    <equipment id="6" slot="0">
+        <sprite>item006.xml</sprite>
+    </equipment>
+    <equipment id="7" slot="0">
+        <sprite>item007.xml</sprite>
+    </equipment>
+    <equipment id="8" slot="0">
+        <sprite>item008.xml</sprite>
+    </equipment>
+    <equipment id="9" slot="0">
+        <sprite>item009.xml</sprite>
+    </equipment>
+    <equipment id="10" slot="0">
+        <sprite>item010.xml</sprite>
+    </equipment>
+    <equipment id="11" slot="0">
+        <sprite>item011.xml</sprite>
+    </equipment>
+    <equipment id="12" slot="0">
+        <sprite>item012.xml</sprite>
+    </equipment>
+    <equipment id="13" slot="0">
+        <sprite>item013.xml</sprite>
+    </equipment>
+    <equipment id="14" slot="0">
+        <sprite>item014.xml</sprite>
+    </equipment>
+    <equipment id="15" slot="0">
+        <sprite>item015.xml</sprite>
+    </equipment>
+    <equipment id="16" slot="0">
+        <sprite>item016.xml</sprite>
+    </equipment>
+    <equipment id="17" slot="0">
+        <sprite>item017.xml</sprite>
+    </equipment>
+    <equipment id="18" slot="0">
+        <sprite>item018.xml</sprite>
+    </equipment>
+    <equipment id="19" slot="0">
+        <sprite gender="male">chest-vnecksweater-male.xml</sprite>
+        <sprite gender="female">chest-vnecksweater-female.xml</sprite>
+    </equipment>
+    <equipment id="20" slot="0">
+        <sprite gender="male">chest-tnecksweater-male.xml</sprite>
+        <sprite gender="female">chest-tnecksweater-female.xml</sprite>
+    </equipment>
+    <equipment id="21" slot="0">
+        <sprite>head-rangerhat.xml</sprite>
+    </equipment>
+    <equipment id="22" slot="0">
+        <sprite>head-antlerhat.xml</sprite>
+    </equipment>
+    <equipment id="23" slot="0">
+        <sprite>head-christmastree.xml</sprite>
+    </equipment>
+    <equipment id="24" slot="0">
+        <sprite>head-santabeardhat.xml</sprite>
+    </equipment>
+    <equipment id="25" slot="0">
+        <sprite gender="male">chest-chainmail-male.xml</sprite>
+        <sprite gender="female">chest-chainmail-female.xml</sprite>
+    </equipment>
+    <equipment id="26" slot="0">
+        <sprite gender="male">chest-lightplatemail-male.xml</sprite>
+        <sprite gender="female">chest-lightplatemail-female.xml</sprite>
+    </equipment>
+
+    <!--
+    eAthenas equipment IDs for the local characters weapons
+    (same as their item IDs)
+    -->
+    <equipment id="623" slot="0" attacktype="swing">
+        <sprite>weapon-scythe.xml</sprite>
+    </equipment>
+
+    <equipment id="1200" slot="0" attacktype="bow">
+        <sprite>weapon-bow.xml</sprite>
+        <sound event="swing">bow_shoot_1.ogg</sound>
+    </equipment>
+    <equipment id="530" slot="0" attacktype="bow">
+        <sprite>weapon-bow.xml</sprite>
+        <sound event="swing">bow_shoot_1.ogg</sound>
+    </equipment>
+    <equipment id="545" slot="0" attacktype="bow">
+        <sprite>weapon-bow.xml</sprite>
+        <sound event="swing">bow_shoot_1.ogg</sound>
+    </equipment>
+
+    <equipment id="521" slot="0" attacktype="stab">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">short-sword-miss1.ogg</sound>
+        <sound event="hit">short-sword-hit1.ogg</sound>
+    </equipment>
+    <equipment id="522" slot="0" attacktype="stab">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">short-sword-miss1.ogg</sound>
+        <sound event="hit">short-sword-hit1.ogg</sound>
+    </equipment>
+    <equipment id="536" slot="0" attacktype="stab">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">short-sword-miss1.ogg</sound>
+        <sound event="hit">short-sword-hit1.ogg</sound>
+    </equipment>
+    <equipment id="1201" slot="0" attacktype="stab">
+        <sprite>weapon-dagger.xml</sprite>
+        <sound event="strike">short-sword-miss1.ogg</sound>
+        <sound event="hit">short-sword-hit1.ogg</sound>
+    </equipment>
+
+    <!--
+    eAthenas equipment IDs for remote characters weapons
+    All numbers are * 10.000 to avoid collisions with the lower ID
+    equipment pieces
+    -->
+    <equipment id="10000" slot="0" attacktype="stab">
+        <sprite>weapon-dagger.xml</sprite>
+    </equipment>
+    <equipment id="20000" slot="0" attacktype="bow">
+        <sprite>weapon-bow.xml</sprite>
+    </equipment>
+    <equipment id="30000" slot="0" attacktype="swing">
+        <sprite>weapon-scythe.xml</sprite>
+    </equipment>
+
+</equipments>