(3622747f3) Unstable 0.9.705.0

Barotrauma/BarotraumaShared/SharedSource/Characters/CharacterInfo.cs

@@ -262,7 +262,10 @@ namespace Barotrauma
 
 #if CLIENT
         private Sprite jobIcon;
-        private Vector2 jobIconPos;
+        private Vector2 jobIconPos
+        {
+            get { return new Vector2(HUDLayoutSettings.HealthBarAreaLeft.Right, HUDLayoutSettings.HealthBarAreaLeft.Y - HUDLayoutSettings.Padding); }
+        }
 #endif
 
         private Sprite portraitBackground;
@@ -449,9 +452,6 @@ namespace Barotrauma
             Job = (jobPrefab == null) ? Job.Random(Rand.RandSync.Server) : new Job(jobPrefab, variant);
 #if CLIENT
             jobIcon = Job.Prefab.Icon;
-            //TODO: fix jobIconPos
-            jobIconPos = new Vector2(HUDLayoutSettings.HealthBarAreaLeft.Right, HUDLayoutSettings.HealthBarAreaLeft.Y - HUDLayoutSettings.Padding);
-            GameMain.Instance.OnResolutionChanged += () => jobIconPos = new Vector2(HUDLayoutSettings.HealthBarAreaLeft.Right, HUDLayoutSettings.HealthBarAreaLeft.Y - HUDLayoutSettings.Padding);
 #endif
 
             if (!string.IsNullOrEmpty(name))

Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs

@@ -282,6 +282,8 @@ namespace Barotrauma
 
             commands.Add(new Command("botspawnmode", "botspawnmode [fill/normal]: Set how bots are spawned in the multiplayer.", null));
 
+            commands.Add(new Command("killdisconnectedtimer", "killdisconnectedtimer [seconds]: Set the time after which disconnect players' characters get automatically killed.", null));
+
             commands.Add(new Command("autorestart", "autorestart [true/false]: Enable or disable round auto-restart.", null));
 
             commands.Add(new Command("autorestartinterval", "autorestartinterval [seconds]: Set how long the server waits between rounds before automatically starting a new one. If set to 0, autorestart is disabled.", null));

Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs

@@ -67,6 +67,9 @@ namespace Barotrauma
         {
             if (isClient) { return; }
 
+            pendingEventSets.Clear();
+            selectedEvents.Clear();
+
             var suitableSettings = EventManagerSettings.List.FindAll(s =>
                 level.Difficulty >= s.MinLevelDifficulty &&
                 level.Difficulty <= s.MaxLevelDifficulty);
@@ -322,6 +325,12 @@ namespace Barotrauma
 
                     pendingEventSets.RemoveAt(i);
 
+                    if (!selectedEvents.ContainsKey(eventSet))
+                    {
+                        DebugConsole.ThrowError("Error in EventManager.Update: pending event set \"" + eventSet.DebugIdentifier + "\" not present in selected event sets.");
+                        continue;
+                    }
+
                     //start events in this set
                     foreach (ScriptedEvent scriptedEvent in selectedEvents[eventSet])
                     {

Barotrauma/BarotraumaShared/SharedSource/Items/CharacterInventory.cs

@@ -198,7 +198,7 @@ namespace Barotrauma
                     }
                 }
 
-                if (!free) continue;
+                if (!free) { continue; }
 
                 for (int i = 0; i < capacity; i++)
                 {
@@ -212,7 +212,8 @@ namespace Barotrauma
                         item.Equip(character);
                         placedInSlot = i;
                     }
-                }              
+                }
+                if (placedInSlot > -1) { break; }
             }
 
             return placedInSlot > -1;

Barotrauma/BarotraumaShared/SharedSource/Networking/ServerSettings.cs

@@ -752,7 +752,7 @@ namespace Barotrauma.Networking
             private set;
         }
 
-        [Serialize(30.0f, true)]
+        [Serialize(120.0f, true)]
         public float KillDisconnectedTime
         {
             get;

Barotrauma/BarotraumaShared/SharedSource/TextManager.cs

@@ -86,7 +86,7 @@ namespace Barotrauma
             HashSet<string> newLanguages = new HashSet<string>();
             Dictionary<string, List<TextPack>> newTextPacks = new Dictionary<string, List<TextPack>>();
 
-            var textFiles = ContentPackage.GetFilesOfType(selectedContentPackages, ContentType.Text);
+            var textFiles = ContentPackage.GetFilesOfType(selectedContentPackages, ContentType.Text).ToList();
 
             foreach (ContentFile file in textFiles)
             {
@@ -131,13 +131,7 @@ namespace Barotrauma
             {
                 textPacks = newTextPacks;
                 availableLanguages = newLanguages;
-
-                string loadedLangsMsg = "Loaded languages: ";
-                foreach (string language in newLanguages)
-                {
-                    loadedLangsMsg += language + ", ";
-                }
-                DebugConsole.NewMessage(loadedLangsMsg.Substring(0,loadedLangsMsg.Length-2));
+                DebugConsole.NewMessage("Loaded languages: " + string.Join(", ", newLanguages));
             }
 
             Initialized = true;

Barotrauma/BarotraumaShared/SharedSource/TextPack.cs

@@ -16,7 +16,7 @@ namespace Barotrauma
         /// </summary>
         public readonly string TranslatedName;
 
-        private Dictionary<string, List<string>> texts;
+        private readonly Dictionary<string, List<string>> texts;
         
         public readonly string FilePath;
 

Barotrauma/BarotraumaShared/SharedSource/Timing.cs

@@ -11,7 +11,7 @@ namespace Barotrauma
 
         public static double Accumulator;
         public const int FixedUpdateRate = 60;
-        public static double Step = 1.0 / FixedUpdateRate;
+        public const double Step = 1.0 / FixedUpdateRate;
 
         private static int frameLimit;
         /// <summary>