Release v0.15.12.0

2021-10-27 18:50:57 +03:00
parent bf95e82d80
commit 234fb6bc06
450 changed files with 26042 additions and 10457 deletions
@@ -1,12 +1,11 @@
 using Barotrauma.Items.Components;
+using Barotrauma.Networking;
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
-using Barotrauma.Networking;
-using Barotrauma.Extensions;

 namespace Barotrauma
 {
@@ -17,7 +16,15 @@ namespace Barotrauma
        // Anything that uses this field I wasn't sure if actually needed the proper campaign settings to be passed down
        public static CampaignSettings Unsure = Empty;
        public bool RadiationEnabled { get; set; }
-        public int MaxMissionCount { get; set; }
+
+        public int TotalMaxMissionCount => MaxMissionCount + GetAddedMissionCount();
+
+        private int maxMissionCount;
+        public int MaxMissionCount
+        {
+            get { return maxMissionCount; }
+            set { maxMissionCount = MathHelper.Clamp(value, MinMissionCountLimit, MaxMissionCountLimit); }
+        }

        public const int DefaultMaxMissionCount = 2;
        public const int MaxMissionCountLimit = 10;
@@ -25,14 +32,16 @@ namespace Barotrauma

        public CampaignSettings(IReadMessage inc)
        {
+            maxMissionCount = DefaultMaxMissionCount;
            RadiationEnabled = inc.ReadBoolean();
            MaxMissionCount = inc.ReadInt32();
        }
-        
+
        public CampaignSettings(XElement element)
        {
-            RadiationEnabled = element.GetAttributeBool(nameof(RadiationEnabled).ToLower(), true);
-            MaxMissionCount = element.GetAttributeInt(nameof(MaxMissionCount).ToLower(), DefaultMaxMissionCount);
+            maxMissionCount = DefaultMaxMissionCount;
+            RadiationEnabled = element.GetAttributeBool(nameof(RadiationEnabled).ToLowerInvariant(), true);
+            MaxMissionCount = element.GetAttributeInt(nameof(MaxMissionCount).ToLowerInvariant(), DefaultMaxMissionCount);
        }

        public void Serialize(IWriteMessage msg)
@@ -41,9 +50,19 @@ namespace Barotrauma
            msg.Write(MaxMissionCount);
        }

+        public int GetAddedMissionCount()
+        {
+            int count = 0;
+            foreach (Character character in GameSession.GetSessionCrewCharacters())
+            {
+                count += (int)character.GetStatValue(StatTypes.ExtraMissionCount);
+            }
+            return count;
+        }
+
        public XElement Save()
        {
-            return new XElement(nameof(CampaignSettings), new XAttribute(nameof(RadiationEnabled).ToLower(), RadiationEnabled), new XAttribute(nameof(MaxMissionCount).ToLower().ToLower(), MaxMissionCount));
+            return new XElement(nameof(CampaignSettings), new XAttribute(nameof(RadiationEnabled).ToLowerInvariant(), RadiationEnabled), new XAttribute(nameof(MaxMissionCount).ToLowerInvariant(), MaxMissionCount));
        }
    }

@@ -226,6 +245,8 @@ namespace Barotrauma
            PurchasedLostShuttles = false;
            var connectedSubs = Submarine.MainSub.GetConnectedSubs();
            wasDocked = Level.Loaded.StartOutpost != null && connectedSubs.Contains(Level.Loaded.StartOutpost);
+
+            ResetTalentData();
        }

        public void InitCampaignData()
@@ -522,6 +543,7 @@ namespace Barotrauma
                if (Level.Loaded.EndOutpost == null)
                {
                    Submarine closestSub = Submarine.FindClosest(Level.Loaded.EndExitPosition, ignoreOutposts: true, ignoreRespawnShuttle: true, teamType: leavingPlayers.FirstOrDefault()?.TeamID);
+                    if (closestSub == null) { return null; }
                    return closestSub.DockedTo.Contains(Submarine.MainSub) ? Submarine.MainSub : closestSub;
                }
                else
@@ -546,13 +568,16 @@ namespace Barotrauma
        public override void End(CampaignMode.TransitionType transitionType = CampaignMode.TransitionType.None)
        {
            List<Item> takenItems = new List<Item>();
-            foreach (Item item in Item.ItemList)
+            if (Level.Loaded?.Type == LevelData.LevelType.Outpost)
            {
-                if (!item.SpawnedInOutpost || item.OriginalModuleIndex < 0) { continue; }
-                var owner = item.GetRootInventoryOwner();
-                if ((!(owner?.Submarine?.Info?.IsOutpost ?? false)) || (owner is Character character && character.TeamID == CharacterTeamType.Team1) || item.Submarine == null || !item.Submarine.Info.IsOutpost)
+                foreach (Item item in Item.ItemList)
                {
-                    takenItems.Add(item);
+                    if (!item.SpawnedInOutpost || item.OriginalModuleIndex < 0) { continue; }
+                    var owner = item.GetRootInventoryOwner();
+                    if ((!(owner?.Submarine?.Info?.IsOutpost ?? false)) || (owner is Character character && character.TeamID == CharacterTeamType.Team1) || item.Submarine == null || !item.Submarine.Info.IsOutpost)
+                    {
+                        takenItems.Add(item);
+                    }
                }
            }
            if (map != null && CargoManager != null)
@@ -642,16 +667,7 @@ namespace Barotrauma
            }
            foreach (Location location in Map.Locations)
            {
-                if (location.Type != location.OriginalType)
-                {
-                    location.ChangeType(location.OriginalType);
-                    location.PendingLocationTypeChange = null;
-                }
-                location.CreateStore(force: true);
-                location.ClearMissions();
-                location.Discovered = false;
-                location.LevelData?.EventHistory?.Clear();
-                location.UnlockInitialMissions();
+                location.Reset();
            }
            Map.SetLocation(Map.Locations.IndexOf(Map.StartLocation));
            Map.SelectLocation(-1);
@@ -846,7 +862,7 @@ namespace Barotrauma
            Location location = Map?.CurrentLocation;
            if (location != null)
            {
-                location.Reputation.Value -= attackResult.Damage * Reputation.ReputationLossPerNPCDamage;
+                location.Reputation.AddReputation(-attackResult.Damage * Reputation.ReputationLossPerNPCDamage);
            }
        }

@@ -898,15 +914,24 @@ namespace Barotrauma
        {
            foreach (Location location in currentLocation.Connections.Select(c => c.OtherLocation(currentLocation)))
            {
-                if (NumberOfMissionsAtLocation(location) > Settings.MaxMissionCount)
+                if (NumberOfMissionsAtLocation(location) > Settings.TotalMaxMissionCount)
                {
                    DebugConsole.AddWarning($"Client {sender.Name} had too many missions selected for location {location.Name}! Count was {NumberOfMissionsAtLocation(location)}. Deselecting extra missions.");
-                    foreach (Mission mission in currentLocation.SelectedMissions.Where(m => m.Locations[1] == location).Skip(Settings.MaxMissionCount).ToList())
+                    foreach (Mission mission in currentLocation.SelectedMissions.Where(m => m.Locations[1] == location).Skip(Settings.TotalMaxMissionCount).ToList())
                    {
                        currentLocation.DeselectMission(mission);
                    }
                }
            }
        }
+
+        // Talent relevant data, only stored for the duration of the mission
+        private void ResetTalentData()
+        {
+            CrewHasDied = false;
+        }
+
+        public bool CrewHasDied { get; set; }
+
    }
 }