From f6425a72291f46536735c03a8840951ca79a56d3 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed, 14 Jun 2017 16:27:12 +0300
Subject: [PATCH] Characters using FishAnimController twitch for a few seconds
 after dying

---
 .../Characters/Animation/FishAnimController.cs   | 16 ++++++++++++----
 .../Source/Characters/Animation/Ragdoll.cs       |  4 +++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Barotrauma/Source/Characters/Animation/FishAnimController.cs b/Barotrauma/Source/Characters/Animation/FishAnimController.cs
index 5b3188d6c..35024c7ba 100644
--- a/Barotrauma/Source/Characters/Animation/FishAnimController.cs
+++ b/Barotrauma/Source/Characters/Animation/FishAnimController.cs
@@ -23,6 +23,8 @@ namespace Barotrauma
 
         private float? footRotation;
 
+        private float deathAnimTimer, deathAnimDuration = 5.0f;
+
         public FishAnimController(Character character, XElement element)
             : base(character, element)
         {
@@ -63,6 +65,12 @@ namespace Barotrauma
                     Collider.LinearVelocity = (MainLimb.SimPosition - Collider.SimPosition) * 60.0f;
                     Collider.SmoothRotate(MainLimb.Rotation);
                 }
+
+                if (character.IsDead && deathAnimTimer < deathAnimDuration)
+                {
+                    deathAnimTimer += deltaTime;
+                    UpdateDying(deltaTime);
+                }
                 
                 return;
             }
@@ -297,8 +305,8 @@ namespace Barotrauma
             Limb head = GetLimb(LimbType.Head);
             Limb tail = GetLimb(LimbType.Tail);
 
-            if (head != null) head.body.ApplyTorque(head.Mass * Dir * (float)Math.Sin(walkPos) * 5.0f);
-            if (tail != null) tail.body.ApplyTorque(tail.Mass * -Dir * (float)Math.Sin(walkPos) * 5.0f);
+            if (head != null && !head.IsSevered) head.body.ApplyTorque((float)(Math.Sqrt(head.Mass) * Dir * Math.Sin(walkPos)) * 10.0f);
+            if (tail != null && !tail.IsSevered) tail.body.ApplyTorque((float)(Math.Sqrt(tail.Mass) * -Dir * (float)Math.Sin(walkPos)) * 10.0f);
 
             walkPos += deltaTime * 5.0f;
 
@@ -306,9 +314,9 @@ namespace Barotrauma
 
             foreach (Limb limb in Limbs)
             {
-                if (limb.type == LimbType.Head || limb.type == LimbType.Tail) continue;
+                if (limb.type == LimbType.Head || limb.type == LimbType.Tail || limb.IsSevered) continue;
 
-                limb.body.ApplyForce((centerOfMass - limb.SimPosition) * (float)Math.Sin(walkPos) * limb.Mass * 10.0f);
+                limb.body.ApplyForce((centerOfMass - limb.SimPosition) * (float)(Math.Sin(walkPos) * Math.Sqrt(limb.Mass)) * 10.0f);
             }
         }
 
diff --git a/Barotrauma/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/Source/Characters/Animation/Ragdoll.cs
index cd13bc0ab..89cb897b6 100644
--- a/Barotrauma/Source/Characters/Animation/Ragdoll.cs
+++ b/Barotrauma/Source/Characters/Animation/Ragdoll.cs
@@ -702,13 +702,15 @@ namespace Barotrauma
         public Vector2 GetCenterOfMass()
         {
             Vector2 centerOfMass = Vector2.Zero;
+            float totalMass = 0.0f;
             foreach (Limb limb in Limbs)
             {
                 if (limb.IsSevered) continue;
                 centerOfMass += limb.Mass * limb.SimPosition;
+                totalMass += limb.Mass;
             }
 
-            centerOfMass /= Mass;
+            centerOfMass /= totalMass;
 
             return centerOfMass;
         }