From acf7ad27f1e6cd84a264c8cf5f68b5642374de0f Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sat, 5 Jun 2021 16:11:01 -0500
Subject: [PATCH] Balance tweaks.

---
 CHANGELOG.md                                        | 1 +
 assets/common/abilities/custom/yeti/frostbreath.ron | 2 +-
 assets/common/abilities/custom/yeti/icespikes.ron   | 4 ++--
 assets/common/abilities/custom/yeti/strike.ron      | 4 ++--
 common/src/states/roll.rs                           | 2 +-
 server/src/sys/agent.rs                             | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40a27cf9fa..4d4b87eb32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -120,6 +120,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Optimized rendering of quads (most of the graphics in the game) using an index buffer, decreasing the number of vertices that need to be processed by 33%.
 - Moved the rest of screenshot work into the background. Screenshoting no longer induces large pauses.
 - Reworked tidal warrior to have unique attacks
+- Reworked yeti to have unique attacks
 
 ### Removed
 
diff --git a/assets/common/abilities/custom/yeti/frostbreath.ron b/assets/common/abilities/custom/yeti/frostbreath.ron
index e2c99281d7..826f59bbcb 100644
--- a/assets/common/abilities/custom/yeti/frostbreath.ron
+++ b/assets/common/abilities/custom/yeti/frostbreath.ron
@@ -9,7 +9,7 @@ BasicBeam(
     damage_effect: Some(Buff((
         kind: Frozen,
         dur_secs: 3.0,
-        strength: Value(2.0),
+        strength: Value(1.5),
         chance: 1.0,
     ))),
     energy_regen: 0,
diff --git a/assets/common/abilities/custom/yeti/icespikes.ron b/assets/common/abilities/custom/yeti/icespikes.ron
index 818369591b..dc192963b0 100644
--- a/assets/common/abilities/custom/yeti/icespikes.ron
+++ b/assets/common/abilities/custom/yeti/icespikes.ron
@@ -3,9 +3,9 @@ Shockwave(
     buildup_duration: 0.6,
     swing_duration: 0.12,
     recover_duration: 1.2,
-    damage: 200,
+    damage: 100,
     poise_damage: 10,
-    knockback: (strength: 30.0, direction: Up),
+    knockback: (strength: 25.0, direction: Up),
     shockwave_angle: 90.0,
     shockwave_vertical_angle: 15.0,
     shockwave_speed: 50.0,
diff --git a/assets/common/abilities/custom/yeti/strike.ron b/assets/common/abilities/custom/yeti/strike.ron
index 8753f5d1f8..681f8963d5 100644
--- a/assets/common/abilities/custom/yeti/strike.ron
+++ b/assets/common/abilities/custom/yeti/strike.ron
@@ -3,9 +3,9 @@ BasicMelee(
     buildup_duration: 0.8,
     swing_duration: 0.2,
     recover_duration: 0.5,
-    base_damage: 150,
+    base_damage: 100,
     base_poise_damage: 50,
-    knockback: ( strength: 50.0, direction: Away),
+    knockback: ( strength: 40.0, direction: Away),
     range: 4.0,
     max_angle: 20.0,
     damage_effect: None,
diff --git a/common/src/states/roll.rs b/common/src/states/roll.rs
index f6d83ab4f0..8acf61ef7f 100644
--- a/common/src/states/roll.rs
+++ b/common/src/states/roll.rs
@@ -84,7 +84,7 @@ impl CharacterBehavior for Data {
                             - self.timer.as_secs_f32()
                                 / self.static_data.movement_duration.as_secs_f32())
                             / 2.0
-                            + 0.5),
+                            + 0.25),
                 });
 
                 if self.timer < self.static_data.movement_duration {
diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs
index fbf827e382..152e49030b 100644
--- a/server/src/sys/agent.rs
+++ b/server/src/sys/agent.rs
@@ -3503,7 +3503,7 @@ impl<'a> AgentData<'a> {
     ) {
         const ICE_SPIKES_RANGE: f32 = 20.0;
         const ICE_BREATH_RANGE: f32 = 15.0;
-        const ICE_BREATH_TIMER: f32 = 5.0;
+        const ICE_BREATH_TIMER: f32 = 10.0;
         const SNOWBALL_MAX_RANGE: f32 = 50.0;
 
         agent.action_state.counter += read_data.dt.0;