Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-03-13 13:32:14 -03:00
parent 3fe775405c b5ecaf0194
commit 4a229c6427
335 changed files with 11052 additions and 5179 deletions
@@ -140,8 +140,7 @@ namespace Barotrauma.Networking
                return Option<BannedPlayer>.Some(new BannedPlayer(name, addressOrAccountId, reason, expirationTime));
            }
            
-            bannedPlayers.AddRange(doc.Root.Elements().Select(loadFromElement)
-                .OfType<Some<BannedPlayer>>().Select(o => o.Value));
+            bannedPlayers.AddRange(doc.Root.Elements().Select(loadFromElement).NotNone());
        }
        
        private void RemoveExpired()
@@ -1129,6 +1129,7 @@ namespace Barotrauma.Networking
                {
                    //check if midround syncing is needed due to missed unique events
                    if (!midroundSyncingDone) { entityEventManager.InitClientMidRoundSync(c); }
+                    MissionAction.NotifyMissionsUnlockedThisRound(c);
                    c.InGame = true;
                }
            }
@@ -2388,10 +2389,7 @@ namespace Barotrauma.Networking

                List<WayPoint> spawnWaypoints = null;
                List<WayPoint> mainSubWaypoints = WayPoint.SelectCrewSpawnPoints(characterInfos, Submarine.MainSubs[n]).ToList();
-                if (Level.Loaded?.StartOutpost != null &&
-                    Level.Loaded.Type == LevelData.LevelType.Outpost &&
-                    (Level.Loaded.StartOutpost.Info.OutpostGenerationParams?.SpawnCrewInsideOutpost ?? false) &&
-                    Level.Loaded.StartOutpost.GetConnectedSubs().Any(s => s.Info.Type == SubmarineType.Player))
+                if (Level.Loaded != null && Level.Loaded.ShouldSpawnCrewInsideOutpost())
                {
                    spawnWaypoints = WayPoint.WayPointList.FindAll(wp =>
                        wp.SpawnType == SpawnType.Human &&
@@ -2466,7 +2464,6 @@ namespace Barotrauma.Networking
                    spawnedCharacter.Info.InventoryData = new XElement("inventory");
                    spawnedCharacter.Info.StartItemsGiven = true;
                    spawnedCharacter.SaveInventory();
-                    // talents are only avilable for players in online sessions, but modders or someone else might want to have them loaded anyway
                    spawnedCharacter.LoadTalents();
                }
            }
@@ -3023,7 +3020,7 @@ namespace Barotrauma.Networking
            client.WaitForNextRoundRespawn = null;
            client.InGame = false;

-            if (client.AccountId is Some<AccountId> { Value: SteamId steamId }) { SteamManager.StopAuthSession(steamId); }
+            if (client.AccountId.TryUnwrap<SteamId>(out var steamId)) { SteamManager.StopAuthSession(steamId); }

            var previousPlayer = previousPlayers.Find(p => p.MatchesClient(client));
            if (previousPlayer == null)
@@ -3366,12 +3363,13 @@ namespace Barotrauma.Networking

            if (checkActiveVote && Voting.ActiveVote != null)
            {
+#warning TODO: this is mostly the same as Voting.Update, deduplicate (if/when refactoring the Voting class?)
                var inGameClients = GameMain.Server.ConnectedClients.Where(c => c.InGame);
-                if (inGameClients.Count() == 1)
+                if (inGameClients.Count() == 1 && inGameClients.First() == Voting.ActiveVote.VoteStarter)
                {
                    Voting.ActiveVote.Finish(Voting, passed: true);
                }
-                else
+                else if (inGameClients.Any())
                {
                    var eligibleClients = inGameClients.Where(c => c != Voting.ActiveVote.VoteStarter);
                    int yes = eligibleClients.Count(c => c.GetVote<int>(Voting.ActiveVote.VoteType) == 2);
@@ -3441,12 +3439,11 @@ namespace Barotrauma.Networking

        public void SwitchSubmarine()
        {
-            if (!(Voting.ActiveVote is Voting.SubmarineVote subVote)) { return; }
+            if (Voting.ActiveVote is not Voting.SubmarineVote subVote) { return; }

            SubmarineInfo targetSubmarine = subVote.Sub;
            VoteType voteType = Voting.ActiveVote.VoteType;
            Client starter = Voting.ActiveVote.VoteStarter;
-            int deliveryFee = 0;

            switch (voteType)
            {
@@ -3456,7 +3453,6 @@ namespace Barotrauma.Networking
                    GameMain.GameSession.PurchaseSubmarine(targetSubmarine, starter);
                    break;
                case VoteType.SwitchSub:
-                    deliveryFee = subVote.DeliveryFee;
                    break;
                default:
                    return;
@@ -3464,7 +3460,7 @@ namespace Barotrauma.Networking

            if (voteType != VoteType.PurchaseSub)
            {
-                GameMain.GameSession.SwitchSubmarine(targetSubmarine, subVote.TransferItems, deliveryFee, starter);
+                GameMain.GameSession.SwitchSubmarine(targetSubmarine, subVote.TransferItems, starter);
            }

            Voting.StopSubmarineVote(true);
@@ -4030,8 +4026,7 @@ namespace Barotrauma.Networking
        }

        public void Quit()
-        {
-            
+        {            
            if (started)
            {
                started = false;
@@ -4043,7 +4038,7 @@ namespace Barotrauma.Networking

                ServerSettings.SaveSettings();

-                ModSender.Dispose();
+                ModSender?.Dispose();
                
                if (ServerSettings.SaveServerLogs)
                {
@@ -158,7 +158,7 @@ namespace Barotrauma
                else if (client.Karma < 40.0f)
                    herpesStrength = 30.0f;
                
-                var existingAffliction = client.Character.CharacterHealth.GetAffliction<AfflictionSpaceHerpes>("spaceherpes");
+                var existingAffliction = client.Character.CharacterHealth.GetAffliction<AfflictionSpaceHerpes>(AfflictionPrefab.SpaceHerpesType);
                if (existingAffliction == null && herpesStrength > 0.0f)
                {
                    client.Character.CharacterHealth.ApplyAffliction(null, new Affliction(herpesAffliction, herpesStrength));
@@ -170,7 +170,7 @@ namespace Barotrauma
                    existingAffliction.Strength = herpesStrength;
                    if (herpesStrength <= 0.0f)
                    {
-                        client.Character.CharacterHealth.ReduceAfflictionOnAllLimbs("invertcontrols".ToIdentifier(), 100.0f);
+                        client.Character.CharacterHealth.ReduceAfflictionOnAllLimbs(AfflictionPrefab.InvertControlsType, 100.0f);
                    }
                }

@@ -358,8 +358,8 @@ namespace Barotrauma
                }
            }

-            bool targetIsHusk = target.CharacterHealth?.GetAffliction<AfflictionHusk>("huskinfection")?.State == AfflictionHusk.InfectionState.Active;
-            bool attackerIsHusk = attacker.CharacterHealth?.GetAffliction<AfflictionHusk>("huskinfection")?.State == AfflictionHusk.InfectionState.Active;
+            bool targetIsHusk = target.CharacterHealth?.GetAffliction<AfflictionHusk>(AfflictionPrefab.HuskInfectionType)?.State == AfflictionHusk.InfectionState.Active;
+            bool attackerIsHusk = attacker.CharacterHealth?.GetAffliction<AfflictionHusk>(AfflictionPrefab.HuskInfectionType)?.State == AfflictionHusk.InfectionState.Active;
            //huskified characters count as enemies to healthy characters and vice versa
            if (targetIsHusk != attackerIsHusk) { isEnemy = true; }

@@ -614,7 +614,7 @@ namespace Barotrauma

            if (amount < 0.0f)
            {
-                float? herpesStrength = client.Character?.CharacterHealth.GetAfflictionStrength("spaceherpes");
+                float? herpesStrength = client.Character?.CharacterHealth.GetAfflictionStrength(AfflictionPrefab.SpaceHerpesType);
                var clientMemory = GetClientMemory(client);
                clientMemory.KarmaDecreasesInPastMinute.RemoveAll(ta => ta.Time + 60.0f < Timing.TotalTime);
                float aggregate = clientMemory.KarmaDecreasesInPastMinute.Select(ta => ta.Amount).DefaultIfEmpty().Aggregate((a, b) => a + b);
@@ -308,7 +308,7 @@ namespace Barotrauma.Networking
        {
            if (netServer == null) { return; }

-            PendingClient? pendingClient = pendingClients.Find(c => c.AccountInfo.AccountId is Some<AccountId> { Value: SteamId id } && id.Value == steamId);
+            PendingClient? pendingClient = pendingClients.Find(c => c.AccountInfo.AccountId.TryUnwrap<SteamId>(out var id) && id.Value == steamId);
            DebugConsole.Log($"{steamId} validation: {status}, {(pendingClient != null)}");

            if (pendingClient is null)
@@ -316,7 +316,7 @@ namespace Barotrauma.Networking
                if (status == Steamworks.AuthResponse.OK) { return; }

                if (connectedClients.Find(c
-                        => c.AccountInfo.AccountId is Some<AccountId> { Value: SteamId id } && id.Value == steamId)
+                        => c.AccountInfo.AccountId.TryUnwrap<SteamId>(out var id) && id.Value == steamId)
                    is LidgrenConnection connection)
                {
                    Disconnect(connection,  PeerDisconnectPacket.SteamAuthError(status));
@@ -390,7 +390,7 @@ namespace Barotrauma.Networking
                lidgrenConn.Status = NetworkConnectionStatus.Disconnected;
                connectedClients.Remove(lidgrenConn);
                callbacks.OnDisconnect.Invoke(conn, peerDisconnectPacket);
-                if (conn.AccountInfo.AccountId is Some<AccountId> { Value: SteamId steamId }) { SteamManager.StopAuthSession(steamId); }
+                if (conn.AccountInfo.AccountId.TryUnwrap<SteamId>(out var steamId)) { SteamManager.StopAuthSession(steamId); }
            }

            lidgrenConn.NetConnection.Disconnect(peerDisconnectPacket.ToLidgrenStringRepresentation());
@@ -71,7 +71,7 @@ namespace Barotrauma.Networking
        protected List<NetworkConnection> connectedClients = null!;
        protected List<PendingClient> pendingClients = null!;
        protected ServerSettings serverSettings = null!;
-        protected Option<int> ownerKey = null!;
+        protected Option<int> ownerKey = Option.None;
        protected NetworkConnection? OwnerConnection;

        protected void ReadConnectionInitializationStep(PendingClient pendingClient, IReadMessage inc, ConnectionInitialization initializationStep)
@@ -295,7 +295,7 @@ namespace Barotrauma.Networking

                pendingClients.Remove(pendingClient);

-                if (pendingClient.AuthSessionStarted && pendingClient.AccountInfo.AccountId is Some<AccountId> { Value: SteamId steamId })
+                if (pendingClient.AuthSessionStarted && pendingClient.AccountInfo.AccountId.TryUnwrap<SteamId>(out var steamId))
                {
                    Steam.SteamManager.StopAuthSession(steamId);
                    pendingClient.Connection.SetAccountInfo(AccountInfo.None);
@@ -239,7 +239,10 @@ namespace Barotrauma.Networking

            foreach (Door door in shuttleDoors)
            {
-                if (door.IsOpen) door.TrySetState(false, false, true);
+                if (door.IsOpen)
+                {
+                    door.TrySetState(open: false, isNetworkMessage: false, sendNetworkMessage: true);
+                }
            }

            var shuttleGaps = Gap.GapList.FindAll(g => g.Submarine == RespawnShuttle && g.ConnectedWall != null);
@@ -51,7 +51,7 @@ namespace Barotrauma.Networking
            => LastUpdateIdForFlag.Keys
                .Where(k => IsFlagRequired(c, k))
                .Aggregate(NetFlags.None, (f1, f2) => f1 | f2);
-        
+
        partial void InitProjSpecific()
        {
            LoadSettings();
@@ -176,7 +176,11 @@ namespace Barotrauma.Networking
                        netProperties[key].Read(incMsg);
                        if (!netProperties[key].PropEquals(prevValue, netProperties[key]))
                        {
-                            GameServer.Log(GameServer.ClientLogName(c) + " changed " + netProperties[key].Name + " to " + netProperties[key].Value.ToString(), ServerLog.MessageType.ServerMessage);
+                            GameServer.Log(
+                                NetworkMember.ClientLogName(c)
+                                + $" changed {netProperties[key].Name}"
+                                + $" to {netProperties[key].Value}",
+                                ServerLog.MessageType.ServerMessage);
                        }
                        propertiesChanged = true;
                    }
@@ -330,6 +334,10 @@ namespace Barotrauma.Networking
            {
                LosMode = GameSettings.CurrentConfig.Graphics.LosMode;
            }
+            if (string.IsNullOrEmpty(doc.Root.GetAttributeString("language", "")))
+            {
+                Language = ServerLanguageOptions.PickLanguage(GameSettings.CurrentConfig.Language);
+            }

            AutoRestart = doc.Root.GetAttributeBool("autorestart", false);
                        
@@ -28,13 +28,11 @@ namespace Barotrauma

            public SubmarineInfo Sub;
            public bool TransferItems;
-            public int DeliveryFee;

-            public SubmarineVote(Client starter, SubmarineInfo subInfo, bool transferItems, int deliveryFee, VoteType voteType)
+            public SubmarineVote(Client starter, SubmarineInfo subInfo, bool transferItems, VoteType voteType)
            {
                Sub = subInfo;
                TransferItems = transferItems;
-                DeliveryFee = deliveryFee;
                VoteType = voteType;
                State = VoteState.Started;
                VoteStarter = starter;
@@ -81,10 +79,10 @@ namespace Barotrauma
                if (passed)
                {
                    Wallet fromWallet = From == null ? (GameMain.GameSession.GameMode as MultiPlayerCampaign)?.Bank : From.Character?.Wallet;
-                    if (fromWallet.TryDeduct(TransferAmount))
+                    if (fromWallet != null && fromWallet.TryDeduct(TransferAmount))
                    {
                        Wallet toWallet = To == null ? (GameMain.GameSession.GameMode as MultiPlayerCampaign)?.Bank : To.Character?.Wallet;
-                        toWallet.Give(TransferAmount);
+                        toWallet?.Give(TransferAmount);
                    }
                }
                else
@@ -109,7 +107,6 @@ namespace Barotrauma
                sender,
                subInfo,
                transferItems,
-                voteType == VoteType.SwitchSub ? GameMain.GameSession.Map.DistanceToClosestLocationWithOutpost(GameMain.GameSession.Map.CurrentLocation, out Location endLocation) : 0,
                voteType);
            StartOrEnqueueVote(subVote);
            GameMain.Server.UpdateVoteStatus(checkActiveVote: false);
@@ -206,12 +203,16 @@ namespace Barotrauma
                // Do not take unanswered into account for total
                int yes = eligibleClients.Count(c => c.GetVote<int>(ActiveVote.VoteType) == 2);
                int no = eligibleClients.Count(c => c.GetVote<int>(ActiveVote.VoteType) == 1);
-                int total = Math.Max(yes + no, 1);
-
-                bool passed = 
-                    yes / (float)total >= GameMain.NetworkMember.ServerSettings.VoteRequiredRatio || 
-                    inGameClients.Count() == 1; 
+                int total = yes + no;

+                bool passed = false;
+                //total can be zero if the client who initiated the vote has left
+                if (total > 0)
+                {
+                    passed = 
+                        yes / (float)total >= GameMain.NetworkMember.ServerSettings.VoteRequiredRatio ||
+                        inGameClients.Count() == 1;
+                }
                ActiveVote.Finish(this, passed);
            }
        }
@@ -436,7 +437,6 @@ namespace Barotrauma
                                    var subVote = ActiveVote as SubmarineVote;
                                    msg.WriteString(subVote.Sub.Name);
                                    msg.WriteBoolean(subVote.TransferItems);
-                                    msg.WriteInt16((short)subVote.DeliveryFee);
                                    break;
                            }
                            break;