v0.13.0.11

2021-04-22 17:33:08 +03:00
parent 0697d7fc64
commit 8bb31f2893
391 changed files with 17271 additions and 5949 deletions
@@ -4,6 +4,7 @@ using Microsoft.Xna.Framework;
 using System.Threading;
 using FarseerPhysics.Dynamics;
 #if DEBUG && CLIENT
+using System;
 using Microsoft.Xna.Framework.Input;
 #endif

@@ -115,6 +116,37 @@ namespace Barotrauma
                    }
                }
            }
+            
+#if LINUX
+            // disgusting
+            if (PlayerInput.KeyDown(Keys.RightShift) && Character.Controlled is { CharacterHealth: { } health } && PlayerInput.MouseSpeed != Vector2.Zero)
+            {
+                AfflictionPrefab radiationPrefab = AfflictionPrefab.RadiationSickness;
+                float afflictionAmount = (PlayerInput.MousePosition.X / GameMain.GraphicsWidth) * radiationPrefab.MaxStrength;
+                Affliction affliction = health.GetAffliction(radiationPrefab.Identifier, true);
+
+                if (affliction == null)
+                {
+                    health.ApplyAffliction(null, new Affliction(radiationPrefab, Math.Abs(afflictionAmount)));
+                }
+                else
+                {
+                    float diff = affliction.Strength - afflictionAmount;
+
+                    if (!MathUtils.NearlyEqual(diff, 0))
+                    {
+                        if (diff > 0)
+                        {
+                            health.ReduceAffliction(null, radiationPrefab.Identifier, Math.Abs(diff));
+                        }
+                        else if (diff < 0)
+                        {
+                            health.ApplyAffliction(null, new Affliction(radiationPrefab, Math.Abs(diff)));
+                        }
+                    }
+                }
+            }
+#endif
 #endif

 #if CLIENT
@@ -192,7 +224,7 @@ namespace Barotrauma
            if (Character.Controlled != null && 
                Lights.LightManager.ViewTarget != null)
            {
-                Vector2 targetPos = Lights.LightManager.ViewTarget.DrawPosition;
+                Vector2 targetPos = Lights.LightManager.ViewTarget.WorldPosition;
                if (Lights.LightManager.ViewTarget == Character.Controlled &&
                    (CharacterHealth.OpenHealthWindow != null || CrewManager.IsCommandInterfaceOpen || ConversationAction.IsDialogOpen))
                {
@@ -212,7 +244,7 @@ namespace Barotrauma
                cam.TargetPos = targetPos;
            }

-            cam.MoveCamera((float)deltaTime);
+            cam.MoveCamera((float)deltaTime, allowZoom: GUI.MouseOn == null);
 #endif

            foreach (Submarine sub in Submarine.Loaded)
@@ -36,6 +36,23 @@ namespace Barotrauma
            levelDifficultyScrollBar.OnMoved(levelDifficultyScrollBar, levelDifficultyScrollBar.BarScroll);
 #endif
        }
+
+        public void SetRadiationEnabled(bool enabled)
+        {
+#if CLIENT
+            if (radiationEnabledTickBox == null) { return; }
+            radiationEnabledTickBox.Selected = enabled;
+#endif
+        }
+
+        public bool IsRadiationEnabled()
+        {
+#if CLIENT
+            return radiationEnabledTickBox != null && radiationEnabledTickBox.Selected;
+#elif SERVER
+            return GameMain.Server.ServerSettings.RadiationEnabled;
+#endif
+        }
        
        public void ToggleTraitorsEnabled(int dir)
        {
@@ -24,6 +24,7 @@
            {
                selected.Deselect();
 #if CLIENT
+                GUIContextMenu.CurrentContextMenu = null;
                GUI.ClearCursorWait();
                //make sure any textbox in the previously selected screen doesn't stay selected
                if (GUI.KeyboardDispatcher.Subscriber != DebugConsole.TextBox)
@@ -31,6 +32,13 @@
                    GUI.KeyboardDispatcher.Subscriber = null;
                    GUI.ScreenChanged = true;
                }
+                SubmarinePreview.Close();
+
+                // Make sure the saving indicator is disabled when returning to main menu or lobby
+                if (this == GameMain.MainMenuScreen || this == GameMain.NetLobbyScreen)
+                {
+                    GUI.DisableSavingIndicatorDelayed();
+                }
 #endif
            }
            selected = this;