- Charybdis's and coelanths can eat other creatures.

- Split charybdis's tail into several parts, the single stiff tail limb made it too difficult for it to turn around.
- Option to override the torque that's used to rotate the mainlimb of swimming creatures to the correct direction.
- The scale of the characters' limbs is taken into account in EditCharacterScreen.

Barotrauma/Source/Characters/AI/EnemyAIController.cs

@@ -485,6 +485,7 @@ namespace Barotrauma
                     {
                         //only one limb left, the character is now full eaten
                         Entity.Spawner.AddToRemoveQueue(targetCharacter);
+                        selectedAiTarget = null;
                         state = AIState.None;
                     }
                     else //sever a random joint

Barotrauma/Source/Characters/Animation/FishAnimController.cs

@@ -15,6 +15,8 @@ namespace Barotrauma
         private float waveAmplitude;
         private float waveLength;
 
+        private float steerTorque;
+
         private bool rotateTowardsMovement;
 
         private bool mirror, flip;
@@ -28,13 +30,15 @@ namespace Barotrauma
         public FishAnimController(Character character, XElement element)
             : base(character, element)
         {
-            waveAmplitude = ConvertUnits.ToSimUnits(ToolBox.GetAttributeFloat(element, "waveamplitude", 0.0f));
-            waveLength = ConvertUnits.ToSimUnits(ToolBox.GetAttributeFloat(element, "wavelength", 0.0f));
+            waveAmplitude   = ConvertUnits.ToSimUnits(ToolBox.GetAttributeFloat(element, "waveamplitude", 0.0f));
+            waveLength      = ConvertUnits.ToSimUnits(ToolBox.GetAttributeFloat(element, "wavelength", 0.0f));
+
+            steerTorque     = ToolBox.GetAttributeFloat(element, "steertorque", 25.0f);
             
-            flip = ToolBox.GetAttributeBool(element, "flip", true);
-            mirror = ToolBox.GetAttributeBool(element, "mirror", false);
+            flip            = ToolBox.GetAttributeBool(element, "flip", true);
+            mirror          = ToolBox.GetAttributeBool(element, "mirror", false);
             
-            float footRot = ToolBox.GetAttributeFloat(element,"footrotation", float.NaN);
+            float footRot = ToolBox.GetAttributeFloat(element, "footrotation", float.NaN);
             if (float.IsNaN(footRot))
             {
                 footRotation = null;
@@ -184,12 +188,12 @@ namespace Barotrauma
             if (rotateTowardsMovement)
             {
                 Collider.SmoothRotate(movementAngle, 25.0f);
-                MainLimb.body.SmoothRotate(movementAngle, 25.0f);
+                MainLimb.body.SmoothRotate(movementAngle, steerTorque);
             }
             else
             {
                 Collider.SmoothRotate(HeadAngle * Dir, 25.0f);
-                MainLimb.body.SmoothRotate(HeadAngle * Dir, 25.0f);
+                MainLimb.body.SmoothRotate(HeadAngle * Dir, steerTorque);
             }
 
             Limb tail = GetLimb(LimbType.Tail);

Barotrauma/Source/Characters/Limb.cs

@@ -136,6 +136,11 @@ namespace Barotrauma
             get { return body.Rotation; }
         }
 
+        public float Scale
+        {
+            get { return scale; }
+        }
+
         //where an animcontroller is trying to pull the limb, only used for debug visualization
         public Vector2 AnimTargetPos
         {