(f2e516dfe) v0.9.3.2

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Controller.cs

@@ -1,4 +1,5 @@
-using Microsoft.Xna.Framework.Graphics;
+using Barotrauma.Networking;
+using Microsoft.Xna.Framework.Graphics;
 
 namespace Barotrauma.Items.Components
 {
@@ -72,5 +73,10 @@ namespace Barotrauma.Items.Components
                 GameMain.Client.ChatBox.ToggleOpen = value;
             }
         }
+
+        public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
+        {
+            state = msg.ReadBoolean();
+        }
     }
 }

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Engine.cs

@@ -136,7 +136,7 @@ namespace Barotrauma.Items.Components
         public void ClientWrite(IWriteMessage msg, object[] extraData = null)
         {
             //targetForce can only be adjusted at 10% intervals -> no need for more accuracy than this
-            msg.WriteRangedIntegerDeprecated(-10, 10, (int)(targetForce / 10.0f));
+            msg.WriteRangedInteger((int)(targetForce / 10.0f), -10, 10);
         }
 
         public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Fabricator.cs

@@ -44,6 +44,16 @@ namespace Barotrauma.Items.Components
                 Stretch = true,
                 RelativeSpacing = 0.02f
             };
+            
+            itemList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.5f), paddedFrame.RectTransform))
+            {
+                OnSelected = (GUIComponent component, object userdata) =>
+                {
+                    selectedItem = userdata as FabricationRecipe;
+                    if (selectedItem != null) { SelectItem(Character.Controlled, selectedItem); }
+                    return true;
+                }
+            };
 
             var filterArea = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.06f), paddedFrame.RectTransform), isHorizontal: true)
             {
@@ -58,16 +68,6 @@ namespace Barotrauma.Items.Components
                 OnClicked = (btn, userdata) => { ClearFilter(); itemFilterBox.Flash(Color.White); return true; }
             };
 
-            itemList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.5f), paddedFrame.RectTransform))
-            {
-                OnSelected = (GUIComponent component, object userdata) =>
-                {
-                    selectedItem = userdata as FabricationRecipe;
-                    if (selectedItem != null) { SelectItem(Character.Controlled, selectedItem); }
-                    return true;
-                }
-            };
-
             inputInventoryHolder = new GUIFrame(new RectTransform(new Vector2(0.7f, 0.15f), paddedFrame.RectTransform), style: null);
             inputInventoryOverlay = new GUICustomComponent(new RectTransform(Vector2.One, inputInventoryHolder.RectTransform), DrawInputOverLay, null)
             {
@@ -462,7 +462,7 @@ namespace Barotrauma.Items.Components
         public void ClientWrite(IWriteMessage msg, object[] extraData = null)
         {
             int itemIndex = pendingFabricatedItem == null ? -1 : fabricationRecipes.IndexOf(pendingFabricatedItem);
-            msg.WriteRangedIntegerDeprecated(-1, fabricationRecipes.Count - 1, itemIndex);
+            msg.WriteRangedInteger(itemIndex, -1, fabricationRecipes.Count - 1);
         }
 
         public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Pump.cs

@@ -179,7 +179,7 @@ namespace Barotrauma.Items.Components
         public void ClientWrite(IWriteMessage msg, object[] extraData = null)
         {
             //flowpercentage can only be adjusted at 10% intervals -> no need for more accuracy than this
-            msg.WriteRangedIntegerDeprecated(-10, 10, (int)(flowPercentage / 10.0f));
+            msg.WriteRangedInteger((int)(flowPercentage / 10.0f), -10, 10);
             msg.Write(IsActive);
         }
 

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs

@@ -451,7 +451,10 @@ namespace Barotrauma.Items.Components
                 if (PlayerInput.KeyDown(InputType.Right)) input.X += 1.0f;
                 if (PlayerInput.KeyDown(InputType.Up)) input.Y += 1.0f;
                 if (PlayerInput.KeyDown(InputType.Down)) input.Y += -1.0f;
-                if (PlayerInput.KeyDown(InputType.Run)) rate = 200.0f;
+                if (PlayerInput.KeyDown(InputType.Run))
+                    rate = 200.0f;
+                else if (PlayerInput.KeyDown(InputType.Crouch))
+                    rate = 20.0f;
 
                 rate *= deltaTime;
                 input.X *= rate;

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

@@ -73,11 +73,18 @@ namespace Barotrauma.Items.Components
             set { maintainPosTickBox.Selected = value; }
         }
 
+        private bool dockingModeEnabled;
         public bool DockingModeEnabled
+        {
+            get { return UseAutoDocking && dockingModeEnabled; }
+            set { dockingModeEnabled = value; }
+        }
+
+        public bool UseAutoDocking
         {
             get;
             set;
-        }
+        } = true;
 
         public List<DockingPort> DockingSources = new List<DockingPort>();
         public DockingPort ActiveDockingSource, DockingTarget;
@@ -726,6 +733,8 @@ namespace Barotrauma.Items.Components
                 inputCumulation = 0;
                 keyboardInput = Vector2.Zero;
             }
+
+            if (!UseAutoDocking) { return; }
             
             float closestDist = DockingAssistThreshold * DockingAssistThreshold;
             DockingModeEnabled = false;