From 645cc60dc04537dbf80deac321ebf84ed4ae24ef Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Wed, 23 Jun 2021 20:31:45 -0500
Subject: [PATCH] Balance tweaks.

---
 CHANGELOG.md                                               | 1 +
 .../common/abilities/custom/harvester/ensnaringvines.ron   | 2 +-
 assets/common/abilities/custom/harvester/firebreath.ron    | 2 +-
 assets/common/abilities/custom/harvester/scythe.ron        | 6 +++---
 common/src/comp/body.rs                                    | 7 ++++---
 common/systems/src/buff.rs                                 | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28ecd811af..31b7a1ec1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Clay Golem uses shockwave only after specific fraction of health and other difficulty adjustments.
 - Made strafing slightly slower
 - Food now has limited regeneration strength but longer duration.
+- Harvester boss now has new abilities and AI
 
 ### Removed
 
diff --git a/assets/common/abilities/custom/harvester/ensnaringvines.ron b/assets/common/abilities/custom/harvester/ensnaringvines.ron
index b040d57b6a..e050dc8241 100644
--- a/assets/common/abilities/custom/harvester/ensnaringvines.ron
+++ b/assets/common/abilities/custom/harvester/ensnaringvines.ron
@@ -4,5 +4,5 @@ SpriteSummon(
     recover_duration: 0.3,
     sprite: EnsnaringVines,
     summon_distance: (0, 25),
-    sparseness: 0.5,
+    sparseness: 0.67,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/custom/harvester/firebreath.ron b/assets/common/abilities/custom/harvester/firebreath.ron
index c94818ad01..94f0a66de4 100644
--- a/assets/common/abilities/custom/harvester/firebreath.ron
+++ b/assets/common/abilities/custom/harvester/firebreath.ron
@@ -2,7 +2,7 @@ BasicBeam(
     buildup_duration: 0.5,
     recover_duration: 0.5,
     beam_duration: 1.0,
-    damage: 30,
+    damage: 40,
     tick_rate: 1.5,
     range: 20.0,
     max_angle: 15.0,
diff --git a/assets/common/abilities/custom/harvester/scythe.ron b/assets/common/abilities/custom/harvester/scythe.ron
index ac8f1cef3e..f299ddaf66 100644
--- a/assets/common/abilities/custom/harvester/scythe.ron
+++ b/assets/common/abilities/custom/harvester/scythe.ron
@@ -1,9 +1,9 @@
 BasicMelee(
     energy_cost: 0,
-    buildup_duration: 0.6,
+    buildup_duration: 0.7,
     swing_duration: 0.1,
-    recover_duration: 0.5,
-    base_damage: 60,
+    recover_duration: 0.6,
+    base_damage: 70,
     base_poise_damage: 10,
     knockback: ( strength: 10.0, direction: Away),
     range: 4.0,
diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index 7117c1189c..623f164283 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -490,7 +490,7 @@ impl Body {
                 biped_large::Species::Tidalwarrior => 16000,
                 biped_large::Species::Yeti => 12000,
                 biped_large::Species::Minotaur => 30000,
-                biped_large::Species::Harvester => 3000,
+                biped_large::Species::Harvester => 5000,
                 biped_large::Species::Blueoni => 2400,
                 biped_large::Species::Redoni => 2400,
                 _ => 1200,
@@ -609,12 +609,12 @@ impl Body {
                 biped_large::Species::Mountaintroll => 60,
                 biped_large::Species::Swamptroll => 60,
                 biped_large::Species::Dullahan => 120,
-                biped_large::Species::Yeti => 0,
-                biped_large::Species::Harvester => 80,
                 // Boss enemies have their health set, not adjusted by level.
                 biped_large::Species::Mindflayer => 0,
                 biped_large::Species::Minotaur => 0,
                 biped_large::Species::Tidalwarrior => 0,
+                biped_large::Species::Yeti => 0,
+                biped_large::Species::Harvester => 0,
                 _ => 100,
             },
             Body::BipedSmall(_) => 10,
@@ -677,6 +677,7 @@ impl Body {
                 biped_large::Species::Minotaur => 3.2,
                 biped_large::Species::Tidalwarrior => 2.25,
                 biped_large::Species::Yeti => 2.0,
+                biped_large::Species::Harvester => 2.4,
                 _ => 1.0,
             },
             Body::Golem(g) => match g.species {
diff --git a/common/systems/src/buff.rs b/common/systems/src/buff.rs
index 364ee9832f..8e32991f80 100644
--- a/common/systems/src/buff.rs
+++ b/common/systems/src/buff.rs
@@ -70,7 +70,7 @@ impl<'a> System<'a> for Sys {
                         entity,
                         buff_change: BuffChange::Add(Buff::new(
                             BuffKind::Ensnared,
-                            BuffData::new(1.5, Some(Duration::from_secs_f32(1.0))),
+                            BuffData::new(1.0, Some(Duration::from_secs_f32(1.0))),
                             Vec::new(),
                             BuffSource::World,
                         )),