New weapons coming....

6 files changed, 92 insertions, 0 deletions

diff --git a/LICENSE b/LICENSE
index 5ab04a82..683ec822 100644
--- a/LICENSE
+++ b/LICENSE
@@ -448,6 +448,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	graphics/items/equipment/weapons/deathscythe.png (lunovox)              (GPLv2)                 (TMW-Br)
 	graphics/items/equipment/weapons/desertbow.png  (Adarias)               (GPLv2)                 (-)
 	graphics/items/equipment/weapons/divinesword.png  (Irukard)             (CC BY-SA 3.0)          (-)
+	graphics/items/equipment/weapons/imortal.png (?)                        (GPLv2)                 (TMW-Br)
 	graphics/items/equipment/weapons/forestbow.png  (?)                     (GPLv2)                 (tmw.org)
 	graphics/items/equipment/weapons/halberd.png  (Irukard)                 (CC BY-SA 3.0)          (-)
 	graphics/items/equipment/weapons/icegladius.png  (ChefChelios)          (CC BY-SA 3.0)          (-)
@@ -476,6 +477,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	graphics/items/equipment/weapons/woodenbow.png (Reid)                   (CC BY-SA 3.0)          (-)
 	graphics/items/equipment/weapons/woodenstaff.png  (?)                   (GPLv2)                 (tmw.org)
 	graphics/items/equipment/weapons/woodensword.png (Len)                  (CC BY-SA 3.0)          (Reid)
+	graphics/items/equipment/weapons/zambacutou.png (?)                     (GPLv2)                 (tmw-br)
 
 	graphics/items/equipment/weapons/placeholder_revolver.png (TODO: DELETE ME)(GPL 2.0)               (basse/InfraRed/FreedroidRPG)
 	graphics/items/equipment/weapons/placeholder_gatling.png (TODO: DELETE ME) (GPL 2.0)               (basse/InfraRed/FreedroidRPG)
@@ -1411,6 +1413,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	graphics/sprites/equipment/weapons/knife.png (Alige)                    (CC BY-SA 3.0)          (-)
 	graphics/sprites/equipment/weapons/kurogane.png (Arqueiro)              (GPL 3.0)               (TMW-BR)
 	graphics/sprites/equipment/weapons/lidersword.png (?)                   (GPL 3.0)               (TMW-BR)
+	graphics/sprites/equipment/weapons/pickaxe.png (?)                      (GPL 3.0)               (TMW-BR)
 	graphics/sprites/equipment/weapons/piouslayer.png (Alige, Reid)         (CC BY-SA 3.0)          (-)
 	graphics/sprites/equipment/weapons/scorpionkinglance.png (?)            (?)                     (TMW-BR)
 	graphics/sprites/equipment/weapons/scythe.png (?)                       (?)                     (TMW.org)
diff --git a/graphics/items/equipment/weapons/imortal.png b/graphics/items/equipment/weapons/imortal.png
new file mode 100644
index 00000000..026dfc12
--- /dev/null
+++ b/graphics/items/equipment/weapons/imortal.png
diff --git a/graphics/items/equipment/weapons/zambacutou.png b/graphics/items/equipment/weapons/zambacutou.png
new file mode 100644
index 00000000..4a33cde4
--- /dev/null
+++ b/graphics/items/equipment/weapons/zambacutou.png
diff --git a/graphics/sprites/equipment/weapons/pickaxe.png b/graphics/sprites/equipment/weapons/pickaxe.png
new file mode 100644
index 00000000..da48b6fd
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/pickaxe.png
diff --git a/graphics/sprites/equipment/weapons/pickaxe.xml b/graphics/sprites/equipment/weapons/pickaxe.xml
new file mode 100644
index 00000000..6b39c571
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/pickaxe.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<sprite>
+    <imageset name="weapon"
+              src="graphics/sprites/equipment/weapons/pickaxe.png"
+              width="64"
+              height="64"/>
+
+    <include file="equipment/weapons/kanabo.xml"/>
+</sprite>
diff --git a/items.xml b/items.xml
index 5583d68a..529daab1 100644
--- a/items.xml
+++ b/items.xml
@@ -6121,6 +6121,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		level="80"
 		type="equip-1hand"
 		attack-action="attack"
+		hit-effect-id="813"
 		weight="1100">
 		<sprite>equipment/weapons/piouslayer.xml</sprite>
 		<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
@@ -6398,6 +6399,85 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		<sound event="hit">weapons/piouslayer/hit2.ogg</sound>
 		<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
 	</item>
+	<item id="3532"
+		image="equipment/weapons/imortal.png"
+		name="Immortal Heavy Sword"
+		description="It glows with magic power. It cuts steel and stone. But does it makes the fighter immortal?"
+		effect="Crit +19 ; MATK +50"
+		defense=" (-77)"
+		agi=" (-9)"
+		dex=" (-9)"
+		attack="430"
+		attack-range="1"
+		level="96"
+		type="equip-2hand"
+		attack-action="attack"
+		hit-effect-id="813"
+		weight="1600">
+		<sprite>equipment/weapons/heavyaxe.xml</sprite>
+		<sound event="hit">weapons/knife/hit1.ogg</sound>
+		<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
+		<sound event="hit">weapons/piouslayer/hit2.ogg</sound>
+		<sound event="miss">weapons/axe/miss.ogg</sound>
+	</item>
+	<item id="3533"
+		image="equipment/weapons/zambacutou.png"
+		name="Zambacutou Heavy Sword"
+		description="Designed to kill cavalary and cause a calamity."
+		effect="Crit +14"
+		defense=" (-57)"
+		agi=" (-7)"
+		dex=" (-7)"
+		attack="430"
+		attack-range="1"
+		level="72"
+		type="equip-2hand"
+		attack-action="attack"
+		hit-effect-id="812"
+		weight="1400">
+		<sprite>equipment/weapons/heavyaxe.xml</sprite>
+		<sound event="hit">weapons/knife/hit1.ogg</sound>
+		<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
+		<sound event="hit">weapons/piouslayer/hit2.ogg</sound>
+		<sound event="miss">weapons/axe/miss.ogg</sound>
+	</item>
+	<item id="3534"
+		image="equipment/weapons/halberd.png"
+		name="Halberd"
+		description="Only the pro may use this weapon to quickly sweep their enemies."
+		effect="Crit +16"
+		defense=" (-67)"
+		agi=" (-8)"
+		dex=" (-8)"
+		attack="430"
+		attack-range="1"
+		level="84"
+		type="equip-2hand"
+		attack-action="attack"
+		hit-effect-id="812"
+		weight="1500">
+		<sprite>equipment/weapons/heavyaxe.xml</sprite>
+		<sound event="hit">weapons/knife/hit1.ogg</sound>
+		<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
+		<sound event="hit">weapons/piouslayer/hit2.ogg</sound>
+		<sound event="miss">weapons/axe/miss.ogg</sound>
+	</item>
+	<item id="3535"
+		image="equipment/weapons/pickaxe.png"
+		name="Pickaxe"
+		description="Only useful for farming Bifs."
+		effect="Bifs drop ore more often"
+		attack="0"
+		attack-range="1"
+		level="1"
+		type="equip-1hand"
+		attack-action="attack"
+		hit-effect-id="803"
+		weight="360">
+		<sprite>equipment/weapons/pickaxe.xml</sprite>
+		<sound event="hit">weapons/axe/hit.ogg</sound>
+		<sound event="miss">weapons/axe/miss.ogg</sound>
+	</item>
 	<!-- Fill new weapons HERE -->
 	<item id="3600"
 		image="equipment/weapons/savior.png"