From b90c51d1007c67a09e8dc2a2ff5c23bbef411542 Mon Sep 17 00:00:00 2001
From: Scott Williams <swilliamsgames@gmail.com>
Date: Fri, 11 Jun 2021 12:27:40 +0100
Subject: [PATCH] Adjusted quad_small health and fixed training dummy hitbox

---
 common/src/comp/body.rs        | 45 +++++++++++++++++++++++++---------
 common/src/comp/body/object.rs |  1 +
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index 2cc9582c5a..d697942e04 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -423,13 +423,33 @@ impl Body {
         match self {
             Body::Humanoid(_) => 500,
             Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species {
-                quadruped_small::Species::Boar => 700,
-                quadruped_small::Species::Batfox => 400,
-                quadruped_small::Species::Dodarock => 1000,
-                quadruped_small::Species::Holladon => 800,
-                quadruped_small::Species::Hyena => 450,
+                quadruped_small::Species::Boar => 400,
+                quadruped_small::Species::Batfox => 300,
+                quadruped_small::Species::Dodarock => 500,
+                quadruped_small::Species::Holladon => 500,
+                quadruped_small::Species::Hyena => 400,
                 quadruped_small::Species::Truffler => 450,
-                _ => 400,
+                quadruped_small::Species::Rat => 100,
+                quadruped_small::Species::Pig => 200,
+                quadruped_small::Species::Fox => 200,
+                quadruped_small::Species::Sheep => 200,
+                quadruped_small::Species::Jackalope => 150,
+                quadruped_small::Species::Skunk => 150,
+                quadruped_small::Species::Cat => 150,
+                quadruped_small::Species::Raccoon => 150,
+                quadruped_small::Species::Quokka => 150,
+                quadruped_small::Species::Rabbit => 150,
+                quadruped_small::Species::Frog => 100,
+                quadruped_small::Species::Gecko => 100,
+                quadruped_small::Species::Turtle => 300,
+                quadruped_small::Species::Squirrel => 100,
+                quadruped_small::Species::Fungome => 150,
+                quadruped_small::Species::Porcupine => 250,
+                quadruped_small::Species::Beaver => 250,
+                quadruped_small::Species::Hare => 150,
+                quadruped_small::Species::Dog => 200,
+                quadruped_small::Species::Goat => 200,
+                _ => 250,
             },
             Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species {
                 quadruped_medium::Species::Grolgar => 900,
@@ -461,12 +481,13 @@ impl Body {
                 _ => 700,
             },
             Body::BirdMedium(bird_medium) => match bird_medium.species {
-                bird_medium::Species::Chicken => 300,
-                bird_medium::Species::Duck => 300,
-                bird_medium::Species::Goose => 300,
-                bird_medium::Species::Parrot => 250,
-                bird_medium::Species::Peacock => 350,
-                bird_medium::Species::Eagle => 450,
+                bird_medium::Species::Chicken => 150,
+                bird_medium::Species::Duck => 150,
+                bird_medium::Species::Goose => 250,
+                bird_medium::Species::Parrot => 150,
+                bird_medium::Species::Peacock => 300,
+                bird_medium::Species::Eagle => 350,
+                bird_medium::Species::Owl => 350,
                 _ => 250,
             },
             Body::FishMedium(_) => 250,
diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs
index 95d8978b9d..603aee02d2 100644
--- a/common/src/comp/body/object.rs
+++ b/common/src/comp/body/object.rs
@@ -370,6 +370,7 @@ impl Body {
             Body::BoltFire => Vec3::new(0.1, 0.1, 0.1),
             Body::Crossbow => Vec3::new(3.0, 3.0, 1.5),
             Body::HaniwaSentry => Vec3::new(0.8, 0.8, 1.4),
+            Body::TrainingDummy => Vec3::new(1.5, 1.2, 2.8),
             Body::SeaLantern => Vec3::new(0.5, 0.5, 1.0),
             Body::Snowball => Vec3::broadcast(2.5),
             _ => Vec3::broadcast(0.5),