Unstable 0.1300.0.3

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

@@ -361,6 +361,11 @@ namespace Barotrauma
                         if (subElement.Attribute("index") != null)
                         {
                             int locationTypeChangeIndex = subElement.GetAttributeInt("index", 0);
+                            if (locationTypeChangeIndex < 0 || locationTypeChangeIndex >= Type.CanChangeTo.Count)
+                            {
+                                DebugConsole.AddWarning($"Failed to activate a location type change in the location \"{Name}\". Location index out of bounds ({locationTypeChangeIndex}).");
+                                continue;
+                            }
                             PendingLocationTypeChange = (Type.CanChangeTo[locationTypeChangeIndex], timer, null);
                         }
                         else
@@ -1059,12 +1064,21 @@ namespace Barotrauma
                 if (PendingLocationTypeChange.Value.parentMission != null)
                 {
                     changeElement.Add(new XAttribute("missionidentifier", PendingLocationTypeChange.Value.parentMission.Identifier));
+                    locationElement.Add(changeElement);
                 }
                 else
                 {
-                    changeElement.Add(new XAttribute("index", Type.CanChangeTo.IndexOf(PendingLocationTypeChange.Value.typeChange)));
+                    int index = Type.CanChangeTo.IndexOf(PendingLocationTypeChange.Value.typeChange);
+                    changeElement.Add(new XAttribute("index", index));
+                    if (index == -1)
+                    {
+                        DebugConsole.AddWarning($"Invalid location type change in the location \"{Name}\". Unknown type change ({PendingLocationTypeChange.Value.typeChange.ChangeToType}).");
+                    }
+                    else
+                    {
+                        locationElement.Add(changeElement);
+                    }
                 }
-                locationElement.Add(changeElement);
             }
 
             if (LocationTypeChangeCooldown > 0)

Barotrauma/BarotraumaShared/SharedSource/Map/Map/LocationType.cs

@@ -27,6 +27,8 @@ namespace Barotrauma
 
         public readonly float BeaconStationChance;
 
+        public readonly CharacterTeamType OutpostTeam;
+
         public readonly List<LocationTypeChange> CanChangeTo = new List<LocationTypeChange>();
 
         public readonly List<string> MissionIdentifiers = new List<string>();
@@ -90,6 +92,9 @@ namespace Barotrauma
 
             ReplaceInRadiation = element.GetAttributeString(nameof(ReplaceInRadiation).ToLower(), "");
 
+            string teamStr = element.GetAttributeString("outpostteam", "FriendlyNPC");
+            Enum.TryParse(teamStr, out OutpostTeam);
+
             string nameFile = element.GetAttributeString("namefile", "Content/Map/locationNames.txt");
             try
             {

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

@@ -316,20 +316,13 @@ namespace Barotrauma
                     if (connection2.Locations[1] == connection.Locations[0]) { connection2.Locations[1] = connection.Locations[1]; }
                 }
             }
-            
-            HashSet<Location> connectedLocations = new HashSet<Location>();
+
             foreach (LocationConnection connection in Connections)
             {
                 connection.Locations[0].Connections.Add(connection);
                 connection.Locations[1].Connections.Add(connection);
-
-                connectedLocations.Add(connection.Locations[0]);
-                connectedLocations.Add(connection.Locations[1]);
             }
 
-            //remove orphans
-            Locations.RemoveAll(c => !connectedLocations.Contains(c));
-
             //remove locations that are too close to each other
             float minLocationDistanceSqr = generationParams.MinLocationDistance * generationParams.MinLocationDistance;
             for (int i = Locations.Count - 1; i >= 0; i--)
@@ -443,6 +436,9 @@ namespace Barotrauma
                 }
             }
 
+            //remove orphans
+            Locations.RemoveAll(l => !Connections.Any(c => c.Locations.Contains(l)));
+
             foreach (LocationConnection connection in Connections)
             {
                 connection.Difficulty = MathHelper.Clamp((connection.CenterPos.X / Width * 100) + Rand.Range(-10.0f, 0.0f, Rand.RandSync.Server), 1.2f, 100.0f);
@@ -654,10 +650,12 @@ namespace Barotrauma
             CurrentLocation.CreateStore();
             OnLocationChanged?.Invoke(prevLocation, CurrentLocation);
 
-            if (GameMain.GameSession?.GameMode is CampaignMode campaign && campaign.CampaignMetadata is { } metadata)
+            if (GameMain.GameSession is { Campaign: { CampaignMetadata: { } metadata } })
             {
                 metadata.SetValue("campaign.location.id", CurrentLocationIndex);
                 metadata.SetValue("campaign.location.name", CurrentLocation.Name);
+                metadata.SetValue("campaign.location.biome", CurrentLocation.Biome?.Identifier ?? "null");
+                metadata.SetValue("campaign.location.type", CurrentLocation.Type?.Identifier ?? "null");
             }
         }