From f993f28eff5a6c3b8b3b4fa5c521e37ff9ef41df Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sat, 22 May 2021 12:41:47 -0500
Subject: [PATCH] Various tweaks.

---
 assets/common/abilities/bow/shotgun.ron |  4 ++--
 assets/common/abilities/hammer/leap.ron |  2 +-
 common/src/cmd.rs                       |  1 -
 server/src/cmd.rs                       | 15 +++++++--------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/assets/common/abilities/bow/shotgun.ron b/assets/common/abilities/bow/shotgun.ron
index 33fcc34359..eb4d779610 100644
--- a/assets/common/abilities/bow/shotgun.ron
+++ b/assets/common/abilities/bow/shotgun.ron
@@ -1,10 +1,10 @@
 BasicRanged(
-    energy_cost: 350,
+    energy_cost: 450,
     buildup_duration: 0.4,
     recover_duration: 0.3,
     projectile_spread: 0.05,
     projectile: Arrow(
-        damage: 50.0,
+        damage: 40.0,
         knockback: 5.0,
         energy_regen: 0,
     ),
diff --git a/assets/common/abilities/hammer/leap.ron b/assets/common/abilities/hammer/leap.ron
index 42d1064cf8..f1dd598690 100644
--- a/assets/common/abilities/hammer/leap.ron
+++ b/assets/common/abilities/hammer/leap.ron
@@ -1,5 +1,5 @@
 LeapMelee(
-    energy_cost: 700,
+    energy_cost: 500,
     buildup_duration: 0.1,
     movement_duration: 0.8,
     swing_duration: 0.15,
diff --git a/common/src/cmd.rs b/common/src/cmd.rs
index 460ab59f21..ae753992c6 100644
--- a/common/src/cmd.rs
+++ b/common/src/cmd.rs
@@ -913,7 +913,6 @@ impl ArgumentSpec {
     }
 }
 
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index c1fa751b3e..1338707477 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -3058,14 +3058,13 @@ fn handle_skill_preset(
 fn clear_skillset(skill_set: &mut comp::SkillSet) { *skill_set = comp::SkillSet::default(); }
 
 fn set_skills(skill_set: &mut comp::SkillSet, preset: &str) -> CmdResult<()> {
-    let presets =
-        match common::cmd::SkillPresetManifest::load("server.manifests.presets") {
-            Ok(presets) => presets.read().0.clone(),
-            Err(err) => {
-                warn!("Error in preset: {}", err);
-                return Err("Error while loading presets".to_owned());
-            },
-        };
+    let presets = match common::cmd::SkillPresetManifest::load("server.manifests.presets") {
+        Ok(presets) => presets.read().0.clone(),
+        Err(err) => {
+            warn!("Error in preset: {}", err);
+            return Err("Error while loading presets".to_owned());
+        },
+    };
     if let Some(preset) = presets.get(preset) {
         for (skill, level) in preset {
             let group = if let Some(group) = skill.skill_group_kind() {