Networking bugfixes, underwater scooter, fixed limbs going through walls when flipping the ragdoll

Subsurface/Source/Characters/AI/Objectives/AIObjective.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Barotrauma
+{
+    class AIObjective
+    {
+        protected List<AIObjective> subObjectives;
+
+        public virtual bool IsCompleted()
+        {
+            return true;
+        }
+
+        public AIObjective()
+        {
+            subObjectives = new List<AIObjective>();
+        }
+
+        /// <summary>
+        /// makes the character act according to the objective, or according to any subobjectives that
+        /// need to be completed before this one (starting from the one with the highest priority)
+        /// </summary>
+        /// <param name="character">the character who's trying to achieve the objective</param>
+        public void TryComplete(float deltaTime, Character character)
+        {
+            foreach (AIObjective objective in subObjectives)
+            {
+                if (objective.IsCompleted()) continue;
+
+                objective.TryComplete(deltaTime, character);
+                return;
+            }
+
+            Act(deltaTime, character);
+        }
+
+        protected virtual void Act(float deltaTime, Character character) { }
+    }
+}

Subsurface/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Barotrauma
+{
+    class AIObjectiveOperateItem : AIObjective
+    {
+        private Item targetItem;
+
+        public AIObjectiveOperateItem(Item item)
+        {
+            targetItem = item;
+        }
+
+        protected override void Act(float deltaTime, Character character)
+        {
+            //item.AIOperate(float deltaTime, Character character) or something
+        }
+    }
+}

Subsurface/Source/Characters/HumanoidAnimController.cs

@@ -787,6 +787,8 @@ namespace Barotrauma
 
         public override void HoldItem(float deltaTime, Item item, Vector2[] handlePos, Vector2 holdPos, Vector2 aimPos, bool aim, float holdAngle)
         {
+            Holdable holdable = item.GetComponent<Holdable>();
+
             //calculate the handle positions
             Matrix itemTransfrom = Matrix.CreateRotationZ(item.body.Rotation);
             Vector2[] transformedHandlePos = new Vector2[2];
@@ -808,19 +810,23 @@ namespace Barotrauma
                 Vector2 diff = (mousePos - torso.SimPosition) * Dir;
 
                 holdAngle = MathUtils.VectorToAngle(new Vector2(diff.X, diff.Y * Dir)) - torso.body.Rotation * Dir;
-                holdAngle = MathHelper.Clamp(MathUtils.WrapAnglePi(holdAngle), -1.3f, 1.0f);
+                //holdAngle = MathHelper.Clamp(MathUtils.WrapAnglePi(holdAngle), -1.3f, 1.0f);
 
                 itemAngle = (torso.body.Rotation + holdAngle * Dir);
 
-                head.body.SmoothRotate(itemAngle);
-
-                if (TargetMovement == Vector2.Zero && inWater)
+                if (holdable.ControlPose)
                 {
-                    torso.body.AngularVelocity -= torso.body.AngularVelocity * 0.1f;
-                    torso.body.ApplyForce(torso.body.LinearVelocity * -0.5f);
+                    head.body.SmoothRotate(itemAngle);
+
+                    if (TargetMovement == Vector2.Zero && inWater)
+                    {
+                        torso.body.AngularVelocity -= torso.body.AngularVelocity * 0.1f;
+                        torso.body.ApplyForce(torso.body.LinearVelocity * -0.5f);
+                    }
+
+                    aiming = true;
                 }
 
-                aiming = true;
             }
             else
             {
@@ -945,23 +951,25 @@ namespace Barotrauma
                 }
             }
 
-            foreach (Limb l in Limbs)
+            foreach (Limb limb in Limbs)
             {
-                switch (l.type)
+                switch (limb.type)
                 {
                     case LimbType.LeftHand:
                     case LimbType.LeftArm:
                     case LimbType.RightHand:
                     case LimbType.RightArm:
-                        difference = l.body.SimPosition - torso.SimPosition;
+                        difference = limb.body.SimPosition - torso.SimPosition;
                         difference = Vector2.Transform(difference, torsoTransform);
                         difference.Y = -difference.Y;
 
-                        l.body.SetTransform(torso.SimPosition + Vector2.Transform(difference, -torsoTransform), -l.body.Rotation);
+                        TrySetLimbPosition(limb, limb.SimPosition, torso.SimPosition + Vector2.Transform(difference, -torsoTransform));
+
+                        limb.body.SetTransform(limb.body.SimPosition, -limb.body.Rotation);
                         break;
                     default:
-                        if (!inWater) l.body.SetTransform(l.body.SimPosition,
-                            MathUtils.WrapAnglePi(l.body.Rotation * (l.DoesFlip ? -1.0f : 1.0f)));
+                        if (!inWater) limb.body.SetTransform(limb.body.SimPosition,
+                            MathUtils.WrapAnglePi(limb.body.Rotation * (limb.DoesFlip ? -1.0f : 1.0f)));
                         break;
                 }
             }

Subsurface/Source/Characters/Ragdoll.cs

@@ -671,7 +671,7 @@ namespace Barotrauma
             }
         }
 
-        private void TrySetLimbPosition(Limb limb, Vector2 original, Vector2 simPosition)
+        protected void TrySetLimbPosition(Limb limb, Vector2 original, Vector2 simPosition)
         {
             if (original == simPosition) return;