2 weapons

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 (

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,
         )
     ),

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,
         )
     ),

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,
+        )
+    ),
+)

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,
+        )
+    ),
+)

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

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 {