Unstable 0.1500.0.0

2021-08-26 21:08:21 +09:00
parent 265a2e7ab3
commit 501e02c026
245 changed files with 9775 additions and 2034 deletions
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using Barotrauma.IO;
-using System.IO.Pipes;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Win32.SafeHandles;
+using System.IO.Pipes;

 namespace Barotrauma.Networking
 {
@@ -2354,6 +2354,8 @@ namespace Barotrauma.Networking
                        characterData.ApplyHealthData(spawnedCharacter);
                        characterData.ApplyOrderData(spawnedCharacter);
                        spawnedCharacter.GiveIdCardTags(mainSubWaypoints[i]);
+                        spawnedCharacter.LoadTalents();
+
                        characterData.HasSpawned = true;
                    }
                    spawnedCharacter.OwnerClientEndPoint = teamClients[i].Connection.EndPointString;
@@ -2366,6 +2368,8 @@ namespace Barotrauma.Networking
                    spawnedCharacter.TeamID = teamID;
                    spawnedCharacter.GiveJobItems(mainSubWaypoints[i]);
                    spawnedCharacter.GiveIdCardTags(mainSubWaypoints[i]);
+                    // talents are only avilable for players in online sessions, but modders or someone else might want to have them loaded anyway
+                    spawnedCharacter.LoadTalents();
                }
            }

@@ -2431,6 +2435,7 @@ namespace Barotrauma.Networking

            roundStartTime = DateTime.Now;

+            startGameCoroutine = null;
            yield return CoroutineStatus.Success;
        }

@@ -2619,8 +2624,8 @@ namespace Barotrauma.Networking
                }
            }

-            Submarine.Unload();
            entityEventManager.Clear();
+            Submarine.Unload();
            GameMain.NetLobbyScreen.Select();
            Log("Round ended.", ServerLog.MessageType.ServerMessage);

@@ -3145,28 +3150,19 @@ namespace Barotrauma.Networking
        public void SendOrderChatMessage(OrderChatMessage message)
        {
            if (message.Sender == null || message.Sender.SpeechImpediment >= 100.0f) { return; }
-            //ChatMessageType messageType = ChatMessage.CanUseRadio(message.Sender) ? ChatMessageType.Radio : ChatMessageType.Default;
-
            //check which clients can receive the message and apply distance effects
            foreach (Client client in ConnectedClients)
            {
-                string modifiedMessage = message.Text;
-
-                if (message.Sender != null &&
-                    client.Character != null && !client.Character.IsDead)
+                if (message.Sender != null && client.Character != null && !client.Character.IsDead)
                {
                    //too far to hear the msg -> don't send
                    if (!client.Character.CanHearCharacter(message.Sender)) { continue; }
                }
-
                SendDirectChatMessage(new OrderChatMessage(message.Order, message.OrderOption, message.OrderPriority, message.TargetEntity, message.TargetCharacter, message.Sender), client);
            }
-
-            string myReceivedMessage = message.Text;
-
-            if (!string.IsNullOrWhiteSpace(myReceivedMessage))
+            if (!string.IsNullOrWhiteSpace(message.Text))
            {
-                AddChatMessage(new OrderChatMessage(message.Order, message.OrderOption, message.OrderPriority, myReceivedMessage, message.TargetEntity, message.TargetCharacter, message.Sender));
+                AddChatMessage(new OrderChatMessage(message.Order, message.OrderOption, message.OrderPriority, message.Text, message.TargetEntity, message.TargetCharacter, message.Sender));
            }
        }

@@ -44,11 +44,11 @@ namespace Barotrauma.Networking

    class ServerEntityEventManager : NetEntityEventManager
    {
-        private List<ServerEntityEvent> events;
+        private readonly List<ServerEntityEvent> events;

        //list of unique events (i.e. !IsDuplicate) created during the round
        //used for syncing clients who join mid-round
-        private List<ServerEntityEvent> uniqueEvents;
+        private readonly List<ServerEntityEvent> uniqueEvents;

        private UInt16 lastSentToAll;
        private UInt16 lastSentToAnyone;
@@ -90,11 +90,11 @@ namespace Barotrauma.Networking
            }
        }

-        private List<BufferedEvent> bufferedEvents;
+        private readonly List<BufferedEvent> bufferedEvents;

        private UInt16 ID;

-        private GameServer server;
+        private readonly GameServer server;

        private double lastEventCountHighWarning;
        
@@ -284,6 +284,8 @@ namespace Barotrauma.Networking
        
        partial void RespawnCharactersProjSpecific(Vector2? shuttlePos)
        {
+            respawnedCharacters.Clear();
+
            var respawnSub = RespawnShuttle ?? Submarine.MainSub;

            MultiPlayerCampaign campaign = GameMain.GameSession.GameMode as MultiPlayerCampaign;
@@ -300,7 +302,7 @@ namespace Barotrauma.Networking
                if (matchingData != null && !matchingData.HasSpawned)
                {
                    c.CharacterInfo = matchingData.CharacterInfo;
-                }                
+                }

                //all characters are in Team 1 in game modes/missions with only one team.
                //if at some point we add a game mode with multiple teams where respawning is possible, this needs to be reworked
@@ -355,8 +357,21 @@ namespace Barotrauma.Networking

                characterInfos[i].ClearCurrentOrders();

-                var character = Character.Create(characterInfos[i], shuttleSpawnPoints[i].WorldPosition, characterInfos[i].Name, isRemotePlayer: !bot, hasAi: bot);
+                bool forceSpawnInMainSub = false;
+                if (!bot && campaign != null)
+                {
+                    var matchingData = campaign?.GetClientCharacterData(clients[i]);
+                    if (matchingData != null && !matchingData.HasSpawned)
+                    {
+                        forceSpawnInMainSub = true;
+                    }
+                }
+
+                var character = Character.Create(characterInfos[i], (forceSpawnInMainSub ? mainSubSpawnPoints[i] : shuttleSpawnPoints[i]).WorldPosition, characterInfos[i].Name, isRemotePlayer: !bot, hasAi: bot);
                character.TeamID = CharacterTeamType.Team1;
+                character.LoadTalents();
+
+                respawnedCharacters.Add(character);

                if (bot)
                {