From ad7b18f8f0600a2f12bd59fce2fef4d348ed3e20 Mon Sep 17 00:00:00 2001
From: Treeco <5021038-Treeco@users.noreply.gitlab.com>
Date: Sat, 7 Aug 2021 08:26:52 +0100
Subject: [PATCH] Buff swim thrust for humans  reduce gains from skillpoints
 This is intended to give a swim speed of 4.7 m/s when unskilled, and 7.2 when
 skilled However, this turns out to be horrifically fps-dependant, both after
 this branch and in master. Needs further research into fixes This commit
 tunes it for 60 fps

---
 common/src/comp/skills.rs  | 2 +-
 common/src/states/utils.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/comp/skills.rs b/common/src/comp/skills.rs
index a585454e03..541e8494f7 100644
--- a/common/src/comp/skills.rs
+++ b/common/src/comp/skills.rs
@@ -576,7 +576,7 @@ pub enum SwimSkill {
 impl Boost for SwimSkill {
     fn boost(self) -> BoostValue {
         match self {
-            Self::Speed => 40.into(),
+            Self::Speed => 25.into(),
         }
     }
 }
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index 8611f5cfb0..2d6aa78b65 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -184,7 +184,7 @@ impl Body {
             Body::FishMedium(_) => Some(50.0 * self.mass().0),
             Body::FishSmall(_) => Some(50.0 * self.mass().0),
             Body::Dragon(_) => Some(200.0 * self.mass().0),
-            Body::Humanoid(_) => Some(200.0 * self.mass().0),
+            Body::Humanoid(_) => Some(2500.0 * self.mass().0),
             Body::Theropod(body) => match body.species {
                 theropod::Species::Sandraptor
                 | theropod::Species::Snowraptor
@@ -375,7 +375,7 @@ fn swim_move(
         let mut water_accel = force / data.mass.0;
 
         if let Ok(Some(level)) = data.skill_set.skill_level(Skill::Swim(SwimSkill::Speed)) {
-            water_accel *= 1.4_f32.powi(level.into());
+            water_accel *= 1.25_f32.powi(level.into());
         }
 
         let dir = if data.body.can_strafe() {