From fca56be4c0bcb2b2d527bb5fdc432c7494eec510 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Fri, 7 May 2021 12:43:54 -0400
Subject: [PATCH] Balance tweaks

---
 assets/common/abilities/custom/claygolem/laser.ron     | 4 ++--
 assets/common/abilities/custom/claygolem/shockwave.ron | 2 +-
 common/src/comp/body.rs                                | 4 ++--
 server/src/sys/agent.rs                                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/common/abilities/custom/claygolem/laser.ron b/assets/common/abilities/custom/claygolem/laser.ron
index 20c724f888..bf3d4b75a0 100644
--- a/assets/common/abilities/custom/claygolem/laser.ron
+++ b/assets/common/abilities/custom/claygolem/laser.ron
@@ -2,8 +2,8 @@ BasicBeam(
     buildup_duration: 0.20,
     recover_duration: 0.20,
     beam_duration: 0.25,
-    damage: 10,
-    tick_rate: 10.0,
+    damage: 30,
+    tick_rate: 5.0,
     range: 40.0,
     max_angle: 1.0,
     damage_effect: None,
diff --git a/assets/common/abilities/custom/claygolem/shockwave.ron b/assets/common/abilities/custom/claygolem/shockwave.ron
index d985029a71..921b879e1f 100644
--- a/assets/common/abilities/custom/claygolem/shockwave.ron
+++ b/assets/common/abilities/custom/claygolem/shockwave.ron
@@ -9,7 +9,7 @@ Shockwave(
     shockwave_angle: 360.0,
     shockwave_vertical_angle: 90.0,
     shockwave_speed: 15.0,
-    shockwave_duration: 5.0,
+    shockwave_duration: 3.0,
     requires_ground: true,
     move_efficiency: 0.0,
     damage_kind: Crushing,
diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index 63e810feaf..21411bd035 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -468,7 +468,7 @@ impl Body {
                 _ => 10000,
             },
             Body::Golem(golem) => match golem.species {
-                golem::Species::ClayGolem => 5000,
+                golem::Species::ClayGolem => 7500,
                 _ => 10000,
             },
             Body::Theropod(theropod) => match theropod.species {
@@ -625,7 +625,7 @@ impl Body {
                 _ => 1.0,
             },
             Body::Golem(g) => match g.species {
-                golem::Species::ClayGolem => 1.8,
+                golem::Species::ClayGolem => 1.2,
                 _ => 1.0,
             },
             _ => 1.0,
diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs
index 9c0dd5d5ac..553915ba8f 100644
--- a/server/src/sys/agent.rs
+++ b/server/src/sys/agent.rs
@@ -3483,7 +3483,7 @@ impl<'a> AgentData<'a> {
             .and_then(|e| read_data.velocities.get(e))
             .map_or(0.0, |v| v.0.cross(self.ori.look_vec()).magnitude_squared());
         if attack_data.dist_sqrd < golem_melee_range.powi(2) {
-            if agent.action_state.counter < 15.0 {
+            if agent.action_state.counter < 7.5 {
                 // If target is close, whack them
                 controller
                     .actions