Unstable v0.19.3.0

2022-09-02 15:10:56 -03:00
parent 28789616bd
commit 3f2c843247
336 changed files with 7152 additions and 7739 deletions
@@ -109,6 +109,7 @@ namespace Barotrauma
            subs[1].FlipX();
 #if SERVER
            crews = new List<Character>[] { new List<Character>(), new List<Character>() };
+            roundEndTimer = RoundEndDuration;
 #endif
        }

@@ -3,7 +3,9 @@ using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
+using PositionType = Barotrauma.Level.PositionType;

 namespace Barotrauma
 {
@@ -29,6 +31,25 @@ namespace Barotrauma

        private readonly HashSet<Level.Cave> caves = new HashSet<Level.Cave>();

+        private readonly PositionType positionType = PositionType.Cave;
+        /// <remarks>
+        /// The list order is important.
+        /// It defines the order in which we "override" <see cref="positionType"/> in case no valid position types are found
+        /// in the level when generating them in <see cref="Level.GenerateMissionResources(ItemPrefab, int, PositionType, out float)"/>.
+        /// </remarks>
+        public static readonly ImmutableArray<PositionType> ValidPositionTypes = new PositionType[]
+        {
+            PositionType.Cave,
+            PositionType.SidePath,
+            PositionType.MainPath,
+            PositionType.AbyssCave,
+        }.ToImmutableArray();
+
+        /// <summary>
+        /// Percentage. Value between 0 and 1.
+        /// </summary>
+        private readonly float resourceHandoverAmount;
+
        public override IEnumerable<Vector2> SonarPositions
        {
            get
@@ -39,8 +60,23 @@ namespace Barotrauma
            }
        }

+        public override LocalizedString SuccessMessage => ModifyMessage(base.SuccessMessage);
+        public override LocalizedString FailureMessage => ModifyMessage(base.FailureMessage);
+        public override LocalizedString Description => ModifyMessage(description);
+        public override LocalizedString Name => ModifyMessage(base.Name, false);
+        public override LocalizedString SonarLabel => ModifyMessage(base.SonarLabel, false);
+
        public MineralMission(MissionPrefab prefab, Location[] locations, Submarine sub) : base(prefab, locations, sub)
        {
+            var positionType = prefab.ConfigElement.GetAttributeEnum("PositionType", in this.positionType);
+            if (ValidPositionTypes.Contains(positionType))
+            {
+                this.positionType = positionType;
+            }
+
+            float handoverAmount = prefab.ConfigElement.GetAttributeFloat("ResourceHandoverAmount", 0.0f);
+            resourceHandoverAmount = Math.Clamp(handoverAmount, 0.0f, 1.0f);
+
            var configElement = prefab.ConfigElement.GetChildElement("Items");
            foreach (var c in configElement.GetChildElements("Item"))
            {
@@ -92,27 +128,28 @@ namespace Barotrauma
            caves.Clear();

            if (IsClient) { return; }
-            foreach (var kvp in resourceClusters)
+
+            foreach ((Identifier identifier, ResourceCluster cluster) in resourceClusters)
            {
-                var prefab = ItemPrefab.Find(null, kvp.Key);
-                if (prefab == null)
+                if (!(MapEntityPrefab.FindByIdentifier(identifier) is ItemPrefab prefab))
                {
-                    DebugConsole.ThrowError("Error in MineralMission - " +
-                        "couldn't find an item prefab with the identifier " + kvp.Key);
+                    DebugConsole.ThrowError($"Error in MineralMission: couldn't find an item prefab (identifier: \"{identifier}\")");
                    continue;
                }
-                var spawnedResources = level.GenerateMissionResources(prefab, kvp.Value.Amount, out float rotation);
-                if (spawnedResources.Count < kvp.Value.Amount)
-                {
-                    DebugConsole.ThrowError("Error in MineralMission - " +
-                        "spawned " + spawnedResources.Count + "/" + kvp.Value.Amount + " of " + prefab.Name);
-                }
-                if (spawnedResources.None()) { continue; }
-                this.spawnedResources.Add(kvp.Key, spawnedResources);

-                foreach (Level.Cave cave in Level.Loaded.Caves)
+                var spawnedResources = level.GenerateMissionResources(prefab, cluster.Amount, positionType, out float rotation);
+                if (spawnedResources.Count < cluster.Amount)
                {
-                    foreach (Item spawnedResource in spawnedResources)
+                    DebugConsole.ThrowError($"Error in MineralMission: spawned only {spawnedResources.Count}/{cluster.Amount} of {prefab.Name}");
+                }
+
+                if (spawnedResources.None()) { continue; }
+
+                this.spawnedResources.Add(identifier, spawnedResources);
+
+                foreach (var cave in Level.Loaded.Caves)
+                {
+                    foreach (var spawnedResource in spawnedResources)
                    {
                        if (cave.Area.Contains(spawnedResource.WorldPosition))
                        {
@@ -123,6 +160,7 @@ namespace Barotrauma
                    }
                }
            }
+
            CalculateMissionClusterPositions();
            FindRelevantLevelResources();
        }
@@ -151,6 +189,28 @@ namespace Barotrauma
                {
                    ChangeLocationType(Prefab.LocationTypeChangeOnCompleted);
                }
+                if (!IsClient)
+                {
+                    // When mission is completed successfully, half of the resources will be removed from the player (i.e. given to the outpost as a part of the mission)
+                    var handoverResources = new List<Item>();
+                    foreach (Identifier identifier in resourceClusters.Keys)
+                    {
+                        if (relevantLevelResources.TryGetValue(identifier, out var availableResources))
+                        {
+                            var collectedResources = availableResources.Where(HasBeenCollected);
+                            if (collectedResources.Count() < 1) { continue; }
+                            int handoverCount = (int)MathF.Round(resourceHandoverAmount * collectedResources.Count());
+                            for (int i = 0; i < handoverCount; i++)
+                            {
+                                handoverResources.Add(collectedResources.ElementAt(i));
+                            }
+                        }
+                    }
+                    foreach (var resource in handoverResources)
+                    {
+                        resource.Remove();
+                    }
+                }
                GiveReward();
                completed = true;
            }
@@ -237,5 +297,27 @@ namespace Barotrauma
                missionClusterPositions.Add((kvp.Key, pos));
            }
        }
+
+        protected override LocalizedString ModifyMessage(LocalizedString message, bool color = true)
+        {
+            int i = 1;
+            foreach ((Identifier identifier, ResourceCluster cluster) in resourceClusters)
+            {
+                Replace($"[resourcename{i}]", ItemPrefab.FindByIdentifier(identifier)?.Name.Value ?? "");
+                Replace($"[resourcequantity{i}]", cluster.Amount.ToString());
+                i++;
+            }
+            Replace("[handoverpercentage]", ToolBox.GetFormattedPercentage(resourceHandoverAmount));
+            return message;
+
+            void Replace(string find, string replace)
+            {
+                if (color)
+                {
+                    replace = $"‖color:gui.orange‖{replace}‖end‖";
+                }
+                message = message.Replace(find, replace);
+            }
+        }
    }    
 }
@@ -41,7 +41,7 @@ namespace Barotrauma
        public readonly ImmutableArray<LocalizedString> Headers;
        public readonly ImmutableArray<LocalizedString> Messages;

-        public LocalizedString Name => Prefab.Name;
+        public virtual LocalizedString Name => Prefab.Name;

        private readonly LocalizedString successMessage;
        public virtual LocalizedString SuccessMessage
@@ -276,6 +276,10 @@ namespace Barotrauma

        partial void ShowMessageProjSpecific(int missionState);

+        protected virtual LocalizedString ModifyMessage(LocalizedString message, bool color = true)
+        {
+            return message;
+        }

        private void TryTriggerEvents(int state)
        {