Unstable 0.17.7.0

2022-04-08 00:34:17 +09:00
parent 95764d1fa8
commit 164d72ae3a
82 changed files with 852 additions and 385 deletions
@@ -106,6 +106,7 @@ namespace Barotrauma
            GameModePreset.Init();

            ContentPackageManager.Init().Consume();
+            ContentPackageManager.LogEnabledRegularPackageErrors();

            SubmarineInfo.RefreshSavedSubs();

@@ -917,18 +917,17 @@ namespace Barotrauma
                    TransferMoney(wallet);
                    break;
                case None<ushort> _:
-                    if (!AllowedToManageCampaign(sender, ClientPermissions.ManageMoney)) 
+                    if (!AllowedToManageCampaign(sender, ClientPermissions.ManageMoney))
                    {
                        if (transfer.Receiver is Some<ushort> { Value: var receiverId } && receiverId == sender.CharacterID)
                        {
                            GameMain.Server?.Voting.StartTransferVote(sender, null, transfer.Amount, sender);
+                            GameServer.Log($"{sender.Name} started a vote to transfer {transfer.Amount} mk from the bank.", ServerLog.MessageType.Money);
                        }
-                        return; 
-                    }
-                    else
-                    {
-                        TransferMoney(Bank);
+                        return;
                    }
+
+                    TransferMoney(Bank);
                    break;
            }

@@ -943,9 +942,11 @@ namespace Barotrauma
                        if (wallet is InvalidWallet) { return; }

                        wallet.Give(transfer.Amount);
+                        GameServer.Log($"{sender.Name} transferred {transfer.Amount} mk to {wallet.GetOwnerLogName()} from {from.GetOwnerLogName()}.", ServerLog.MessageType.Money);
                        break;
                    case None<ushort> _:
                        Bank.Give(transfer.Amount);
+                        GameServer.Log($"{sender.Name} transferred {transfer.Amount} mk to {Bank.GetOwnerLogName()} from {from.GetOwnerLogName()}.", ServerLog.MessageType.Money);
                        break;
                }
            }
@@ -965,6 +966,7 @@ namespace Barotrauma

            Character targetCharacter = Character.CharacterList.FirstOrDefault(c => c.ID == update.Target);
            targetCharacter?.Wallet.SetRewardDistribution(update.NewRewardDistribution);
+            GameServer.Log($"{sender.Name} changed the salary of {targetCharacter?.Name ?? "the bank"} to {update.NewRewardDistribution}%.", ServerLog.MessageType.Money);
        }

        public void ServerReadCrew(IReadMessage msg, Client sender)
@@ -46,7 +46,7 @@ namespace Barotrauma.Networking
                    {
                        //setting a wait timer means that network conditions
                        //aren't ideal, slow down the packet rate
-                        PacketsPerUpdate = Math.Max(PacketsPerUpdate / 2.0f, 1.0f);
+                        PacketsPerUpdate = Math.Max(PacketsPerUpdate / 4.0f, 1.0f);
                    }
                    waitTimer = value;
                }
@@ -130,7 +130,7 @@ namespace Barotrauma.Networking
        public FileSender(ServerPeer serverPeer, int mtu)
        {
            peer = serverPeer;
-            chunkLen = mtu - 100;
+            chunkLen = mtu - 200;

            activeTransfers = new List<FileTransferOut>();
        }
@@ -197,11 +197,8 @@ namespace Barotrauma.Networking
            foreach (FileTransferOut transfer in activeTransfers)
            {
                transfer.WaitTimer -= deltaTime;
-                for (int i = 0; i < 10; i++)
-                {
-                    if (transfer.WaitTimer > 0.0f) { break; }
-                    Send(transfer);
-                }
+                if (transfer.WaitTimer > 0.0f) { continue; }
+                Send(transfer);
            }

            if (numRemoved > 0 || endedTransfers.Count > 0)
@@ -281,7 +278,7 @@ namespace Barotrauma.Networking
                    if (transfer.SentOffset >= transfer.Data.Length)
                    {
                        transfer.SentOffset = transfer.KnownReceivedOffset;
-                        transfer.WaitTimer = 0.5f;
+                        transfer.WaitTimer = 1.0f;
                    }

                    peer.Send(message, transfer.Connection, DeliveryMethod.Unreliable, compressPastThreshold: false);
@@ -356,7 +353,7 @@ namespace Barotrauma.Networking
                        matchingTransfer.SentOffset >= matchingTransfer.Data.Length)
                    {
                        matchingTransfer.SentOffset = matchingTransfer.KnownReceivedOffset;
-                        matchingTransfer.WaitTimer = 0.5f;
+                        matchingTransfer.WaitTimer = 1.0f;
                    }

                    if (matchingTransfer.KnownReceivedOffset >= matchingTransfer.Data.Length)
@@ -364,6 +361,7 @@ namespace Barotrauma.Networking
                        matchingTransfer.Status = FileTransferStatus.Finished;
                    }
                }
+                return;
            }

            FileTransferType fileType = (FileTransferType)inc.ReadByte();
@@ -91,13 +91,16 @@ namespace Barotrauma

        private void StartSubmarineVote(SubmarineInfo subInfo, VoteType voteType, Client sender)
        {
+            if (ActiveVote == null)
+            {
+                sender.SetVote(voteType, 2);
+            }
            var subVote = new SubmarineVote(
                sender,
                subInfo,
                voteType == VoteType.SwitchSub ? GameMain.GameSession.Map.DistanceToClosestLocationWithOutpost(GameMain.GameSession.Map.CurrentLocation, out Location endLocation) : 0,
                voteType);
            StartOrEnqueueVote(subVote);
-            sender.SetVote(voteType, 2);
            GameMain.Server.UpdateVoteStatus(checkActiveVote: false);
        }

@@ -127,13 +130,17 @@ namespace Barotrauma
            if (pendingVotes.Any())
            {
                ActiveVote = pendingVotes.Dequeue();
+                ActiveVote.VoteStarter?.SetVote(ActiveVote.VoteType, 2);
            }
        }

        public void StartTransferVote(Client starter, Client from, int transferAmount, Client to)
        {
+            if (ActiveVote == null)
+            {
+                starter.SetVote(VoteType.TransferMoney, 2);
+            }
            StartOrEnqueueVote(new TransferVote(starter, from, transferAmount, to));
-            starter.SetVote(VoteType.TransferMoney, 2);
            GameMain.Server.UpdateVoteStatus(checkActiveVote: false);
        }