Update items accordingly

10 files changed, 107 insertions, 1 deletions

diff --git a/graphics/items/equipment/weapons/broadsword.png b/graphics/items/equipment/weapons/broadsword.png
new file mode 100644
index 00000000..0ef7af43
--- /dev/null
+++ b/graphics/items/equipment/weapons/broadsword.png
diff --git a/graphics/items/equipment/weapons/cleaver.png b/graphics/items/equipment/weapons/cleaver.png
new file mode 100644
index 00000000..5cd8a1f9
--- /dev/null
+++ b/graphics/items/equipment/weapons/cleaver.png
diff --git a/graphics/items/equipment/weapons/kanabo.png b/graphics/items/equipment/weapons/kanabo.png
new file mode 100755
index 00000000..ae8fc0ec
--- /dev/null
+++ b/graphics/items/equipment/weapons/kanabo.png
diff --git a/graphics/items/generic/black-mamba-skin.png b/graphics/items/generic/black-mamba-skin.png
new file mode 100644
index 00000000..720bb0ec
--- /dev/null
+++ b/graphics/items/generic/black-mamba-skin.png
diff --git a/graphics/items/usable/food/.gitkeep b/graphics/items/usable/food/.gitkeep
deleted file mode 100644
index e69de29b..00000000
--- a/graphics/items/usable/food/.gitkeep
+++ /dev/null
diff --git a/graphics/sprites/equipment/weapons/heavyaxe.png b/graphics/sprites/equipment/weapons/heavyaxe.png
new file mode 100644
index 00000000..de6e3916
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/heavyaxe.png
diff --git a/graphics/sprites/equipment/weapons/heavyaxe.xml b/graphics/sprites/equipment/weapons/heavyaxe.xml
new file mode 100644
index 00000000..f4e4af8e
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/heavyaxe.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<sprite>
+    <imageset name="weapon"
+              src="graphics/sprites/equipment/weapons/heavyaxe.png"
+              width="64"
+              height="64"/>
+
+    <include file="equipment/weapons/kanabo.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/kanabo.png b/graphics/sprites/equipment/weapons/kanabo.png
new file mode 100644
index 00000000..e227b988
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/kanabo.png
diff --git a/graphics/sprites/equipment/weapons/kanabo.xml b/graphics/sprites/equipment/weapons/kanabo.xml
new file mode 100644
index 00000000..d8553886
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/kanabo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="weapon" src="graphics/sprites/equipment/weapons/kanabo.png" width="64" height="64" />
+
+	<action name="default" imageset="weapon">
+	</action>
+
+	<action name="attack" imageset="weapon">
+		<animation direction="down">
+			<sequence start="0" end="3" delay="75" />
+		 	<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="4" end="7" delay="75" />
+		  	<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="8" end="11" delay="75" />
+		  	<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="12" end="15" delay="75" />
+		 	 <end />
+		</animation>
+	</action>
+</sprite>
diff --git a/items.xml b/items.xml
index 2a71bd3f..711ccc3e 100644
--- a/items.xml
+++ b/items.xml
@@ -1018,6 +1018,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="25"
 		sellProtected="true"
 		maxFloorOffset="20"/>
+	<item id="613"
+		image="usable/snakeeggmodel.png|W:#373737;R:#901010;G:#1a1a1a"
+		name="Black Mamba Egg"
+        description="An edible black mamba egg."
+		useButton="Eat"
+		effect="Heal 100-250 HP"
+		type="usable"
+		weight="4"/>
 	<!-- Generic Items -->
 	<item id="700"
 		image="generic/smalltentacles.png"
@@ -2226,6 +2234,18 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
+    <item id="878"
+        image="generic/black-mamba-skin.png"
+        name="Black Mamba Skin"
+        description="The skin of a slain black mamba."
+        type="generic"
+        weight="22"/>
+    <item id="879"
+        image="generic/snaketongue.png|W:#0a0a0a,e02020"
+        name="Black Mamba Tongue"
+        description="The forked tongue of a black mamba."
+        type="generic"
+        weight="2"/>
 
 
 	<!-- Necklaces -->
@@ -5134,13 +5154,64 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		attack="159"
 		attack-range="2"
 		level="20"
-		type="equip-1hand"
+		type="equip-2hand"
 		attack-action="attack"
 		weight="820">
 		<sprite>equipment/weapons/scythe.xml</sprite>
 		<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
 		<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
 	</item>
+	<item id="3522"
+		image="equipment/weapons/kanabo.png"
+		name="Kanabo"
+		description="A heavy and clumbersome mace from the lands of fire."
+		defense="-2"
+		dex="-2"
+		str="1"
+		attack="284"
+		attack-range="1"
+		level="30"
+		type="equip-2hand"
+		attack-action="attack"
+		weight="500">
+		<sprite>equipment/weapons/kanabo.xml</sprite>
+		<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
+		<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+	</item>
+	<item id="3523"
+		image="equipment/weapons/cleaver.png"
+		name="Cleaver"
+		description="A heavy and dangerous cleaver from the lands of fire."
+		defense="-2"
+		dex="-2"
+		str="2"
+		attack="409"
+		attack-range="1"
+		level="40"
+		type="equip-2hand"
+		attack-action="attack"
+		weight="600">
+		<sprite>equipment/weapons/heavyaxe.xml</sprite>
+		<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
+		<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+	</item>
+	<item id="3524"
+		image="equipment/weapons/broadsword.png"
+		name="Broadsword"
+		description="A heavy sword from the lands of fire. Useful even for bashing."
+		defense="-2"
+		dex="-2"
+		str="3"
+		attack="534"
+		attack-range="1"
+		level="50"
+		type="equip-2hand"
+		attack-action="attack"
+		weight="500">
+		<sprite>equipment/weapons/heavyaxe.xml</sprite>
+		<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
+		<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+	</item>
 	<!-- Pets -->
 	<item id="4000"
 		image="usable/piouegg.png"