From 240a8e577d6b9ca8f172b265dda6f1f1e0cd2dd8 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sat, 1 May 2021 09:36:45 -0400
Subject: [PATCH] Minor balancing tweaks.

---
 .../common/abilities/custom/mindflayer/cursedflames.ron   | 2 +-
 .../common/abilities/custom/mindflayer/necroticvortex.ron | 2 +-
 assets/common/abilities/custom/minotaur/frenzy.ron        | 2 +-
 common/src/comp/buff.rs                                   | 2 +-
 common/src/states/charged_melee.rs                        | 8 ++++----
 common/src/states/utils.rs                                | 2 +-
 server/src/sys/agent.rs                                   | 6 ++----
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/assets/common/abilities/custom/mindflayer/cursedflames.ron b/assets/common/abilities/custom/mindflayer/cursedflames.ron
index f78afb1eda..4559957598 100644
--- a/assets/common/abilities/custom/mindflayer/cursedflames.ron
+++ b/assets/common/abilities/custom/mindflayer/cursedflames.ron
@@ -2,7 +2,7 @@ BasicBeam(
     buildup_duration: 0.40,
     recover_duration: 0.50,
     beam_duration: 1.0,
-    damage: 750,
+    damage: 500,
     tick_rate: 0.9,
     range: 22.0,
     max_angle: 15.0,
diff --git a/assets/common/abilities/custom/mindflayer/necroticvortex.ron b/assets/common/abilities/custom/mindflayer/necroticvortex.ron
index acd6664570..82f8416777 100644
--- a/assets/common/abilities/custom/mindflayer/necroticvortex.ron
+++ b/assets/common/abilities/custom/mindflayer/necroticvortex.ron
@@ -2,7 +2,7 @@ SpinMelee(
     buildup_duration: 0.5,
     swing_duration: 0.2,
     recover_duration: 0.6,
-    base_damage: 150.0,
+    base_damage: 100.0,
     base_poise_damage: 1.0,
     knockback: ( strength: 7.0, direction: Towards),
     range: 16.0,
diff --git a/assets/common/abilities/custom/minotaur/frenzy.ron b/assets/common/abilities/custom/minotaur/frenzy.ron
index 5d905a28ac..160a527abc 100644
--- a/assets/common/abilities/custom/minotaur/frenzy.ron
+++ b/assets/common/abilities/custom/minotaur/frenzy.ron
@@ -4,6 +4,6 @@ SelfBuff(
     recover_duration: 0.25,
     buff_kind: Frenzied,
     buff_strength: 0.5,
-    buff_duration: None,
+    buff_duration: Some(300.0),
     energy_cost: 0,
 )
\ No newline at end of file
diff --git a/common/src/comp/buff.rs b/common/src/comp/buff.rs
index 131a6af390..69fe6cf9fe 100644
--- a/common/src/comp/buff.rs
+++ b/common/src/comp/buff.rs
@@ -278,7 +278,7 @@ impl Buff {
                 vec![
                     BuffEffect::MovementSpeed(1.0 - nn_scaling(data.strength)),
                     BuffEffect::HealthChangeOverTime {
-                        rate: -data.strength * 100.0,
+                        rate: -data.strength * 40.0,
                         accumulated: 0.0,
                         kind: ModifierKind::Additive,
                     },
diff --git a/common/src/states/charged_melee.rs b/common/src/states/charged_melee.rs
index 721da8ce20..bb12d5b462 100644
--- a/common/src/states/charged_melee.rs
+++ b/common/src/states/charged_melee.rs
@@ -206,13 +206,13 @@ impl CharacterBehavior for Data {
 
                     if let Some(FrontendSpecifier::GroundCleave) = self.static_data.specifier {
                         // Send local event used for frontend shenanigans
-                        update
-                            .local_events
-                            .push_front(LocalEvent::CreateOutcome(Outcome::GroundSlam {
+                        update.local_events.push_front(LocalEvent::CreateOutcome(
+                            Outcome::GroundSlam {
                                 pos: data.pos.0
                                     + *data.ori.look_dir()
                                         * (data.body.radius() + self.static_data.range),
-                            }));
+                            },
+                        ));
                     }
                 } else if self.timer < self.static_data.swing_duration {
                     // Swings
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index c65908feac..7b155d1787 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -71,7 +71,7 @@ impl Body {
                 biped_large::Species::Occultsaurok => 100.0,
                 biped_large::Species::Mightysaurok => 100.0,
                 biped_large::Species::Mindflayer => 90.0,
-                biped_large::Species::Minotaur => 70.0,
+                biped_large::Species::Minotaur => 60.0,
                 _ => 80.0,
             },
             Body::BirdMedium(_) => 80.0,
diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs
index a490634a49..5097b30cfa 100644
--- a/server/src/sys/agent.rs
+++ b/server/src/sys/agent.rs
@@ -603,8 +603,7 @@ impl<'a> AgentData<'a> {
                         event_emitter
                             .emit(ServerEvent::Chat(UnresolvedChatMsg::npc(*self.uid, msg)));
                         agent.action_state.timer = 0.01;
-                    } else if agent.action_state.timer < FLEE_DURATION
-                        || dist_sqrd < MAX_FLEE_DIST
+                    } else if agent.action_state.timer < FLEE_DURATION || dist_sqrd < MAX_FLEE_DIST
                     {
                         self.flee(
                             agent,
@@ -1896,8 +1895,7 @@ impl<'a> AgentData<'a> {
                                     .actions
                                     .push(ControlAction::CancelInput(InputKind::Secondary));
                                 agent.action_state.timer = 0.0;
-                            } else if agent.action_state.timer > 2.0
-                                && self.energy.current() > 300
+                            } else if agent.action_state.timer > 2.0 && self.energy.current() > 300
                             {
                                 controller
                                     .actions