From 060ebbc861f5eb9f81cede44326d0328f2fc20d7 Mon Sep 17 00:00:00 2001
From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com>
Date: Tue, 24 Mar 2020 01:11:14 +0100
Subject: [PATCH] healing sceptre

---
 assets/common/items/weapons/staff_nature.ron          | 11 +++++++++++
 assets/voxygen/item_image_manifest.ron                |  4 ++++
 .../voxygen/voxel/humanoid_main_weapon_manifest.ron   |  4 ++++
 common/src/comp/inventory/item.rs                     |  5 +++++
 4 files changed, 24 insertions(+)
 create mode 100644 assets/common/items/weapons/staff_nature.ron

diff --git a/assets/common/items/weapons/staff_nature.ron b/assets/common/items/weapons/staff_nature.ron
new file mode 100644
index 0000000000..d9961ef873
--- /dev/null
+++ b/assets/common/items/weapons/staff_nature.ron
@@ -0,0 +1,11 @@
+Item(
+    name: "Sceptre of Regeneration",
+    description: " Infused by the power of Nature.   
+    Power: 25",
+    kind: Tool(
+        ToolData (
+            kind: Staff(Sceptre),    
+            equip_time_millis: 800,
+        )
+    ),
+)
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index c0f91482e4..ee846de0da 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -45,6 +45,10 @@
         "voxel.weapon.staff.wood-fire",
         (0.0, -9.0, 0.0), (90.0, 90.0, 0.0), 2.5,
     ),
+    Tool(Staff(Sceptre)): VoxTrans(
+        "voxel.weapon.staff.wood-nature",
+        (0.0, -9.0, 0.0), (90.0, 90.0, 0.0), 2.5,
+    ),    
     // Shields
     Tool(Shield(BasicShield)): VoxTrans(
         "voxel.weapon.shield.wood-0",
diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
index 89ccc89f0e..5a689b103d 100644
--- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
@@ -42,6 +42,10 @@
     Staff(BasicStaff): (
         vox_spec: ("weapon.staff.wood-fire", (-1.0, -6.0, -3.0)),
         color: None
+    ),
+     Staff(Sceptre): (
+        vox_spec: ("weapon.staff.wood-nature", (-1.0, -6.0, -5.0)),
+        color: None
     ),
     Debug(Boost): (
         vox_spec: ("weapon.debug_wand", (-1.5, -9.5, -4.0)),
diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs
index 729eabda62..c315a4c973 100644
--- a/common/src/comp/inventory/item.rs
+++ b/common/src/comp/inventory/item.rs
@@ -39,6 +39,7 @@ pub enum DaggerKind {
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum StaffKind {
     BasicStaff,
+    Sceptre,
 }
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum ShieldKind {
@@ -113,6 +114,10 @@ impl ToolData {
                 max_angle: 60.0,
             }],
             Staff(_) => vec![
+                //Intended behaviour for the healing sceptre: M1 -> Heal a single target (not a
+                // projectile, just a heal for the target.) Optional: Green flash of the healed
+                // target. M2: Heal everyone around the caster, including the
+                // caster
                 BasicMelee {
                     buildup_duration: Duration::from_millis(0),
                     recover_duration: Duration::from_millis(300),