Unstable 0.17.5.0

2022-03-30 01:20:59 +09:00
parent c1b8e5a341
commit 44ded0225a
88 changed files with 2033 additions and 1430 deletions
@@ -22,7 +22,7 @@ namespace Barotrauma
        private GUIButton clearAllButton;

        private List<CharacterInfo> PendingHires => campaign.Map?.CurrentLocation?.HireManager?.PendingHires;
-        private bool HasPermission => campaignUI.Campaign.AllowedToManageCampaign();
+        private bool HasPermission => campaignUI.Campaign.AllowedToManageCampaign(ClientPermissions.ManageHires);

        private Point resolutionWhenCreated;

@@ -433,7 +433,7 @@ namespace Barotrauma
                    else if (!btn.Enabled)
                    {
                        btn.ToolTip = string.Empty;
-                        btn.Enabled = true;
+                        btn.Enabled = HasPermission;
                    }
                };

@@ -632,7 +632,7 @@ namespace Barotrauma
            totalBlock.Text = TextManager.FormatCurrency(total);
            bool enoughMoney = campaign == null || campaign.Wallet.CanAfford(total);
            totalBlock.TextColor = enoughMoney ? Color.White : Color.Red;
-            validateHiresButton.Enabled = enoughMoney && pendingList.Content.RectTransform.Children.Any();
+            validateHiresButton.Enabled = enoughMoney && HasPermission && pendingList.Content.RectTransform.Children.Any();
        }

        public bool ValidateHires(List<CharacterInfo> hires, bool createNetworkEvent = false)
@@ -316,26 +316,27 @@ namespace Barotrauma

                if (GameMain.ShowPerf)
                {
+                    int x = 400;
                    int y = 10;
-                    DrawString(spriteBatch, new Vector2(300, y),
+                    DrawString(spriteBatch, new Vector2(x, y),
                        "Draw - Avg: " + GameMain.PerformanceCounter.DrawTimeGraph.Average().ToString("0.00") + " ms" +
                        " Max: " + GameMain.PerformanceCounter.DrawTimeGraph.LargestValue().ToString("0.00") + " ms",
                        GUIStyle.Green, Color.Black * 0.8f, font: GUIStyle.SmallFont);
                        y += 15;
-                    GameMain.PerformanceCounter.DrawTimeGraph.Draw(spriteBatch, new Rectangle(300, y, 170, 50), color: GUIStyle.Green);
+                    GameMain.PerformanceCounter.DrawTimeGraph.Draw(spriteBatch, new Rectangle(x, y, 170, 50), color: GUIStyle.Green);
                    y += 50;

-                    DrawString(spriteBatch, new Vector2(300, y),
+                    DrawString(spriteBatch, new Vector2(x, y),
                        "Update - Avg: " + GameMain.PerformanceCounter.UpdateTimeGraph.Average().ToString("0.00") + " ms" +
                        " Max: " + GameMain.PerformanceCounter.UpdateTimeGraph.LargestValue().ToString("0.00") + " ms",
                        Color.LightBlue, Color.Black * 0.8f, font: GUIStyle.SmallFont);
                    y += 15;
-                    GameMain.PerformanceCounter.UpdateTimeGraph.Draw(spriteBatch, new Rectangle(300, y, 170, 50), color: Color.LightBlue);
+                    GameMain.PerformanceCounter.UpdateTimeGraph.Draw(spriteBatch, new Rectangle(x, y, 170, 50), color: Color.LightBlue);
                    y += 50;
                    foreach (string key in GameMain.PerformanceCounter.GetSavedIdentifiers)
                    {
                        float elapsedMillisecs = GameMain.PerformanceCounter.GetAverageElapsedMillisecs(key);
-                        DrawString(spriteBatch, new Vector2(300, y),
+                        DrawString(spriteBatch, new Vector2(x, y),
                            key + ": " + elapsedMillisecs.ToString("0.00"),
                            Color.Lerp(Color.LightGreen, GUIStyle.Red, elapsedMillisecs / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
                        y += 15;
@@ -351,18 +352,19 @@ namespace Barotrauma

                    if (Powered.Grids != null)
                    {
-                        DrawString(spriteBatch, new Vector2(300, y), "Grids: " + Powered.Grids.Count, Color.LightGreen, Color.Black * 0.5f, 0, GUIStyle.SmallFont);
+                        DrawString(spriteBatch, new Vector2(x, y), "Grids: " + Powered.Grids.Count, Color.LightGreen, Color.Black * 0.5f, 0, GUIStyle.SmallFont);
                        y += 15;
                    }

                    if (Settings.EnableDiagnostics)
                    {
-                        DrawString(spriteBatch, new Vector2(320, y), "ContinuousPhysicsTime: " + GameMain.World.ContinuousPhysicsTime.TotalMilliseconds, Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)GameMain.World.ContinuousPhysicsTime.TotalMilliseconds / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
-                        DrawString(spriteBatch, new Vector2(320, y + 15), "ControllersUpdateTime: " + GameMain.World.ControllersUpdateTime.TotalMilliseconds, Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)GameMain.World.ControllersUpdateTime.TotalMilliseconds / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
-                        DrawString(spriteBatch, new Vector2(320, y + 30), "AddRemoveTime: " + GameMain.World.AddRemoveTime.TotalMilliseconds, Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)GameMain.World.AddRemoveTime.TotalMilliseconds / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
-                        DrawString(spriteBatch, new Vector2(320, y + 45), "NewContactsTime: " + GameMain.World.NewContactsTime.TotalMilliseconds, Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)GameMain.World.NewContactsTime.TotalMilliseconds / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
-                        DrawString(spriteBatch, new Vector2(320, y + 60), "ContactsUpdateTime: " + GameMain.World.ContactsUpdateTime.TotalMilliseconds, Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)GameMain.World.ContactsUpdateTime.TotalMilliseconds / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
-                        DrawString(spriteBatch, new Vector2(320, y + 75), "SolveUpdateTime: " + GameMain.World.SolveUpdateTime.TotalMilliseconds, Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)GameMain.World.SolveUpdateTime.TotalMilliseconds / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
+                        x += 20;
+                        DrawString(spriteBatch, new Vector2(x, y), "ContinuousPhysicsTime: " + GameMain.World.ContinuousPhysicsTime.TotalMilliseconds, Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)GameMain.World.ContinuousPhysicsTime.TotalMilliseconds / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
+                        DrawString(spriteBatch, new Vector2(x, y + 15), "ControllersUpdateTime: " + GameMain.World.ControllersUpdateTime.TotalMilliseconds, Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)GameMain.World.ControllersUpdateTime.TotalMilliseconds / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
+                        DrawString(spriteBatch, new Vector2(x, y + 30), "AddRemoveTime: " + GameMain.World.AddRemoveTime.TotalMilliseconds, Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)GameMain.World.AddRemoveTime.TotalMilliseconds / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
+                        DrawString(spriteBatch, new Vector2(x, y + 45), "NewContactsTime: " + GameMain.World.NewContactsTime.TotalMilliseconds, Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)GameMain.World.NewContactsTime.TotalMilliseconds / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
+                        DrawString(spriteBatch, new Vector2(x, y + 60), "ContactsUpdateTime: " + GameMain.World.ContactsUpdateTime.TotalMilliseconds, Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)GameMain.World.ContactsUpdateTime.TotalMilliseconds / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
+                        DrawString(spriteBatch, new Vector2(x, y + 75), "SolveUpdateTime: " + GameMain.World.SolveUpdateTime.TotalMilliseconds, Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)GameMain.World.SolveUpdateTime.TotalMilliseconds / 10.0f), Color.Black * 0.5f, 0, GUIStyle.SmallFont);
                    }
                }

@@ -534,7 +534,10 @@ namespace Barotrauma
                }
            }
            Vector2 finalBottomRight = characterPositions[endIndex];
-            finalBottomRight += Font.MeasureChar(Text[endIndex]) * TextBlock.TextScale;
+            if (Text.Length > endIndex)
+            {
+                finalBottomRight += Font.MeasureChar(Text[endIndex]) * TextBlock.TextScale;
+            }
            drawRect(topLeft, finalBottomRight);
        }

@@ -113,71 +113,40 @@ namespace Barotrauma

        #region Permissions

-        private bool hadPermissions, hadBuyPermissions, hadSellInventoryPermissions, hadSellSubPermissions;
+        private bool hadBuyPermissions, hadSellInventoryPermissions, hadSellSubPermissions;

-        private bool HasPermissions
-        {
-            get => GetPermissions();
-            set => hadPermissions = value;
-        }
        private bool HasBuyPermissions
        {
-            get => HasPermissions || GetPermissions(StoreTab.Buy);
+            get => HasPermissionToUseTab(StoreTab.Buy);
            set => hadBuyPermissions = value;
        }
        private bool HasSellInventoryPermissions
        {
-            get => HasPermissions || GetPermissions(StoreTab.Sell);
+            get => HasPermissionToUseTab(StoreTab.Sell);
            set => hadSellInventoryPermissions = value;
        }
        private bool HasSellSubPermissions
        {
-            get => HasPermissions || GetPermissions(StoreTab.SellSub);
+            get => HasPermissionToUseTab(StoreTab.SellSub);
            set => hadSellSubPermissions = value;
        }

-        private bool GetPermissions(StoreTab? tab = null)
+        private bool HasPermissionToUseTab(StoreTab tab)
        {
-            if (!tab.HasValue)
+            return tab switch
            {
-                return campaignUI.Campaign.AllowedToManageCampaign() || campaignUI.Campaign.AllowedToManageCampaign(Networking.ClientPermissions.CampaignStore);
-            }
-            else
-            {
-                return tab.Value switch
-                {
-                    StoreTab.Buy => campaignUI.Campaign.AllowedToManageCampaign(Networking.ClientPermissions.BuyItems),
-                    StoreTab.Sell => campaignUI.Campaign.AllowedToManageCampaign(Networking.ClientPermissions.SellInventoryItems),
-                    StoreTab.SellSub => campaignUI.Campaign.AllowedToManageCampaign(Networking.ClientPermissions.SellSubItems),
-                    _ => false,
-                };
-            }
+                StoreTab.Buy => true,
+                StoreTab.Sell => campaignUI.Campaign.AllowedToManageCampaign(Networking.ClientPermissions.SellInventoryItems),
+                StoreTab.SellSub => campaignUI.Campaign.AllowedToManageCampaign(Networking.ClientPermissions.SellSubItems),
+                _ => false,
+            };            
        }

-        private void UpdatePermissions(StoreTab? tab = null)
+        private void UpdatePermissions()
        {
-            HasPermissions = GetPermissions();
-            if (!tab.HasValue)
-            {
-                HasBuyPermissions = GetPermissions(StoreTab.Buy);
-                HasSellInventoryPermissions = GetPermissions(StoreTab.Sell);
-                HasSellSubPermissions = GetPermissions(StoreTab.SellSub);
-            }
-            else
-            {
-                switch (tab.Value)
-                {
-                    case StoreTab.Buy:
-                        HasBuyPermissions = GetPermissions(tab.Value);
-                        break;
-                    case StoreTab.Sell:
-                        HasSellInventoryPermissions = GetPermissions(tab.Value);
-                        break;
-                    case StoreTab.SellSub:
-                        HasSellSubPermissions = GetPermissions(tab.Value);
-                        break;
-                }
-            }
+            HasBuyPermissions = HasPermissionToUseTab(StoreTab.Buy);
+            HasSellInventoryPermissions = HasPermissionToUseTab(StoreTab.Sell);
+            HasSellSubPermissions = HasPermissionToUseTab(StoreTab.SellSub);        
        }

        private bool HasTabPermissions(StoreTab tab)
@@ -196,23 +165,16 @@ namespace Barotrauma
            return HasTabPermissions(activeTab);
        }

-        private bool HavePermissionsChanged(StoreTab? tab = null)
+        private bool HavePermissionsChanged(StoreTab tab)
        {
-            if (!tab.HasValue)
+            bool hadTabPermissions = tab switch
            {
-                return hadPermissions != HasPermissions;
-            }
-            else
-            {
-                bool hadTabPermissions = tab.Value switch
-                {
-                    StoreTab.Buy => hadBuyPermissions,
-                    StoreTab.Sell => hadSellInventoryPermissions,
-                    StoreTab.SellSub => hadSellSubPermissions,
-                    _ => false
-                };
-                return hadTabPermissions != HasTabPermissions(tab.Value);
-            }
+                StoreTab.Buy => hadBuyPermissions,
+                StoreTab.Sell => hadSellInventoryPermissions,
+                StoreTab.SellSub => hadSellSubPermissions,
+                _ => false
+            };
+            return hadTabPermissions != HasTabPermissions(tab);            
        }

        #endregion
@@ -2202,10 +2164,6 @@ namespace Barotrauma
            {
                RefreshItemsToSellFromSub();
            }
-            if (needsRefresh || HavePermissionsChanged())
-            {
-                Refresh(updateOwned: ownedItemsUpdateTimer > 0.0f);
-            }
            if (needsBuyingRefresh || HavePermissionsChanged(StoreTab.Buy))
            {
                RefreshBuying(updateOwned: ownedItemsUpdateTimer > 0.0f);
@@ -43,6 +43,7 @@ namespace Barotrauma
        private GUIButton transferMenuButton;
        private float transferMenuOpenState;
        private bool transferMenuStateCompleted;
+        private readonly HashSet<Identifier> registeredEvents = new HashSet<Identifier>();

        private class LinkedGUI
        {
@@ -218,7 +219,7 @@ namespace Barotrauma

        public void AddToGUIUpdateList()
        {
-            infoFrame?.AddToGUIUpdateList(order: 1);
+            infoFrame?.AddToGUIUpdateList();
            NetLobbyScreen.JobInfoFrame?.AddToGUIUpdateList();
        }

@@ -298,11 +299,13 @@ namespace Barotrauma
                }

                SetBalanceText(balanceText, campaignMode.Bank.Balance);
-                campaignMode.OnMoneyChanged.RegisterOverwriteExisting(nameof(CreateInfoFrame).ToIdentifier(), e =>
+                Identifier eventIdentifier = nameof(CreateInfoFrame).ToIdentifier();
+                campaignMode.OnMoneyChanged.RegisterOverwriteExisting(eventIdentifier, e =>
                {
-                    if (e.Wallet != campaignMode.Bank) { return; }
+                    if (!e.Owner.IsNone()) { return; }
                    SetBalanceText(balanceText, e.Wallet.Balance);
                });
+                registeredEvents.Add(eventIdentifier);

                static void SetBalanceText(GUITextBlock text, int balance)
                {
@@ -371,15 +374,16 @@ namespace Barotrauma
            }
        }

-        private const float jobColumnWidthPercentage = 0.138f;
-        private const float characterColumnWidthPercentage = 0.656f;
-        private const float pingColumnWidthPercentage = 0.206f;
+        private const float jobColumnWidthPercentage = 0.138f,
+                            characterColumnWidthPercentage = 0.45f,
+                            pingColumnWidthPercentage = 0.206f,
+                            walletColumnWidthPercentage = 0.206f;

-        private int jobColumnWidth, characterColumnWidth, pingColumnWidth;
+        private int jobColumnWidth, characterColumnWidth, pingColumnWidth, walletColumnWidth;

        private void CreateCrewListFrame(GUIFrame crewFrame)
        {
-            crew = GameMain.GameSession?.CrewManager?.GetCharacters() ?? Array.Empty<Character>();
+            crew = GameMain.GameSession?.CrewManager?.GetCharacters() ?? new List<Character>() { TestScreen.dummyCharacter};
            teamIDs = crew.Select(c => c.TeamID).Distinct().ToList();

            // Show own team first when there's more than one team
@@ -553,20 +557,23 @@ namespace Barotrauma
            GUIButton jobButton = new GUIButton(new RectTransform(new Vector2(0f, 1f), headerFrame.RectTransform), TextManager.Get("tabmenu.job"), style: "GUIButtonSmallFreeScale");
            GUIButton characterButton = new GUIButton(new RectTransform(new Vector2(0f, 1f), headerFrame.RectTransform), TextManager.Get("name"), style: "GUIButtonSmallFreeScale");
            GUIButton pingButton = new GUIButton(new RectTransform(new Vector2(0f, 1f), headerFrame.RectTransform), TextManager.Get("serverlistping"), style: "GUIButtonSmallFreeScale");
+            GUIButton walletButton = new GUIButton(new RectTransform(new Vector2(0f, 1f), headerFrame.RectTransform), TextManager.Get("crewwallet.wallet"), style: "GUIButtonSmallFreeScale");

            sizeMultiplier = (headerFrame.Rect.Width - headerFrame.AbsoluteSpacing * (headerFrame.CountChildren - 1)) / (float)headerFrame.Rect.Width;

            jobButton.RectTransform.RelativeSize = new Vector2(jobColumnWidthPercentage * sizeMultiplier, 1f);
            characterButton.RectTransform.RelativeSize = new Vector2(characterColumnWidthPercentage * sizeMultiplier, 1f);
            pingButton.RectTransform.RelativeSize = new Vector2(pingColumnWidthPercentage * sizeMultiplier, 1f);
+            walletButton.RectTransform.RelativeSize = new Vector2(walletColumnWidthPercentage * sizeMultiplier, 1f);

-            jobButton.TextBlock.Font = characterButton.TextBlock.Font = pingButton.TextBlock.Font = GUIStyle.HotkeyFont;
-            jobButton.CanBeFocused = characterButton.CanBeFocused = pingButton.CanBeFocused = false;
-            jobButton.TextBlock.ForceUpperCase = characterButton.TextBlock.ForceUpperCase = pingButton.ForceUpperCase = ForceUpperCase.Yes;
+            jobButton.TextBlock.Font = characterButton.TextBlock.Font = pingButton.TextBlock.Font = walletButton.TextBlock.Font = GUIStyle.HotkeyFont;
+            jobButton.CanBeFocused = characterButton.CanBeFocused = pingButton.CanBeFocused = walletButton.CanBeFocused = false;
+            jobButton.TextBlock.ForceUpperCase = characterButton.TextBlock.ForceUpperCase = pingButton.ForceUpperCase = walletButton.ForceUpperCase = ForceUpperCase.Yes;

            jobColumnWidth = jobButton.Rect.Width;
            characterColumnWidth = characterButton.Rect.Width;
            pingColumnWidth = pingButton.Rect.Width;
+            walletColumnWidth = walletButton.Rect.Width;
        }

        private void CreateMultiPlayerList(bool refresh)
@@ -651,6 +658,8 @@ namespace Barotrauma
                    };
                }
            }
+
+            CreateWalletCrewFrame(character, paddedFrame);
        }

        private void CreateMultiPlayerClientElement(Client client)
@@ -678,6 +687,10 @@ namespace Barotrauma
            };

            CreateNameWithPermissionIcon(client, paddedFrame);
+            if (client.Character is { } character)
+            {
+                CreateWalletCrewFrame(character, paddedFrame);
+            }
            linkedGUIList.Add(new LinkedGUI(client, frame, false, new GUITextBlock(new RectTransform(new Point(pingColumnWidth, paddedFrame.Rect.Height), paddedFrame.RectTransform), client.Ping.ToString(), textAlignment: Alignment.Center)));
        }

@@ -714,6 +727,47 @@ namespace Barotrauma
            return 0;
        }

+        private void CreateWalletCrewFrame(Character character, GUILayoutGroup paddedFrame)
+        {
+            GUILayoutGroup walletLayout = new GUILayoutGroup(new RectTransform(new Point(walletColumnWidth, paddedFrame.Rect.Height), paddedFrame.RectTransform, Anchor.Center), childAnchor: Anchor.Center)
+            {
+                CanBeFocused = false
+            };
+
+            if (character.IsBot) { return; }
+
+            GUILayoutGroup paddedLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 1f), walletLayout.RectTransform, Anchor.Center), isHorizontal: true)
+            {
+                Stretch = true
+            };
+
+            GUIImage icon = new GUIImage(new RectTransform(Vector2.One, paddedLayoutGroup.RectTransform, scaleBasis: ScaleBasis.BothHeight), style: "StoreTradingIcon", scaleToFit: true);
+            GUITextBlock walletBlock = new GUITextBlock(new RectTransform(Vector2.One, paddedLayoutGroup.RectTransform), string.Empty, textAlignment: Alignment.Right, font: GUIStyle.SubHeadingFont);
+            SetWalletText(walletBlock, character.Wallet);
+
+            if (GameMain.GameSession?.Campaign is MultiPlayerCampaign campaign)
+            {
+                Identifier eventIdentifier = new Identifier($"{nameof(CreateWalletCrewFrame)}.{character.ID}");
+                campaign.OnMoneyChanged.RegisterOverwriteExisting(eventIdentifier, e =>
+                {
+                    if (!(e.Owner is Some<Character> { Value: var owner }) || owner != character) { return; }
+                    SetWalletText(walletBlock, e.Wallet);
+                });
+                registeredEvents.Add(eventIdentifier);
+            }
+
+            static void SetWalletText(GUITextBlock block, Wallet wallet)
+            {
+                block.Text = TextManager.FormatCurrency(wallet.Balance);
+                block.ToolTip = string.Empty;
+                if (block.TextSize.X + block.Padding.X + block.Padding.Z > block.Rect.Width)
+                {
+                    block.ToolTip = block.Text;
+                    block.Text = TextManager.Get("crewwallet.balance.toomuchtoshow");
+                }
+            }
+        }
+
        private void CreateNameWithPermissionIcon(Client client, GUILayoutGroup paddedFrame)
        {
            GUITextBlock characterNameBlock;
@@ -795,7 +849,7 @@ namespace Barotrauma
            GUIComponent existingPreview = infoFrameHolder.FindChild("SelectedCharacter");
            if (existingPreview != null) { infoFrameHolder.RemoveChild(existingPreview); }

-            GUIFrame background = new GUIFrame(new RectTransform(new Vector2(0.543f, 0.717f), infoFrameHolder.RectTransform, Anchor.TopLeft, Pivot.TopRight) { RelativeOffset = new Vector2(-0.145f, 0) })
+            GUIFrame background = new GUIFrame(new RectTransform(new Vector2(0.543f, 0.69f), infoFrameHolder.RectTransform, Anchor.TopRight, Pivot.TopLeft) { RelativeOffset = new Vector2(-0.061f, 0) })
            {
                UserData = "SelectedCharacter"
            };
@@ -810,28 +864,29 @@ namespace Barotrauma
                {
                    GUIComponent preview = character.Info.CreateInfoFrame(background, false, GetPermissionIcon(GameMain.Client.ConnectedClients.Find(c => c.Character == character)));
                    GameMain.Client.SelectCrewCharacter(character, preview);
-                    CreateWalletFrame(background, character);
+                    if (!character.IsBot && GameMain.GameSession?.Campaign is MultiPlayerCampaign mpCampaign) { CreateWalletFrame(background, character, mpCampaign); }
                }
            }
            else if (client != null)
            {
                GUIComponent preview = CreateClientInfoFrame(background, client, GetPermissionIcon(client));
                GameMain.Client?.SelectCrewClient(client, preview);
-                if (client.Character != null)
+                if (client.Character != null && GameMain.GameSession?.Campaign is MultiPlayerCampaign mpCampaign)
                {
-                    CreateWalletFrame(background, client.Character);
+                    CreateWalletFrame(background, client.Character, mpCampaign);
                }
            }

            return true;
        }

-        private void CreateWalletFrame(GUIComponent parent, Character character)
+        private void CreateWalletFrame(GUIComponent parent, Character character, MultiPlayerCampaign campaign)
        {
+            if (campaign is null) { throw new ArgumentNullException(nameof(campaign), "Tried to create a wallet frame when campaign was null"); }
            if (character is null) { throw new ArgumentNullException(nameof(character), "Tried to create a wallet frame for a null character");}
            isTransferMenuOpen = false;
            transferMenuOpenState = 1f;
-            ImmutableArray<Character> salaryCrew = Mission.GetSalaryEligibleCrew().Where(c => c != character).ToImmutableArray();
+            ImmutableHashSet<Character> salaryCrew = GameSession.GetSessionCrewCharacters(CharacterType.Player).Where(c => c != character).ToImmutableHashSet();

            Wallet targetWallet = character.Wallet;

@@ -905,8 +960,8 @@ namespace Barotrauma

                    GUILayoutGroup buttonLayout = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.25f), paddedTransferMenuLayout.RectTransform), childAnchor: Anchor.Center);
                        GUILayoutGroup centerButtonLayout = new GUILayoutGroup(new RectTransform(new Vector2(0.75f, 1f), buttonLayout.RectTransform), isHorizontal: true);
-                            GUIButton confirmButton = new GUIButton(new RectTransform(new Vector2(0.5f, 1f), centerButtonLayout.RectTransform), TextManager.Get("confirm"), style: "GUIButtonFreeScale") { Enabled = false };
                            GUIButton resetButton = new GUIButton(new RectTransform(new Vector2(0.5f, 1f), centerButtonLayout.RectTransform), TextManager.Get("reset"), style: "GUIButtonFreeScale") { Enabled = false };
+                            GUIButton confirmButton = new GUIButton(new RectTransform(new Vector2(0.5f, 1f), centerButtonLayout.RectTransform), TextManager.Get("confirm"), style: "GUIButtonFreeScale") { Enabled = false };
 // @formatter:on
            ImmutableArray<GUILayoutGroup> layoutGroups = ImmutableArray.Create(transferMenuLayout, paddedTransferMenuLayout, mainLayout, leftLayout, rightLayout);
            MedicalClinicUI.EnsureTextDoesntOverflow(character.Name, leftName, leftLayout.Rect, layoutGroups);
@@ -927,137 +982,146 @@ namespace Barotrauma
            ToggleTransferMenuIcon(transferMenuButton, open: isTransferMenuOpen);
            ToggleCenterButton(centerButton, isSending);

-            if (GameMain.GameSession?.Campaign is MultiPlayerCampaign campaign)
+
+            if (!(Character.Controlled is { } myCharacter))
            {
-                if (!(Character.Controlled is { } myCharacter))
-                {
-                    salarySlider.Enabled = false;
-                    transferAmountInput.Enabled = false;
-                    centerButton.Enabled = false;
-                    confirmButton.Enabled = false;
-                    return;
-                }
+                salarySlider.Enabled = false;
+                transferAmountInput.Enabled = false;
+                centerButton.Enabled = false;
+                confirmButton.Enabled = false;
+                return;
+            }

-                bool hasPermissions = campaign.AllowedToManageCampaign();
-                salarySlider.Enabled = hasPermissions;
-                Wallet otherWallet;
+            bool hasMoneyPermissions = campaign.AllowedToManageCampaign(ClientPermissions.ManageMoney);
+            salarySlider.Enabled = hasMoneyPermissions;
+            Wallet otherWallet;

-                switch (hasPermissions)
-                {
-                    case true:
-                        rightName.Text = TextManager.Get("crewwallet.bank");
-                        otherWallet = campaign.Bank;
-                        break;
-                    case false when character == myCharacter:
-                        rightName.Text =  TextManager.Get("crewwallet.bank");
-                        otherWallet = campaign.Bank;
-                        isSending = true;
-                        ToggleCenterButton(centerButton, isSending);
-                        break;
-                    default:
-                        rightName.Text = myCharacter.Name;
-                        otherWallet = campaign.PersonalWallet;
-                        break;
-                }
+            switch (hasMoneyPermissions)
+            {
+                case true:
+                    rightName.Text = TextManager.Get("crewwallet.bank");
+                    otherWallet = campaign.Bank;
+                    break;
+                case false when character == myCharacter:
+                    rightName.Text =  TextManager.Get("crewwallet.bank");
+                    otherWallet = campaign.Bank;
+                    isSending = true;
+                    ToggleCenterButton(centerButton, isSending);
+                    break;
+                default:
+                    rightName.Text = myCharacter.Name;
+                    otherWallet = campaign.PersonalWallet;
+                    break;
+            }

-                MedicalClinicUI.EnsureTextDoesntOverflow(rightName.Text.ToString(), rightName, rightLayout.Rect, layoutGroups);
-
-                if (!hasPermissions)
+            MedicalClinicUI.EnsureTextDoesntOverflow(rightName.Text.ToString(), rightName, rightLayout.Rect, layoutGroups);
+            updateButtonText();
+            if (!hasMoneyPermissions)
+            {
+                if (character != Character.Controlled)
                {
                    centerButton.Enabled = centerButton.CanBeFocused = false;
-                    salarySlider.Enabled = salarySlider.CanBeFocused = false;
                }
+                salarySlider.Enabled = salarySlider.CanBeFocused = false;
+            }

-                leftBalance.Text = TextManager.FormatCurrency(otherWallet.Balance);
+            leftBalance.Text = TextManager.FormatCurrency(otherWallet.Balance);

+            UpdateAllInputs();
+
+            centerButton.OnClicked = (btn, o) =>
+            {
+                isSending = !isSending;
+                updateButtonText();
+                ToggleCenterButton(btn, isSending);
                UpdateAllInputs();
+                return true;
+            };

-                centerButton.OnClicked = (btn, o) =>
+            void updateButtonText()
+            {
+                confirmButton.Text = TextManager.Get(hasMoneyPermissions || isSending ? "confirm" : "crewwallet.requestmoney");
+            }
+
+            transferAmountInput.OnValueChanged = input =>
+            {
+                UpdateInputs();
+            };
+
+            transferAmountInput.OnValueEntered = input =>
+            {
+                UpdateAllInputs();
+            };
+
+            Identifier eventIdentifier = nameof(CreateWalletFrame).ToIdentifier();
+            campaign.OnMoneyChanged.RegisterOverwriteExisting(eventIdentifier, e =>
+            {
+                if (e.Wallet == targetWallet)
                {
-                    isSending = !isSending;
-                    ToggleCenterButton(btn, isSending);
-                    UpdateAllInputs();
-                    return true;
-                };
-
-                transferAmountInput.OnValueChanged = input =>
-                {
-                    UpdateInputs();
-                };
-
-                transferAmountInput.OnValueEntered = input =>
-                {
-                    UpdateAllInputs();
-                };
-
-                campaign.OnMoneyChanged.RegisterOverwriteExisting(nameof(CreateWalletFrame).ToIdentifier(), e =>
-                {
-                    if (e.Wallet == targetWallet)
-                    {
-                        moneyBlock.Text = TextManager.FormatCurrency(e.Info.Balance);
-                        salarySlider.BarScrollValue = e.Info.RewardDistribution / 100f;
-                    }
-                    UpdateAllInputs();
-                });
-
-                resetButton.OnClicked = (button, o) =>
-                {
-                    transferAmountInput.IntValue = 0;
-                    UpdateAllInputs();
-                    return true;
-                };
-
-                confirmButton.OnClicked = (button, o) =>
-                {
-                    int amount = transferAmountInput.IntValue;
-                    if (amount == 0) { return false; }
-
-                    Option<Character> target1 = Option<Character>.Some(character),
-                                      target2 = otherWallet == campaign.Bank ? Option<Character>.None() : Option<Character>.Some(myCharacter);
-                    if (isSending) { (target1, target2) = (target2, target1); }
-
-                    SendTransaction(target1, target2, amount);
-                    isTransferMenuOpen = false;
-                    ToggleTransferMenuIcon(transferMenuButton, isTransferMenuOpen);
-                    return true;
-                };
-
-                void UpdateAllInputs()
-                {
-                    UpdateInputs();
-                    UpdateMaxInput();
+                    moneyBlock.Text = TextManager.FormatCurrency(e.Info.Balance);
+                    salarySlider.BarScrollValue = e.Info.RewardDistribution / 100f;
                }
+                UpdateAllInputs();
+            });
+            registeredEvents.Add(eventIdentifier);

-                void UpdateInputs()
-                {
-                    confirmButton.Enabled = resetButton.Enabled = transferAmountInput.IntValue > 0;
-                    if (transferAmountInput.IntValue == 0)
-                    {
-                        rightBalance.Text = TextManager.FormatCurrency(otherWallet.Balance);
-                        rightBalance.TextColor = GUIStyle.TextColorNormal;
-                        leftBalance.Text = TextManager.FormatCurrency(targetWallet.Balance);
-                        leftBalance.TextColor = GUIStyle.TextColorNormal;
-                    }
-                    else if (isSending)
-                    {
-                        rightBalance.Text = TextManager.FormatCurrency(otherWallet.Balance + transferAmountInput.IntValue);
-                        rightBalance.TextColor = GUIStyle.Blue;
-                        leftBalance.Text = TextManager.FormatCurrency(targetWallet.Balance - transferAmountInput.IntValue);
-                        leftBalance.TextColor = GUIStyle.Red;
-                    }
-                    else
-                    {
-                        rightBalance.Text = TextManager.FormatCurrency(otherWallet.Balance - transferAmountInput.IntValue);
-                        rightBalance.TextColor = GUIStyle.Red;
-                        leftBalance.Text = TextManager.FormatCurrency(targetWallet.Balance + transferAmountInput.IntValue);
-                        leftBalance.TextColor = GUIStyle.Blue;
-                    }
-                }
+            resetButton.OnClicked = (button, o) =>
+            {
+                transferAmountInput.IntValue = 0;
+                UpdateAllInputs();
+                return true;
+            };

-                void UpdateMaxInput()
+            confirmButton.OnClicked = (button, o) =>
+            {
+                int amount = transferAmountInput.IntValue;
+                if (amount == 0) { return false; }
+
+                Option<Character> target1 = Option<Character>.Some(character),
+                                  target2 = otherWallet == campaign.Bank ? Option<Character>.None() : Option<Character>.Some(myCharacter);
+                if (isSending) { (target1, target2) = (target2, target1); }
+
+                SendTransaction(target1, target2, amount);
+                isTransferMenuOpen = false;
+                ToggleTransferMenuIcon(transferMenuButton, isTransferMenuOpen);
+                return true;
+            };
+
+            void UpdateAllInputs()
+            {
+                UpdateInputs();
+                UpdateMaxInput();
+            }
+
+            void UpdateInputs()
+            {
+                confirmButton.Enabled = resetButton.Enabled = transferAmountInput.IntValue > 0;
+                if (transferAmountInput.IntValue == 0)
                {
-                    transferAmountInput.MaxValueInt = isSending ? targetWallet.Balance : otherWallet.Balance;
+                    rightBalance.Text = TextManager.FormatCurrency(otherWallet.Balance);
+                    rightBalance.TextColor = GUIStyle.TextColorNormal;
+                    leftBalance.Text = TextManager.FormatCurrency(targetWallet.Balance);
+                    leftBalance.TextColor = GUIStyle.TextColorNormal;
                }
+                else if (isSending)
+                {
+                    rightBalance.Text = TextManager.FormatCurrency(otherWallet.Balance + transferAmountInput.IntValue);
+                    rightBalance.TextColor = GUIStyle.Blue;
+                    leftBalance.Text = TextManager.FormatCurrency(targetWallet.Balance - transferAmountInput.IntValue);
+                    leftBalance.TextColor = GUIStyle.Red;
+                }
+                else
+                {
+                    rightBalance.Text = TextManager.FormatCurrency(otherWallet.Balance - transferAmountInput.IntValue);
+                    rightBalance.TextColor = GUIStyle.Red;
+                    leftBalance.Text = TextManager.FormatCurrency(targetWallet.Balance + transferAmountInput.IntValue);
+                    leftBalance.TextColor = GUIStyle.Blue;
+                }
+            }
+
+            void UpdateMaxInput()
+            {
+                transferAmountInput.MaxValueInt = isSending ? targetWallet.Balance : otherWallet.Balance;
            }

            static void ToggleTransferMenuIcon(GUIButton btn, bool open)
@@ -1173,7 +1237,7 @@ namespace Barotrauma

        private void CreateMultiPlayerLogContent(GUIFrame crewFrame)
        {
-            var logContainer = new GUIFrame(new RectTransform(new Vector2(0.543f, 0.717f), crewFrame.RectTransform, Anchor.TopRight, Pivot.TopLeft) { RelativeOffset = new Vector2(-0.061f, 0) });
+            var logContainer = new GUIFrame(new RectTransform(new Vector2(0.543f, 0.717f), infoFrameHolder.RectTransform, Anchor.TopLeft, Pivot.TopRight) { RelativeOffset = new Vector2(-0.145f, 0) });
            var innerFrame = new GUIFrame(new RectTransform(new Vector2(0.900f, 0.900f), logContainer.RectTransform, Anchor.TopCenter, Pivot.TopCenter) { RelativeOffset = new Vector2(0f, 0.0475f) }, style: null);
            var content = new GUILayoutGroup(new RectTransform(Vector2.One, innerFrame.RectTransform))
            {
@@ -1188,22 +1252,22 @@ namespace Barotrauma
                Spacing = (int)(5 * GUI.Scale)
            };

-            foreach (Pair<string, PlayerConnectionChangeType> pair in storedMessages)
+            foreach ((string message, PlayerConnectionChangeType type) in storedMessages)
            {
-                AddLineToLog(pair.First, pair.Second);
+                AddLineToLog(message, type);
            }

            logList.BarScroll = 1f;
        }

-        private static readonly List<Pair<string, PlayerConnectionChangeType>> storedMessages = new List<Pair<string, PlayerConnectionChangeType>>();
+        private static readonly List<(string message, PlayerConnectionChangeType type)> storedMessages = new List<(string message, PlayerConnectionChangeType type)>();

        public static void StorePlayerConnectionChangeMessage(ChatMessage message)
        {
            if (!GameMain.GameSession?.IsRunning ?? true) { return; }

            string msg = ChatMessage.GetTimeStamp() + message.TextWithSender;
-            storedMessages.Add(new Pair<string, PlayerConnectionChangeType>(msg, message.ChangeType));
+            storedMessages.Add((msg, message.ChangeType));

            if (GameSession.IsTabMenuOpen && SelectedTab == InfoFrameTab.Crew)
            {
@@ -2026,5 +2090,14 @@ namespace Barotrauma
            if (character != Character.Controlled) { return; }
            UpdateTalentInfo();
        }
+
+        public void OnClose()
+        {
+            if (!(GameMain.GameSession?.Campaign is { } campaign)) { return; }
+            foreach (Identifier identifier in registeredEvents)
+            {
+                campaign.OnMoneyChanged.TryDeregister(identifier);
+            }
+        }
    }
 }
@@ -73,6 +73,8 @@ namespace Barotrauma
        
        private Point screenResolution;

+        private bool needsRefresh = true;
+
        /// <summary>
        /// While set to true any call to <see cref="RefreshUpgradeList"/> will cause the buy button to be disabled and to not update the prices.
        /// This is to prevent us from buying another upgrade before the server has given us the new prices and causing potential syncing issues.
@@ -102,13 +104,18 @@ namespace Barotrauma
            CreateUI(upgradeFrame);

            if (Campaign == null) { return; }
-            Campaign.UpgradeManager.OnUpgradesChanged += RefreshAll;
-            Campaign.CargoManager.OnPurchasedItemsChanged += RefreshAll;
-            Campaign.CargoManager.OnSoldItemsChanged += RefreshAll;
-            Campaign.OnMoneyChanged.RegisterOverwriteExisting(nameof(UpgradeStore).ToIdentifier(), e => { RefreshAll(); } );
+            Campaign.UpgradeManager.OnUpgradesChanged += RequestRefresh;
+            Campaign.CargoManager.OnPurchasedItemsChanged += RequestRefresh;
+            Campaign.CargoManager.OnSoldItemsChanged += RequestRefresh;
+            Campaign.OnMoneyChanged.RegisterOverwriteExisting(nameof(UpgradeStore).ToIdentifier(), e => { RequestRefresh(); } );
        }

-        public void RefreshAll()
+        public void RequestRefresh()
+        {
+            needsRefresh = true;
+        }
+
+        private void RefreshAll()
        {
            switch (selectedUpgradeTab)
            {
@@ -131,6 +138,7 @@ namespace Barotrauma
                    }
                    break;
            }
+            needsRefresh = false;
        }

        private void RefreshUpgradeList()
@@ -1295,7 +1303,9 @@ namespace Barotrauma
        {
            if (Campaign == null) { return; }

-            if (!parent.Children.Any() || Submarine.MainSub != null && Submarine.MainSub != drawnSubmarine || GameMain.GraphicsWidth != screenResolution.X || GameMain.GraphicsHeight != screenResolution.Y)
+            if (!parent.Children.Any() || 
+                Submarine.MainSub != null && Submarine.MainSub != drawnSubmarine || 
+                GameMain.GraphicsWidth != screenResolution.X || GameMain.GraphicsHeight != screenResolution.Y)
            {
                GameMain.GameSession?.SubmarineInfo?.CheckSubsLeftBehind();
                drawnSubmarine = Submarine.MainSub;
@@ -1313,6 +1323,10 @@ namespace Barotrauma
                // we also need this when we first load in so we know which category entries to disable since the CampaignUI is created before the submarine is loaded in.
                RefreshAll();
            }
+            if (needsRefresh)
+            {
+                RefreshAll();
+            }

            // accept an active confirmation popup if any
            if (PlayerInput.KeyHit(Keys.Enter) && GUIMessageBox.MessageBoxes.Any())
@@ -1588,7 +1602,7 @@ namespace Barotrauma
                if (button != null)
                {
                    button.Enabled = currentLevel < prefab.MaxLevel;
-                    if (WaitForServerUpdate || !campaign.AllowedToManageCampaign() || !campaign.Wallet.CanAfford(price))
+                    if (WaitForServerUpdate || !campaign.Wallet.CanAfford(price))
                    {
                        button.Enabled = false;
                    }
@@ -1693,7 +1707,7 @@ namespace Barotrauma
            return frames.ToArray();
        }

-        private bool HasPermission => campaignUI.Campaign.AllowedToManageCampaign();
+        private bool HasPermission => true;

        // just a shortcut to create new RectTransforms since all the new RectTransform and new Vector2 confuses my IDE (and me)
        private static RectTransform rectT(float x, float y, GUIComponent parentComponent, Anchor anchor = Anchor.TopLeft, ScaleBasis scaleBasis = ScaleBasis.Normal)
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;

@@ -22,27 +23,50 @@ namespace Barotrauma
        private float votingTime = 100f;
        private float timer;
        private VoteType currentVoteType;
-        private Color submarineColor => GUIStyle.Orange;
+        private Color SubmarineColor => GUIStyle.Orange;
        private Point createdForResolution;

-        public VotingInterface(Client starter, SubmarineInfo info, VoteType type, float votingTime)
+        public static VotingInterface CreateSubmarineVotingInterface(Client starter, SubmarineInfo info, VoteType type, float votingTime)
        {
-            if (starter == null || info == null) return;
-            SetSubmarineVotingText(starter, info, type);
-            this.votingTime = votingTime;
-            getYesVotes = SubmarineYesVotes;
-            getNoVotes = SubmarineNoVotes;
-            getMaxVotes = SubmarineMaxVotes;
-            onVoteEnd = () => SendSubmarineVoteEndMessage(info, type);
+            if (starter == null || info == null) { return null; }

-            Initialize(starter, type);
+            var subVoting = new VotingInterface()
+            {
+                votingTime = votingTime,
+                getYesVotes = () => GameMain.NetworkMember?.Voting?.GetVoteCountYes(type) ?? 0,
+                getNoVotes = () => GameMain.NetworkMember?.Voting?.GetVoteCountNo(type) ?? 0,
+                getMaxVotes = () => GameMain.NetworkMember?.Voting?.GetVoteCountMax(type) ?? 0,
+            };
+            subVoting.onVoteEnd = () => subVoting.SendSubmarineVoteEndMessage(info, type);
+            subVoting.SetSubmarineVotingText(starter, info, type);
+            subVoting.Initialize(starter, type);
+            return subVoting;
        }

+        public static VotingInterface CreateMoneyTransferVotingInterface(Client starter, Client from, Client to, int amount, float votingTime)
+        {
+            if (starter == null) { return null; }
+            if (from == null && to == null) { return null; }
+
+            var transferVoting = new VotingInterface()
+            {
+                votingTime = votingTime,
+                getYesVotes = () => GameMain.NetworkMember?.Voting?.GetVoteCountYes(VoteType.TransferMoney) ?? 0,
+                getNoVotes = () => GameMain.NetworkMember?.Voting?.GetVoteCountNo(VoteType.TransferMoney) ?? 0,
+                getMaxVotes = () => GameMain.NetworkMember?.Voting?.GetVoteCountMax(VoteType.TransferMoney) ?? 0,
+            };
+            transferVoting.onVoteEnd = () => transferVoting.SendMoneyTransferVoteEndMessage(from, to, amount);
+            transferVoting.SetMoneyTransferVotingText(starter, from, to, amount);
+            transferVoting.Initialize(starter, VoteType.TransferMoney);
+            return transferVoting;
+        }
+
+
        private void Initialize(Client starter, VoteType type)
        {
            currentVoteType = type;
            CreateVotingGUI();
-            if (starter.ID == GameMain.Client.ID) SetGUIToVotedState(2);
+            if (starter.ID == GameMain.Client.ID) { SetGUIToVotedState(2); }
            VoteRunning = true;
        }

@@ -50,7 +74,7 @@ namespace Barotrauma
        {
            createdForResolution = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);

-            if (frame != null) frame.Parent.RemoveChild(frame);
+            frame?.Parent.RemoveChild(frame);
            frame = new GUIFrame(HUDLayoutSettings.ToRectTransform(HUDLayoutSettings.VotingArea, GameMain.Client.InGameHUD.RectTransform), style: "");

            int padding = HUDLayoutSettings.Padding * 2;
@@ -116,8 +140,8 @@ namespace Barotrauma

        public void Update(float deltaTime)
        {
-            if (!VoteRunning) return;
-            if (GameMain.GraphicsWidth != createdForResolution.X || GameMain.GraphicsHeight != createdForResolution.Y) CreateVotingGUI();
+            if (!VoteRunning) { return; }
+            if (GameMain.GraphicsWidth != createdForResolution.X || GameMain.GraphicsHeight != createdForResolution.Y) { CreateVotingGUI(); }
            yesVotes = getYesVotes();
            noVotes = getNoVotes();
            maxVotes = getMaxVotes();
@@ -126,7 +150,6 @@ namespace Barotrauma
            votingTimer.BarSize = timer / votingTime;
        }

-
        public void EndVote(bool passed, int yesVoteFinal, int noVoteFinal)
        {
            VoteRunning = false;
@@ -143,19 +166,20 @@ namespace Barotrauma
            JobPrefab prefab = starter?.Character?.Info?.Job?.Prefab;
            Color nameColor = prefab != null ? prefab.UIColor : Color.White;
            string characterRichString = $"‖color:{nameColor.R},{nameColor.G},{nameColor.B}‖{name}‖color:end‖";
-            string submarineRichString = $"‖color:{submarineColor.R},{submarineColor.G},{submarineColor.B}‖{info.DisplayName}‖color:end‖";
+            string submarineRichString = $"‖color:{SubmarineColor.R},{SubmarineColor.G},{SubmarineColor.B}‖{info.DisplayName}‖color:end‖";

+            LocalizedString text = string.Empty;
            switch (type)
            {
                case VoteType.PurchaseAndSwitchSub:
-                    votingOnText = TextManager.GetWithVariables("submarinepurchaseandswitchvote",
+                    text = TextManager.GetWithVariables("submarinepurchaseandswitchvote",
                        ("[playername]", characterRichString),
                        ("[submarinename]", submarineRichString),
                        ("[amount]", info.Price.ToString()),
                        ("[currencyname]", TextManager.Get("credit").ToLower()));
                    break;
                case VoteType.PurchaseSub:
-                    votingOnText = TextManager.GetWithVariables("submarinepurchasevote",
+                    text = TextManager.GetWithVariables("submarinepurchasevote",
                        ("[playername]", characterRichString),
                        ("[submarinename]", submarineRichString),
                        ("[amount]", info.Price.ToString()),
@@ -163,10 +187,9 @@ namespace Barotrauma
                    break;
                case VoteType.SwitchSub:
                    int deliveryFee = SubmarineSelection.DeliveryFeePerDistanceTravelled * GameMain.GameSession.Map.DistanceToClosestLocationWithOutpost(GameMain.GameSession.Map.CurrentLocation, out Location endLocation);
-
                    if (deliveryFee > 0)
                    {
-                        votingOnText = TextManager.GetWithVariables("submarineswitchfeevote",
+                        text = TextManager.GetWithVariables("submarineswitchfeevote",
                            ("[playername]", characterRichString),
                            ("[submarinename]", submarineRichString),
                            ("[locationname]", endLocation.Name),
@@ -175,37 +198,22 @@ namespace Barotrauma
                    }
                    else
                    {
-                        votingOnText = TextManager.GetWithVariables("submarineswitchnofeevote",
+                        text = TextManager.GetWithVariables("submarineswitchnofeevote",
                            ("[playername]", characterRichString),
                            ("[submarinename]", submarineRichString));
                    }
                    break;
            }

-            votingOnText = RichString.Rich(votingOnText);
-        }
-
-        private int SubmarineYesVotes()
-        {
-            return GameMain.NetworkMember.SubmarineVoteYesCount;
-        }
-
-        private int SubmarineNoVotes()
-        {
-            return GameMain.NetworkMember.SubmarineVoteNoCount;
-        }
-
-        private int SubmarineMaxVotes()
-        {
-            return GameMain.NetworkMember.SubmarineVoteMax;
+            votingOnText = RichString.Rich(text);
        }

        private void SendSubmarineVoteEndMessage(SubmarineInfo info, VoteType type)
        {
-            GameMain.NetworkMember.AddChatMessage(GetSubmarineVoteResultMessage(info, type, yesVotes.ToString(), noVotes.ToString(), votePassed).Value, ChatMessageType.Server);
+            GameMain.NetworkMember.AddChatMessage(GetSubmarineVoteResultMessage(info, type, yesVotes, noVotes, votePassed).Value, ChatMessageType.Server);
        }

-        public static LocalizedString GetSubmarineVoteResultMessage(SubmarineInfo info, VoteType type, string yesVoteString, string noVoteString, bool votePassed)
+        private LocalizedString GetSubmarineVoteResultMessage(SubmarineInfo info, VoteType type, int yesVoteCount, int noVoteCount, bool votePassed)
        {
            LocalizedString result = string.Empty;

@@ -214,18 +222,18 @@ namespace Barotrauma
                case VoteType.PurchaseAndSwitchSub:
                    result = TextManager.GetWithVariables(votePassed ? "submarinepurchaseandswitchvotepassed" : "submarinepurchaseandswitchvotefailed",
                        ("[submarinename]", info.DisplayName),
-                        ("[amount]", info.Price.ToString()),
+                        ("[amount]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", info.Price)),
                        ("[currencyname]", TextManager.Get("credit").ToLower()),
-                        ("[yesvotecount]", yesVoteString),
-                        ("[novotecount]" , noVoteString));
+                        ("[yesvotecount]", yesVoteCount.ToString()),
+                        ("[novotecount]" , noVoteCount.ToString()));
                    break;
                case VoteType.PurchaseSub:
                    result = TextManager.GetWithVariables(votePassed ? "submarinepurchasevotepassed" : "submarinepurchasevotefailed",
                        ("[submarinename]", info.DisplayName),
-                        ("[amount]", info.Price.ToString()),
+                        ("[amount]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", info.Price)),
                        ("[currencyname]", TextManager.Get("credit").ToLower()),
-                        ("[yesvotecount]", yesVoteString),
-                        ("[novotecount]", noVoteString));
+                        ("[yesvotecount]", yesVoteCount.ToString()),
+                        ("[novotecount]", noVoteCount.ToString()));
                    break;
                case VoteType.SwitchSub:
                    int deliveryFee = SubmarineSelection.DeliveryFeePerDistanceTravelled * GameMain.GameSession.Map.DistanceToClosestLocationWithOutpost(GameMain.GameSession.Map.CurrentLocation, out Location endLocation);
@@ -235,17 +243,17 @@ namespace Barotrauma
                        result = TextManager.GetWithVariables(votePassed ? "submarineswitchfeevotepassed" : "submarineswitchfeevotefailed",
                            ("[submarinename]", info.DisplayName),
                            ("[locationname]", endLocation.Name),
-                            ("[amount]", deliveryFee.ToString()),
+                            ("[amount]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", deliveryFee)),
                            ("[currencyname]", TextManager.Get("credit").ToLower()),
-                            ("[yesvotecount]", yesVoteString),
-                            ("[novotecount]", noVoteString));
+                            ("[yesvotecount]", yesVoteCount.ToString()),
+                            ("[novotecount]", noVoteCount.ToString()));
                    }
                    else
                    {
                        result = TextManager.GetWithVariables(votePassed ? "submarineswitchnofeevotepassed" : "submarineswitchnofeevotefailed",
                            ("[submarinename]", info.DisplayName),
-                            ("[yesvotecount]", yesVoteString),
-                            ("[novotecount]", noVoteString));
+                            ("[yesvotecount]", yesVoteCount.ToString()),
+                            ("[novotecount]", noVoteCount.ToString()));
                    }
                    break;
                default:
@@ -255,6 +263,58 @@ namespace Barotrauma
        }
        #endregion

+
+        private void SetMoneyTransferVotingText(Client starter, Client from, Client to, int amount)
+        {
+            string name = starter.Name;
+            JobPrefab prefab = starter?.Character?.Info?.Job?.Prefab;
+            Color nameColor = prefab != null ? prefab.UIColor : Color.White;
+            string characterRichString = $"‖color:{nameColor.R},{nameColor.G},{nameColor.B}‖{name}‖color:end‖";
+
+            LocalizedString text = string.Empty;
+            if (from == null && to != null)
+            {
+                text = TextManager.GetWithVariables("crewwallet.requestbanktoselfvote",
+                    ("[requester]", characterRichString),
+                    ("[amount]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", amount)));
+            }
+            else if (from != null && to == null)
+            {
+                text = TextManager.GetWithVariables("crewwallet.requestselftobankvote",
+                    ("[requester]", characterRichString),
+                    ("[amount]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", amount)));
+            }
+            else
+            {
+                //not supported atm: clients can only requests transfers between their own wallet and the bank
+                LocalizedString bankName = TextManager.Get("crewwallet.bank");
+                text = TextManager.GetWithVariables("crewwallet.requesttransfervote",
+                    ("[requester]", characterRichString),
+                    ("[player1]", from?.Character == null ? bankName : from.Character.Name),
+                    ("[player2]", to?.Character == null ? bankName : to.Character.Name),
+                    ("[amount]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", amount)));
+            }
+
+            votingOnText = RichString.Rich(text);
+        }
+        private void SendMoneyTransferVoteEndMessage(Client from, Client to, int amount)
+        {
+            GameMain.NetworkMember.AddChatMessage(GetMoneyTransferVoteResultMessage(from, to, amount, yesVotes, noVotes, votePassed).Value, ChatMessageType.Server);
+        }
+
+        public static LocalizedString GetMoneyTransferVoteResultMessage(Client from, Client to, int transferAmount, int yesVoteCount, int noVoteCount, bool votePassed)
+        {
+            LocalizedString result = string.Empty;
+            if (from != null)
+            {
+                result = TextManager.GetWithVariables(votePassed ? "crewwallet.banktoplayer.votepassed" : "crewwallet.banktoplayer.votefailed",
+                    ("[playername]", from.Name),
+                    ("[amount]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", transferAmount)),
+                    ("[yesvotecount]", yesVoteCount.ToString()),
+                    ("[novotecount]", noVoteCount.ToString()));
+            }          
+            return result;
+        }
        public void Remove()
        {
            if (frame != null)