Build 0.21.6.0 (1.0 pre-patch)

2023-01-31 18:08:26 +02:00
parent e1c04bc31d
commit cf9ecd35b3
231 changed files with 4479 additions and 2276 deletions
@@ -58,6 +58,7 @@ namespace Barotrauma.Networking

        private DateTime roundStartTime;

+        private bool wasReadyToStartAutomatically;
        private bool autoRestartTimerRunning;
        private float endRoundTimer;

@@ -139,6 +140,7 @@ namespace Barotrauma.Networking
            ServerSettings = new ServerSettings(this, name, port, queryPort, maxPlayers, isPublic, attemptUPnP);
            KarmaManager.SelectPreset(ServerSettings.KarmaPreset);
            ServerSettings.SetPassword(password);
+            ServerSettings.SaveSettings();

            Voting = new Voting();

@@ -366,8 +368,7 @@ namespace Barotrauma.Networking
                    character.KillDisconnectedTimer += deltaTime;
                    character.SetStun(1.0f);

-                    Client owner = connectedClients.Find(c => (c.Character == null || c.Character == character) && c.AddressMatches(character.OwnerClientAddress));
-
+                    Client owner = connectedClients.Find(c => (c.Character == null || c.Character == character) && character.IsClientOwner(c));
                    if ((OwnerConnection == null || owner?.Connection != OwnerConnection) && character.KillDisconnectedTimer > ServerSettings.KillDisconnectedTime)
                    {
                        character.Kill(CauseOfDeathType.Disconnected, null);
@@ -504,8 +505,7 @@ namespace Barotrauma.Networking
                    initiatedStartGame = false;
                }
            }
-            else if (Screen.Selected == GameMain.NetLobbyScreen && !GameStarted && !initiatedStartGame &&
-                    (GameMain.NetLobbyScreen.SelectedMode != GameModePreset.MultiPlayerCampaign || GameMain.GameSession?.GameMode is MultiPlayerCampaign))
+            else if (Screen.Selected == GameMain.NetLobbyScreen && !GameStarted && !initiatedStartGame)
            {
                if (ServerSettings.AutoRestart)
                {
@@ -526,18 +526,25 @@ namespace Barotrauma.Networking
                    }
                }

+                bool readyToStartAutomatically = false;
                if (ServerSettings.AutoRestart && autoRestartTimerRunning && ServerSettings.AutoRestartTimer < 0.0f)
                {
-                    StartGame();
+                    readyToStartAutomatically = true;
                }
                else if (ServerSettings.StartWhenClientsReady)
                {
                    int clientsReady = connectedClients.Count(c => c.GetVote<bool>(VoteType.StartRound));
                    if (clientsReady / (float)connectedClients.Count >= ServerSettings.StartWhenClientsReadyRatio)
                    {
-                        StartGame();
+                        readyToStartAutomatically = true;
                    }
                }
+                if (readyToStartAutomatically)
+                {
+                    if (!wasReadyToStartAutomatically) { GameMain.NetLobbyScreen.LastUpdateID++; }
+                    TryStartGame();
+                }
+                wasReadyToStartAutomatically = readyToStartAutomatically;
            }

            for (int i = disconnectedClients.Count - 1; i >= 0; i--)
@@ -763,7 +770,7 @@ namespace Barotrauma.Networking
                        else
                        {
                            string localSavePath = SaveUtil.CreateSavePath(SaveUtil.SaveType.Multiplayer, saveName);
-                            if (connectedClient.HasPermission(ClientPermissions.SelectMode) || connectedClient.HasPermission(ClientPermissions.ManageCampaign))
+                            if (CampaignMode.AllowedToManageCampaign(connectedClient, ClientPermissions.ManageRound))
                            {
                                ServerSettings.CampaignSettings = settings;
                                ServerSettings.SaveSettings();
@@ -779,7 +786,10 @@ namespace Barotrauma.Networking
                            SendDirectChatMessage(TextManager.Get("CampaignStartFailedRoundRunning").Value, connectedClient, ChatMessageType.MessageBox);
                            return;
                        }
-                        if (connectedClient.HasPermission(ClientPermissions.SelectMode) || connectedClient.HasPermission(ClientPermissions.ManageCampaign)) { MultiPlayerCampaign.LoadCampaign(saveName); }
+                        if (CampaignMode.AllowedToManageCampaign(connectedClient, ClientPermissions.ManageRound)) 
+                        { 
+                            MultiPlayerCampaign.LoadCampaign(saveName); 
+                        }
                    }
                    break;
                case ClientPacketHeader.VOICE:
@@ -1389,13 +1399,13 @@ namespace Barotrauma.Networking
                    if (end)
                    {
                        if (mpCampaign == null ||
-                            CampaignMode.AllowedToManageCampaign(sender, ClientPermissions.ManageRound) ||
-                            CampaignMode.AllowedToManageCampaign(sender, ClientPermissions.ManageCampaign))
+                            CampaignMode.AllowedToManageCampaign(sender, ClientPermissions.ManageRound))
                        {
                            bool save = inc.ReadBoolean();
+                            bool quitCampaign = inc.ReadBoolean();
                            if (GameStarted)
                            {
-                                Log("Client \"" + GameServer.ClientLogName(sender) + "\" ended the round.", ServerLog.MessageType.ServerMessage);
+                                Log($"Client \"{ClientLogName(sender)}\" ended the round.", ServerLog.MessageType.ServerMessage);
                                if (mpCampaign != null && Level.IsLoadedFriendlyOutpost && save)
                                {
                                    mpCampaign.SavePlayers();
@@ -1409,6 +1419,14 @@ namespace Barotrauma.Networking
                                }
                                EndGame(wasSaved: save);
                            }
+                            else if (mpCampaign != null)
+                            {
+                                Log($"Client \"{ClientLogName(sender)}\" quit the currently active campaign.", ServerLog.MessageType.ServerMessage);
+                                GameMain.GameSession = null;
+                                GameMain.NetLobbyScreen.SelectedModeIdentifier = GameModePreset.Sandbox.Identifier;
+                                GameMain.NetLobbyScreen.LastUpdateID++;
+
+                            }
                        }
                    }
                    else
@@ -1425,12 +1443,11 @@ namespace Barotrauma.Networking
                            {
                                MultiPlayerCampaign.LoadCampaign(GameMain.GameSession.SavePath);
                            }
-
                        }
                        else if (!GameStarted && !initiatedStartGame)
                        {
                            Log("Client \"" + ClientLogName(sender) + "\" started the round.", ServerLog.MessageType.ServerMessage);
-                            StartGame();
+                            TryStartGame();
                        }
                        else if (mpCampaign != null && (CampaignMode.AllowedToManageCampaign(sender, ClientPermissions.ManageCampaign) || CampaignMode.AllowedToManageCampaign(sender, ClientPermissions.ManageMap)))
                        {
@@ -1492,20 +1509,10 @@ namespace Barotrauma.Networking
                case ClientPermissions.SelectMode:
                    UInt16 modeIndex = inc.ReadUInt16();
                    GameMain.NetLobbyScreen.SelectedModeIndex = modeIndex;
-                    Log("Gamemode changed to " + GameMain.NetLobbyScreen.GameModes[GameMain.NetLobbyScreen.SelectedModeIndex].Name.Value, ServerLog.MessageType.ServerMessage);
-
-                    if (GameMain.NetLobbyScreen.GameModes[modeIndex].Identifier == "multiplayercampaign")
+                    Log("Gamemode changed to " + (GameMain.NetLobbyScreen.SelectedMode?.Name.Value ?? "none"), ServerLog.MessageType.ServerMessage);
+                    if (GameMain.NetLobbyScreen.GameModes[modeIndex] == GameModePreset.MultiPlayerCampaign)
                    {
-                        const int MaxSaves = 255;
-                        var saveInfos = SaveUtil.GetSaveFiles(SaveUtil.SaveType.Multiplayer, includeInCompatible: false);
-                        IWriteMessage msg = new WriteOnlyMessage();
-                        msg.WriteByte((byte)ServerPacketHeader.CAMPAIGN_SETUP_INFO);
-                        msg.WriteByte((byte)Math.Min(saveInfos.Count, MaxSaves));
-                        for (int i = 0; i < saveInfos.Count && i < MaxSaves; i++)
-                        {
-                            msg.WriteNetSerializableStruct(saveInfos[i]);
-                        }
-                        serverPeer.Send(msg, sender.Connection, DeliveryMethod.Reliable);
+                        TrySendCampaignSetupInfo(sender);
                    }
                    break;
                case ClientPermissions.ManageCampaign:
@@ -1612,7 +1619,7 @@ namespace Barotrauma.Networking
        {
            if (GameSettings.CurrentConfig.VerboseLogging)
            {
-                DebugConsole.NewMessage("Sending initial lobby update", Color.Gray);
+                DebugConsole.NewMessage($"Sending initial lobby update to {c.Name}", Color.Gray);
            }

            outmsg.WriteByte(c.SessionId);
@@ -1745,9 +1752,9 @@ namespace Barotrauma.Networking
                        continue;
                    }

-                    IWriteMessage tempBuffer = new ReadWriteMessage();
-                    tempBuffer.WriteBoolean(entity is Item); tempBuffer.WritePadBits();
-                    tempBuffer.WriteUInt32(entity is MapEntity me ? me.Prefab.UintIdentifier : (UInt32)0);
+                    var tempBuffer = new ReadWriteMessage();
+                    var entityPositionHeader = EntityPositionHeader.FromEntity(entity);
+                    tempBuffer.WriteNetSerializableStruct(entityPositionHeader);
                    entityPositionSync.ServerWritePosition(tempBuffer, c);

                    //no more room in this packet
@@ -1758,6 +1765,7 @@ namespace Barotrauma.Networking

                    segmentTable.StartNewSegment(ServerNetSegment.EntityPosition);
                    outmsg.WritePadBits(); //padding is required here to make sure any padding bits within tempBuffer are read correctly
+                    outmsg.WriteVariableUInt32((uint)tempBuffer.LengthBytes);
                    outmsg.WriteBytes(tempBuffer.Buffer, 0, tempBuffer.LengthBytes);
                    outmsg.WritePadBits();

@@ -1934,6 +1942,13 @@ namespace Barotrauma.Networking
                    {
                        outmsg.WriteSingle(autoRestartTimerRunning ? ServerSettings.AutoRestartTimer : 0.0f);
                    }
+
+                    if (GameMain.NetLobbyScreen.SelectedMode == GameModePreset.MultiPlayerCampaign &&
+                        connectedClients.None(c => c.Connection == OwnerConnection || c.HasPermission(ClientPermissions.ManageRound) || c.HasPermission(ClientPermissions.ManageCampaign)))
+                    {
+                        //if no-one has permissions to manage the campaign, show the setup UI to everyone
+                        TrySendCampaignSetupInfo(c);
+                    }
                }
                else
                {
@@ -1943,9 +1958,8 @@ namespace Barotrauma.Networking
                settingsBytes = outmsg.LengthBytes - settingsBytes;

                int campaignBytes = outmsg.LengthBytes;
-                var campaign = GameMain.GameSession?.GameMode as MultiPlayerCampaign;
                if (outmsg.LengthBytes < MsgConstants.MTU - 500 &&
-                    campaign != null && campaign.Preset == GameMain.NetLobbyScreen.SelectedMode)
+                    GameMain.GameSession?.GameMode is MultiPlayerCampaign campaign && campaign.Preset == GameMain.NetLobbyScreen.SelectedMode)
                {
                    outmsg.WriteBoolean(true);
                    outmsg.WritePadBits();
@@ -2023,7 +2037,7 @@ namespace Barotrauma.Networking
            }
        }

-        private void WriteChatMessages(in SegmentTableWriter<ServerNetSegment> segmentTable, IWriteMessage outmsg, Client c)
+        private static void WriteChatMessages(in SegmentTableWriter<ServerNetSegment> segmentTable, IWriteMessage outmsg, Client c)
        {
            c.ChatMsgQueue.RemoveAll(cMsg => !NetIdUtils.IdMoreRecent(cMsg.NetStateID, c.LastRecvChatMsgID));
            for (int i = 0; i < c.ChatMsgQueue.Count && i < ChatMessage.MaxMessagesPerPacket; i++)
@@ -2037,10 +2051,26 @@ namespace Barotrauma.Networking
            }
        }

-        public bool StartGame()
+        public bool TryStartGame()
        {
            if (initiatedStartGame || GameStarted) { return false; }

+            GameModePreset selectedMode = 
+                Voting.HighestVoted<GameModePreset>(VoteType.Mode, connectedClients) ?? GameMain.NetLobbyScreen.SelectedMode;
+            if (selectedMode == null)
+            {
+                return false;
+            }
+            if (selectedMode == GameModePreset.MultiPlayerCampaign && GameMain.GameSession?.GameMode is not MultiPlayerCampaign)
+            {
+                //DebugConsole.ThrowError($"{nameof(TryStartGame)} failed. Cannot start a multiplayer campaign via {nameof(TryStartGame)} - use {nameof(MultiPlayerCampaign.StartNewCampaign)} or {nameof(MultiPlayerCampaign.LoadCampaign)} instead.");
+                if (GameMain.NetLobbyScreen.SelectedMode != GameModePreset.MultiPlayerCampaign)
+                {
+                    GameMain.NetLobbyScreen.SelectedModeIdentifier = GameModePreset.MultiPlayerCampaign.Identifier;
+                }
+                return false;
+            }
+
            Log("Starting a new round...", ServerLog.MessageType.ServerMessage);
            SubmarineInfo selectedShuttle = GameMain.NetLobbyScreen.SelectedShuttle;

@@ -2060,23 +2090,13 @@ namespace Barotrauma.Networking
                return false;
            }

-            GameModePreset selectedMode = Voting.HighestVoted<GameModePreset>(VoteType.Mode, connectedClients);
-            if (selectedMode == null) { selectedMode = GameMain.NetLobbyScreen.SelectedMode; }
-            if (selectedMode == null)
-            {
-                return false;
-            }
-            if (selectedMode == GameModePreset.MultiPlayerCampaign && !(GameMain.GameSession?.GameMode is CampaignMode))
-            {
-                DebugConsole.ThrowError("StartGame failed. Cannot start a multiplayer campaign via StartGame - use MultiPlayerCampaign.StartNewCampaign or MultiPlayerCampaign.LoadCampaign instead.");
-                return false;
-            }
            initiatedStartGame = true;
-            startGameCoroutine = CoroutineManager.StartCoroutine(InitiateStartGame(selectedSub, selectedShuttle, selectedMode), "InitiateStartGame");
+            startGameCoroutine = CoroutineManager.StartCoroutine(InitiateStartGame(selectedSub, selectedShuttle, selectedMode), "InitiateStartGame");            

            return true;
        }

+
        private IEnumerable<CoroutineStatus> InitiateStartGame(SubmarineInfo selectedSub, SubmarineInfo selectedShuttle, GameModePreset selectedMode)
        {
            initiatedStartGame = true;
@@ -2168,7 +2188,6 @@ namespace Barotrauma.Networking
                initialSuppliesSpawned = GameMain.GameSession.SubmarineInfo is { InitialSuppliesSpawned: true };
            }

-
            List<Client> playingClients = new List<Client>(connectedClients);
            if (ServerSettings.AllowSpectating)
            {
@@ -2413,8 +2432,7 @@ namespace Barotrauma.Networking
                        mpCampaign.ClearSavedExperiencePoints(teamClients[i]);
                    }

-                    spawnedCharacter.OwnerClientAddress = teamClients[i].Connection.Endpoint.Address;
-                    spawnedCharacter.OwnerClientName = teamClients[i].Name;
+                    spawnedCharacter.SetOwnerClient(teamClients[i]);
                }

                for (int i = teamClients.Count; i < teamClients.Count + bots.Count; i++)
@@ -2479,7 +2497,7 @@ namespace Barotrauma.Networking

            yield return CoroutineStatus.Running;

-            Voting?.ResetVotes(GameMain.Server.ConnectedClients, resetKickVotes: false);
+            Voting.ResetVotes(GameMain.Server.ConnectedClients, resetKickVotes: false);
            
            GameMain.GameScreen.Select();

@@ -2507,14 +2525,11 @@ namespace Barotrauma.Networking

        private void SendStartMessage(int seed, string levelSeed, GameSession gameSession, Client client, bool includesFinalize)
        {
-            MultiPlayerCampaign campaign = GameMain.GameSession?.GameMode as MultiPlayerCampaign;
-            MissionMode missionMode = GameMain.GameSession.GameMode as MissionMode;
-
            IWriteMessage msg = new WriteOnlyMessage();
            msg.WriteByte((byte)ServerPacketHeader.STARTGAME);
            msg.WriteInt32(seed);
            msg.WriteIdentifier(gameSession.GameMode.Preset.Identifier);
-            bool missionAllowRespawn = missionMode == null || !missionMode.Missions.Any(m => !m.AllowRespawn);
+            bool missionAllowRespawn = GameMain.GameSession.GameMode is not MissionMode missionMode || !missionMode.Missions.Any(m => !m.AllowRespawn);
            msg.WriteBoolean(ServerSettings.AllowRespawn && missionAllowRespawn);
            msg.WriteBoolean(ServerSettings.AllowDisguises);
            msg.WriteBoolean(ServerSettings.AllowRewiring);
@@ -2530,7 +2545,7 @@ namespace Barotrauma.Networking

            ServerSettings.WriteMonsterEnabled(msg);

-            if (campaign == null)
+            if (GameMain.GameSession?.GameMode is not MultiPlayerCampaign campaign)
            {
                msg.WriteString(levelSeed);
                msg.WriteSingle(ServerSettings.SelectedLevelDifficulty);
@@ -2566,6 +2581,23 @@ namespace Barotrauma.Networking
            serverPeer.Send(msg, client.Connection, DeliveryMethod.Reliable);
        }

+        private bool TrySendCampaignSetupInfo(Client client)
+        {
+            if (!CampaignMode.AllowedToManageCampaign(client, ClientPermissions.ManageRound)) { return false; }
+
+            const int MaxSaves = 255;
+            var saveInfos = SaveUtil.GetSaveFiles(SaveUtil.SaveType.Multiplayer, includeInCompatible: false);
+            IWriteMessage msg = new WriteOnlyMessage();
+            msg.WriteByte((byte)ServerPacketHeader.CAMPAIGN_SETUP_INFO);
+            msg.WriteByte((byte)Math.Min(saveInfos.Count, MaxSaves));
+            for (int i = 0; i < saveInfos.Count && i < MaxSaves; i++)
+            {
+                msg.WriteNetSerializableStruct(saveInfos[i]);
+            }
+            serverPeer.Send(msg, client.Connection, DeliveryMethod.Reliable);
+            return true;
+        }
+
        private bool IsUsingRespawnShuttle()
        {
           return ServerSettings.UseRespawnShuttle || (GameStarted && RespawnManager != null && RespawnManager.UsingShuttle);
@@ -3196,16 +3228,16 @@ namespace Barotrauma.Networking
                            }

                            //too far to hear the msg -> don't send
-                            if (string.IsNullOrWhiteSpace(modifiedMessage)) continue;
+                            if (string.IsNullOrWhiteSpace(modifiedMessage)) { continue; }
                        }
                        break;
                    case ChatMessageType.Dead:
                        //character still alive -> don't send
-                        if (client != senderClient && client.Character != null && !client.Character.IsDead) continue;
+                        if (client != senderClient && client.Character != null && !client.Character.IsDead) { continue; }
                        break;
                    case ChatMessageType.Private:
                        //private msg sent to someone else than this client -> don't send
-                        if (client != targetClient && client != senderClient) continue;
+                        if (client != targetClient && client != senderClient) { continue; }
                        break;
                }

@@ -3241,11 +3273,17 @@ namespace Barotrauma.Networking
                    //too far to hear the msg -> don't send
                    if (!client.Character.CanHearCharacter(message.Sender)) { continue; }
                }
-                SendDirectChatMessage(new OrderChatMessage(message.Order, message.TargetCharacter, message.Sender, isNewOrder: message.IsNewOrder), client);
+                SendDirectChatMessage(new OrderChatMessage(message.Order, message.Text, message.TargetCharacter, message.Sender, isNewOrder: message.IsNewOrder), client);
            }
            if (!string.IsNullOrWhiteSpace(message.Text))
            {
-                AddChatMessage(new OrderChatMessage(message.Order, message.TargetCharacter, message.Sender, isNewOrder: message.IsNewOrder));
+                AddChatMessage(new OrderChatMessage(message.Order, message.Text, message.TargetCharacter, message.Sender, isNewOrder: message.IsNewOrder));
+                if (ChatMessage.CanUseRadio(message.Sender, out var senderRadio))
+                {
+                    //send to chat-linked wifi components
+                    Signal s = new Signal(message.Text, sender: message.Sender, source: senderRadio.Item);
+                    senderRadio.TransmitSignal(s, sentFromChat: true);
+                }
            }
        }

@@ -3521,9 +3559,7 @@ namespace Barotrauma.Networking
            //the client's previous character is no longer a remote player
            if (client.Character != null)
            {
-                client.Character.IsRemotePlayer = false;
-                client.Character.OwnerClientAddress = null;
-                client.Character.OwnerClientName = null;
+                client.Character.SetOwnerClient(null);
            }

            if (newCharacter == null)
@@ -3549,9 +3585,7 @@ namespace Barotrauma.Networking
                    newCharacter.Info.Character = newCharacter;
                }

-                newCharacter.OwnerClientAddress = client.Connection.Endpoint.Address;
-                newCharacter.OwnerClientName = client.Name;
-                newCharacter.IsRemotePlayer = true;
+                newCharacter.SetOwnerClient(client);
                newCharacter.Enabled = true;
                client.Character = newCharacter;
                CreateEntityEvent(newCharacter, new Character.ControlEventData(client));