Unstable v0.10.600.0

2020-10-01 12:19:24 -03:00
parent 20a69375ca
commit ebe1ce1427
217 changed files with 4284 additions and 1547 deletions
@@ -44,7 +44,7 @@ namespace Barotrauma
        {
            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient)
            {
-                DebugConsole.ThrowError("Clients are not allowed to use AutoItemPlacer.\n" + Environment.StackTrace);
+                DebugConsole.ThrowError("Clients are not allowed to use AutoItemPlacer.\n" + Environment.StackTrace.CleanupStackTrace());
                return;
            }

@@ -135,7 +135,7 @@ namespace Barotrauma
            {
                if (itemPrefab == null)
                {
-                    string errorMsg = "Error in AutoItemPlacer.SpawnItems - itemPrefab was null.\n"+Environment.StackTrace;
+                    string errorMsg = "Error in AutoItemPlacer.SpawnItems - itemPrefab was null.\n"+Environment.StackTrace.CleanupStackTrace();
                    DebugConsole.ThrowError(errorMsg);
                    GameAnalyticsManager.AddErrorEventOnce("AutoItemPlacer.SpawnItems:ItemNull", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
                    return false;
@@ -14,6 +14,8 @@ namespace Barotrauma
        private float conversationTimer, conversationLineTimer;
        private readonly List<Pair<Character, string>> pendingConversationLines = new List<Pair<Character, string>>();

+        public const int MaxCrewSize = 16;
+
        private readonly List<CharacterInfo> characterInfos = new List<CharacterInfo>();
        private readonly List<Character> characters = new List<Character>();

@@ -40,7 +42,7 @@ namespace Barotrauma
        {
            if (order.TargetEntity == null)
            {
-                DebugConsole.ThrowError("Attempted to add an order with no target entity to CrewManager!\n" + Environment.StackTrace);
+                DebugConsole.ThrowError("Attempted to add an order with no target entity to CrewManager!\n" + Environment.StackTrace.CleanupStackTrace());
                return false;
            }

@@ -95,12 +97,12 @@ namespace Barotrauma
        {
            if (character.Removed)
            {
-                DebugConsole.ThrowError("Tried to add a removed character to CrewManager!\n" + Environment.StackTrace);
+                DebugConsole.ThrowError("Tried to add a removed character to CrewManager!\n" + Environment.StackTrace.CleanupStackTrace());
                return;
            }
            if (character.IsDead)
            {
-                DebugConsole.ThrowError("Tried to add a dead character to CrewManager!\n" + Environment.StackTrace);
+                DebugConsole.ThrowError("Tried to add a dead character to CrewManager!\n" + Environment.StackTrace.CleanupStackTrace());
                return;
            }

@@ -122,7 +124,7 @@ namespace Barotrauma
        {
            if (characterInfos.Contains(characterInfo))
            {
-                DebugConsole.ThrowError("Tried to add the same character info to CrewManager twice.\n" + Environment.StackTrace);
+                DebugConsole.ThrowError("Tried to add the same character info to CrewManager twice.\n" + Environment.StackTrace.CleanupStackTrace());
                return;
            }

@@ -31,6 +31,7 @@ namespace Barotrauma
            get => Math.Min(MaxReputation, Metadata.GetFloat(metaDataIdentifier, InitialReputation));
            set
            {
+                if (MathUtils.NearlyEqual(Value, value)) { return; }
                Metadata.SetValue(metaDataIdentifier, Math.Clamp(value, MinReputation, MaxReputation));
                OnReputationValueChanged?.Invoke();
                OnAnyReputationValueChanged?.Invoke();
@@ -188,7 +188,7 @@ namespace Barotrauma

            if (CoroutineManager.IsCoroutineRunning("LevelTransition"))
            {
-                DebugConsole.ThrowError("Level transition already running.\n" + Environment.StackTrace);
+                DebugConsole.ThrowError("Level transition already running.\n" + Environment.StackTrace.CleanupStackTrace());
                return;
            }

@@ -208,7 +208,7 @@ namespace Barotrauma
                    "leaving sub: " + (leavingSub?.Info?.Name ?? "null") + ", " +
                    "at start: " + (leavingSub?.AtStartPosition.ToString() ?? "null") + ", " +
                    "at end: " + (leavingSub?.AtEndPosition.ToString() ?? "null") + ")\n" +
-                    Environment.StackTrace);
+                    Environment.StackTrace.CleanupStackTrace());
                return;
            }
            if (nextLevel == null)
@@ -220,7 +220,7 @@ namespace Barotrauma
                    "leaving sub: " + (leavingSub?.Info?.Name ?? "null") + ", " +
                    "at start: " + (leavingSub?.AtStartPosition.ToString() ?? "null") + ", " +
                    "at end: " + (leavingSub?.AtEndPosition.ToString() ?? "null") + ")\n" +
-                    Environment.StackTrace);
+                    Environment.StackTrace.CleanupStackTrace());
                return;
            }
 #if CLIENT
@@ -348,6 +348,8 @@ namespace Barotrauma
                    GUI.AddMessage(TextManager.AddPunctuation(':', TextManager.Get("Location"), StartLocation.Name), Color.CadetBlue, playSound: false);
                }
            }
+
+            GUI.PreventPauseMenuToggle = false;
 #endif
        }

@@ -542,6 +544,12 @@ namespace Barotrauma
                Mission == null ? "None" : Mission.GetType().ToString());

 #if CLIENT
+            if (GUI.PauseMenuOpen)
+            {
+                GUI.TogglePauseMenu();
+            }
+            GUI.PreventPauseMenuToggle = true;
+
            if (!(GameMode is TestGameMode) && Screen.Selected == GameMain.GameScreen && RoundSummary != null)
            {
                GUI.ClearMessages();
@@ -262,7 +262,7 @@ namespace Barotrauma
                lastErrorSpeak = DateTime.Now;
            }
 #if CLIENT
-            GUI.PlayUISound(GUISoundType.PickItemFail);
+            SoundPlayer.PlayUISound(GUISoundType.PickItemFail);
 #endif
        }