(bf212a41f) v0.9.2.0 pre-release test version

2019-07-27 21:06:07 +03:00
parent afa2137bd2
commit 0f63da27b2
154 changed files with 3959 additions and 1428 deletions
@@ -182,7 +182,7 @@ namespace Barotrauma.Items.Components
        }


-        partial void SetState(bool open, bool isNetworkMessage, bool sendNetworkMessage)
+        partial void SetState(bool open, bool isNetworkMessage, bool sendNetworkMessage, bool forcedOpen)
        {
            if (isStuck ||
                (PredictedState == null && isOpen == open) ||
@@ -200,12 +200,16 @@ namespace Barotrauma.Items.Components
                //sent by the server, or reverting it back to its old state if no msg from server was received
                PredictedState = open;
                resetPredictionTimer = CorrectionDelay;
-                if (stateChanged) PlaySound(ActionType.OnUse, item.WorldPosition);
+                if (stateChanged) PlaySound(forcedOpen ? ActionType.OnPicked : ActionType.OnUse, item.WorldPosition);
            }
            else
            {
                isOpen = open;
-                if (!isNetworkMessage || open != PredictedState) PlaySound(ActionType.OnUse, item.WorldPosition);
+                if (!isNetworkMessage || open != PredictedState)
+                {
+                    StopPicking(null);
+                    PlaySound(forcedOpen ? ActionType.OnPicked : ActionType.OnUse, item.WorldPosition);
+                }
            }

            //opening a partially stuck door makes it less stuck
@@ -217,7 +221,9 @@ namespace Barotrauma.Items.Components
        {
            base.ClientRead(type, msg, sendingTime);

-            SetState(msg.ReadBoolean(), isNetworkMessage: true, sendNetworkMessage: false);
+            bool open = msg.ReadBoolean();
+            bool forcedOpen = msg.ReadBoolean();
+            SetState(open, isNetworkMessage: true, sendNetworkMessage: false, forcedOpen: forcedOpen);
            Stuck = msg.ReadRangedSingle(0.0f, 100.0f, 8);

            PredictedState = null;
@@ -291,16 +291,16 @@ namespace Barotrauma.Items.Components
            else
            {
                float volume = GetSoundVolume(itemSound);
-                if (volume <= 0.0f) return;
+                if (volume <= 0.0f) { return; }
                SoundPlayer.PlaySound(itemSound.RoundSound.Sound, position, volume, itemSound.Range, item.CurrentHull);
            }
        }

        public void StopSounds(ActionType type)
        {
-            if (loopingSound == null) return;
+            if (loopingSound == null) { return; }

-            if (loopingSound.Type != type) return;
+            if (loopingSound.Type != type) { return; }

            if (loopingSoundChannel != null)
            {
@@ -25,12 +25,12 @@ namespace Barotrauma.Items.Components
        {
            noPowerTip = TextManager.Get("SteeringNoPowerTip");

-            GuiFrame.RectTransform.RelativeOffset = new Vector2(0.4f, 0.0f);
-            new GUICustomComponent(new RectTransform(new Vector2(0.9f, 0.85f), GuiFrame.RectTransform, Anchor.Center),
+            GuiFrame.RectTransform.RelativeOffset = new Vector2(0.05f, 0.0f);
+            new GUICustomComponent(new RectTransform(new Vector2(0.95f, 0.9f), GuiFrame.RectTransform, Anchor.Center),
                DrawHUDBack, null);
-            submarineContainer = new GUIFrame(new RectTransform(new Vector2(0.9f, 0.85f), GuiFrame.RectTransform, Anchor.Center), style: null);
+            submarineContainer = new GUIFrame(new RectTransform(new Vector2(0.95f, 0.9f), GuiFrame.RectTransform, Anchor.Center), style: null);

-            new GUICustomComponent(new RectTransform(new Vector2(0.9f, 0.85f), GuiFrame.RectTransform, Anchor.Center),
+            new GUICustomComponent(new RectTransform(new Vector2(0.95f, 0.9f), GuiFrame.RectTransform, Anchor.Center),
                DrawHUDFront, null)
            {
                CanBeFocused = false
@@ -179,11 +179,21 @@ namespace Barotrauma.Items.Components
                    GetLinkedHulls(hull, hullData.LinkedHulls);
                    hullDatas.Add(hull, hullData);
                }
+                
+                Color neutralColor = Color.DarkCyan;
+                if (hull.RoomName != null)
+                {
+                    if (hull.RoomName.Contains("ballast") || hull.RoomName.Contains("Ballast") ||
+                        hull.RoomName.Contains("airlock") || hull.RoomName.Contains("Airlock"))
+                    {
+                        neutralColor = new Color(9, 80, 159);
+                    }
+                }

                if (hullData.Distort)
                {
                    hullFrame.Children.First().Color = Color.Lerp(Color.Black, Color.DarkGray * 0.5f, Rand.Range(0.0f, 1.0f));
-                    hullFrame.Color = Color.DarkGray * 0.5f;
+                    hullFrame.Color = neutralColor * 0.5f;
                    continue;
                }
                
@@ -192,20 +202,23 @@ namespace Barotrauma.Items.Components
                    hullFrame.Parent.Rect.Width / (float)hull.Submarine.Borders.Width, 
                    hullFrame.Parent.Rect.Height / (float)hull.Submarine.Borders.Height);
                
-                Color borderColor = Color.DarkCyan;
+                Color borderColor = neutralColor;
                
                float? gapOpenSum = 0.0f;
                if (ShowHullIntegrity)
                {
                    gapOpenSum = hull.ConnectedGaps.Where(g => !g.IsRoomToRoom).Sum(g => g.Open);
-                    borderColor = Color.Lerp(Color.DarkCyan, Color.Red, Math.Min((float)gapOpenSum, 1.0f));
+                    borderColor = Color.Lerp(neutralColor, Color.Red, Math.Min((float)gapOpenSum, 1.0f));
                }

                float? oxygenAmount = null;
                if (!RequireOxygenDetectors || hullData?.Oxygen != null)
                {
                    oxygenAmount = RequireOxygenDetectors ? hullData.Oxygen : hull.OxygenPercentage;
-                    GUI.DrawRectangle(spriteBatch, hullFrame.Rect, Color.Lerp(Color.Red * 0.5f, Color.Green * 0.3f, (float)oxygenAmount / 100.0f), true);
+                    GUI.DrawRectangle(
+                        spriteBatch, hullFrame.Rect, 
+                        Color.Lerp(Color.Red * 0.5f, Color.Green * 0.3f, (float)oxygenAmount / 100.0f), 
+                        true);
                }

                float? waterAmount = null;
@@ -234,7 +247,7 @@ namespace Barotrauma.Items.Components
                }
                else
                {
-                    hullFrame.Children.First().Color = Color.DarkCyan * 0.8f;
+                    hullFrame.Children.First().Color = neutralColor * 0.8f;
                }

                if (mouseOnHull == hull)
@@ -291,8 +304,6 @@ namespace Barotrauma.Items.Components
                    GUI.DrawLine(spriteBatch, center + start, center + end, Color.DarkCyan * Rand.Range(0.3f, 0.35f), width: (int)(10 * GUI.Scale));
                }
            }
-
-
        }

        private void GetLinkedHulls(Hull hull, List<Hull> linkedHulls)
@@ -58,6 +58,10 @@ namespace Barotrauma.Items.Components
        private GUIFrame inventoryContainer;

        private GUIComponent leftHUDColumn;
+        private GUIComponent midHUDColumn;
+        private GUIComponent rightHUDColumn;
+
+        private GUILayoutGroup sliderControlsContainer;

        private Dictionary<string, GUIButton> warningButtons = new Dictionary<string, GUIButton>();

@@ -107,11 +111,13 @@ namespace Barotrauma.Items.Components
                RelativeSpacing = 0.012f,
                Stretch = true
            };
-            
+
            GUIFrame columnLeft = new GUIFrame(new RectTransform(new Vector2(0.25f, 1.0f), paddedFrame.RectTransform), style: null);
-            leftHUDColumn = columnLeft;
            GUIFrame columnMid = new GUIFrame(new RectTransform(new Vector2(0.45f, 1.0f), paddedFrame.RectTransform), style: null);
            GUIFrame columnRight = new GUIFrame(new RectTransform(new Vector2(0.3f, 1.0f), paddedFrame.RectTransform), style: null);
+            leftHUDColumn = columnLeft;
+            midHUDColumn = columnMid;
+            rightHUDColumn = columnRight;

            //----------------------------------------------------------
            //left column
@@ -180,9 +186,16 @@ namespace Barotrauma.Items.Components
                ToolTip = TextManager.Get("ReactorTipTurbineOutput")
            };

-            new GUITextBlock(new RectTransform(new Point(0, (int)(20 * GUI.Scale)), columnMid.RectTransform, Anchor.BottomLeft) { AbsoluteOffset = new Point(0, (int)(90 * GUI.Scale)) },
+            GUILayoutGroup sliderControls = new GUILayoutGroup(new RectTransform(new Point(columnMid.Rect.Width, (int)(114 * GUI.Scale)), columnMid.RectTransform, Anchor.BottomCenter))
+            {
+                Stretch = true,
+                AbsoluteSpacing = (int)(5 * GUI.Scale)
+            };
+            sliderControlsContainer = sliderControls;
+
+            new GUITextBlock(new RectTransform(new Point(0, (int)(20 * GUI.Scale)), sliderControls.RectTransform, Anchor.TopLeft),
                TextManager.Get("ReactorFissionRate"));
-            fissionRateScrollBar = new GUIScrollBar(new RectTransform(new Point(columnMid.Rect.Width, (int)(30 * GUI.Scale)), columnMid.RectTransform, Anchor.BottomCenter) { AbsoluteOffset = new Point(0, (int)(60 * GUI.Scale)) },
+            fissionRateScrollBar = new GUIScrollBar(new RectTransform(new Point(sliderControls.Rect.Width, (int)(30 * GUI.Scale)), sliderControls.RectTransform, Anchor.TopCenter),
                style: "GUISlider", barSize: 0.1f)
            {
                OnMoved = (GUIScrollBar bar, float scrollAmount) =>
@@ -194,10 +207,10 @@ namespace Barotrauma.Items.Components
                    return false;
                }
            };
-                        
-            new GUITextBlock(new RectTransform(new Point(0, (int)(20 * GUI.Scale)), columnMid.RectTransform, Anchor.BottomLeft) { AbsoluteOffset = new Point(0, (int)(30 * GUI.Scale)) },
+
+            new GUITextBlock(new RectTransform(new Point(0, (int)(20 * GUI.Scale)), sliderControls.RectTransform, Anchor.BottomLeft),
                TextManager.Get("ReactorTurbineOutput"));
-            turbineOutputScrollBar = new GUIScrollBar(new RectTransform(new Point(columnMid.Rect.Width, (int)(30 * GUI.Scale)), columnMid.RectTransform, Anchor.BottomCenter),
+            turbineOutputScrollBar = new GUIScrollBar(new RectTransform(new Point(sliderControls.Rect.Width, (int)(30 * GUI.Scale)), sliderControls.RectTransform, Anchor.BottomCenter),
                style: "GUISlider", barSize: 0.1f, isHorizontal: true)
            {
                OnMoved = (GUIScrollBar bar, float scrollAmount) =>
@@ -263,11 +276,11 @@ namespace Barotrauma.Items.Components
                "Load", textColor: Color.LightBlue, textAlignment: Alignment.CenterLeft)
            {
                ToolTip = TextManager.Get("ReactorTipLoad")
-            };            
+            };
            string loadStr = TextManager.Get("ReactorLoad");
            loadText.TextGetter += () => { return loadStr.Replace("[kw]", ((int)load).ToString()); };

-            var outputText = new GUITextBlock(new RectTransform(textSize, graphArea.RectTransform, Anchor.BottomLeft, Pivot.TopLeft), 
+            var outputText = new GUITextBlock(new RectTransform(textSize, graphArea.RectTransform, Anchor.BottomLeft, Pivot.TopLeft),
                "Output", textColor: Color.LightGreen, textAlignment: Alignment.CenterLeft)
            {
                ToolTip = TextManager.Get("ReactorTipPower")
@@ -321,9 +334,9 @@ namespace Barotrauma.Items.Components

            if (temperature > optimalTemperature.Y)
            {
-                GUI.DrawRectangle(spriteBatch, 
-                    new Vector2(graphArea.X - 30, graphArea.Y), 
-                    new Vector2(tempMeterFrame.SourceRect.Width, (graphArea.Bottom - graphArea.Height * optimalTemperature.Y / 100.0f) - graphArea.Y), 
+                GUI.DrawRectangle(spriteBatch,
+                    new Vector2(graphArea.X - 30, graphArea.Y),
+                    new Vector2(tempMeterFrame.SourceRect.Width, (graphArea.Bottom - graphArea.Height * optimalTemperature.Y / 100.0f) - graphArea.Y),
                    Color.Red * (float)Math.Sin(Timing.TotalTime * 5.0f) * 0.7f, isFilled: true);
            }
            if (temperature < optimalTemperature.X)
@@ -415,15 +428,52 @@ namespace Barotrauma.Items.Components
            warningButtons["ReactorWarningLowFuel"].Selected = prevAvailableFuel < fissionRate && lightOn;
            warningButtons["ReactorWarningMeltdown"].Selected = meltDownTimer > MeltdownDelay * 0.5f || item.Condition == 0.0f && lightOn;
            warningButtons["ReactorWarningSCRAM"].Selected = temperature > 0.1f && onOffSwitch.BarScroll > 0.5f;
-                        
+
            AutoTemp = autoTempSlider.BarScroll < 0.5f;
            shutDown = onOffSwitch.BarScroll > 0.5f;

+            if ((sliderControlsContainer.Rect.Contains(PlayerInput.MousePosition) || sliderControlsContainer.Children.Contains(GUIScrollBar.draggingBar)) &&
+                !PlayerInput.KeyDown(InputType.Deselect) && !PlayerInput.KeyHit(InputType.Deselect))
+            {
+                Character.DisableControls = true;
+            }
+
            if (shutDown)
            {
                fissionRateScrollBar.BarScroll = FissionRate / 100.0f;
                turbineOutputScrollBar.BarScroll = TurbineOutput / 100.0f;
-            }            
+            }
+            else if (!autoTemp && Character.DisableControls && GUI.KeyboardDispatcher.Subscriber == null)
+            {
+                Vector2 input = Vector2.Zero;
+                float rate = 50.0f; //percentage per second
+
+                if (PlayerInput.KeyDown(InputType.Left)) input.X += -1.0f;
+                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;
+
+                rate *= deltaTime;
+                input.X *= rate;
+                input.Y *= rate;
+
+                if (input.LengthSquared() > 0)
+                {
+                    LastUser = Character.Controlled;
+                    unsentChanges = true;
+                    if (input.X != 0.0f && GUIScrollBar.draggingBar != fissionRateScrollBar)
+                    {
+                        targetFissionRate = MathHelper.Clamp(targetFissionRate + input.X, 0.0f, 100.0f);
+                        fissionRateScrollBar.BarScroll += input.X / 100.0f;
+                    }
+                    if (input.Y != 0.0f && GUIScrollBar.draggingBar != turbineOutputScrollBar)
+                    {
+                        targetTurbineOutput = MathHelper.Clamp(targetTurbineOutput + input.Y, 0.0f, 100.0f);
+                        turbineOutputScrollBar.BarScroll += input.Y / 100.0f;
+                    }
+                }
+            }
        }

        private bool ToggleAutoTemp(GUITickBox tickBox)
@@ -11,12 +11,6 @@ namespace Barotrauma.Items.Components
 {
    partial class Sonar : Powered, IServerSerializable, IClientSerializable
    {
-        enum Mode
-        {
-            Active,
-            Passive
-        };
-
        private bool dynamicDockingIndicator = true;

        private bool unsentChanges;
@@ -43,8 +37,6 @@ namespace Barotrauma.Items.Components

        private List<SonarBlip> sonarBlips;

-        private float prevPingRadius;
-
        private float prevPassivePingRadius;

        private Vector2 center;
@@ -102,7 +94,7 @@ namespace Barotrauma.Items.Components
                ToolTip = TextManager.Get("SonarTipActive"),
                OnSelected = (GUITickBox box) =>
                {
-                    IsActive = box.Selected;
+                    CurrentMode = box.Selected ? Mode.Active : Mode.Passive;
                    if (GameMain.Client != null)
                    {
                        unsentChanges = true;
@@ -262,7 +254,7 @@ namespace Barotrauma.Items.Components
            {
                if (component is GUITextBlock textBlock)
                {
-                    textBlock.TextColor = IsActive ? textBlock.Style.textColor : textBlock.Style.textColor * 0.5f;
+                    textBlock.TextColor = currentMode == Mode.Active ? textBlock.Style.textColor : textBlock.Style.textColor * 0.5f;
                }
            }

@@ -281,14 +273,21 @@ namespace Barotrauma.Items.Components
            if (Level.Loaded != null)
            {
                Dictionary<LevelTrigger, Vector2> levelTriggerFlows = new Dictionary<LevelTrigger, Vector2>();
-                foreach (LevelObject levelObject in Level.Loaded.LevelObjectManager.GetAllObjects(transducerCenter, range * pingState / zoom))
+                for (var pingIndex = 0; pingIndex < activePingsCount; ++pingIndex)
                {
-                    //gather all nearby triggers that are causing the water to flow into the dictionary
-                    foreach (LevelTrigger trigger in levelObject.Triggers)
+                    var activePing = activePings[pingIndex];
+                    foreach (LevelObject levelObject in Level.Loaded.LevelObjectManager.GetAllObjects(transducerCenter, range * activePing.State / zoom))
                    {
-                        Vector2 flow = trigger.GetWaterFlowVelocity();
-                        //ignore ones that are barely doing anything (flow^2 < 1)
-                        if (flow.LengthSquared() > 1.0f) levelTriggerFlows.Add(trigger, flow);
+                        //gather all nearby triggers that are causing the water to flow into the dictionary
+                        foreach (LevelTrigger trigger in levelObject.Triggers)
+                        {
+                            Vector2 flow = trigger.GetWaterFlowVelocity();
+                            //ignore ones that are barely doing anything (flow^2 < 1)
+                            if (flow.LengthSquared() > 1.0f && !levelTriggerFlows.ContainsKey(trigger))
+                            {
+                                levelTriggerFlows.Add(trigger, flow);
+                            }
+                        }
                    }
                }

@@ -350,13 +349,18 @@ namespace Barotrauma.Items.Components
                prevDockingDist = float.MaxValue;
            }

-            if (IsActive)
+            for (var pingIndex = 0; pingIndex < activePingsCount; ++pingIndex)
+            {
+                var activePing = activePings[pingIndex];
+                float pingRadius = DisplayRadius * activePing.State / zoom;
+                UpdateDisruptions(transducerCenter, pingRadius / displayScale, activePing.PrevPingRadius / displayScale);
+                Ping(transducerCenter, transducerCenter,
+                    pingRadius, activePing.PrevPingRadius, displayScale, range / zoom, passive: false, pingStrength: 2.0f);
+                activePing.PrevPingRadius = pingRadius;
+
+            }
+            if (currentMode == Mode.Active && currentPingIndex != -1)
            {
-                float pingRadius = DisplayRadius * pingState / zoom;
-                UpdateDisruptions(transducerCenter, pingRadius / displayScale, prevPingRadius / displayScale);
-                Ping(transducerCenter, transducerCenter, 
-                    pingRadius, prevPingRadius, displayScale, range / zoom, passive: false, pingStrength: 2.0f);
-                prevPingRadius = pingRadius;
                return;
            }

@@ -396,17 +400,18 @@ namespace Barotrauma.Items.Components
                screenBackground.Draw(spriteBatch, center, 0.0f, rect.Width / screenBackground.size.X);
            }

-            if (IsActive)
+            if (currentMode == Mode.Active && currentPingIndex != -1)
            {
-                if (isLastPingDirectional && directionalPingCircle != null)
+                var activePing = activePings[currentPingIndex];
+                if (activePing.IsDirectional && directionalPingCircle != null)
                {
-                    directionalPingCircle.Draw(spriteBatch, center, Color.White * (1.0f - pingState),
-                        rotate: MathUtils.VectorToAngle(lastPingDirection),
-                        scale: (DisplayRadius / directionalPingCircle.size.X) * pingState);
+                    directionalPingCircle.Draw(spriteBatch, center, Color.White * (1.0f - activePing.State),
+                    rotate: MathUtils.VectorToAngle(activePing.Direction),
+                    scale: (DisplayRadius / directionalPingCircle.size.X) * activePing.State);
                }
                else
                {
-                    pingCircle.Draw(spriteBatch, center, Color.White * (1.0f - pingState), 0.0f, (DisplayRadius * 2 / pingCircle.size.X) * pingState);
+                    pingCircle.Draw(spriteBatch, center, Color.White * (1.0f - activePing.State), 0.0f, (DisplayRadius * 2 / pingCircle.size.X) * activePing.State);
                }
            }

@@ -448,7 +453,7 @@ namespace Barotrauma.Items.Components
                spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend);
            }

-            float directionalPingVisibility = useDirectionalPing && IsActive ? 1.0f : showDirectionalIndicatorTimer;
+            float directionalPingVisibility = useDirectionalPing && currentMode == Mode.Active ? 1.0f : showDirectionalIndicatorTimer;
            if (directionalPingVisibility > 0.0f)
            {
                Vector2 sector1 = MathUtils.RotatePointAroundTarget(pingDirection * DisplayRadius, Vector2.Zero, DirectionalPingSector * 0.5f);
@@ -753,24 +758,47 @@ namespace Barotrauma.Items.Components
            disruptedDirections.Clear();
            if (Level.Loaded == null) { return; }

-            foreach (LevelObject levelObject in Level.Loaded.LevelObjectManager.GetAllObjects(pingSource, range * pingState))
+            for (var pingIndex = 0; pingIndex < activePingsCount; ++pingIndex)
            {
-                if (levelObject.ActivePrefab?.SonarDisruption <= 0.0f) { continue; }
-
-                float disruptionStrength = levelObject.ActivePrefab.SonarDisruption;
-                Vector2 disruptionPos = new Vector2(levelObject.Position.X, levelObject.Position.Y);
-
-                float disruptionDist = Vector2.Distance(pingSource, disruptionPos);
-                disruptedDirections.Add(new Pair<Vector2, float>((disruptionPos - pingSource) / disruptionDist, disruptionStrength));
-
-                if (disruptionDist > worldPrevPingRadius && disruptionDist <= worldPingRadius)
+                var activePing = activePings[pingIndex];
+                foreach (LevelObject levelObject in Level.Loaded.LevelObjectManager.GetAllObjects(pingSource, range * activePing.State))
                {
-                    for (int i = 0; i < disruptionStrength * Level.GridCellSize * 0.02f; i++)
+                    if (levelObject.ActivePrefab?.SonarDisruption <= 0.0f) { continue; }
+
+                    float disruptionStrength = levelObject.ActivePrefab.SonarDisruption;
+                    Vector2 disruptionPos = new Vector2(levelObject.Position.X, levelObject.Position.Y);
+
+                    float disruptionDist = Vector2.Distance(pingSource, disruptionPos);
+                    disruptedDirections.Add(new Pair<Vector2, float>((disruptionPos - pingSource) / disruptionDist, disruptionStrength));
+
+                    if (disruptionDist > worldPrevPingRadius && disruptionDist <= worldPingRadius)
                    {
-                        var blip = new SonarBlip(disruptionPos + Rand.Vector(Rand.Range(0.0f, Level.GridCellSize * 4 * disruptionStrength)), MathHelper.Lerp(1.0f, 1.5f, disruptionStrength), Rand.Range(1.0f, 2.0f + disruptionStrength));
-                        sonarBlips.Add(blip);
+                        CreateBlipsForDisruption(disruptionPos, disruptionStrength);
                    }
                }
+                foreach (AITarget aiTarget in AITarget.List)
+                {
+                    if (aiTarget.SonarDisruption <= 0.0f || !aiTarget.Enabled) { continue; }
+                    float distSqr = Vector2.DistanceSquared(aiTarget.WorldPosition, pingSource);
+                    if (distSqr > worldPingRadiusSqr) { continue; }
+
+                    float disruptionDist = (float)Math.Sqrt(distSqr);
+                    disruptedDirections.Add(new Pair<Vector2, float>((aiTarget.WorldPosition - pingSource) / disruptionDist, aiTarget.SonarDisruption));
+
+                    if (disruptionDist > worldPrevPingRadius && disruptionDist <= worldPingRadius)
+                    {
+                        CreateBlipsForDisruption(aiTarget.WorldPosition, aiTarget.SonarDisruption);
+                    }
+                }
+            }
+
+            void CreateBlipsForDisruption(Vector2 disruptionPos, float disruptionStrength)
+            {
+                for (int i = 0; i < disruptionStrength * Level.GridCellSize * 0.02f; i++)
+                {
+                    var blip = new SonarBlip(disruptionPos + Rand.Vector(Rand.Range(0.0f, Level.GridCellSize * 4 * disruptionStrength)), MathHelper.Lerp(1.0f, 1.5f, disruptionStrength), Rand.Range(1.0f, 2.0f + disruptionStrength));
+                    sonarBlips.Add(blip);
+                }
            }
        }

@@ -1045,9 +1073,9 @@ namespace Barotrauma.Items.Components
            }

            Vector2 dir = pos / (float)Math.Sqrt(posDistSqr);
-            if (isLastPingDirectional)
+            if (currentPingIndex != -1 && activePings[currentPingIndex].IsDirectional)
            {
-                if (Vector2.Dot(lastPingDirection, dir) < DirectionalPingDotProduct)
+                if (Vector2.Dot(activePings[currentPingIndex].Direction, dir) < DirectionalPingDotProduct)
                {
                    blip.FadeTimer = 0.0f;
                    return false;
@@ -1155,8 +1183,8 @@ namespace Barotrauma.Items.Components
        
        public void ClientWrite(Lidgren.Network.NetBuffer msg, object[] extraData = null)
        {
-            msg.Write(IsActive);
-            if (IsActive)
+            msg.Write(currentMode == Mode.Active);
+            if (currentMode == Mode.Active)
            {
                msg.WriteRangedSingle(zoom, MinZoom, MaxZoom, 8);
                msg.Write(useDirectionalPing);
@@ -1192,8 +1220,8 @@ namespace Barotrauma.Items.Components
                StartDelayedCorrection(type, msg.ExtractBits(msgLength), sendingTime);
                return;
            }
-            
-            IsActive = isActive;
+
+            CurrentMode = isActive ? Mode.Active : Mode.Passive;
            if (isActive)
            {
                activeTickBox.Selected = true;
@@ -735,9 +735,7 @@ namespace Barotrauma.Items.Components
                if (sourcePort.Docked || sourcePort.Item.Submarine == null) { continue; }
                if (sourcePort.Item.Submarine != controlledSub) { continue; }

-                int sourceDir = sourcePort.IsHorizontal ?
-                    Math.Sign(sourcePort.Item.WorldPosition.X - sourcePort.Item.Submarine.WorldPosition.X) :
-                    Math.Sign(sourcePort.Item.WorldPosition.Y - sourcePort.Item.Submarine.WorldPosition.Y);
+                int sourceDir = sourcePort.GetDir();

                foreach (DockingPort targetPort in DockingPort.List)
                {
@@ -745,9 +743,7 @@ namespace Barotrauma.Items.Components
                    if (targetPort.Item.Submarine == controlledSub || targetPort.IsHorizontal != sourcePort.IsHorizontal) { continue; }
                    if (Level.Loaded != null && targetPort.Item.Submarine.WorldPosition.Y > Level.Loaded.Size.Y) { continue; }

-                    int targetDir = targetPort.IsHorizontal ?
-                        Math.Sign(targetPort.Item.WorldPosition.X - targetPort.Item.Submarine.WorldPosition.X) :
-                        Math.Sign(targetPort.Item.WorldPosition.Y - targetPort.Item.Submarine.WorldPosition.Y);
+                    int targetDir = targetPort.GetDir();

                    if (sourceDir == targetDir) { continue; }

@@ -1,19 +1,16 @@
-using System.Collections.Generic;
+using Barotrauma.Sounds;
+using System.Collections.Generic;
 using System.Xml.Linq;
-using Barotrauma.Sounds;

 namespace Barotrauma.Items.Components
 {
    partial class Powered : ItemComponent
    {
-        protected List<RoundSound> sparkSounds;
-
        private RoundSound powerOnSound;
        private bool powerOnSoundPlayed;
        
        partial void InitProjectSpecific(XElement element)
        {
-            sparkSounds = new List<RoundSound>();
            foreach (XElement subElement in element.Elements())
            {
                switch (subElement.Name.ToString().ToLowerInvariant())
@@ -21,10 +18,6 @@ namespace Barotrauma.Items.Components
                    case "poweronsound":
                        powerOnSound = Submarine.LoadRoundSound(subElement, false);
                        break;
-                    case "sparksound":
-                        var sparkSound = Submarine.LoadRoundSound(subElement, false);
-                        if (sparkSound != null) { sparkSounds.Add(sparkSound); }
-                        break;
                }
            }
        }
@@ -32,6 +32,8 @@ namespace Barotrauma.Items.Components
        private List<ParticleEmitter> ParticleEmitterHitCharacter = new List<ParticleEmitter>();
        private List<Pair<RelatedItem, ParticleEmitter>> ParticleEmitterHitItem = new List<Pair<RelatedItem, ParticleEmitter>>();

+        private float prevProgressBarState;
+
        partial void InitProjSpecific(XElement element)
        {
            foreach (XElement subElement in element.Elements())
@@ -70,7 +72,7 @@ namespace Barotrauma.Items.Components
                float particleAngle = item.body.Rotation + ((item.body.Dir > 0.0f) ? 0.0f : MathHelper.Pi);
                ParticleEmitter.Emit(
                    deltaTime, item.WorldPosition + TransformedBarrelPos,
-                    item.CurrentHull, particleAngle, -particleAngle);
+                    item.CurrentHull, particleAngle, ParticleEmitter.Prefab.CopyEntityAngle ? -particleAngle : 0);
            }
        }

@@ -110,19 +112,22 @@ namespace Barotrauma.Items.Components
            }
        }

-        partial void FixItemProjSpecific(Character user, float deltaTime, Item targetItem, float prevCondition)
+        partial void FixItemProjSpecific(Character user, float deltaTime, Item targetItem)
        {
-            if (prevCondition != targetItem.Condition)
+            float progressBarState = targetItem.ConditionPercentage / 100.0f;
+            if (!MathUtils.NearlyEqual(progressBarState, prevProgressBarState))
            {
                Vector2 progressBarPos = targetItem.DrawPosition;
                var progressBar = user.UpdateHUDProgressBar(
                    targetItem,
                    progressBarPos,
-                    targetItem.Condition / item.MaxCondition,
+                    progressBarState,
                    Color.Red, Color.Green);
                if (progressBar != null) { progressBar.Size = new Vector2(60.0f, 20.0f); }
            }

+            prevProgressBarState = progressBarState;
+
            Vector2 particlePos = ConvertUnits.ToDisplayUnits(pickedPosition);
            if (targetItem.Submarine != null) particlePos += targetItem.Submarine.DrawPosition;
            foreach (var emitter in ParticleEmitterHitItem)
@@ -74,10 +74,16 @@ namespace Barotrauma.Items.Components
                //dropped or dragged from the panel to the players inventory
                if (draggingConnected != null)
                {
-                    int linkIndex = c.FindWireIndex(draggingConnected.Item);
-                    if (linkIndex > -1)
+                    //the wire can only be dragged out if it's not connected to anything at the other end
+                    if (Screen.Selected == GameMain.SubEditorScreen ||
+                        (draggingConnected.Connections[0] == null && draggingConnected.Connections[1] == null) ||
+                        (draggingConnected.Connections.Contains(c) && draggingConnected.Connections.Contains(null)))
                    {
-                        Inventory.draggingItem = c.wires[linkIndex].Item;
+                        int linkIndex = c.FindWireIndex(draggingConnected.Item);
+                        if (linkIndex > -1 || panel.DisconnectedWires.Contains(draggingConnected))
+                        {
+                            Inventory.draggingItem = draggingConnected.Item;
+                        }
                    }
                }

@@ -109,59 +115,79 @@ namespace Barotrauma.Items.Components

            if (draggingConnected != null)
            {
-                DrawWire(spriteBatch, draggingConnected, draggingConnected.Item, PlayerInput.MousePosition, new Vector2(x + width / 2, y + height - 10), mouseInRect, null, panel, "");
+                if (mouseInRect)
+                {
+                    DrawWire(spriteBatch, draggingConnected, PlayerInput.MousePosition, new Vector2(x + width / 2, y + height - 10), null, panel, "");
+                }

                if (!PlayerInput.LeftButtonHeld())
                {
-                    if (GameMain.Client != null)
+                    if (draggingConnected.Connections[0]?.ConnectionPanel == panel ||
+                        draggingConnected.Connections[1]?.ConnectionPanel == panel)
                    {
-                        panel.Item.CreateClientEvent(panel);
+                        draggingConnected.RemoveConnection(panel.Item);
+                        panel.DisconnectedWires.Add(draggingConnected);
                    }

+                    if (GameMain.Client != null) { panel.Item.CreateClientEvent(panel); }
                    draggingConnected = null;
                }
            }

            //if the Character using the panel has a wire item equipped
            //and the wire hasn't been connected yet, draw it on the panel
-            if (equippedWire != null)
+            if (equippedWire != null && (draggingConnected != equippedWire || !mouseInRect))
            {
                if (panel.Connections.Find(c => c.Wires.Contains(equippedWire)) == null)
                {
-                    DrawWire(spriteBatch, equippedWire, equippedWire.Item,
-                        new Vector2(x + width / 2, y + height - 100),
-                        new Vector2(x + width / 2, y + height), mouseInRect, null, panel, "");
+                    DrawWire(spriteBatch, equippedWire, new Vector2(x + width / 2, y + height - 150 * GUI.Scale),
+                        new Vector2(x + width / 2, y + height),
+                        null, panel, "");

-                    if (draggingConnected == equippedWire) Inventory.draggingItem = equippedWire.Item;
+                    if (draggingConnected == equippedWire) { Inventory.draggingItem = equippedWire.Item; }
                }
            }
-            
+
+
+            float step = (width * 0.75f) / panel.DisconnectedWires.Count();
+            x = (int)(x + width / 2 - step * (panel.DisconnectedWires.Count() - 1) / 2);
+            foreach (Wire wire in panel.DisconnectedWires)
+            {
+                if (wire == draggingConnected && mouseInRect) { continue; }
+
+                Connection recipient = wire.OtherConnection(null);
+                string label = recipient == null ? "" : recipient.item.Name + $" ({recipient.DisplayName})";
+                if (wire.Locked) { label += "\n" + TextManager.Get("ConnectionLocked"); }
+                DrawWire(spriteBatch, wire, new Vector2(x, y + height - 100 * GUI.Scale),
+                    new Vector2(x, y + height),
+                    null, panel, label);
+                x += (int)step;
+            }
+
            //stop dragging a wire item if the cursor is within any connection panel
            //(so we don't drop the item when dropping the wire on a connection)
-            if (mouseInRect || GUI.MouseOn?.UserData is ConnectionPanel) Inventory.draggingItem = null;            
+            if (mouseInRect || GUI.MouseOn?.UserData is ConnectionPanel) { Inventory.draggingItem = null; }       
        }

        private void Draw(SpriteBatch spriteBatch, ConnectionPanel panel, Vector2 position, Vector2 labelPos, Vector2 wirePosition, bool mouseIn, Wire equippedWire, float wireInterval)
        {
-            //spriteBatch.DrawString(GUI.SmallFont, Name, new Vector2(labelPos.X, labelPos.Y-10), Color.White);
            GUI.DrawString(spriteBatch, labelPos, DisplayName, IsPower ? Color.Red : Color.White, Color.Black, 0, GUI.SmallFont);
-            
+
            connectionSprite.Draw(spriteBatch, position);

            for (int i = 0; i < MaxLinked; i++)
            {
-                if (wires[i] == null || wires[i].Hidden || draggingConnected == wires[i]) continue;
+                if (wires[i] == null || wires[i].Hidden || (draggingConnected == wires[i] && (mouseIn || Screen.Selected == GameMain.SubEditorScreen))) { continue; }

                Connection recipient = wires[i].OtherConnection(this);
-                
-                string label = recipient == null ? "" :
-                    wires[i].Locked ? recipient.item.Name + "\n" + TextManager.Get("ConnectionLocked") : recipient.item.Name;
-                DrawWire(spriteBatch, wires[i], (recipient == null) ? wires[i].Item : recipient.item, position, wirePosition, mouseIn, equippedWire, panel, label);
+                string label = recipient == null ? "" : recipient.item.Name + $" ({recipient.DisplayName})";
+                if (wires[i].Locked) { label += "\n" + TextManager.Get("ConnectionLocked"); }
+                DrawWire(spriteBatch, wires[i], position, wirePosition, equippedWire, panel, label);

                wirePosition.Y += wireInterval;
            }

-            if (draggingConnected != null && Vector2.Distance(position, PlayerInput.MousePosition) < 13.0f)
+            if (draggingConnected != null && Vector2.Distance(position, PlayerInput.MousePosition) < (20.0f * GUI.Scale))
            {
                connectionSpriteHighlight.Draw(spriteBatch, position);

@@ -172,15 +198,15 @@ namespace Barotrauma.Items.Components
                    if (index > -1 && !Wires.Contains(draggingConnected))
                    {
                        bool alreadyConnected = draggingConnected.IsConnectedTo(panel.Item);
-
                        draggingConnected.RemoveConnection(panel.Item);
-
                        if (draggingConnected.Connect(this, !alreadyConnected, true))
                        {
                            var otherConnection = draggingConnected.OtherConnection(this);
                            SetWire(index, draggingConnected);
                        }
                    }
+                    if (GameMain.Client != null) { panel.Item.CreateClientEvent(panel); }
+                    draggingConnected = null;
                }
            }

@@ -215,15 +241,8 @@ namespace Barotrauma.Items.Components
            flashTimer -= deltaTime;
        }

-        private static void DrawWire(SpriteBatch spriteBatch, Wire wire, Item item, Vector2 end, Vector2 start, bool mouseIn, Wire equippedWire, ConnectionPanel panel, string label)
+        private static void DrawWire(SpriteBatch spriteBatch, Wire wire, Vector2 end, Vector2 start, Wire equippedWire, ConnectionPanel panel, string label)
        {
-            if (draggingConnected == wire)
-            {
-                if (!mouseIn) return;
-                end = PlayerInput.MousePosition;
-                start.X = (start.X + end.X) / 2.0f;
-            }
-
            int textX = (int)start.X;
            if (start.X < end.X)
                textX -= 10;
@@ -244,11 +263,19 @@ namespace Barotrauma.Items.Components

            if (!string.IsNullOrEmpty(label))
            {
-                GUI.DrawString(spriteBatch,
-                    new Vector2(start.X < end.X ? textX - GUI.SmallFont.MeasureString(label).X : textX, start.Y - 5.0f),
-                    label,
-                    (mouseOn ? Color.Gold : Color.White) * (wire.Locked ? 0.6f : 1.0f), Color.Black * 0.8f,
-                    3, GUI.SmallFont);
+                if (start.Y > panel.GuiFrame.Rect.Bottom - 1.0f)
+                {
+                    //wire at the bottom of the panel -> draw the text below the panel, tilted 45 degrees
+                    GUI.SmallFont.DrawString(spriteBatch, label, start + Vector2.UnitY * 20 * GUI.Scale, Color.White, 45.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.0f);
+                }
+                else
+                {
+                    GUI.DrawString(spriteBatch,
+                        new Vector2(start.X < end.X ? textX - GUI.SmallFont.MeasureString(label).X : textX, start.Y - 5.0f),
+                        label,
+                        (mouseOn ? Color.Gold : Color.White) * (wire.Locked ? 0.6f : 1.0f), Color.Black * 0.8f,
+                        3, GUI.SmallFont);
+                }
            }

            var wireEnd = end + Vector2.Normalize(start - end) * 30.0f;
@@ -259,14 +286,14 @@ namespace Barotrauma.Items.Components
            {
                spriteBatch.Draw(wireVertical.Texture, new Rectangle(wireEnd.ToPoint(), new Point(18, (int)dist)), wireVertical.SourceRect,
                    Color.Gold,
-                    MathUtils.VectorToAngle(end - start) + MathHelper.PiOver2,     //angle of line (calulated above)
+                    MathUtils.VectorToAngle(end - start) + MathHelper.PiOver2,
                    new Vector2(6, 0), // point in line about which to rotate
                    SpriteEffects.None,
                    0.0f);
            }
            spriteBatch.Draw(wireVertical.Texture, new Rectangle(wireEnd.ToPoint(), new Point(12, (int)dist)), wireVertical.SourceRect,
                wire.Item.Color * alpha,
-                MathUtils.VectorToAngle(end - start) + MathHelper.PiOver2,     //angle of line (calulated above)
+                MathUtils.VectorToAngle(end - start) + MathHelper.PiOver2,
                new Vector2(6, 0), // point in line about which to rotate
                SpriteEffects.None,
                0.0f);
@@ -283,7 +310,7 @@ namespace Barotrauma.Items.Components
                    if (allowRewiring && !wire.Locked && (!panel.Locked || Screen.Selected == GameMain.SubEditorScreen))
                    {
                        //start dragging the wire
-                        if (PlayerInput.LeftButtonHeld()) draggingConnected = wire;
+                        if (PlayerInput.LeftButtonHeld()) { draggingConnected = wire; }
                    }
                }
            }
@@ -52,7 +52,7 @@ namespace Barotrauma.Items.Components

        private void DrawConnections(SpriteBatch spriteBatch, GUICustomComponent container)
        {
-            if (user != Character.Controlled || user == null) return;
+            if (user != Character.Controlled || user == null) { return; }

            HighlightedWire = null;
            Connection.DrawConnections(spriteBatch, this, user);
@@ -70,8 +70,22 @@ namespace Barotrauma.Items.Components
            {
                //delay reading the state until midround syncing is done
                //because some of the wires connected to the panel may not exist yet
-                int bitsToRead = Connections.Count * Connection.MaxLinked * 16;
-                StartDelayedCorrection(type, msg.ExtractBits(bitsToRead), sendingTime, waitForMidRoundSync: true);
+                long msgStartPos = msg.Position;
+                foreach (Connection connection in Connections)
+                {
+                    for (int i = 0; i < Connection.MaxLinked; i++)
+                    {
+                        msg.ReadUInt16();
+                    }
+                }
+                ushort disconnectedWireCount = msg.ReadUInt16();
+                for (int i = 0; i < disconnectedWireCount; i++)
+                {
+                    msg.ReadUInt16();
+                }
+                int msgLength = (int)(msg.Position - msgStartPos);
+                msg.Position = msgStartPos;
+                StartDelayedCorrection(type, msg.ExtractBits(msgLength), sendingTime, waitForMidRoundSync: true);
            }
            else
            {
@@ -95,11 +109,9 @@ namespace Barotrauma.Items.Components
                {
                    ushort wireId = msg.ReadUInt16();

-                    Item wireItem = Entity.FindEntityByID(wireId) as Item;
-                    if (wireItem == null) continue;
-
+                    if (!(Entity.FindEntityByID(wireId) is Item wireItem)) { continue; }
                    Wire wireComponent = wireItem.GetComponent<Wire>();
-                    if (wireComponent == null) continue;
+                    if (wireComponent == null) { continue; }

                    newWires.Add(wireComponent);

@@ -108,18 +120,46 @@ namespace Barotrauma.Items.Components
                }
            }

+            List<Wire> previousDisconnectedWires = new List<Wire>(DisconnectedWires);
+            DisconnectedWires.Clear();
+            ushort disconnectedWireCount = msg.ReadUInt16();
+            for (int i = 0; i < disconnectedWireCount; i++)
+            {
+                ushort wireId = msg.ReadUInt16();
+                if (!(Entity.FindEntityByID(wireId) is Item wireItem)) { continue; }
+                Wire wireComponent = wireItem.GetComponent<Wire>();
+                if (wireComponent == null) { continue; }
+                DisconnectedWires.Add(wireComponent);
+            }
+
            foreach (Wire wire in prevWires)
            {
-                if (wire.Connections[0] == null && wire.Connections[1] == null)
+                bool connected = wire.Connections[0] != null || wire.Connections[1] != null;
+                if (!connected)
+                {
+                    foreach (Item item in Item.ItemList)
+                    {
+                        var connectionPanel = item.GetComponent<ConnectionPanel>();
+                        if (connectionPanel != null && connectionPanel.DisconnectedWires.Contains(wire))
+                        {
+                            connected = true;
+                            break;
+                        }
+                    }
+                }
+                if (wire.Item.ParentInventory == null && !connected)
                {
                    wire.Item.Drop(null);
                }
-                //wires that are not in anyone's inventory (i.e. not currently being rewired) can never be connected to only one connection
-                // -> someone must have dropped the wire from the connection panel
-                else if (wire.Item.ParentInventory == null &&
-                    (wire.Connections[0] != null ^ wire.Connections[1] != null))
+            }
+
+            foreach (Wire disconnectedWire in previousDisconnectedWires)
+            {
+                if (disconnectedWire.Connections[0] == null &&
+                    disconnectedWire.Connections[1] == null &&
+                    !DisconnectedWires.Contains(disconnectedWire))
                {
-                    wire.Item.Drop(null);
+                    disconnectedWire.Item.Drop(dropper: null);
                }
            }
        }
@@ -2,6 +2,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
+using System;
 using System.Collections.Generic;
 using System.Linq;

@@ -90,18 +91,26 @@ namespace Barotrauma.Items.Components
                section.Draw(spriteBatch, item.Color, drawOffset, depth, 0.3f);
            }

-            if (IsActive && nodes.Count > 0 && Vector2.Distance(newNodePos, nodes[nodes.Count - 1]) > nodeDistance)
+            if (nodes.Count > 0)
            {
-                WireSection.Draw(
-                    spriteBatch,
-                    new Vector2(nodes[nodes.Count - 1].X, nodes[nodes.Count - 1].Y) + drawOffset,
-                    new Vector2(newNodePos.X, newNodePos.Y) + drawOffset,
-                    item.Color * 0.5f,
-                    depth,
-                    0.3f);
+                if (!IsActive)
+                {
+                    if (connections[0] == null) { DrawHangingWire(spriteBatch, nodes[0] + drawOffset, depth); }
+                    if (connections[1] == null) { DrawHangingWire(spriteBatch, nodes.Last() + drawOffset, depth); }
+                }
+                if (IsActive && Vector2.Distance(newNodePos, nodes[nodes.Count - 1]) > nodeDistance)
+                {
+                    WireSection.Draw(
+                        spriteBatch,
+                        new Vector2(nodes[nodes.Count - 1].X, nodes[nodes.Count - 1].Y) + drawOffset,
+                        new Vector2(newNodePos.X, newNodePos.Y) + drawOffset,
+                        item.Color * 0.5f,
+                        depth,
+                        0.3f);
+                }
            }

-            if (!editing || !GameMain.SubEditorScreen.WiringMode) return;
+            if (!editing || !GameMain.SubEditorScreen.WiringMode) { return; }

            for (int i = 0; i < nodes.Count; i++)
            {
@@ -126,6 +135,23 @@ namespace Barotrauma.Items.Components
            }
        }

+        private void DrawHangingWire(SpriteBatch spriteBatch, Vector2 start, float depth)
+        {
+            float angle = (float)Math.Sin(GameMain.GameScreen.GameTime * 2.0f + item.ID) * 0.2f;
+            Vector2 endPos = start + new Vector2((float)Math.Sin(angle), -(float)Math.Cos(angle)) * 50.0f;
+
+            WireSection.Draw(
+                spriteBatch,
+                start, endPos,
+                Color.Orange, depth + 0.00001f, 0.2f);
+
+            WireSection.Draw(
+                spriteBatch,
+                start, start + (endPos - start) * 0.7f,
+                item.Color, depth, 0.3f);
+        }
+
+
        public static void UpdateEditing(List<Wire> wires)
        {
            //dragging a node of some wire
@@ -25,6 +25,9 @@ namespace Barotrauma.Items.Components
        private SoundChannel moveSoundChannel;

        private Vector2 crosshairPos, crosshairPointerPos;
+
+        private Dictionary<string, Widget> widgets = new Dictionary<string, Widget>();
+        private float prevAngle;
        
        private bool flashLowPower;
        private bool flashNoAmmo;
@@ -117,6 +120,25 @@ namespace Barotrauma.Items.Components
            barSize: 0.0f);
        }

+        private void InitializeRotationLimitWidget(Widget widget)
+        {
+            widget.Hovered += () =>
+            {
+                widget.secondaryColor = Color.Green;
+            };
+            widget.Selected += () =>
+            {
+                widget.color = Color.Green;
+            };
+            widget.MouseHeld += (deltaTime) =>
+            {
+                widget.DrawPos = PlayerInput.MousePosition;
+            };
+            widget.Deselected += () =>
+            {
+                widget.color = Color.Red;
+            };
+        }

        partial void LaunchProjSpecific()
        {
@@ -246,24 +268,153 @@ namespace Barotrauma.Items.Components
                item.SpriteColor,
                rotation + MathHelper.PiOver2, item.Scale,
                SpriteEffects.None, item.SpriteDepth + (barrelSprite.Depth - item.Sprite.Depth));
-            
-    
-            if (!editing) return;
+
+            if (!editing) { return; }
+
+            float widgetRadius = 60.0f;

            GUI.DrawLine(spriteBatch,
                drawPos,
-                drawPos + new Vector2((float)Math.Cos(minRotation), (float)Math.Sin(minRotation)) * 60.0f,
+                drawPos + new Vector2((float)Math.Cos(minRotation), (float)Math.Sin(minRotation)) * widgetRadius,
                Color.Green);

            GUI.DrawLine(spriteBatch,
                drawPos,
-                drawPos + new Vector2((float)Math.Cos(maxRotation), (float)Math.Sin(maxRotation)) * 60.0f,
+                drawPos + new Vector2((float)Math.Cos(maxRotation), (float)Math.Sin(maxRotation)) * widgetRadius,
                Color.Green);

            GUI.DrawLine(spriteBatch,
                drawPos,
-                drawPos + new Vector2((float)Math.Cos((maxRotation + minRotation) / 2), (float)Math.Sin((maxRotation + minRotation) / 2)) * 60.0f,
+                drawPos + new Vector2((float)Math.Cos((maxRotation + minRotation) / 2), (float)Math.Sin((maxRotation + minRotation) / 2)) * widgetRadius,
                Color.LightGreen);
+
+            if (!item.IsSelected) { return; }
+
+            Widget minRotationWidget = GetWidget("minrotation", spriteBatch, size: 10, initMethod: (widget) =>
+             {
+                 widget.MouseDown += () =>
+                 {
+                     widget.color = Color.Green;
+                     prevAngle = minRotation;
+                 };
+                 widget.Deselected += () =>
+                 {
+                     widget.color = Color.Yellow;
+                     item.CreateEditingHUD();
+                 };
+                 widget.MouseHeld += (deltaTime) =>
+                 {
+                     minRotation = GetRotationAngle(drawPos);
+                     if (minRotation > maxRotation)
+                     {
+                         float temp = minRotation;
+                         minRotation = maxRotation;
+                         maxRotation = temp;
+                     }
+                     MapEntity.DisableSelect = true;
+                 };
+                 widget.PreUpdate += (deltaTime) =>
+                 {
+                     widget.DrawPos = new Vector2(widget.DrawPos.X, -widget.DrawPos.Y);
+                     widget.DrawPos = Screen.Selected.Cam.WorldToScreen(widget.DrawPos);
+                 };
+                 widget.PostUpdate += (deltaTime) =>
+                 {
+                     widget.DrawPos = Screen.Selected.Cam.ScreenToWorld(widget.DrawPos);
+                     widget.DrawPos = new Vector2(widget.DrawPos.X, -widget.DrawPos.Y);
+                 };
+                 widget.PreDraw += (sprtBtch, deltaTime) =>
+                 {
+                     widget.tooltip = "Min: " + (int)MathHelper.ToDegrees(minRotation);
+                     widget.DrawPos = drawPos + new Vector2((float)Math.Cos(minRotation), (float)Math.Sin(minRotation)) * widgetRadius;
+                     widget.Update(deltaTime);
+                 };
+             });
+            
+            Widget maxRotationWidget = GetWidget("maxrotation", spriteBatch, size: 10, initMethod: (widget) =>
+            {
+                widget.MouseDown += () =>
+                {
+                    widget.color = Color.Green;
+                    prevAngle = minRotation;
+                };
+                widget.Deselected += () =>
+                {
+                    widget.color = Color.Yellow;
+                    item.CreateEditingHUD();
+                };
+                widget.MouseHeld += (deltaTime) =>
+                {
+                    maxRotation = GetRotationAngle(drawPos);
+                    if (minRotation > maxRotation)
+                    {
+                        float temp = minRotation;
+                        minRotation = maxRotation;
+                        maxRotation = temp;
+                    }
+                    MapEntity.DisableSelect = true;
+                };
+                widget.PreUpdate += (deltaTime) =>
+                {
+                    widget.DrawPos = new Vector2(widget.DrawPos.X, -widget.DrawPos.Y);
+                    widget.DrawPos = Screen.Selected.Cam.WorldToScreen(widget.DrawPos);
+                };
+                widget.PostUpdate += (deltaTime) =>
+                {
+                    widget.DrawPos = Screen.Selected.Cam.ScreenToWorld(widget.DrawPos);
+                    widget.DrawPos = new Vector2(widget.DrawPos.X, -widget.DrawPos.Y);
+                };
+                widget.PreDraw += (sprtBtch, deltaTime) =>
+                {
+                    widget.tooltip = "Max: " + (int)MathHelper.ToDegrees(maxRotation);
+                    widget.DrawPos = drawPos + new Vector2((float)Math.Cos(maxRotation), (float)Math.Sin(maxRotation)) * widgetRadius;
+                    widget.Update(deltaTime);
+                };
+            });
+            minRotationWidget.Draw(spriteBatch, (float)Timing.Step);
+            maxRotationWidget.Draw(spriteBatch, (float)Timing.Step);
+        }
+
+        private Widget GetWidget(string id, SpriteBatch spriteBatch, int size = 5, Action<Widget> initMethod = null)
+        {
+            if (!widgets.TryGetValue(id, out Widget widget))
+            {
+                widget = new Widget(id, size, Widget.Shape.Rectangle)
+                {
+                    color = Color.Yellow,
+                    tooltipOffset = new Vector2(size / 2 + 5, -10),
+                    inputAreaMargin = 20,
+                    RequireMouseOn = false
+                };               
+                widgets.Add(id, widget);
+                initMethod?.Invoke(widget);
+            }
+            return widget;
+        }
+
+        /// <summary>
+        /// Returns correct angle between -2PI and +2PI
+        /// </summary>
+        /// <param name="drawPosition"></param>
+        /// <returns></returns>
+        private float GetRotationAngle(Vector2 drawPosition)
+        {
+            Vector2 mouseVector = Screen.Selected.Cam.ScreenToWorld(PlayerInput.MousePosition);
+            mouseVector.Y = -mouseVector.Y;
+            Vector2 rotationVector = mouseVector - drawPosition;
+            rotationVector.Normalize();
+            double angle = Math.Atan2(MathHelper.ToRadians(rotationVector.Y), MathHelper.ToRadians(rotationVector.X));
+            if (angle < 0)
+            {// calculates which coterminal angle is closer to previous angle
+                angle = Math.Abs(angle - prevAngle) < Math.Abs((angle + Math.PI * 2) - prevAngle) ? angle : angle + Math.PI * 2;
+            }
+            else if (angle > 0)
+            {
+                angle = Math.Abs(angle - prevAngle) < Math.Abs((angle - Math.PI * 2) - prevAngle) ? angle : angle - Math.PI * 2;
+            }
+            angle = MathHelper.Clamp((float)angle, -((float)Math.PI * 2), (float)Math.PI * 2);
+            prevAngle = (float)angle;
+            return (float)angle;
        }

        public override void DrawHUD(SpriteBatch spriteBatch, Character character)