(e8cd7329b) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs

@@ -121,90 +121,7 @@ namespace Barotrauma
                             MainLimb.PullJointWorldAnchorB = Collider.SimPosition;
                             MainLimb.PullJointEnabled = true;
                         }
-                        character.SelectedConstruction = character.MemState[0].SelectedItem;
                     }
-
-                    if (character.MemState[0].Animation == AnimController.Animation.CPR)
-                    {
-                        character.AnimController.Anim = AnimController.Animation.CPR;
-                    }
-                    else if (character.AnimController.Anim == AnimController.Animation.CPR)
-                    {
-                        character.AnimController.Anim = AnimController.Animation.None;
-                    }
-
-                    Vector2 newVelocity = Collider.LinearVelocity;
-                    Vector2 newPosition = Collider.SimPosition;
-                    float newRotation = Collider.Rotation;
-                    float newAngularVelocity = Collider.AngularVelocity;
-                    Collider.CorrectPosition(character.MemState, out newPosition, out newVelocity, out newRotation, out newAngularVelocity);
-
-                    newVelocity = newVelocity.ClampLength(100.0f);
-                    if (!MathUtils.IsValid(newVelocity)) { newVelocity = Vector2.Zero; }
-                    overrideTargetMovement = newVelocity.LengthSquared() > 0.01f ? newVelocity : Vector2.Zero;
-
-                    Collider.LinearVelocity = newVelocity;
-                    Collider.AngularVelocity = newAngularVelocity;
-
-                    float distSqrd = Vector2.DistanceSquared(newPosition, Collider.SimPosition);
-                    float errorTolerance = character.AllowInput ? 0.01f : 0.2f;
-                    if (distSqrd > errorTolerance)
-                    {
-                        if (distSqrd > 10.0f || !character.AllowInput)
-                        {
-                            Collider.TargetRotation = newRotation;
-                            SetPosition(newPosition, lerp: distSqrd < 5.0f, ignorePlatforms: false);
-                        }
-                        else
-                        {
-                            Collider.TargetRotation = newRotation;
-                            Collider.TargetPosition = newPosition;
-                            Collider.MoveToTargetPosition(true);
-                        }
-                    }
-                    
-                    //unconscious/dead characters can't correct their position using AnimController movement
-                    // -> we need to correct it manually
-                    if (!character.AllowInput)
-                    {
-                        float mainLimbDistSqrd = Vector2.DistanceSquared(MainLimb.PullJointWorldAnchorA, Collider.SimPosition);
-                        float mainLimbErrorTolerance = 0.1f;
-                        //if the main limb is roughly at the correct position and the collider isn't moving (much at least),
-                        //don't attempt to correct the position.
-                        if (mainLimbDistSqrd > mainLimbErrorTolerance || Collider.LinearVelocity.LengthSquared() > 0.05f)
-                        {
-                            MainLimb.PullJointWorldAnchorB = Collider.SimPosition;
-                            MainLimb.PullJointEnabled = true;
-                        }
-                    }
-                }
-                character.MemLocalState.Clear();
-            }
-            else
-            {
-                //remove states with a timestamp (there may still timestamp-based states 
-                //in the list if the controlled character switches from timestamp-based interpolation to ID-based)
-                character.MemState.RemoveAll(m => m.Timestamp > 0.0f);
-                
-                for (int i = 0; i < character.MemLocalState.Count; i++)
-                {
-                    if (character.Submarine == null)
-                    {
-                        //transform in-sub coordinates to outside coordinates
-                        if (character.MemLocalState[i].Position.Y > lowestSubPos)
-                        {                            
-                            character.MemLocalState[i].TransformInToOutside();
-                        }
-                    }
-                    else if (currentHull?.Submarine != null)
-                    {
-                        //transform outside coordinates to in-sub coordinates
-                        if (character.MemLocalState[i].Position.Y < lowestSubPos)
-                        {
-                            character.MemLocalState[i].TransformOutToInside(currentHull.Submarine);
-                        }
-                    }
-
                 }
                 character.MemLocalState.Clear();
             }

Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs

@@ -748,6 +748,8 @@ namespace Barotrauma
 
         private GUILayoutGroup subPreviewContainer;
 
+        private GUILayoutGroup subPreviewContainer;
+
         private GUIButton loadGameButton;
         
         public Action<Submarine, string, string> StartNewGame;

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs

@@ -89,6 +89,21 @@ namespace Barotrauma
             }
         }
 
+        public override void Update(float deltaTime)
+        {
+            if (objectiveManager.CurrentObjective == this)
+            {
+                if (randomTimer > 0)
+                {
+                    randomTimer -= deltaTime;
+                }
+                else
+                {
+                    SetRandom();
+                }
+            }
+        }
+
         public override bool IsCompleted() => false;
         public override bool CanBeCompleted => true;
 

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveManager.cs

@@ -28,14 +28,7 @@ namespace Barotrauma
             get { return _waitTimer; }
             set
             {
-                if (CurrentObjective is AIObjectiveCombat || CurrentObjective is AIObjectiveFindSafety)
+                _waitTimer = IsAllowedToWait() ? value : 0;
-                {
-                    _waitTimer = 0;
-                }
-                else
-                {
-                    _waitTimer = value;
-                }
             }
         }
 
@@ -205,31 +198,6 @@ namespace Barotrauma
             {
                 CurrentObjective?.TryComplete(deltaTime);
             }
-            else
-            {
-                if (CurrentOrder != null)
-                {
-                    CurrentOrder.TryComplete(deltaTime);
-                }
-                else
-                {
-                    // Wait, if not swimming, climbing, or staying in a forbidden/unsafe hull.
-                    if (character.AIController is HumanAIController humanAI && humanAI.SteeringManager != null)
-                    {
-                        if (!character.AnimController.InWater &&
-                            !character.IsClimbing &&
-                            !humanAI.UnsafeHulls.Contains(character.CurrentHull) && 
-                            !AIObjectiveIdle.IsForbidden(character.CurrentHull))
-                        {
-                            humanAI.SteeringManager.Reset();
-                        }
-                        else
-                        {
-                            CurrentObjective?.TryComplete(deltaTime);
-                        }
-                    }
-                }
-            }
         }
         
         public void SetOrder(AIObjective objective)
@@ -306,5 +274,19 @@ namespace Barotrauma
             }
             return newObjective;
         }
+
+        private bool IsAllowedToWait()
+        {
+            if (CurrentOrder != null) { return false; }
+            if (CurrentObjective is AIObjectiveCombat || CurrentObjective is AIObjectiveFindSafety) { return false; }
+            if (character.AnimController.InWater) { return false; }
+            if (character.IsClimbing) { return false; }
+            if (character.AIController is HumanAIController humanAI)
+            {
+                if (humanAI.UnsafeHulls.Contains(character.CurrentHull)) { return false; }
+            }
+            if (AIObjectiveIdle.IsForbidden(character.CurrentHull)) { return false; }
+            return true;
+        }
     }
 }

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs

@@ -897,6 +897,10 @@ namespace Barotrauma
                     {
                         isCompleted = true;
                     }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                 }
                 else
                 {

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -1145,24 +1145,6 @@ namespace Barotrauma
                 SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
             }
             
-            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
-            {
-                //apply some smoothing to the cursor positions of remote players when playing as a client
-                //to make aiming look a little less choppy
-                Vector2 smoothedCursorDiff = cursorPosition - SmoothedCursorPosition;
-                smoothedCursorDiff = NetConfig.InterpolateCursorPositionError(smoothedCursorDiff);
-                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
-            }
-            
-            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
-            {
-                //apply some smoothing to the cursor positions of remote players when playing as a client
-                //to make aiming look a little less choppy
-                Vector2 smoothedCursorDiff = cursorPosition - SmoothedCursorPosition;
-                smoothedCursorDiff = NetConfig.InterpolateCursorPositionError(smoothedCursorDiff);
-                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
-            }
-            
             if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
             {
                 if (speedMultipliers.Count == 0) return 1f;

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs

@@ -639,6 +639,25 @@ namespace Barotrauma.Items.Components
                     }
                 }
                 
+                if (targetItem.Prefab.DeconstructItems.Any())
+                {
+                    inputContainer.Inventory.RemoveItem(targetItem);
+                    Entity.Spawner.AddToRemoveQueue(targetItem);
+                    MoveInputQueue();
+                    PutItemsToLinkedContainer();
+                }
+                else
+                {
+                    if (outputContainer.Inventory.Items.All(i => i != null))
+                    {
+                        targetItem.Drop(dropper: null);
+                    }
+                    else
+                    {
+                        outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true);
+                    }
+                }
+                
                 if (targetItem.Prefab.DeconstructItems.Any())
                 {
                     inputContainer.Inventory.RemoveItem(targetItem);

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -144,6 +144,17 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public Vector2 SteeringInput
+        {
+            get { return steeringInput; }
+            set
+            {
+                if (!MathUtils.IsValid(value)) return;
+                steeringInput.X = MathHelper.Clamp(value.X, -100.0f, 100.0f);
+                steeringInput.Y = MathHelper.Clamp(value.Y, -100.0f, 100.0f);
+            }
+        }
+
         public SteeringPath SteeringPath
         {
             if (!CanBeSelected) return false;
@@ -164,12 +175,6 @@ namespace Barotrauma.Items.Components
             set { posToMaintain = value; }
         }
 
-        public Vector2? PosToMaintain
-        {
-            get { return posToMaintain; }
-            set { posToMaintain = value; }
-        }
-
         struct ObstacleDebugInfo
         {
             public Vector2 Point1;

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -1171,70 +1171,6 @@ namespace Barotrauma
             }
         }
 
-        public void UpdateTransform()
-        {
-            Submarine prevSub = Submarine;
-
-            FindHull();
-
-            if (Submarine == null && prevSub != null)
-            {
-                body.SetTransform(body.SimPosition + prevSub.SimPosition, body.Rotation);
-            }
-            else if (Submarine != null && prevSub == null)
-            {
-                body.SetTransform(body.SimPosition - Submarine.SimPosition, body.Rotation);
-            }
-            else if (Submarine != null && prevSub != null && Submarine != prevSub)
-            {
-                body.SetTransform(body.SimPosition + prevSub.SimPosition - Submarine.SimPosition, body.Rotation);
-            }
-
-            Vector2 displayPos = ConvertUnits.ToDisplayUnits(body.SimPosition);
-            rect.X = (int)(displayPos.X - rect.Width / 2.0f);
-            rect.Y = (int)(displayPos.Y + rect.Height / 2.0f);
-
-            if (Math.Abs(body.LinearVelocity.X) > NetConfig.MaxPhysicsBodyVelocity || 
-                Math.Abs(body.LinearVelocity.Y) > NetConfig.MaxPhysicsBodyVelocity)
-            {
-                body.LinearVelocity = new Vector2(
-                    MathHelper.Clamp(body.LinearVelocity.X, -NetConfig.MaxPhysicsBodyVelocity, NetConfig.MaxPhysicsBodyVelocity),
-                    MathHelper.Clamp(body.LinearVelocity.Y, -NetConfig.MaxPhysicsBodyVelocity, NetConfig.MaxPhysicsBodyVelocity));
-            }
-        }
-                
-        public void UpdateTransform()
-        {
-            Submarine prevSub = Submarine;
-
-            FindHull();
-
-            if (Submarine == null && prevSub != null)
-            {
-                body.SetTransform(body.SimPosition + prevSub.SimPosition, body.Rotation);
-            }
-            else if (Submarine != null && prevSub == null)
-            {
-                body.SetTransform(body.SimPosition - Submarine.SimPosition, body.Rotation);
-            }
-            else if (Submarine != null && prevSub != null && Submarine != prevSub)
-            {
-                body.SetTransform(body.SimPosition + prevSub.SimPosition - Submarine.SimPosition, body.Rotation);
-            }
-
-            Vector2 displayPos = ConvertUnits.ToDisplayUnits(body.SimPosition);
-            rect.X = (int)(displayPos.X - rect.Width / 2.0f);
-            rect.Y = (int)(displayPos.Y + rect.Height / 2.0f);
-
-            if (Math.Abs(body.LinearVelocity.X) > NetConfig.MaxPhysicsBodyVelocity || 
-                Math.Abs(body.LinearVelocity.Y) > NetConfig.MaxPhysicsBodyVelocity)
-            {
-                body.LinearVelocity = new Vector2(
-                    MathHelper.Clamp(body.LinearVelocity.X, -NetConfig.MaxPhysicsBodyVelocity, NetConfig.MaxPhysicsBodyVelocity),
-                    MathHelper.Clamp(body.LinearVelocity.Y, -NetConfig.MaxPhysicsBodyVelocity, NetConfig.MaxPhysicsBodyVelocity));
-            }
-        }
-
         /// <summary>
         /// Applies buoyancy, drag and angular drag caused by water
         /// </summary>

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -683,6 +683,25 @@ namespace Barotrauma
             }
         }
 
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
         public override Rectangle Rect
         {
             get