21 files changed, 90 insertions, 33 deletions
diff --git a/items/equip-1hand/_include.xml b/items/equip-1hand/_include.xml
index fc4e3007..e334c70c 100644
--- a/items/equip-1hand/_include.xml
+++ b/items/equip-1hand/_include.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/equip-1hand/item521_Dagger.xml"/>
-  <include name="items/equip-1hand/item522_SharpKnife.xml"/>
-  <include name="items/equip-1hand/item536_ShortSword.xml"/>
-  <include name="items/equip-1hand/item549_Axe.xml"/>
-  <include name="items/equip-1hand/item570_BoneKnife.xml"/>
-  <include name="items/equip-1hand/item571_Setzer.xml"/>
-  <include name="items/equip-1hand/item576_Beheader.xml"/>
-  <include name="items/equip-1hand/item578_SandCutter.xml"/>
-  <include name="items/equip-1hand/item579_RockKnife.xml"/>
-  <include name="items/equip-1hand/item587_Sword.xml"/>
-  <include name="items/equip-1hand/item591_LongSword.xml"/>
-  <include name="items/equip-1hand/item599_FireSword.xml"/>
-  <include name="items/equip-1hand/item867_IceGladius.xml"/>
+  <include name="items/equip-1hand/item0521_Dagger.xml"/>
+  <include name="items/equip-1hand/item0522_SharpKnife.xml"/>
+  <include name="items/equip-1hand/item0536_ShortSword.xml"/>
+  <include name="items/equip-1hand/item0549_Axe.xml"/>
+  <include name="items/equip-1hand/item0570_BoneKnife.xml"/>
+  <include name="items/equip-1hand/item0571_Setzer.xml"/>
+  <include name="items/equip-1hand/item0576_Beheader.xml"/>
+  <include name="items/equip-1hand/item0578_SandCutter.xml"/>
+  <include name="items/equip-1hand/item0579_RockKnife.xml"/>
+  <include name="items/equip-1hand/item0584_Jackal.xml"/>
+  <include name="items/equip-1hand/item0587_Sword.xml"/>
+  <include name="items/equip-1hand/item0591_LongSword.xml"/>
+  <include name="items/equip-1hand/item0590_DragonSword.xml"/>
+  <include name="items/equip-1hand/item0599_FireSword.xml"/>
+  <include name="items/equip-1hand/item0867_IceGladius.xml"/>
   <include name="items/equip-1hand/item1171_Wand.xml"/>
   <include name="items/equip-1hand/item1201_Knife.xml"/>
   <include name="items/equip-1hand/item1215_ToySabre.xml"/>
diff --git a/items/equip-1hand/item521_Dagger.xml b/items/equip-1hand/item0521_Dagger.xml
index 3de9a3af..b855d30a 100644
--- a/items/equip-1hand/item521_Dagger.xml
+++ b/items/equip-1hand/item0521_Dagger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="521" image="equipment/weapon/dagger-dagger.png" name="Dagger" description="A simple dagger." type="equip-1hand" attack-action="attack" attack="15" attack-range="2" weight="200">
+  <item id="521" image="equipment/weapon/dagger-dagger.png" name="Dagger" description="A simple dagger." effect="Weapon Level 1" type="equip-1hand" attack-action="attack" attack="15" attack-range="1" weight="200">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
diff --git a/items/equip-1hand/item522_SharpKnife.xml b/items/equip-1hand/item0522_SharpKnife.xml
index 451d4872..ec223b33 100644
--- a/items/equip-1hand/item522_SharpKnife.xml
+++ b/items/equip-1hand/item0522_SharpKnife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="522" image="equipment/weapon/dagger-sharpknife.png" name="Sharp Knife" description="A really sharp knife. Don't hurt yourself!" attack="10" type="equip-1hand" attack-action="attack" attack-range="2" weight="150">
+  <item id="522" image="equipment/weapon/dagger-sharpknife.png" name="Sharp Knife" description="A really sharp knife. Don't hurt yourself!" effect="Weapon Level 1" attack="10" type="equip-1hand" attack-action="attack" attack-range="1" weight="150">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
diff --git a/items/equip-1hand/item536_ShortSword.xml b/items/equip-1hand/item0536_ShortSword.xml
index a799c66e..7c858630 100644
--- a/items/equip-1hand/item536_ShortSword.xml
+++ b/items/equip-1hand/item0536_ShortSword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="536" image="equipment/weapon/dagger-shortsword.png" name="Short Sword" description="A small but sharp sword." type="equip-1hand" attack="100" attack-action="attack" attack-range="2" weight="2000">
+  <item id="536" image="equipment/weapon/dagger-shortsword.png" name="Short Sword" description="A small but sharp sword." effect="Weapon Level 1" type="equip-1hand" attack="110" attack-action="attack" attack-range="1" weight="1200" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
diff --git a/items/equip-1hand/item549_Axe.xml b/items/equip-1hand/item0549_Axe.xml
index 6937ca2e..ec8f72a1 100644
--- a/items/equip-1hand/item549_Axe.xml
+++ b/items/equip-1hand/item0549_Axe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="549" image="equipment/weapon/axe-axe.png" name="Axe" description="An axe." attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="2" weight="1200">
+  <item id="549" image="equipment/weapon/axe-axe.png" name="Axe" description="An axe." effect="Weapon Level 1" attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="1" weight="1200" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/axe-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/axe-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
diff --git a/items/equip-1hand/item570_BoneKnife.xml b/items/equip-1hand/item0570_BoneKnife.xml
index 1301cc12..4cef4ae4 100644
--- a/items/equip-1hand/item570_BoneKnife.xml
+++ b/items/equip-1hand/item0570_BoneKnife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="570" image="equipment/weapon/dagger-boneknife.png" name="Bone Knife" description="A knife masterly carved out of a bone." attack="115" type="equip-1hand" attack-action="attack" attack-range="2" weight="450">
+  <item id="570" image="equipment/weapon/dagger-boneknife.png" name="Bone Knife" description="A knife masterly carved out of a bone." effect="Weapon Level 1" attack="115" type="equip-1hand" attack-action="attack" attack-range="1" weight="450" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
diff --git a/items/equip-1hand/item571_Setzer.xml b/items/equip-1hand/item0571_Setzer.xml
index b89b72c5..69b3e3e3 100644
--- a/items/equip-1hand/item571_Setzer.xml
+++ b/items/equip-1hand/item0571_Setzer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="571" image="equipment/weapon/dagger-setzer.png" name="Setzer" description="A sharp knife, named after a famous gambler." attack="100" type="equip-1hand" attack-action="attack" attack-range="2" weight="900" sellProtected="true">
+  <item id="571" image="equipment/weapon/dagger-setzer.png" name="Setzer" description="A sharp knife, named after a famous gambler." effect="Base Attack Delay -25 / Weapon Level 1" attack="100" type="equip-1hand" attack-action="attack" attack-range="1" weight="900" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound>
diff --git a/items/equip-1hand/item576_Beheader.xml b/items/equip-1hand/item0576_Beheader.xml
index 77fd2292..fbd74d80 100644
--- a/items/equip-1hand/item576_Beheader.xml
+++ b/items/equip-1hand/item0576_Beheader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="576" image="equipment/weapon/sword-beheader.png" name="Beheader" description="The only sword capable of beheading a Terranite." effect="Double Damage +50% / No bow / 0 Int" criticalattack="-25" hit="-20" type="equip-1hand" attack="999" attack-action="attack" attack-range="2" weight="2000" sellProtected="true">
+  <item id="576" image="equipment/weapon/sword-beheader.png" name="Beheader" description="The only sword capable of beheading a Terranite." effect="Attack Speed +10% / Double Damage +50% / No bow / Base Attack Delay +1150 / Weapon Level 1" req-int="0" criticalattack="-25" hit="-20" type="equip-1hand" attack="999" attack-action="attack" attack-range="1" weight="2000" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/beheader.xml</sprite>
     <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
     <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
diff --git a/items/equip-1hand/item578_SandCutter.xml b/items/equip-1hand/item0578_SandCutter.xml
index 8e515d67..fc38f90e 100644
--- a/items/equip-1hand/item578_SandCutter.xml
+++ b/items/equip-1hand/item0578_SandCutter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="578" image="equipment/weapon/sword-sandcutter.png" name="Sand Cutter" description="An ancient longsword with moon-shaped blade, frequently used by desert night warriors." effect="Double Damage +5% / Accuracy +3%" attack="140" level="80" type="equip-1hand" attack-action="attack" attack-range="2" weight="1500" sellProtected="true">
+  <item id="578" image="equipment/weapon/sword-sandcutter.png" name="Sand Cutter" description="An ancient longsword with moon-shaped blade, frequently used by desert night warriors." effect="Double Damage +5% / Accuracy +3% / Weapon Level 2" attack="160" level="80" type="equip-1hand" attack-action="attack" attack-range="1" weight="1500" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sandcutter.xml</sprite>
     <sound event="hit">weapons/knives/rock/rock-hit1.ogg</sound>
     <sound event="hit">weapons/knives/rock/rock-hit2.ogg</sound>
diff --git a/items/equip-1hand/item579_RockKnife.xml b/items/equip-1hand/item0579_RockKnife.xml
index 6087eb3e..9d1debf7 100644
--- a/items/equip-1hand/item579_RockKnife.xml
+++ b/items/equip-1hand/item0579_RockKnife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="579" image="equipment/weapon/dagger-rockknive.png" name="Rock Knife" description="A knife made of stone." attack="110" type="equip-1hand" attack-action="attack" attack-range="2" vit="3" weight="500" sellProtected="true">
+  <item id="579" image="equipment/weapon/dagger-rockknive.png" name="Rock Knife" description="A knife made of stone." effect="Weapon Level 1" attack="110" type="equip-1hand" attack-action="attack" attack-range="1" vit="3" weight="500" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/miss1.ogg</sound>
diff --git a/items/equip-1hand/item0584_Jackal.xml b/items/equip-1hand/item0584_Jackal.xml
new file mode 100644
index 00000000..5376dfa1
--- /dev/null
+++ b/items/equip-1hand/item0584_Jackal.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<items>
+    <item id="584"
+	image="equipment/weapon/sword-jackal.png"
+	name="Jackal"
+	description="Made to parry attacks from drakes, relic of a long forsaken war."
+	effect="Attack Speed +1% / Accuracy +5% / HP +50 / HP Drain 5% / Weapon Level 1"
+	attack="150"
+	attack-range="1"
+	defense="5"
+	criticaldefense="2"
+	str="1"
+	level="90"
+	type="equip-1hand"
+	attack-action="attack"
+	hit-effect-id="32"
+	critical-hit-effect-id="30"
+	weight="1000"
+	sellProtected="true">
+	<sprite>equipment/weapons/jackal.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="miss">weapons/swords/sword-miss1.ogg</sound>
+    </item>
+</items>
diff --git a/items/equip-1hand/item587_Sword.xml b/items/equip-1hand/item0587_Sword.xml
index 7383e3a0..824b1059 100644
--- a/items/equip-1hand/item587_Sword.xml
+++ b/items/equip-1hand/item0587_Sword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="587" image="equipment/weapon/sword-sword.png" name="Sword" description="A simple but reliable sword." attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="2" weight="200">
+  <item id="587" image="equipment/weapon/sword-sword.png" name="Sword" description="A simple but reliable sword." effect="Weapon Level 1" attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="1" weight="200" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </item>
diff --git a/items/equip-1hand/item0590_DragonSword.xml b/items/equip-1hand/item0590_DragonSword.xml
new file mode 100644
index 00000000..699d228b
--- /dev/null
+++ b/items/equip-1hand/item0590_DragonSword.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<items>
+    <item id="590"
+	image="equipment/weapon/sword-dragon.png"
+	name="Dragon Sword"
+	description="Empowered by demure's drakes, relic of a long forsaken war."
+	effect="Attack Speed +2% / Accuracy +5% / Base Attack Delay -25 / Weapon Level 2"
+	req-str="50+"
+	req-agi="50+"
+	req-vit="50+"
+	req-dex="50+"
+	req-luk="50+"
+	attack="171"
+	attack-range="1"
+	str="5"
+	level="99"
+	type="equip-1hand"
+	attack-action="attack"
+	hit-effect-id="32"
+	critical-hit-effect-id="30"
+	weight="1000"
+	sellProtected="true">
+	<sprite>equipment/weapons/dragon-sword.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="miss">weapons/swords/sword-miss1.ogg</sound>
+    </item>
+</items>
diff --git a/items/equip-1hand/item591_LongSword.xml b/items/equip-1hand/item0591_LongSword.xml
index 6d69692c..f81d18ad 100644
--- a/items/equip-1hand/item591_LongSword.xml
+++ b/items/equip-1hand/item0591_LongSword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="591" image="equipment/weapon/sword-longsword.png" name="Long Sword" description="A sword with a long and agile blade." attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="2" weight="10">
+  <item id="591" image="equipment/weapon/sword-longsword.png" name="Long Sword" description="A sword with a long and agile blade." effect="Weapon Level 1" attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="1" weight="10" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </item>
diff --git a/items/equip-1hand/item599_FireSword.xml b/items/equip-1hand/item0599_FireSword.xml
index b42c0e4e..e6dd6108 100644
--- a/items/equip-1hand/item599_FireSword.xml
+++ b/items/equip-1hand/item0599_FireSword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="599" image="equipment/weapon/sword-firesword.png" name="Fire Sword" description="A magical sword enchanted with the power of fire." attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="2" weight="10">
+  <item id="599" image="equipment/weapon/sword-firesword.png" name="Fire Sword" description="A magical sword enchanted with the power of fire." effect="Weapon Level 1" attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="1" weight="10" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </item>
diff --git a/items/equip-1hand/item867_IceGladius.xml b/items/equip-1hand/item0867_IceGladius.xml
index 5d66ecfe..bc4da922 100644
--- a/items/equip-1hand/item867_IceGladius.xml
+++ b/items/equip-1hand/item0867_IceGladius.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="867" image="equipment/weapon/sword-ice.png" name="Ice Gladius" description="A sword with a shimmering blue blade." attack="110" type="equip-1hand" attack-action="attack" attack-range="2" luk="1" weight="1000">
+  <item id="867" image="equipment/weapon/sword-ice.png" name="Ice Gladius" description="A sword with a shimmering blue blade." effect="Weapon Level 1" attack="130" type="equip-1hand" attack-action="attack" attack-range="1" luk="1" weight="1000" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit1.ogg</sound>
diff --git a/items/equip-1hand/item1171_Wand.xml b/items/equip-1hand/item1171_Wand.xml
index 86e25608..8a07471b 100644
--- a/items/equip-1hand/item1171_Wand.xml
+++ b/items/equip-1hand/item1171_Wand.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="1171" image="equipment/weapon/wand.png" name="Wand" description="A basic magic wand." effect="Lvl 1 Wand" req-int="5+" attack="1" mattack="5" type="equip-1hand" attack-action="attack" attack-range="3" weight="100">
+  <item id="1171" image="equipment/weapon/wand.png" name="Wand" description="A basic magic wand." effect="Lvl 1 Wand / Weapon Level 1" req-int="5+" attack="1" mattack="5" type="equip-1hand" attack-action="attack" attack-range="1" weight="100" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/wand.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/wand-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
diff --git a/items/equip-1hand/item1201_Knife.xml b/items/equip-1hand/item1201_Knife.xml
index 033ab28c..d4c33b27 100644
--- a/items/equip-1hand/item1201_Knife.xml
+++ b/items/equip-1hand/item1201_Knife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="1201" image="equipment/weapon/dagger-knive.png" name="Knife" description="A small knife; the perfect weapon for a beginner." attack="5" type="equip-1hand" weight="120" attack-action="attack" attack-range="2">
+  <item id="1201" image="equipment/weapon/dagger-knive.png" name="Knife" description="A small knife; the perfect weapon for a beginner." effect="Weapon Level 1" attack="5" type="equip-1hand" weight="120" attack-action="attack" attack-range="1">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
diff --git a/items/equip-1hand/item1215_ToySabre.xml b/items/equip-1hand/item1215_ToySabre.xml
index 4b1de188..48a3ec2a 100644
--- a/items/equip-1hand/item1215_ToySabre.xml
+++ b/items/equip-1hand/item1215_ToySabre.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="1215" image="equipment/weapon/sword-sabre.png" name="Toy Sabre" description="A toy item, doesn't do much damage." attack="1" type="equip-1hand" attack-action="attack" attack-range="2" weight="1" sellProtected="true">
+  <item id="1215" image="equipment/weapon/sword-sabre.png" name="Toy Sabre" description="A toy item, doesn't do much damage." effect="Weapon Level 1" attack="1" type="equip-1hand" attack-action="attack" attack-range="1" weight="1" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </item>
diff --git a/items/equip-1hand/item5261_Launcher.xml b/items/equip-1hand/item5261_Launcher.xml
index e141f40e..9587d061 100644
--- a/items/equip-1hand/item5261_Launcher.xml
+++ b/items/equip-1hand/item5261_Launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5261" image="equipment/weapon/xmas-slingshot-icon.png" name="Candy-Caned Anti-Grinch-Rifle 2020" description="The best way to shoot snowballs." type="equip-2hand" attack-action="attack_bow" attack="20" attack-range="3" weight="10" critical-hit-effect-id="55" missile-particle="graphics/particles/snowball.particle.xml">
+  <item id="5261" image="equipment/weapon/xmas-slingshot-icon.png" name="Candy-Caned Anti-Grinch-Rifle 2020" description="The best way to shoot snowballs." effect="Weapon Level 1" type="equip-2hand" attack-action="attack_bow" attack="20" attack-range="3" weight="10" critical-hit-effect-id="55" sellProtected="true" missile-particle="graphics/particles/snowball.particle.xml">
     <sprite gender="unisex">equipment/weapons/xmas-bow-slingshot.xml</sprite>
     <sprite gender="female">equipment/weapons/xmas-bow-slingshot.xml</sprite>
     <sound event="hit">weapons/projectiles/snowball/hit1.ogg</sound>
diff --git a/items/equip-1hand/item5284_Revolver.xml b/items/equip-1hand/item5284_Revolver.xml
index cd555faa..3a72610d 100644
--- a/items/equip-1hand/item5284_Revolver.xml
+++ b/items/equip-1hand/item5284_Revolver.xml
@@ -4,7 +4,7 @@
 		image="equipment/weapon/revolver.png"
 		name="Short Gunstaff"
 		description="A gunstaff, which is not produced in The Mana World. Brought from the Mirror Lake."
-		effect="Unobtainable."
+		effect="Unobtainable. / Weapon Level 1"
 		attack="120"
 		attack-range="5"
 		missile-particle="graphics/particles/flame.particle.xml"
@@ -14,8 +14,8 @@
 		missile-diedistance="3"
 		type="equip-1hand"
 		attack-action="attack_bow"
-		sellProtected="true"
-		weight="3000">
+		weight="3000"
+		sellProtected="true">
 		<sprite>equipment/weapons/gun.xml</sprite>
 		<sound event="hit">weapons/gun/gun-hit1.ogg</sound>
 		<sound event="miss">weapons/gun/gun-miss1.ogg</sound>