From 51141b2c1a4448eed98d789b9a2ec9b4f4bd408d Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Fri, 25 Sep 2020 16:06:51 -0500
Subject: [PATCH] Changelog line, final balance tweaks.

---
 CHANGELOG.md                           |  1 +
 common/src/comp/inventory/item/tool.rs |  4 ++--
 common/src/states/basic_beam.rs        | 16 ++++++++++------
 voxygen/src/scene/particle.rs          |  4 +++-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac65bf0246..3e4705c407 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Overhauled persistence layer including no longer storing serialized JSON items in the database
 - Overhauled representation of blocks to permit fluid and sprite coexistence
 - Overhauled sword
+- Reworked healing sceptre
 
 ### Removed
 
diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs
index f281e214f8..c16bcd8061 100644
--- a/common/src/comp/inventory/item/tool.rs
+++ b/common/src/comp/inventory/item/tool.rs
@@ -347,8 +347,8 @@ impl Tool {
                         col: (0.0, 1.0, 0.0).into(),
                         ..Default::default()
                     }),
-                    projectile_gravity: Some(Gravity(1.0)),
-                    projectile_speed: 25.0,
+                    projectile_gravity: Some(Gravity(0.5)),
+                    projectile_speed: 40.0,
                 },
             ],
             Staff(_) => vec![
diff --git a/common/src/states/basic_beam.rs b/common/src/states/basic_beam.rs
index a811648719..7ac95f556e 100644
--- a/common/src/states/basic_beam.rs
+++ b/common/src/states/basic_beam.rs
@@ -97,17 +97,21 @@ impl CharacterBehavior for Data {
                         stage_section: StageSection::Cast,
                         particle_ori: Some(*data.inputs.look_dir),
                         offset: eye_height * 0.9,
-
                     });
                 }
             },
             StageSection::Cast => {
                 if data.inputs.primary.is_pressed() {
-                    let damage = (self.static_data.base_dps as f32 / self.static_data.tick_rate) as u32;
-                    let heal = (self.static_data.base_hps as f32 / self.static_data.tick_rate) as u32;
-                    let energy_regen = (self.static_data.energy_regen as f32 / self.static_data.tick_rate) as u32;
-                    let energy_drain = (self.static_data.energy_drain as f32 / self.static_data.tick_rate) as u32;
-                    let speed = self.static_data.range / self.static_data.beam_duration.as_secs_f32();
+                    let damage =
+                        (self.static_data.base_dps as f32 / self.static_data.tick_rate) as u32;
+                    let heal =
+                        (self.static_data.base_hps as f32 / self.static_data.tick_rate) as u32;
+                    let energy_regen =
+                        (self.static_data.energy_regen as f32 / self.static_data.tick_rate) as u32;
+                    let energy_drain =
+                        (self.static_data.energy_drain as f32 / self.static_data.tick_rate) as u32;
+                    let speed =
+                        self.static_data.range / self.static_data.beam_duration.as_secs_f32();
                     let properties = beam::Properties {
                         angle: self.static_data.max_angle.to_radians(),
                         speed,
diff --git a/voxygen/src/scene/particle.rs b/voxygen/src/scene/particle.rs
index 8ec43a9689..704ad843d1 100644
--- a/voxygen/src/scene/particle.rs
+++ b/voxygen/src/scene/particle.rs
@@ -360,7 +360,9 @@ impl ParticleMgr {
                             time + i as f64 / 1000.0,
                             ParticleMode::HealingBeam,
                             pos.0 + particle_ori * 0.5 + Vec3::new(0.0, 0.0, b.offset),
-                            pos.0 + particle_ori * b.static_data.range + Vec3::new(0.0, 0.0, b.offset),
+                            pos.0
+                                + particle_ori * b.static_data.range
+                                + Vec3::new(0.0, 0.0, b.offset),
                         ));
                     }
                 }