v0.19.0.0 (unstable)

2022-07-20 18:47:07 +03:00
parent 2e2663a175
commit 6b55adcdd9
170 changed files with 2769 additions and 1634 deletions
@@ -62,6 +62,8 @@ namespace Barotrauma.Networking

        public float DeleteDisconnectedTimer;

+        public DateTime JoinTime;
+
        private CharacterInfo characterInfo;
        public CharacterInfo CharacterInfo
        {
@@ -114,6 +116,8 @@ namespace Barotrauma.Networking

            //initialize to infinity, gets set to a proper value when initializing midround syncing
            MidRoundSyncTimeOut = double.PositiveInfinity;
+
+            JoinTime = DateTime.Now;
        }

        partial void DisposeProjSpecific()
@@ -2081,7 +2081,7 @@ namespace Barotrauma.Networking
                float waitForResponseTimer = 5.0f;
                while (connectedClients.Any(c => !c.ReadyToStart) && waitForResponseTimer > 0.0f)
                {
-                    waitForResponseTimer -= CoroutineManager.UnscaledDeltaTime;
+                    waitForResponseTimer -= CoroutineManager.DeltaTime;
                    yield return CoroutineStatus.Running;
                }

@@ -2090,7 +2090,7 @@ namespace Barotrauma.Networking
                    float waitForTransfersTimer = 20.0f;
                    while (FileSender.ActiveTransfers.Count > 0 && waitForTransfersTimer > 0.0f)
                    {
-                        waitForTransfersTimer -= CoroutineManager.UnscaledDeltaTime;
+                        waitForTransfersTimer -= CoroutineManager.DeltaTime;
                        yield return CoroutineStatus.Running;
                    }
                }
@@ -3278,7 +3278,8 @@ namespace Barotrauma.Networking

            Client.UpdateKickVotes(connectedClients);

-            int minimumKickVotes = Math.Max(1, (int)(connectedClients.Count * serverSettings.KickVoteRequiredRatio));
+            var kickVoteEligibleClients = connectedClients.Where(c => (DateTime.Now - c.JoinTime).TotalSeconds > ServerSettings.DisallowKickVoteTime);
+            int minimumKickVotes = Math.Max(2, (int)(kickVoteEligibleClients.Count() * serverSettings.KickVoteRequiredRatio));
            var clientsToKick = connectedClients.FindAll(c =>
                c.Connection != OwnerConnection &&
                !c.HasPermission(ClientPermissions.Kick) &&
@@ -3581,14 +3582,14 @@ namespace Barotrauma.Networking

            List<JobVariant> jobPreferences = new List<JobVariant>();
            int count = message.ReadByte();
-            // TODO: modding support?
            for (int i = 0; i < Math.Min(count, 3); i++)
            {
                string jobIdentifier = message.ReadString();
                int variant = message.ReadByte();
-                if (JobPrefab.Prefabs.ContainsKey(jobIdentifier))
+                if (JobPrefab.Prefabs.TryGet(jobIdentifier, out JobPrefab jobPrefab))
                {
-                    jobPreferences.Add(new JobVariant(JobPrefab.Prefabs[jobIdentifier], variant));
+                    if (jobPrefab.HiddenJob) { continue; }
+                    jobPreferences.Add(new JobVariant(jobPrefab, variant));
                }
            }

@@ -188,9 +188,9 @@ namespace Barotrauma
                    }
                }                
                
-                if (client.Character?.Info?.Job.Prefab.Identifier == "captain" && client.Character.SelectedConstruction != null)
+                if (client.Character?.Info?.Job.Prefab.Identifier == "captain" && client.Character.SelectedItem != null)
                {
-                    if (client.Character.SelectedConstruction.GetComponent<Steering>() != null)
+                    if (client.Character.SelectedItem.GetComponent<Steering>() != null)
                    {
                        AdjustKarma(client.Character, SteerSubKarmaIncrease * deltaTime, "Steering the sub");
                    }
@@ -125,7 +125,7 @@ namespace Barotrauma.Networking
            return characterToRespawnCount >= GetMinCharactersToRespawn();
        }

-        partial void UpdateWaiting(float deltaTime)
+        partial void UpdateWaiting(float _)
        {
            if (RespawnShuttle != null)
            {
@@ -487,6 +487,20 @@ namespace Barotrauma.Networking
                    {
                        AutoItemPlacer.RegenerateLoot(RespawnShuttle, respawnContainer);
                    }
+
+                    //try to put the items in containers in the shuttle
+                    foreach (var respawnItem in respawnItems)
+                    {
+                        foreach (Item shuttleItem in RespawnShuttle.GetItems(alsoFromConnectedSubs: false))
+                        {
+                            if (shuttleItem.NonInteractable || shuttleItem.NonPlayerTeamInteractable) { continue; }
+                            var container = shuttleItem.GetComponent<ItemContainer>();
+                            if (container != null && container.Inventory.TryPutItem(respawnItem, user: null))
+                            {
+                                break;
+                            }
+                        }
+                    }
                }

                var characterData = campaign?.GetClientCharacterData(clients[i]);
@@ -254,15 +254,21 @@ namespace Barotrauma
                    break;
                case VoteType.Kick:
                    byte kickedClientID = inc.ReadByte();
-
-                    Client kicked = GameMain.Server.ConnectedClients.Find(c => c.ID == kickedClientID);
-                    if (kicked != null && kicked.Connection != GameMain.Server.OwnerConnection && !kicked.HasKickVoteFrom(sender))
+                    if ((DateTime.Now - sender.JoinTime).TotalSeconds > GameMain.Server.ServerSettings.DisallowKickVoteTime)
                    {
-                        kicked.AddKickVote(sender);
-                        Client.UpdateKickVotes(GameMain.Server.ConnectedClients);
-                        GameMain.Server.SendChatMessage($"ServerMessage.HasVotedToKick~[initiator]={sender.Name}~[target]={kicked.Name}", ChatMessageType.Server, null);
-                    }
+                        GameMain.Server.SendDirectChatMessage($"ServerMessage.kickvotedisallowed", sender);

+                    }
+                    else
+                    {
+                        Client kicked = GameMain.Server.ConnectedClients.Find(c => c.ID == kickedClientID);
+                        if (kicked != null && kicked.Connection != GameMain.Server.OwnerConnection && !kicked.HasKickVoteFrom(sender))
+                        {
+                            kicked.AddKickVote(sender);
+                            Client.UpdateKickVotes(GameMain.Server.ConnectedClients);
+                            GameMain.Server.SendChatMessage($"ServerMessage.HasVotedToKick~[initiator]={sender.Name}~[target]={kicked.Name}", ChatMessageType.Server, null);
+                        }
+                    }
                    break;
                case VoteType.StartRound:
                    bool ready = inc.ReadBoolean();