From 5107cb45fb3590dc43a6c330edd489a164ad6eb2 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Thu, 6 May 2021 19:45:48 -0400
Subject: [PATCH] Increased exp of clay golems.

---
 assets/common/abilities/custom/claygolem/shockwave.ron | 1 +
 assets/common/abilities/custom/claygolem/strike.ron    | 1 +
 common/src/comp/body.rs                                | 6 +++++-
 common/src/comp/projectile.rs                          | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/assets/common/abilities/custom/claygolem/shockwave.ron b/assets/common/abilities/custom/claygolem/shockwave.ron
index 0263f231db..d985029a71 100644
--- a/assets/common/abilities/custom/claygolem/shockwave.ron
+++ b/assets/common/abilities/custom/claygolem/shockwave.ron
@@ -12,4 +12,5 @@ Shockwave(
     shockwave_duration: 5.0,
     requires_ground: true,
     move_efficiency: 0.0,
+    damage_kind: Crushing,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/custom/claygolem/strike.ron b/assets/common/abilities/custom/claygolem/strike.ron
index ee4b0745ac..d8e2a91320 100644
--- a/assets/common/abilities/custom/claygolem/strike.ron
+++ b/assets/common/abilities/custom/claygolem/strike.ron
@@ -9,4 +9,5 @@ BasicMelee(
     range: 5.0,
     max_angle: 60.0,
     damage_effect: None,
+    damage_kind: Crushing,
 )
diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index 8c981a73ec..63e810feaf 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -288,7 +288,7 @@ impl Body {
             Body::Dragon(_) => Vec3::new(16.0, 10.0, 16.0),
             Body::FishMedium(_) => Vec3::new(0.5, 2.0, 0.8),
             Body::FishSmall(_) => Vec3::new(0.3, 1.2, 0.6),
-            Body::Golem(_) => Vec3::new(5.0, 5.0, 8.0),
+            Body::Golem(_) => Vec3::new(5.0, 5.0, 7.5),
             Body::Humanoid(humanoid) => {
                 let height = match (humanoid.species, humanoid.body_type) {
                     (humanoid::Species::Orc, humanoid::BodyType::Male) => 2.3,
@@ -624,6 +624,10 @@ impl Body {
                 biped_large::Species::Minotaur => 3.2,
                 _ => 1.0,
             },
+            Body::Golem(g) => match g.species {
+                golem::Species::ClayGolem => 1.8,
+                _ => 1.0,
+            },
             _ => 1.0,
         }
     }
diff --git a/common/src/comp/projectile.rs b/common/src/comp/projectile.rs
index b2df2d16aa..3d277fd074 100644
--- a/common/src/comp/projectile.rs
+++ b/common/src/comp/projectile.rs
@@ -226,6 +226,7 @@ impl ProjectileConstructor {
                 let damage = AttackDamage::new(
                     Damage {
                         source: DamageSource::Explosion,
+                        kind: DamageKind::Energy,
                         value: damage,
                         kind: DamageKind::Energy,
                     },