From 844e6f2b60a8290429eacff78bacda4cc13213e8 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sat, 17 Oct 2020 11:39:25 -0500
Subject: [PATCH] Slightly nerfed sword dash. Reduced particle count on fire
 aoe by factor of 3.

---
 common/src/comp/inventory/item/tool.rs | 4 ++--
 voxygen/src/scene/particle.rs          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs
index 4cc50a926d..85ed41c40e 100644
--- a/common/src/comp/inventory/item/tool.rs
+++ b/common/src/comp/inventory/item/tool.rs
@@ -173,8 +173,8 @@ impl Tool {
                 },
                 DashMelee {
                     energy_cost: 200,
-                    base_damage: (120.0 * self.base_power()) as u32,
-                    max_damage: (260.0 * self.base_power()) as u32,
+                    base_damage: (100.0 * self.base_power()) as u32,
+                    max_damage: (250.0 * self.base_power()) as u32,
                     base_knockback: 10.0,
                     max_knockback: 20.0,
                     range: 5.0,
diff --git a/voxygen/src/scene/particle.rs b/voxygen/src/scene/particle.rs
index e9002961a5..e757a727f6 100644
--- a/voxygen/src/scene/particle.rs
+++ b/voxygen/src/scene/particle.rs
@@ -594,8 +594,8 @@ impl ParticleMgr {
                         ));
                     }
                 } else {
-                    for d in 0..10 * distance as i32 {
-                        let arc_position = theta - radians / 2.0 + dtheta * d as f32 / 10.0;
+                    for d in 0..3 * distance as i32 {
+                        let arc_position = theta - radians / 2.0 + dtheta * d as f32 / 3.0;
 
                         let position = pos.0
                             + distance * Vec3::new(arc_position.cos(), arc_position.sin(), 0.0);