Merge branch 'itemid' into 'master'

Update Item IDs

See merge request themanaworld/evolved/clientdata!32

1 files changed, 26 insertions, 37 deletions

diff --git a/items/equip-2hand.xml b/items/equip-2hand.xml
index 5897fb81..5cc3816b 100644
--- a/items/equip-2hand.xml
+++ b/items/equip-2hand.xml
@@ -45,6 +45,20 @@
     <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
     <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
   </item>
+  <item id="575"
+        image="equipment/weapon/bow-desert.png"
+        name="Desert Bow"
+        description="A distance weapon, made for open range areas."
+        attack="85"
+        type="equip-2hand"
+        weight="70"
+        missile-particle="graphics/particles/arrow.particle.xml"
+        attack-action="attack_bow"
+        attack-range="7">
+    <sprite gender="unisex">equipment/weapons/bow-desert.xml</sprite>
+    <sound event="strike">weapons/bows/bow-miss1.ogg</sound>
+    <sound event="hit">weapons/bows/bow-hit1.ogg</sound>
+  </item>
   <item id="588"
         image="equipment/weapon/sword-bastardsword.png"
         name="Bastard Sword"
@@ -79,15 +93,21 @@
     <sprite gender="unisex">equipment/weapons/staff.xml</sprite>
   </item>
   <item id="596"
-        image="equipment/weapon/polearm-pike.png"
+        image="equipment/weapon/pike.png"
         name="Pike"
-        description="A light spear with an iron pole."
-        attack="1"
+        description="A heavy 2-hand weapon, useful to keep enemies on distance."
+        attack="170"
         type="equip-2hand"
-        attack-action="attack"
+        attack-action="attack_chop_long"
         attack-range="2"
-        weight="1200">
-    <sprite gender="unisex">equipment/weapons/staff.xml</sprite>
+        weight="1600">
+    <sprite gender="unisex">equipment/weapons/pike.xml</sprite>
+    <sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
+    <sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
+    <sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
   </item>
   <item id="597"
         image="equipment/weapon/polearm-heavypike.png"
@@ -188,37 +208,6 @@
       <item to="-99054" />
     </replace>
   </item>
-  <item id="907"
-        image="equipment/weapon/bow-desert.png"
-        name="Desert Bow"
-        description="A distance weapon, made for open range areas."
-        attack="85"
-        type="equip-2hand"
-        weight="70"
-        missile-particle="graphics/particles/arrow.particle.xml"
-        attack-action="attack_bow"
-        attack-range="7">
-    <sprite gender="unisex">equipment/weapons/bow-desert.xml</sprite>
-    <sound event="strike">weapons/bows/bow-miss1.ogg</sound>
-    <sound event="hit">weapons/bows/bow-hit1.ogg</sound>
-  </item>
-  <item id="908"
-        image="equipment/weapon/pike.png"
-        name="Pike"
-        description="A heavy 2-hand weapon, useful to keep enemies on distance."
-        attack="170"
-        type="equip-2hand"
-        attack-action="attack_chop_long"
-        attack-range="2"
-        weight="1600">
-    <sprite gender="unisex">equipment/weapons/pike.xml</sprite>
-    <sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
-    <sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
-    <sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
-    <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
-    <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
-    <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
-  </item>
   <item id="1200"
         image="equipment/weapon/bow-bow.png"
         name="Bow"