Unstable 0.17.4.0

2022-03-30 00:08:09 +09:00
parent 2968e23ae8
commit c1b8e5a341
177 changed files with 3388 additions and 1977 deletions
@@ -63,6 +63,10 @@ namespace Barotrauma
            }
        }

+        /// <summary>
+        /// Gets the current personal wallet
+        /// In singleplayer this is the campaign bank and in multiplayer this is the personal wallet
+        /// </summary>
        public virtual Wallet Wallet => GetWallet();

        public override void ShowStartMessage()
@@ -301,7 +305,7 @@ namespace Barotrauma
                    goto default;
                default:
                    ShowCampaignUI = true;
-                    CampaignUI.SelectTab(npc.CampaignInteractionType);
+                    CampaignUI.SelectTab(npc.CampaignInteractionType, storeIdentifier: npc.MerchantIdentifier);
                    CampaignUI.UpgradeStore?.RefreshAll();
                    break;
            }