(913ed2ce9) Merge remote-tracking branch 'origin/dev' into enemy-ai

Barotrauma/BarotraumaShared/Source/Events/Missions/Mission.cs

@@ -103,12 +103,6 @@ namespace Barotrauma
             if (missionType == MissionType.Random)
             {
                 allowedMissions.AddRange(MissionPrefab.List);
-#if SERVER
-                if (GameMain.Server != null)
-                {
-                    allowedMissions.RemoveAll(mission => !GameMain.Server.ServerSettings.AllowedRandomMissionTypes.Contains(mission.type));
-                }
-#endif
             }
             else if (missionType == MissionType.None)
             {

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -211,14 +211,14 @@ namespace Barotrauma
             set { spriteColor = value; }
         }
 
-        [Serialize("1.0,1.0,1.0,1.0", false), Editable]
+        [Serialize("1.0,1.0,1.0,1.0", true), Editable]
         public Color InventoryIconColor
         {
             get;
             protected set;
         }
         
-        [Serialize("1.0,1.0,1.0,1.0", false), Editable(ToolTip = "Changes the color of the item this item is contained inside. Only has an effect if either of the UseContainedSpriteColor or UseContainedInventoryIconColor property of the container is set to true.")]
+        [Serialize("1.0,1.0,1.0,1.0", true), Editable(ToolTip = "Changes the color of the item this item is contained inside. Only has an effect if either of the UseContainedSpriteColor or UseContainedInventoryIconColor property of the container is set to true.")]
         public Color ContainerColor
         {
             get;

Barotrauma/BarotraumaShared/Source/Map/Map/Location.cs

@@ -33,7 +33,7 @@ namespace Barotrauma
             get
             {
                 CheckMissionCompleted();
-
+                
                 for (int i = availableMissions.Count; i < Connections.Count * 2; i++)
                 {
                     int seed = (ToolBox.StringToInt(BaseName) + MissionsCompleted * 10 + i) % int.MaxValue;
@@ -47,7 +47,7 @@ namespace Barotrauma
                     if (availableMissions.Any(m => m.Prefab == mission.Prefab)) { continue; }
                     if (GameSettings.VerboseLogging && mission != null)
                     {
-                        DebugConsole.NewMessage("Generated a new mission for a location connection (seed: " + seed.ToString("X") + ", type: " + mission.Name + ")", Color.White);
+                        DebugConsole.NewMessage("Generated a new mission for a location (location: " + Name + ", seed: " + seed.ToString("X") + ", missions completed: " + MissionsCompleted + ", type: " + mission.Name + ")", Color.White);
                     }
                     availableMissions.Add(mission);
                 }
@@ -100,7 +100,16 @@ namespace Barotrauma
 
         public void ChangeType(LocationType newType)
         {
-            if (newType == Type) return;
+            if (newType == Type) { return; }
+
+            //clear missions from this and adjacent locations (they may be invalid now)
+            availableMissions.Clear();
+            foreach (LocationConnection connection in Connections)
+            {
+                connection.OtherLocation(this)?.availableMissions.Clear();
+            }
+
+            DebugConsole.Log("Location " + baseName + " changed it's type from " + Type + " to " + newType);
 
             Type = newType;
             Name = Type.NameFormats[nameFormatIndex % Type.NameFormats.Count].Replace("[name]", baseName);
@@ -112,6 +121,7 @@ namespace Barotrauma
             {
                 if (mission.Completed)
                 {
+                    DebugConsole.Log("Mission \"" + mission.Name + "\" completed in \"" + Name + "\".");
                     MissionsCompleted++;
                 }
             }
@@ -119,7 +129,7 @@ namespace Barotrauma
             availableMissions.RemoveAll(m => m.Completed);
         }
 
-        private string RandomName(LocationType type)
+        public void Remove()
         {
             baseName = type.GetRandomName();
             nameFormatIndex = Rand.Int(type.NameFormats.Count, Rand.RandSync.Server);

Barotrauma/BarotraumaShared/Source/Utils/SaveUtil.cs

@@ -32,6 +32,7 @@ namespace Barotrauma
 
         public static void SaveGame(string filePath)
         {
+            DebugConsole.Log("Saving the game to: " + filePath);
             Directory.CreateDirectory(TempPath);
             try
             {
@@ -111,6 +112,7 @@ namespace Barotrauma
 
         public static XDocument LoadGameSessionDoc(string filePath)
         {
+            DebugConsole.Log("Loading game session doc: " + filePath);
             try
             {
                 DecompressToDirectory(filePath, TempPath, null);
@@ -401,18 +403,18 @@ namespace Barotrauma
             }
         }
 
-        public static void ClearFolder(string FolderName, string[] ignoredFiles = null)
+        public static void ClearFolder(string FolderName, string[] ignoredFileNames = null)
         {
             DirectoryInfo dir = new DirectoryInfo(FolderName);
 
             foreach (FileInfo fi in dir.GetFiles())
             {
-                if (ignoredFiles != null)
+                if (ignoredFileNames != null)
                 {
                     bool ignore = false;
-                    foreach (string ignoredFile in ignoredFiles)
+                    foreach (string ignoredFile in ignoredFileNames)
                     {
-                        if (Path.GetFullPath(fi.FullName).Equals(Path.GetFullPath(ignoredFile)))
+                        if (Path.GetFileName(fi.FullName).Equals(Path.GetFileName(ignoredFile)))
                         {
                             ignore = true;
                             break;