From 4d9327cef536b0e80647a3683b455c062dfe3fff Mon Sep 17 00:00:00 2001
From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com>
Date: Wed, 18 Mar 2020 21:05:20 +0100
Subject: [PATCH] 2 weapons

---
 assets/common/items/weapons/starter_dagger.ron        |  1 +
 assets/common/items/weapons/starter_staff.ron         |  2 +-
 assets/common/items/weapons/starter_sword.ron         |  2 +-
 assets/common/items/weapons/wood_sword.ron            | 11 +++++++++++
 assets/common/items/weapons/zweihander_sword_0.ron    | 11 +++++++++++
 .../voxygen/voxel/humanoid_main_weapon_manifest.ron   | 10 +++++++++-
 common/src/comp/inventory/item.rs                     |  4 +++-
 7 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 assets/common/items/weapons/wood_sword.ron
 create mode 100644 assets/common/items/weapons/zweihander_sword_0.ron

diff --git a/assets/common/items/weapons/starter_dagger.ron b/assets/common/items/weapons/starter_dagger.ron
index bed9c3890b..0a74a79c67 100644
--- a/assets/common/items/weapons/starter_dagger.ron
+++ b/assets/common/items/weapons/starter_dagger.ron
@@ -1,6 +1,7 @@
 Item(
     name: "Sharp Kitchen Knife",
     description: "Great for cutting meat.
+    
     Power: 15",
     kind: Tool(
         ToolData (
diff --git a/assets/common/items/weapons/starter_staff.ron b/assets/common/items/weapons/starter_staff.ron
index bc5d808ae3..16a1971dfa 100644
--- a/assets/common/items/weapons/starter_staff.ron
+++ b/assets/common/items/weapons/starter_staff.ron
@@ -5,7 +5,7 @@ Item(
     Power: 20",
     kind: Tool(
         ToolData (
-            kind: Staff(BasicHammer),    
+            kind: Staff(BasicStaff),    
             equip_time_millis: 800,
         )
     ),
diff --git a/assets/common/items/weapons/starter_sword.ron b/assets/common/items/weapons/starter_sword.ron
index 4429ac2850..c7094813ec 100644
--- a/assets/common/items/weapons/starter_sword.ron
+++ b/assets/common/items/weapons/starter_sword.ron
@@ -5,7 +5,7 @@ Item(
     Power: 15",
     kind: Tool(
         ToolData (
-            kind: Sword(Rapier),    
+            kind: Sword(BasicSword),    
             equip_time_millis: 800,
         )
     ),
diff --git a/assets/common/items/weapons/wood_sword.ron b/assets/common/items/weapons/wood_sword.ron
new file mode 100644
index 0000000000..26f0e33c93
--- /dev/null
+++ b/assets/common/items/weapons/wood_sword.ron
@@ -0,0 +1,11 @@
+Item(
+    name: "Wooden Training Sword",
+    description: "    
+    Power: 15",
+    kind: Tool(
+        ToolData (
+            kind: Sword(WoodTraining),    
+            equip_time_millis: 800,
+        )
+    ),
+)
diff --git a/assets/common/items/weapons/zweihander_sword_0.ron b/assets/common/items/weapons/zweihander_sword_0.ron
new file mode 100644
index 0000000000..2220520918
--- /dev/null
+++ b/assets/common/items/weapons/zweihander_sword_0.ron
@@ -0,0 +1,11 @@
+Item(
+    name: "Wooden Training Sword",
+    description: "    
+    Power: 15",
+    kind: Tool(
+        ToolData (
+            kind: Sword(Zweihander0),    
+            equip_time_millis: 800,
+        )
+    ),
+)
diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
index 60871bc99f..e8cea5f74d 100644
--- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
@@ -1,5 +1,5 @@
 ({
-    Sword(Scimitar): (
+    Sword(BasicSword): (
         vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)),
         color: None
     ),
@@ -7,6 +7,14 @@
         vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)),
         color: None
     ),
+    Sword(WoodTraining)
+        vox_spec: ("weapon.sword.wood_2h", (-1.5, -6.5, -4.0)),
+        color: None
+    ),
+    Sword(Zweihander0)
+        vox_spec: ("weapon.sword.zweihander_2h-0", (-1.5, -6.5, -4.0)),
+        color: None
+    ),
     Axe(BasicAxe): (
         vox_spec: ("weapon.axe.rusty_2h", (-1.5, -5.0, -4.0)),
         color: None
diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs
index 0b5d4c59e9..8b9503bfdb 100644
--- a/common/src/comp/inventory/item.rs
+++ b/common/src/comp/inventory/item.rs
@@ -14,8 +14,10 @@ use std::{fs::File, io::BufReader, time::Duration, vec::Vec};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum SwordKind {
-    Scimitar,
+    BasicSword,
     Rapier,
+    Zweihander0,
+    WoodTraining,
 }
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum AxeKind {