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

Barotrauma/BarotraumaClient/Source/Characters/Character.cs

@@ -23,6 +23,8 @@ namespace Barotrauma
         protected float hudInfoTimer;
         protected bool hudInfoVisible;
 
+        private float pressureParticleTimer;
+
         private float findFocusedTimer;
 
         protected float lastRecvPositionUpdateTime;
@@ -170,13 +172,23 @@ namespace Barotrauma
                 {
                     if (needsAir &&
                         pressureProtection < 80.0f &&
-                        (AnimController.CurrentHull == null || AnimController.CurrentHull.LethalPressure > 50.0f))
+                        (AnimController.CurrentHull == null || AnimController.CurrentHull.LethalPressure > 0.0f))
                     {
                         float pressure = AnimController.CurrentHull == null ? 100.0f : AnimController.CurrentHull.LethalPressure;
+                        if (pressure > 0.0f)
+                        {
+                            float zoomInEffectStrength = MathHelper.Clamp(pressure / 100.0f, 0.1f, 1.0f);
+                            cam.Zoom = MathHelper.Lerp(cam.Zoom,
+                                cam.DefaultZoom + (Math.Max(pressure, 10) / 150.0f) * Rand.Range(0.9f, 1.1f),
+                                zoomInEffectStrength);
 
-                        cam.Zoom = MathHelper.Lerp(cam.Zoom,
+                            pressureParticleTimer += pressure * deltaTime;
-                            (pressure / 50.0f) * Rand.Range(1.0f, 1.05f),
+                            if (pressureParticleTimer > 10.0f)
-                            (pressure - 50.0f) / 50.0f);
+                            {
+                                Particle p = GameMain.ParticleManager.CreateParticle("waterblood", WorldPosition + Rand.Vector(5.0f), Rand.Vector(10.0f));
+                                pressureParticleTimer = 0.0f;
+                            }
+                        }
                     }
 
                     if (IsHumanoid)

Barotrauma/BarotraumaClient/Source/GameSettings.cs

@@ -666,66 +666,6 @@ namespace Barotrauma
             //spacing
             new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), generalLayoutGroup.RectTransform), style: null);
 
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), generalLayoutGroup.RectTransform), style: null);
-
-            new GUIButton(new RectTransform(new Vector2(0.4f, 1.0f), buttonArea.RectTransform, Anchor.BottomLeft),
-                TextManager.Get("Cancel"), style: "GUIButtonLarge")
-            {
-                IgnoreLayoutGroups = true,
-                OnClicked = (x, y) =>
-                {
-                    if (UnsavedSettings)
-                    {
-                        LoadPlayerConfig();
-                    }
-                    if (Screen.Selected == GameMain.MainMenuScreen) GameMain.MainMenuScreen.ReturnToMainMenu(null, null);
-                    GUI.SettingsMenuOpen = false;
-                    return true;
-                }
-            };
-
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), generalLayoutGroup.RectTransform), style: null);
-
-            new GUIButton(new RectTransform(new Vector2(0.4f, 1.0f), buttonArea.RectTransform, Anchor.BottomLeft),
-                TextManager.Get("Cancel"), style: "GUIButtonLarge")
-            {
-                IgnoreLayoutGroups = true,
-                OnClicked = (x, y) =>
-                {
-                    if (UnsavedSettings)
-                    {
-                        LoadPlayerConfig();
-                    }
-                    if (Screen.Selected == GameMain.MainMenuScreen) GameMain.MainMenuScreen.ReturnToMainMenu(null, null);
-                    GUI.SettingsMenuOpen = false;
-                    return true;
-                }
-            };
-
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), generalLayoutGroup.RectTransform), style: null);
-
-            new GUIButton(new RectTransform(new Vector2(0.4f, 1.0f), buttonArea.RectTransform, Anchor.BottomLeft),
-                TextManager.Get("Cancel"), style: "GUIButtonLarge")
-            {
-                IgnoreLayoutGroups = true,
-                OnClicked = (x, y) =>
-                {
-                    if (UnsavedSettings)
-                    {
-                        LoadPlayerConfig();
-                    }
-                    if (Screen.Selected == GameMain.MainMenuScreen) GameMain.MainMenuScreen.ReturnToMainMenu(null, null);
-                    GUI.SettingsMenuOpen = false;
-                    return true;
-                }
-            };
-
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), generalLayoutGroup.RectTransform), style: null);
-
             new GUIButton(new RectTransform(new Vector2(0.4f, 1.0f), buttonArea.RectTransform, Anchor.BottomLeft),
                 TextManager.Get("Cancel"), style: "GUIButtonLarge")
             {

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -1913,7 +1913,7 @@ namespace Barotrauma
 
                     if (PressureTimer >= 100.0f)
                     {
-                        if (Controlled == this) cam.Zoom = 5.0f;
+                        if (Controlled == this) { cam.Zoom = 5.0f; }
                         if (GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient)
                         {
                             Implode();

Barotrauma/BarotraumaShared/Source/Characters/Health/CharacterHealth.cs

@@ -103,6 +103,7 @@ namespace Barotrauma
         }
 
         public float CrushDepth { get; private set; }
+        public float PressureKillDelay { get; private set; } = 5.0f;
 
         public float Vitality { get; private set; }
 

Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs

@@ -26,6 +26,10 @@ namespace Barotrauma.Items.Components
 
         private float blinkTimer;
         
+        private bool itemLoaded;
+
+        private float blinkTimer;
+        
         public PhysicsBody ParentBody;
 
         [Editable(MinValueFloat = 0.0f, MaxValueFloat = 2048.0f), Serialize(100.0f, true)]

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -1208,9 +1208,9 @@ namespace Barotrauma
 
         public List<T> GetConnectedComponents<T>(bool recursive = false) where T : ItemComponent
         {
-            base.FlipY(relativeToSub);
+            List<T> connectedComponents = new List<T>();
 
-            if (Prefab.CanSpriteFlipY)
+            if (recursive)
             {
                 List<Item> alreadySearched = new List<Item>() { this };
                 GetConnectedComponentsRecursive(alreadySearched, connectedComponents);

Barotrauma/BarotraumaShared/Source/Physics/PhysicsBody.cs

@@ -646,7 +646,6 @@ namespace Barotrauma
         /// </summary>
         public void ApplyForce(Vector2 force, float maxVelocity)
         {
-            if (!IsValidValue(force, "force", -1e10f, 1e10f)) return;
             if (!IsValidValue(maxVelocity, "max velocity")) return;
 
             Vector2 velocityAddition = force / Mass * (float)Timing.Step;
@@ -657,7 +656,10 @@ namespace Barotrauma
             {
                 newVelocity = newVelocity.ClampLength(maxVelocity);
             }
-            body.ApplyForce((newVelocity - body.LinearVelocity) * Mass / (float)Timing.Step);
+
+            Vector2 clampedForce = (newVelocity - body.LinearVelocity) * Mass / (float)Timing.Step;
+            if (!IsValidValue(force, "clamped force", -1e10f, 1e10f)) return;
+            body.ApplyForce(force);
         }
 
         public void ApplyForce(Vector2 force, Vector2 point)