Merge branch 'master' into akupara-take-two

new-frontiers-14 · Aug 17, 2024 · 6cf3300 · 6cf3300
2 parents 817685c + 240bbe2
commit 6cf3300
Show file tree

Hide file tree

Showing 336 changed files with 20,131 additions and 11,314 deletions.
diff --git a/Content.Client/Bank/UI/BankATMMenu.xaml.cs b/Content.Client/Bank/UI/BankATMMenu.xaml.cs
@@ -4,6 +4,7 @@
  * See AGPLv3.txt for details.
  */
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -27,14 +28,14 @@ public BankATMMenu()
 
     public void SetBalance(int amount)
     {
-        BalanceLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+        BalanceLabel.Text = BankSystemExtensions.ToSpesoString(amount);
     }
 
     public void SetDeposit(int amount)
     {
         DepositButton.Disabled = amount <= 0;
         if (amount >= 0) // Valid
-            DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+            DepositLabel.Text = BankSystemExtensions.ToSpesoString(amount);
         else
             DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-error");
     }
@@ -59,6 +60,6 @@ private void OnAmountChanged(LineEdit.LineEditEventArgs args)
         if (int.TryParse(args.Text, out var amount))
         {
             Amount = amount;
-        }    
+        }
     }
 }
diff --git a/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs b/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs
@@ -4,6 +4,7 @@
  * See AGPLv3.txt for details.
  */
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -41,14 +42,14 @@ private void OnReasonSelected(OptionButton.ItemSelectedEventArgs args)
     }
     public void SetBalance(int amount)
     {
-        BalanceLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+        BalanceLabel.Text = BankSystemExtensions.ToSpesoString(amount);
     }
 
     public void SetDeposit(int amount)
     {
         DepositButton.Disabled = amount <= 0;
         if (amount >= 0) // Valid
-            DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+            DepositLabel.Text = BankSystemExtensions.ToSpesoString(amount);
         else
             DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-error");
     }
@@ -74,7 +75,7 @@ private void OnAmountChanged(LineEdit.LineEditEventArgs args)
         if (int.TryParse(args.Text, out var amount))
         {
             Amount = amount;
-        }    
+        }
     }
 
     private void OnDescChanged(LineEdit.LineEditEventArgs args)

diff --git a/Content.Client/Bank/UI/WithdrawBankATMMenu.cs b/Content.Client/Bank/UI/WithdrawBankATMMenu.cs
@@ -4,6 +4,7 @@
  * See AGPLv3.txt for details.
  */
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -26,7 +27,7 @@ public WithdrawBankATMMenu()
 
     public void SetBalance(int amount)
     {
-        BalanceLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+        BalanceLabel.Text = BankSystemExtensions.ToSpesoString(amount);
     }
 
     public void SetEnabled(bool enabled)
@@ -44,6 +45,6 @@ private void OnAmountChanged(LineEdit.LineEditEventArgs args)
         if (int.TryParse(args.Text, out var amount))
         {
             Amount = amount;
-        }    
+        }
     }
 }
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml.cs b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.Message;
+using Content.Shared._NF.Bank;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.Random;
@@ -40,7 +41,7 @@ public BountyEntry(CargoBountyData bounty, TimeSpan untilNextSkip)
                 ("item", Loc.GetString(entry.Name))));
         }
         ManifestLabel.SetMarkup(Loc.GetString("bounty-console-manifest-label", ("item", string.Join(", ", items))));
-        RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", bountyPrototype.Reward)));
+        RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", BankSystemExtensions.ToSpesoString(bountyPrototype.Reward)))); // Frontier: bountyPrototype.Reward<BankSystemExtensions.ToSpesoString(bountyPrototype.Reward)
         DescriptionLabel.SetMarkup(Loc.GetString("bounty-console-description-label", ("description", Loc.GetString(bountyPrototype.Description))));
         IdLabel.SetMarkup(Loc.GetString("bounty-console-id-label", ("id", bounty.Id)));
 

diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
@@ -14,7 +14,7 @@
             <Label Text="{Loc 'cargo-console-menu-points-label'}"
                    StyleClasses="LabelKeyText" />
             <Label Name="PointsLabel"
-                   Text="$0" />
+                   Text="-" /> <!-- Frontier: "$0"<"-" -->
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc 'cargo-console-menu-order-capacity-label'}"

diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
@@ -100,7 +101,7 @@ public void PopulateProducts()
                         Product = prototype,
                         ProductName = { Text = prototype.Name },
                         MainButton = { ToolTip = prototype.Description },
-                        PointCost = { Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", prototype.Cost.ToString())) },
+                        PointCost = { Text = BankSystemExtensions.ToSpesoString(prototype.Cost) }, // Frontier: 
                         Icon = { Texture = _spriteSystem.Frame0(prototype.Icon) },
                     };
                     button.MainButton.OnPressed += args =>
@@ -189,10 +190,10 @@ public void UpdateCargoCapacity(int count, int capacity)
             ShuttleCapacityLabel.Text = $"{count}/{capacity}";
         }
 
-        public void UpdateBankData(string name, int points)
+        public void UpdateBankData(string name, int bankBalance)
         {
             AccountNameLabel.Text = name;
-            PointsLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", points.ToString()));
+            PointsLabel.Text = BankSystemExtensions.ToSpesoString(bankBalance);
         }
     }
 }
diff --git a/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs b/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Content.Shared.Cargo;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -21,7 +22,7 @@ public CargoPalletMenu()
 
     public void SetAppraisal(int amount)
     {
-        AppraisalLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", amount.ToString()));
+        AppraisalLabel.Text = BankSystemExtensions.ToSpesoString(amount);
     }
 
     public void SetCount(int count)

diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
 using Robust.Client.AutoGenerated;
@@ -51,7 +52,7 @@ public LoadoutWindow(HumanoidCharacterProfile profile, RoleLoadout loadout, Role
         CalculateLoadoutCost(loadout, collection);
         // Frontier - update bank balance label text - value should not change.
         Balance.Margin = new Thickness(5, 2, 5, 5);
-        Balance.Text = Loc.GetString("frontier-loadout-balance", ("balance", Profile.BankBalance));
+        Balance.Text = Loc.GetString("frontier-loadout-balance", ("balance", BankSystemExtensions.ToSpesoString(Profile.BankBalance)));
     }
 
     public void RefreshLoadouts(RoleLoadout loadout, ICommonSession session, IDependencyCollection collection)
@@ -85,6 +86,7 @@ private void CalculateLoadoutCost(RoleLoadout loadout, IDependencyCollection col
         }
 
         Cost.Margin = new Thickness(5, 2, 5, 5);
-        Cost.Text = Loc.GetString("frontier-loadout-cost", ("cost", cost));
+        Cost.Text = Loc.GetString("frontier-loadout-cost", ("cost", BankSystemExtensions.ToSpesoString(cost)));
     }
+    // End Frontier
 }
diff --git a/Content.Client/PDA/PdaMenu.xaml.cs b/Content.Client/PDA/PdaMenu.xaml.cs
@@ -3,6 +3,7 @@
 using Robust.Shared.Utility;
 using Content.Shared.CartridgeLoader;
 using Content.Client.Message;
+using Content.Shared._NF.Bank;
 using Robust.Client.UserInterface;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -139,7 +140,7 @@ public PdaMenu()
                 _clipboard.SetText(_instructions);
             };
 
-            
+
 
 
             HideAllViews();
@@ -175,7 +176,7 @@ public void UpdateState(PdaUpdateState state)
             StationNameLabel.SetMarkup(Loc.GetString("comp-pda-ui-station",
                 ("station", _stationName)));
 
-            _balance = state.Balance.ToString(); // Frontier
+            _balance = BankSystemExtensions.ToSpesoString(state.Balance); // Frontier
             BalanceLabel.SetMarkup(Loc.GetString("comp-pda-ui-balance", ("balance", _balance))); // Frontier
 
             _shuttleDeed = state.OwnedShipName ?? ""; // Frontier

diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -113,7 +113,31 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
     public bool CheckRoleTime(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         var reqs = _entManager.System<SharedRoleSystem>().GetJobRequirement(job);
-        return CheckRoleTime(reqs, out reason);
+
+        //return CheckRoleTime(reqs, out reason); // Frontier: old implementation
+
+        // Frontier: alternate role time checks
+        if (CheckRoleTime(reqs, out reason))
+            return true;
+
+        var altReqs = _entManager.System<SharedRoleSystem>().GetAlternateJobRequirements(job);
+        if (altReqs != null)
+        {
+            foreach (var alternateSet in altReqs.Values)
+            {
+                // Suppress reasons on alternate requirement sets
+                if (CheckRoleTime(alternateSet, out var altReason))
+                {
+                    return true;
+                }
+                reason.PushNewline();
+                reason.AddMarkupPermissive(Loc.GetString("role-requirement-alternative"));
+                reason.PushNewline();
+                reason.AddMarkupPermissive(altReason.ToMarkup());
+            }
+        }
+        return false;
+        // End Frontier: alternate role time checks
     }
 
     public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason)

diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Client.UserInterface.Controls;
 using Content.Client.Shipyard.BUI;
+using Content.Shared._NF.Bank;
 using Content.Shared.Shipyard.BUI;
 using Content.Shared.Shipyard.Prototypes;
 using Robust.Client.AutoGenerated;
@@ -85,7 +86,7 @@ public void PopulateProducts(List<string> prototypes, string type, bool free)
                 if (_freeListings)
                     priceText = Loc.GetString("shipyard-console-menu-listing-free");
                 else
-                    priceText = Loc.GetString("shipyard-console-menu-listing-amount", ("amount", prototype!.Price.ToString()));
+                    priceText = BankSystemExtensions.ToSpesoString(prototype!.Price);
 
                 var vesselEntry = new VesselRow
                 {
@@ -132,12 +133,12 @@ public void PopulateCategories()
 
     public void UpdateState(ShipyardConsoleInterfaceState state)
     {
-        BalanceLabel.Text = Loc.GetString("shipyard-console-menu-listing-amount", ("amount", state.Balance.ToString()));
-        int shipPrice = 0;
+        BalanceLabel.Text = BankSystemExtensions.ToSpesoString(state.Balance);
+        var shipPrice = 0;
         if (!state.FreeListings)
             shipPrice = state.ShipSellValue;
 
-        ShipAppraisalLabel.Text = Loc.GetString("shipyard-console-menu-listing-amount", ("amount", shipPrice.ToString()));
+        ShipAppraisalLabel.Text = BankSystemExtensions.ToSpesoString(shipPrice);
         SellShipButton.Disabled = state.ShipDeedTitle == null;
         TargetIdButton.Text = state.IsTargetIdPresent
             ? Loc.GetString("id-card-console-window-eject-button")

diff --git a/Content.Client/Store/Ui/StoreMenu.xaml.cs b/Content.Client/Store/Ui/StoreMenu.xaml.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Client.Actions;
 using Content.Client.Message;
+using Content.Shared._NF.Bank;
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
 using Robust.Client.AutoGenerated;
@@ -52,7 +53,7 @@ public void UpdateBalance(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> ba
         var balanceStr = string.Empty;
         foreach (var ((_, amount), proto) in currency)
         {
-            balanceStr += Loc.GetString("store-ui-balance-display", ("amount", amount),
+            balanceStr += Loc.GetString("store-ui-balance-display", ("amount", BankSystemExtensions.ToIndependentString((int) amount)), // Frontier: amount<BankSystemExtensions.GetIndependentString((int)amount)
                 ("currency", Loc.GetString(proto.DisplayName, ("amount", 1))));
         }
 

diff --git a/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs b/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs
@@ -2,6 +2,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Content.Shared._NF.Bank; // Frontier
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
 using Robust.Client.UserInterface.Controls;
@@ -52,7 +53,7 @@ public void CreateCurrencyButtons(Dictionary<ProtoId<CurrencyPrototype>, FixedPo
                 Id = currency.Value.ID,
                 Amount = currency.Key,
                 MinHeight = 20,
-                Text = Loc.GetString("store-withdraw-button-ui", ("currency",Loc.GetString(currency.Value.DisplayName, ("amount", currency.Key)))),
+                Text = Loc.GetString("store-withdraw-button-ui", ("currency",Loc.GetString(currency.Value.DisplayName, ("amount", BankSystemExtensions.ToIndependentString((int) currency.Key))))), // Frontier: currency.Key -> BankSystemExtensions.GetIndendependentString((int) currency.Key)
             };
             button.Disabled = false;
             button.OnPressed += args =>

diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
@@ -7,6 +7,7 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank; // Frontier
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using Content.Shared.Chemistry.Components.SolutionManager;
@@ -198,9 +199,9 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, float priceMo
                 // New Frontiers - Unlimited vending - support items with unlimited vending stock.
                 // This code is licensed under AGPLv3. See AGPLv3.txt
                 if (entry.Amount != uint.MaxValue)
-                    vendingItem.Text = $"[${cost}] {itemName} [{entry.Amount}]";
+                    vendingItem.Text = $"[{BankSystemExtensions.ToSpesoString(cost)}] {itemName} [{entry.Amount}]";
                 else
-                    vendingItem.Text = $"[${cost}] {itemName}";
+                    vendingItem.Text = $"[{BankSystemExtensions.ToSpesoString(cost)}] {itemName}";
                 // End of modified code
                 vendingItem.Icon = icon;
                 filteredInventory.Add(i);
@@ -209,10 +210,12 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, float priceMo
             SetSizeAfterUpdate(longestEntry.Length, inventory.Count);
         }
 
+        // Frontier
         public void UpdateBalance(int balance)
         {
-            BalanceLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", balance.ToString()));
+            BalanceLabel.Text = BankSystemExtensions.ToSpesoString(balance);
         }
+        // End Frontier
 
         private void SetSizeAfterUpdate(int longestEntryLength, int contentCount)
         {

diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Shared._NF.Bank;
 using Content.Shared._NF.BountyContracts;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
@@ -33,8 +34,7 @@ public BountyContractUiFragmentListEntry(BountyContract contract, bool canRemove
         }
 
         // bounty reward
-        BountyReward.Text = Loc.GetString("cargo-console-menu-points-amount",
-            ("amount", contract.Reward.ToString()));
+        BountyReward.Text = BankSystemExtensions.ToSpesoString(contract.Reward);
 
         // remove button
         RemoveButton.OnPressed += _ => OnRemoveButtonPressed?.Invoke(contract);

diff --git a/Content.Client/_NF/Contraband/UI/ContrabandPalletMenu.xaml.cs b/Content.Client/_NF/Contraband/UI/ContrabandPalletMenu.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Content.Shared._NF.Contraband.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -37,7 +38,8 @@ public ContrabandPalletMenu(string locPrefix)
 
     public void SetAppraisal(int amount)
     {
-        AppraisalLabel.Text = Loc.GetString($"{_locPrefix}contraband-console-menu-points-amount", ("amount", amount.ToString()));
+        // TODO: switch currency function by currency in component
+        AppraisalLabel.Text = Loc.GetString($"{_locPrefix}contraband-console-menu-points-amount", ("amount", BankSystemExtensions.ToIndependentString(amount)));
     }
 
     public void SetCount(int count)

diff --git a/Content.Client/_NF/Pirate/UI/PirateBountyEntry.xaml.cs b/Content.Client/_NF/Pirate/UI/PirateBountyEntry.xaml.cs
@@ -6,6 +6,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using Content.Shared._NF.Bank;
 
 namespace Content.Client._NF.Pirate.UI;
 
@@ -46,7 +47,7 @@ public PirateBountyEntry(PirateBountyData bounty, TimeSpan untilNextSkip)
                 ("item", Loc.GetString(entry.Name))));
         }
         ManifestLabel.SetMarkup(Loc.GetString("pirate-bounty-console-manifest-label", ("item", string.Join(", ", items))));
-        RewardLabel.SetMarkup(Loc.GetString("pirate-bounty-console-reward-label", ("reward", bountyPrototype.Reward)));
+        RewardLabel.SetMarkup(Loc.GetString("pirate-bounty-console-reward-label", ("reward", BankSystemExtensions.ToIndependentString(bountyPrototype.Reward))));
         DescriptionLabel.SetMarkup(Loc.GetString("pirate-bounty-console-description-label", ("description", Loc.GetString(bountyPrototype.Description))));
         IdLabel.SetMarkup(Loc.GetString("pirate-bounty-console-id-label", ("id", bounty.Id)));