Unstable 0.1400.7.0 (Coronavirus edition)

2021-07-23 21:01:17 +03:00
parent ee5308b39f
commit 47707c824a
133 changed files with 1310 additions and 533 deletions
@@ -102,6 +102,12 @@ namespace Barotrauma.Items.Components
            get { return limbPositions.Count > 0; }
        }

+        public bool UserInCorrectPosition
+        {
+            get;
+            private set;
+        }
+
        public bool AllowAiming
        {
            get;
@@ -149,6 +155,7 @@ namespace Barotrauma.Items.Components
        public override void Update(float deltaTime, Camera cam) 
        {
            this.cam = cam;
+            UserInCorrectPosition = false;

            if (IsToggle)
            {
@@ -189,6 +196,7 @@ namespace Barotrauma.Items.Components
                    else
                    {
                        user.AnimController.TargetMovement = Vector2.Zero;
+                        UserInCorrectPosition = true;
                    }
                }
                else
@@ -197,7 +205,7 @@ namespace Barotrauma.Items.Components
                    if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient && user != Character.Controlled)
                    {
                        if (Math.Abs(diff.X) > 20.0f)
-                        {                       
+                        {
                            //wait for the character to walk to the correct position
                            return;
                        }
@@ -218,7 +226,8 @@ namespace Barotrauma.Items.Components
                            return;
                        }
                    }
-                    user.AnimController.TargetMovement = Vector2.Zero;                    
+                    user.AnimController.TargetMovement = Vector2.Zero;
+                    UserInCorrectPosition = true;
                }
            }

@@ -365,7 +374,7 @@ namespace Barotrauma.Items.Components

            for (int i = item.LastSentSignalRecipients.Count - 1; i >= 0; i--)
            {
-                if (item.LastSentSignalRecipients[i].Item.Condition <= 0.0f) { continue; }
+                if (item.LastSentSignalRecipients[i].Item.Condition <= 0.0f || item.LastSentSignalRecipients[i].IsPower) { continue; }
                if (item.LastSentSignalRecipients[i].Item.Prefab.FocusOnSelected)
                {
                    return item.LastSentSignalRecipients[i].Item;
@@ -170,7 +170,7 @@ namespace Barotrauma.Items.Components
        private void StartFabricating(FabricationRecipe selectedItem, Character user, bool addToServerLog = true)
        {
            if (selectedItem == null) { return; }
-            if (!outputContainer.Inventory.CanBePut(selectedItem.TargetItem)) { return; }
+            if (!outputContainer.Inventory.CanBePut(selectedItem.TargetItem, selectedItem.OutCondition)) { return; }

 #if CLIENT
            itemList.Enabled = false;
@@ -308,7 +308,7 @@ namespace Barotrauma.Items.Components
                }

                Character tempUser = user;
-                int amountFittingContainer = outputContainer.Inventory.HowManyCanBePut(fabricatedItem.TargetItem);
+                int amountFittingContainer = outputContainer.Inventory.HowManyCanBePut(fabricatedItem.TargetItem, fabricatedItem.OutCondition);
                for (int i = 0; i < fabricatedItem.Amount; i++)
                {
                    if (i < amountFittingContainer)
@@ -334,7 +334,7 @@ namespace Barotrauma.Items.Components
                    }
                }
            
-                if (user != null && !user.Removed)
+                if (user?.Info != null && !user.Removed)
                {
                    foreach (Skill skill in fabricatedItem.RequiredSkills)
                    {
@@ -50,7 +50,7 @@ namespace Barotrauma.Items.Components
            set { maxFlow = value; } 
        }

-        [Editable, Serialize(true, false, alwaysUseInstanceValues: true)]
+        [Editable, Serialize(true, true, alwaysUseInstanceValues: true)]
        public bool IsOn
        {
            get { return IsActive; }
@@ -234,7 +234,10 @@ namespace Barotrauma.Items.Components

            //use a smoothed "correct output" instead of the actual correct output based on the load
            //so the player doesn't have to keep adjusting the rate impossibly fast when the load fluctuates heavily
-            correctTurbineOutput += MathHelper.Clamp((load / MaxPowerOutput * 100.0f) - correctTurbineOutput, -10.0f, 10.0f) * deltaTime;
+            if (!MathUtils.NearlyEqual(MaxPowerOutput, 0.0f))
+            {
+                correctTurbineOutput += MathHelper.Clamp((load / MaxPowerOutput * 100.0f) - correctTurbineOutput, -10.0f, 10.0f) * deltaTime;
+            }

            //calculate tolerances of the meters based on the skills of the user
            //more skilled characters have larger "sweet spots", making it easier to keep the power output at a suitable level
@@ -320,7 +323,7 @@ namespace Barotrauma.Items.Components
                //reset the fission rate, turbine output and
                //temperature to optimal levels to prevent fires
                //at the start of the round
-                correctTurbineOutput = currentLoad / MaxPowerOutput * 100.0f;
+                correctTurbineOutput = MathUtils.NearlyEqual(MaxPowerOutput, 0.0f) ? 0.0f : currentLoad / MaxPowerOutput * 100.0f;
                tolerance = MathHelper.Lerp(2.5f, 10.0f, degreeOfSuccess);
                optimalTurbineOutput = new Vector2(correctTurbineOutput - tolerance, correctTurbineOutput + tolerance);
                tolerance = MathHelper.Lerp(5.0f, 20.0f, degreeOfSuccess);
@@ -795,6 +795,7 @@ namespace Barotrauma.Items.Components
                steeringInput = XMLExtensions.ParseVector2(signal.value, errorMessages: false);
                steeringInput.X = MathHelper.Clamp(steeringInput.X, -100.0f, 100.0f);
                steeringInput.Y = MathHelper.Clamp(-steeringInput.Y, -100.0f, 100.0f);
+                TargetVelocity = steeringInput;
            }
            else
            {