Unstable 0.1400.3.0 (Bad sleep schedule edition)

Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs

@@ -17,7 +17,7 @@ namespace Barotrauma
             public readonly string Identifier;
             public readonly int OriginalContainerIndex;
 
-            public TakenItem(string identifier, UInt16 originalID, UInt16 originalContainerIndex, ushort moduleIndex)
+            public TakenItem(string identifier, UInt16 originalID, int originalContainerIndex, ushort moduleIndex)
             {
                 OriginalID = originalID;
                 OriginalContainerIndex = originalContainerIndex;
@@ -345,7 +345,7 @@ namespace Barotrauma
                     DebugConsole.ThrowError($"Error in saved location: could not parse taken item id \"{takenItemSplit[1]}\"");
                     continue;
                 }
-                if (!ushort.TryParse(takenItemSplit[2], out ushort containerIndex))
+                if (!int.TryParse(takenItemSplit[2], out int containerIndex))
                 {
                     DebugConsole.ThrowError($"Error in saved location: could not parse taken container index \"{takenItemSplit[2]}\"");
                     continue;
@@ -577,6 +577,10 @@ namespace Barotrauma
                     { 
                         weight /= missionCount * 2;
                     }
+                    if (destination.IsRadiated())
+                    {
+                        weight *= 0.001f;
+                    }
                 }
                 return weight;
             }

Barotrauma/BarotraumaShared/SharedSource/Map/Structure.cs

@@ -53,7 +53,16 @@ namespace Barotrauma
         //dimensions of the wall sections' physics bodies (only used for debug rendering)
         private readonly List<Vector2> bodyDebugDimensions = new List<Vector2>();
 
-        public bool Indestructible;
+#if DEBUG
+        [Serialize(false, true), Editable]
+#else
+        [Serialize(false, true)]
+#endif
+        public bool Indestructible
+        {
+            get;
+            set;
+        }
 
         //sections of the wall that are supposed to be rendered
         public WallSection[] Sections
@@ -798,7 +807,7 @@ namespace Barotrauma
 
         public void AddDamage(int sectionIndex, float damage, Character attacker = null)
         {
-            if (!Prefab.Body || Prefab.Platform || Indestructible ) { return; }
+            if (!Prefab.Body || Prefab.Platform || Indestructible) { return; }
 
             if (sectionIndex < 0 || sectionIndex > Sections.Length - 1) { return; }
 

Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineInfo.cs

@@ -23,7 +23,7 @@ namespace Barotrauma
         HideInMenus = 2
     }
 
-    public enum SubmarineType { Player, Outpost, OutpostModule, Wreck, BeaconStation }
+    public enum SubmarineType { Player, Outpost, OutpostModule, Wreck, BeaconStation, EnemySubmarine }
     public enum SubmarineClass { Undefined, Scout, Attack, Transport, DeepDiver }
 
     partial class SubmarineInfo : IDisposable

Barotrauma/BarotraumaShared/SharedSource/Map/WayPoint.cs

@@ -766,14 +766,14 @@ namespace Barotrauma
             if (!wayPoint2.linkedTo.Contains(this)) { wayPoint2.linkedTo.Add(this); }
         }
 
-        public static WayPoint GetRandom(SpawnType spawnType = SpawnType.Human, Job assignedJob = null, Submarine sub = null, Ruin ruin = null, bool useSyncedRand = false)
+        public static WayPoint GetRandom(SpawnType spawnType = SpawnType.Human, JobPrefab assignedJob = null, Submarine sub = null, Ruin ruin = null, bool useSyncedRand = false)
         {
             return WayPointList.GetRandom(wp =>
                 wp.Submarine == sub && 
                 wp.ParentRuin == ruin &&
                 wp.spawnType == spawnType &&
-                (assignedJob == null || (assignedJob != null && wp.AssignedJob == assignedJob.Prefab))
-                , useSyncedRand ? Rand.RandSync.Server : Rand.RandSync.Unsynced);
+                (assignedJob == null || (assignedJob != null && wp.AssignedJob == assignedJob)), 
+                useSyncedRand ? Rand.RandSync.Server : Rand.RandSync.Unsynced);
         }
 
         public static WayPoint[] SelectCrewSpawnPoints(List<CharacterInfo> crew, Submarine submarine)