Unstable 0.1400.1.0

2021-05-20 16:12:54 +03:00
parent 92f0264af2
commit 5bc850cddb
181 changed files with 2475 additions and 1588 deletions
@@ -356,8 +356,12 @@ namespace Barotrauma
                            int orderIndex = Order.PrefabList.IndexOf(orderPrefab);
                            msg.WriteRangedInteger(orderIndex, 0, Order.PrefabList.Count);
                            if (!orderPrefab.HasOptions) { break; }
-                            int optionIndex = orderPrefab.Options.IndexOf(currentOrderInfo.Value.OrderOption);
-                            msg.WriteRangedInteger(optionIndex, 0, orderPrefab.Options.Length);
+                            int optionIndex = orderPrefab.AllOptions.IndexOf(currentOrderInfo.Value.OrderOption);
+                            if (optionIndex == -1)
+                            {
+                                DebugConsole.AddWarning($"Error while writing order data. Order option \"{(currentOrderInfo.Value.OrderOption ?? null)}\" not found in the order prefab \"{orderPrefab.Name}\".");
+                            }
+                            msg.WriteRangedInteger(optionIndex, -1, orderPrefab.AllOptions.Length);
                        }
                        else if (type == 2)
                        {
@@ -381,6 +385,13 @@ namespace Barotrauma
                        break;
                    case NetEntityEvent.Type.AddToCrew:
                        msg.WriteRangedInteger(9, min, max);
+                        msg.Write((byte)(CharacterTeamType)extraData[1]); // team id
+                        ushort[] inventoryItemIDs = (ushort[])extraData[2];
+                        msg.Write((ushort)inventoryItemIDs.Length);
+                        for (int i = 0; i < inventoryItemIDs.Length; i++)
+                        {
+                            msg.Write(inventoryItemIDs[i]);
+                        }
                        break;
                    default:
                        DebugConsole.ThrowError("Invalid NetworkEvent type for entity " + ToString() + " (" + (NetEntityEvent.Type)extraData[0] + ")");
@@ -1,5 +1,7 @@
 using Barotrauma.Networking;
+using System;
 using System.Collections.Generic;
+using System.Linq;

 namespace Barotrauma
 {
@@ -15,9 +17,45 @@ namespace Barotrauma
        private static readonly Dictionary<Client, ConversationAction> lastActiveAction = new Dictionary<Client, ConversationAction>();

        private readonly HashSet<Client> targetClients = new HashSet<Client>();
+        private readonly Dictionary<Client, DateTime> ignoredClients = new Dictionary<Client, DateTime>();
+
        public IEnumerable<Client> TargetClients
        {
-            get { return targetClients; }
+            get
+            {
+                UpdateIgnoredClients();
+                return targetClients.Where(c => !ignoredClients.ContainsKey(c));
+            }
+        }
+
+        private void UpdateIgnoredClients()
+        {
+            if (ignoredClients.Any())
+            {
+                HashSet<Client> clientsToRemove = null;
+                foreach (var k in ignoredClients.Keys)
+                {
+                    if (ignoredClients[k] < DateTime.Now)
+                    {
+                        clientsToRemove ??= new HashSet<Client>();
+                        clientsToRemove.Add(k);
+                    }
+                }
+                if (!(clientsToRemove is null))
+                {
+                    foreach (var k in clientsToRemove)
+                    {
+                        ignoredClients.Remove(k);
+                    }
+                }
+            }
+        }
+
+        public void IgnoreClient(Client c, float seconds)
+        {
+            if (!ignoredClients.ContainsKey(c)) { ignoredClients.Add(c, DateTime.Now); }
+            ignoredClients[c] = DateTime.Now + TimeSpan.FromSeconds(seconds);
+            Reset();
        }

        private bool IsBlockedByAnotherConversation(IEnumerable<Entity> targets)
@@ -28,7 +28,14 @@ namespace Barotrauma
                        continue;
                    }
                    
-                    convAction.SelectedOption = selectedOption;
+                    if (selectedOption == byte.MaxValue)
+                    {
+                        convAction.IgnoreClient(sender, 3f);
+                    }
+                    else
+                    {
+                        convAction.SelectedOption = selectedOption;
+                    }
                    return;                    
                }                
            }
@@ -1,16 +1,20 @@
 using Barotrauma.Networking;
 using System;
+using System.Collections.Generic;
 using System.Linq;

 namespace Barotrauma
 {
    partial class AbandonedOutpostMission : Mission
    {
+        private readonly List<Item> spawnedItems = new List<Item>();
+
        public override void ServerWriteInitial(IWriteMessage msg, Client c)
        {
-            if (characters.Count == 0)
+            msg.Write((ushort)spawnedItems.Count);
+            foreach (Item item in spawnedItems)
            {
-                throw new InvalidOperationException("Server attempted to write AbandonedOutpostMission data when no characters had been spawned.");
+                item.WriteSpawnData(msg, item.ID, Entity.NullEntityID, 0);
            }

            msg.Write((byte)characters.Count);
@@ -21,7 +21,7 @@ namespace Barotrauma
            }
        }

-        public override void Update(float deltaTime)
+        protected override void UpdateMissionSpecific(float deltaTime)
        {
            if (!initialized)
            {
@@ -18,6 +18,7 @@ namespace Barotrauma
            foreach (Character character in characters)
            {
                character.WriteSpawnData(msg, character.ID, restrictMessageSize: false);
+                msg.Write(terroristCharacters.Contains(character));
                List<Item> characterItems = characterDictionary[character];
                // items must be written in a specific sequence so that child items aren't written before their parents
                msg.Write((ushort)characterItems.Count());
@@ -6,10 +6,12 @@ namespace Barotrauma
    {
        partial void ShowMessageProjSpecific(int missionState)
        {
-            if (missionState >= Headers.Count && missionState >= Messages.Count) return;
+            int messageIndex = missionState - 1;
+            if (messageIndex >= Headers.Count && messageIndex >= Messages.Count) { return; }
+            if (messageIndex < 0) { return; }

-            string header = missionState < Headers.Count ? Headers[missionState] : "";
-            string message = missionState < Messages.Count ? Messages[missionState] : "";
+            string header = messageIndex < Headers.Count ? Headers[messageIndex] : "";
+            string message = messageIndex < Messages.Count ? Messages[messageIndex] : "";

            GameServer.Log(TextManager.Get("MissionInfo") + ": " + header + " - " + message, ServerLog.MessageType.ServerMessage);
        }
@@ -1,19 +0,0 @@
-using Barotrauma.Networking;
-using System.Collections.Generic;
-
-namespace Barotrauma
-{
-    partial class OutpostDestroyMission : AbandonedOutpostMission
-    {
-        private readonly List<Item> spawnedItems = new List<Item>();
-        public override void ServerWriteInitial(IWriteMessage msg, Client c)
-        {
-            base.ServerWriteInitial(msg, c);
-            msg.Write((ushort)spawnedItems.Count);
-            foreach (Item item in spawnedItems)
-            {
-                item.WriteSpawnData(msg, item.ID, Entity.NullEntityID, 0);
-            }
-        }
-    }
-}
@@ -35,6 +35,8 @@ namespace Barotrauma
            private set;
        }

+        public static Thread MainThread { get; private set; }
+
        //only screens the server implements
        public static GameScreen GameScreen;
        public static NetLobbyScreen NetLobbyScreen;
@@ -91,6 +93,8 @@ namespace Barotrauma

            Console.WriteLine("Initializing GameScreen");
            GameScreen = new GameScreen();
+
+            MainThread = Thread.CurrentThread;
        }

        public void Init()
@@ -388,6 +392,8 @@ namespace Barotrauma

            if (GameSettings.SaveDebugConsoleLogs) { DebugConsole.SaveLogs(); }
            if (GameSettings.SendUserStatistics) { GameAnalytics.OnQuit(); }
+
+            MainThread = null;
        }

        public static void ResetFrameTime()
@@ -214,6 +214,7 @@ namespace Barotrauma
                    c.CharacterHealth.Save(c.Info.HealthData);
                    c.Info.InventoryData = new XElement("inventory");
                    c.SaveInventory();
+                    c.Info.SaveOrderData();
                }

                c.Inventory.DeleteAllItems();
@@ -332,7 +333,7 @@ namespace Barotrauma
                CargoManager.OnSoldItemsChanged += () => { LastUpdateID++; };
                UpgradeManager.OnUpgradesChanged += () => { LastUpdateID++; };
                Map.OnLocationSelected += (loc, connection) => { LastUpdateID++; };
-                Map.OnMissionSelected += (loc, mission) => { LastUpdateID++; };
+                Map.OnMissionsSelected += (loc, mission) => { LastUpdateID++; };
                Reputation.OnAnyReputationValueChanged += () => { LastUpdateID++; };
            }
            //increment save ID so clients know they're lacking the most up-to-date save file
@@ -431,8 +432,15 @@ namespace Barotrauma
            msg.Write(lastSaveID);
            msg.Write(map.Seed);
            msg.Write(map.CurrentLocationIndex == -1 ? UInt16.MaxValue : (UInt16)map.CurrentLocationIndex);
-            msg.Write(map.SelectedLocationIndex == -1 ? UInt16.MaxValue : (UInt16)map.SelectedLocationIndex);
-            msg.Write(map.SelectedMissionIndex == -1 ? byte.MaxValue : (byte)map.SelectedMissionIndex);
+            msg.Write(map.SelectedLocationIndex == -1 ? UInt16.MaxValue : (UInt16)map.SelectedLocationIndex); 
+            
+            var selectedMissionIndices = map.GetSelectedMissionIndices();
+            msg.Write((byte)selectedMissionIndices.Count());
+            foreach (int selectedMissionIndex in selectedMissionIndices)
+            {
+                msg.Write((byte)selectedMissionIndex);
+            }
+
            msg.Write(map.AllowDebugTeleport);
            msg.Write(reputation != null);
            if (reputation != null) { msg.Write(reputation.Value); }
@@ -535,7 +543,14 @@ namespace Barotrauma
        {
            UInt16 currentLocIndex  = msg.ReadUInt16();
            UInt16 selectedLocIndex = msg.ReadUInt16();
-            byte selectedMissionIndex = msg.ReadByte();
+
+            byte selectedMissionCount = msg.ReadByte();
+            List<int> selectedMissionIndices = new List<int>();
+            for (int i = 0; i < selectedMissionCount; i++)
+            {
+                selectedMissionIndices.Add(msg.ReadByte());
+            }
+
            bool purchasedHullRepairs = msg.ReadBoolean();
            bool purchasedItemRepairs = msg.ReadBoolean();
            bool purchasedLostShuttles = msg.ReadBoolean();
@@ -663,7 +678,7 @@ namespace Barotrauma

            Map.SelectLocation(selectedLocIndex == UInt16.MaxValue ? -1 : selectedLocIndex);
            if (Map.SelectedLocation == null) { Map.SelectRandomLocation(preferUndiscovered: true); }
-            if (Map.SelectedConnection != null) { Map.SelectMission(selectedMissionIndex); }
+            if (Map.SelectedConnection != null) { Map.SelectMission(selectedMissionIndices); }

            List<PurchasedItem> currentBuyCrateItems = new List<PurchasedItem>(CargoManager.ItemsInBuyCrate);
            currentBuyCrateItems.ForEach(i => CargoManager.ModifyItemQuantityInBuyCrate(i.ItemPrefab, -i.Quantity));
@@ -20,33 +20,5 @@ namespace Barotrauma
                }
            }
        }
-        
-        /// <summary>
-        /// Sends a message to all clients telling them that all upgrades on the submarine were reset.
-        /// </summary>
-        /// <remarks>
-        /// <param name="newUpgrades"/> is supposed to have a list of reloaded metadata but seeing as
-        /// this method is currently only used when switching submarines and that disables the repair NPC
-        /// until the next round so currently there's no need for it as we get the new values from the save
-        /// file anyways.
-        /// </remarks>
-        /// <see cref="UpgradeManager.ClientRead"/>
-        private void SendUpgradeResetMessage(Dictionary<string, int> newUpgrades)
-        {
-            foreach (Client c in GameMain.Server.ConnectedClients)
-            {
-                IWriteMessage outmsg = new WriteOnlyMessage();
-                outmsg.Write((byte)ServerPacketHeader.RESET_UPGRADES);
-                outmsg.Write(true);
-                outmsg.Write(Campaign.Money);
-                // outmsg.Write((uint)newUpgrades.Count);
-                // foreach (var (key, value) in newUpgrades)
-                // {
-                //     outmsg.Write(key);
-                //     outmsg.Write((byte)value);
-                // }
-                GameMain.Server?.ServerPeer?.Send(outmsg, c.Connection, DeliveryMethod.Reliable);
-            }
-        }
    }
 }
@@ -41,7 +41,7 @@ namespace Barotrauma.Items.Components
            }

            //don't allow rewiring locked panels
-            if (Locked || !GameMain.NetworkMember.ServerSettings.AllowRewiring) { return; }
+            if (Locked || TemporarilyLocked || !GameMain.NetworkMember.ServerSettings.AllowRewiring) { return; }

            item.CreateServerEvent(this);

@@ -378,7 +378,7 @@ namespace Barotrauma.Networking

            if (gameStarted)
            {
-                if (respawnManager != null) { respawnManager.Update(deltaTime); }
+                respawnManager?.Update(deltaTime);

                entityEventManager.Update(connectedClients);

@@ -406,10 +406,7 @@ namespace Barotrauma.Networking
                    }
                }

-                if (TraitorManager != null)
-                {
-                    TraitorManager.Update(deltaTime);
-                }
+                TraitorManager?.Update(deltaTime);

                if (serverSettings.Voting.VoteRunning)
                {
@@ -433,7 +430,7 @@ namespace Barotrauma.Networking
                    connectedClients.All(c => c.Character == null || c.Character.IsDead || c.Character.IsIncapacitated);

                bool subAtLevelEnd = false;
-                if (Submarine.MainSub != null && Submarine.MainSubs[1] == null)
+                if (Submarine.MainSub != null && !(GameMain.GameSession.GameMode is PvPMode))
                {
                    if (Level.Loaded?.EndOutpost != null)
                    {
@@ -488,8 +485,10 @@ namespace Barotrauma.Networking
                }
                else if (isCrewDead && (GameMain.GameSession?.GameMode is CampaignMode))
                {
+#if !DEBUG
                    endRoundDelay = 1.0f;
                    endRoundTimer += deltaTime;
+#endif
                }
                else
                {
@@ -3281,7 +3280,6 @@ namespace Barotrauma.Networking
            if (voteType != VoteType.PurchaseSub)
            {
                SubmarineInfo newSub = GameMain.GameSession.SwitchSubmarine(targetSubmarine, deliveryFee);
-                GameMain.GameSession.Campaign.UpgradeManager.RefundResetAndReload(newSub, true);
            }

            serverSettings.Voting.StopSubmarineVote(true);
@@ -306,7 +306,8 @@ namespace Barotrauma.Networking
            {
                if (Enum.TryParse(missionTypeName, out MissionType missionType))
                {
-                    if (missionType == Barotrauma.MissionType.None) continue;
+                    if (missionType == Barotrauma.MissionType.None) { continue; }
+                    if (MissionPrefab.HiddenMissionClasses.Contains(missionType)) { continue; }
                    AllowedRandomMissionTypes.Add(missionType);
                }
            }