From c23e50bc14b3ac3070a52fc15296eb837dc7aa16 Mon Sep 17 00:00:00 2001
From: Chuck Miller <shadowmil@gmail.com>
Date: Fri, 3 Jul 2009 22:55:24 -0400
Subject: Nothing changing for eA, but corrected the weapon-type IDs in
 items.xml for the new skills Also added the mace skill left out

---
 items.xml      | 94 ++++++++++++++++++++++++++++------------------------------
 tmw-skills.xml |  5 ++--
 2 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/items.xml b/items.xml
index 8f875122..1a63c870 100644
--- a/items.xml
+++ b/items.xml
@@ -76,28 +76,28 @@
 
 
     <item id="30"
-        weapon_type="1">
+        weapon_type="101">
         <sprite>weapon-dagger.xml</sprite>
         <sound event="strike">short-sword-miss1.ogg</sound>
         <sound event="hit">short-sword-hit1.ogg</sound>
     </item>
     <item id="31"
-        weapon_type="10">
+        weapon_type="106">
         <sprite>weapon-bow.xml</sprite>
         <sound event="swing">bow_shoot_1.ogg</sound>
     </item>
     <item id="32"
-        weapon_type="11">
+        weapon_type="103">
         <sprite>weapon-scythe.xml</sprite>
     </item>
     <item id="33"
-        weapon_type="1">
+        weapon_type="101">
         <sprite>weapon-dagger.xml</sprite>
         <sound event="strike">short-sword-miss1.ogg</sound>
         <sound event="hit">short-sword-hit1.ogg</sound>
     </item>
     <item id="34"
-        weapon_type="1"> <!-- magic fist -->
+        weapon_type="100"> <!-- magic fist -->
         <sprite>weapon-fist.xml</sprite>
     </item>
 
@@ -266,7 +266,7 @@
         description="A simple dagger."
         effect="+15 Damage, 1 Range"
         type="equip-1hand"
-        weapon_type="1"
+        weapon_type="101"
         weight="60"
         weapon-type="knife"
         attack-min="5"
@@ -286,7 +286,7 @@
         description="A really sharp knife. Don't hurt yourself!"
         effect="+10 Damage, 1 Range"
         type="equip-1hand"
-        weapon_type="1"
+        weapon_type="101"
         weight="45"
         max-per-slot="1"
         weapon-type="knife"
@@ -374,7 +374,7 @@
         description="A bow for short distances."
         effect="+50 Damage, 5 Range"
         type="equip-2hand"
-        weapon_type="10"
+        weapon_type="106"
         weapon-type="bow"
         weight="210"
         max-per-slot="1"
@@ -439,7 +439,7 @@
         description="A small but sharp sword."
         effect="+100 Damage, 1 Range"
         type="equip-1hand"
-        weapon_type="2"
+        weapon_type="102"
         weight="1025"
         slot ="0"
         weapon-type="sword"
@@ -529,7 +529,7 @@
         description="A bow usually used for hunting."
         effect="+70 Damage, 5 Range"
         type="equip-2hand"
-        weapon_type="10"
+        weapon_type="106"
         weight="530"
         max-per-slot="1"
         weapon-type="bow"
@@ -558,7 +558,7 @@
         description="A Bardiche."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="polearm"
+        weapon_type="103"
         weight="10"
         max-per-slot="1"/>
     <item id="548"
@@ -567,7 +567,7 @@
         description="A weapon usually carried by guards."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="polearm"
+        weapon_type="103"
         weight="10"
         max-per-slot="1"/>
     <item id="549"
@@ -576,7 +576,7 @@
         description="An axe."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="axe"
+        weapon_type="108"
         weight="10"
         max-per-slot="1"/>
     <item id="550"
@@ -585,7 +585,7 @@
         description="An axe usually used by blacksmiths."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="axe"
+        weapon-type="108"
         weight="10"
         max-per-slot="1"/>
     <item id="551"
@@ -674,7 +674,7 @@
         description="A sword with a very sharp, curved, single-edged blade."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="sword"
+        weapon_type="102"
         weight="10"
         max-per-slot="1"/>
     <item id="562"
@@ -755,8 +755,7 @@
         description="A knife masterly carved out of a bone."
         effect="+115 Damage, 1 Range"
         type="equip-1hand"
-        weapon_type="2"
-        weapon-type="knife"
+        weapon-type="101"
         weight="10"
         max-per-slot="1"
         view="521"/>
@@ -766,10 +765,9 @@
         description="A sharp knife, named after a famous gambler."
         effect="+110 Damage, 1 Range"
         type="equip-1hand"
-        weapon-type="knife"
         weight="10"
         max-per-slot="1"
-        weapon_type="2"
+        weapon-type="101"
         view="521"/>
     <item id="572"
         image="weapon-sword-scimitar.png"
@@ -777,7 +775,7 @@
         description="A sword with a heavy, curved, single-edged blade."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="sword"
+        weapon-type="102"
         weight="10"
         max-per-slot="1"/>
     <item id="573"
@@ -786,7 +784,7 @@
         description="A heavy one-handed, single-edged sword."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="sword"
+        weapon-type="102"
         weight="10"
         max-per-slot="1"/>
     <item id="574"
@@ -795,7 +793,7 @@
         description="A well crafted glaive."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="polearm"
+        weapon-type="103"
         weight="1"
         max-per-slot="1"/>
     <item id="575"
@@ -804,7 +802,7 @@
         description="A tonorian short bow."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="bow"
+        weapon-type="106"
         weight="10"
         max-per-slot="1"/>
     <item id="576"
@@ -813,7 +811,7 @@
         description="An oddly designed sword especially made for beheading enemies."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="sword"
+        weapon-type="102"
         weight="10"
         max-per-slot="1"/>
     <item id="577"
@@ -822,7 +820,7 @@
         description="Darts made of bones."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="thrown"
+        weapon-type="109"
         weight="10"
         max-per-slot="1"/>
     <item id="578"
@@ -831,7 +829,7 @@
         description="A sand cutter."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="sword"
+        weapon-type="102"
         weight="10"
         max-per-slot="1"/>
     <item id="579"
@@ -840,7 +838,7 @@
         description="A knife made of stone."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="knife"
+        weapon-type="101"
         weight="10"
         max-per-slot="1"/>
     <item id="580"
@@ -849,7 +847,7 @@
         description="A staff that increases healing magic."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="staff"
+        weapon-type="104"
         weight="10"
         max-per-slot="1"/>
     <item id="581"
@@ -858,7 +856,7 @@
         description="A crescent rod."
         effect="+50 Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="staff"
+        weapon-type="104"
         weight="10"
         max-per-slot="1"/>
     <item id="582"
@@ -867,7 +865,7 @@
         description="A staff that increases fire magic."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="staff"
+        weapon-type="104"
         weight="10"
         max-per-slot="1"/>
     <item id="583"
@@ -876,7 +874,7 @@
         description="A staff that increases ice magic."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="staff"
+        weapon-type="104"
         weight="10"
         max-per-slot="1"/>
     <item id="584"
@@ -885,7 +883,7 @@
         description="A jackal."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="sword"
+        weapon-type="104"
         weight="10"
         max-per-slot="1"/>
     <item id="585"
@@ -914,7 +912,7 @@
         description="A simple but reliable sword."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="sword"
+        weapon-type="102"
         weight="10"
         max-per-slot="1"/>
     <item id="588"
@@ -923,7 +921,7 @@
         description="A large two handed sword."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="sword"
+        weapon-type="102"
         weight="10"
         max-per-slot="1"/>
     <item id="589"
@@ -932,7 +930,7 @@
         description="A two handed sword with a very broad blade."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="sword"
+        weapon-type="102"
         weight="10"
         max-per-slot="1"/>
     <item id="590"
@@ -941,7 +939,7 @@
         description="A short and powerful sword."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="sword"
+        weapon-type="102"
         weight="10"
         max-per-slot="1"/>
     <item id="591"
@@ -950,7 +948,7 @@
         description="A sword with a long and agile blade."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="sword"
+        weapon-type="102"
         weight="10"
         max-per-slot="1"/>
     <item id="592"
@@ -959,7 +957,7 @@
         description="A dagger with a long and thin blade."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="knife"
+        weapon-type="101"
         weight="10"
         max-per-slot="1"/>
     <item id="593"
@@ -968,7 +966,7 @@
         description="A light sword made for duels."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="sword"
+        weapon-type="102"
         weight="10"
         max-per-slot="1"/>
     <item id="594"
@@ -977,7 +975,7 @@
         description="A light spear with a wooden pole."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="polearm"
+        weapon-type="103"
         weight="10"
         max-per-slot="1"/>
     <item id="595"
@@ -986,7 +984,7 @@
         description="A heavy spear with a wooden pole."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="polearm"
+        weapon-type="103"
         weight="10"
         max-per-slot="1"/>
     <item id="596"
@@ -995,7 +993,7 @@
         description="A light spear with an iron pole."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="polearm"
+        weapon-type="103"
         weight="10"
         max-per-slot="1"/>
     <item id="597"
@@ -1004,7 +1002,7 @@
         description="A heavy spear with an iron pole."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="polearm"
+        weapon-type="103"
         weight="10"
         max-per-slot="1"/>
     <item id="598"
@@ -1013,7 +1011,7 @@
         description="A spear with two tops."
         effect="??? Damage, ??? Range"
         type="equip-2hand"
-        weapon-type="polearm"
+        weapon-type="103"
         weight="10"
         max-per-slot="1"/>
     <item id="599"
@@ -1022,7 +1020,7 @@
         description="A magical sword enchanted with the power of fire."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
-        weapon-type="sword"
+        weapon-type="102"
         weight="10"
         max-per-slot="1"/>
     <item id="600"
@@ -1247,7 +1245,7 @@
         description="Usually used for farming but also usable as a weapon. Slow but deadly."
         effect="+75 Damage, 1 Range"
         type="equip-2hand"
-        weapon_type="11"
+        weapon_type="103"
         weapon-type="polearm"
         weight="400"
         attack-min="0"
@@ -2420,7 +2418,7 @@
         description="A distance weapon."
         effect="+15 Damage, 5 Range"
         type="equip-2hand"
-        weapon_type="10"
+        weapon_type="106"
         weight="125"
         attack-min="15"
         attack-delta="0"
@@ -2439,7 +2437,7 @@
         description="A small knife; the perfect weapon for a beginner."
         effect="+5 Damage, 1 Range"
         type="equip-1hand"
-        weapon_type="1"
+        weapon_type="101"
         weight="20"
         attack-min="0"
         attack-delta="5"
diff --git a/tmw-skills.xml b/tmw-skills.xml
index a7da0362..972df51a 100644
--- a/tmw-skills.xml
+++ b/tmw-skills.xml
@@ -9,8 +9,9 @@
         <skill id="105" name="Whip" icon="graphics/images/whip.png" />
         <skill id="106" name="Bow" icon="graphics/images/bow.png" />
         <skill id="107" name="Shooting" icon="graphics/images/shooting.png" />
-        <skill id="108" name="Axe" icon="graphics/images/axe.png" />
-        <skill id="109" name="Thrown" icon="graphics/images/thrown.png" />
+        <skill id="108" name="Mace" />
+        <skill id="109" name="Axe" icon="graphics/images/axe.png" />
+        <skill id="110" name="Thrown" icon="graphics/images/thrown.png" />
     </set>
     <set name="Magic">
         <skill id="200" name="Magic Example" />
-- 
cgit v1.2.3-60-g2f50