Up060824

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

@@ -1496,7 +1496,8 @@ private void SetPreviewRotation(Direction direction)
 
         private void RandomizeEverything()
         {
-            Profile = HumanoidCharacterProfile.Random();
+            var oldBank = Profile?.BankBalance ?? HumanoidCharacterProfile.DefaultBalance; // Frontier
+            Profile = HumanoidCharacterProfile.Random().WithBankBalance(oldBank); // Frontier: add WithBankBalance(oldBank)
             SetProfile(Profile, CharacterSlot);
             SetDirty();
         }

Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs

@@ -72,6 +72,11 @@ public void RefreshLoadouts(HumanoidCharacterProfile profile, RoleLoadout loadou
             if (!protoMan.TryIndex(loadoutProto, out var loadProto))
                 continue;
 
+            // Frontier: hide loadout effects
+            if (loadout.IsHidden(profile, session, loadoutProto, collection))
+                continue;
+            // End Frontier: hide loadout effects
+
             var matchingLoadout = selected.FirstOrDefault(e => e.Prototype == loadoutProto);
             var pressed = matchingLoadout != null;
 
@@ -90,5 +95,40 @@ public void RefreshLoadouts(HumanoidCharacterProfile profile, RoleLoadout loadou
 
             LoadoutsContainer.AddChild(loadoutContainer);
         }
+
+        // Frontier: loadoutGroup subgroups
+        foreach (var subgroupProto in _groupProto.Subgroups)
+        {
+            if (!protoMan.TryIndex(subgroupProto, out var loadoutGroupProto))
+                continue;
+
+            foreach (var loadoutProto in loadoutGroupProto.Loadouts)
+            {
+                if (!protoMan.TryIndex(loadoutProto, out var loadProto))
+                    continue;
+
+                if (loadout.IsHidden(profile, session, loadoutProto, collection))
+                    continue;
+
+                var matchingLoadout = selected.FirstOrDefault(e => e.Prototype == loadoutProto);
+                var pressed = matchingLoadout != null;
+
+                var enabled = loadout.IsValid(profile, session, loadoutProto, collection, out var reason);
+                var loadoutContainer = new LoadoutContainer(loadoutProto, !enabled, reason);
+                loadoutContainer.Select.Pressed = pressed;
+                loadoutContainer.Text = string.IsNullOrEmpty(loadProto.Name) ? loadoutSystem.GetName(loadProto) : loadProto.Name; // Frontier: allow overriding loadout names
+
+                loadoutContainer.Select.OnPressed += args =>
+                {
+                    if (args.Button.Pressed)
+                        OnLoadoutPressed?.Invoke(loadoutProto);
+                    else
+                        OnLoadoutUnpressed?.Invoke(loadoutProto);
+                };
+
+                LoadoutsContainer.AddChild(loadoutContainer);
+            }
+        }
+        // End Frontier
     }
 }

Content.Client/Paper/UI/PaperWindow.xaml.cs

@@ -240,10 +240,19 @@ public void Populate(SharedPaperComponent.PaperBoundUserInterfaceState state)
                 Input.InsertAtCursor(state.Text);
             }
 
-            for (var i = 0; i <= state.StampedBy.Count * 3 + 1; i++)
+            // for (var i = 0; i <= state.StampedBy.Count * 3 + 1; i++) // Frontier
+            // { // Frontier
+            //     msg.AddMarkupPermissive("\r\n"); // Frontier
+            // } // Frontier
+
+            // Frontier: signatures shouldn't walk off the page
+            if (state.StampedBy.Count > 0)
             {
-                msg.AddMarkupPermissive("\r\n");
+                for (int i = 0; i < 6; i++)
+                    msg.AddMarkupPermissive("\r\n");
             }
+            // End Frontier
+
             WrittenTextLabel.SetMessage(msg, _allowedTags, DefaultTextColor);
 
             WrittenTextLabel.Visible = !isEditing && state.Text.Length > 0;

Content.Client/Shuttles/UI/NavScreen.xaml.cs

@@ -70,7 +70,7 @@ public void SetShuttle(EntityUid? shuttle)
         {
             var shipNameParts = metadata.EntityName.Split(' ');
             var designation = shipNameParts[^1];
-            if (designation[2] == '-')
+            if (designation.Length > 2 && designation[2] == '-')
             {
                 NavDisplayLabel.Text = string.Join(' ', shipNameParts[..^1]);
                 ShuttleDesignation.Text = designation;

Content.Client/Stylesheets/StyleNano.cs

@@ -1423,6 +1423,10 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     .Prop(TextureRect.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Nano/ntlogo.svg.png"))
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#757575")),
 
+                Element<TextureRect>().Class("PirateLogoDark") // Frontier
+                    .Prop(TextureRect.StylePropertyTexture, resCache.GetTexture("/Textures/_NF/Interface/Pirate/piratelogo.png")) // Frontier
+                    .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#757575")), // Frontier
+
                 Element<Label>().Class("WindowFooterText")
                     .Prop(Label.StylePropertyFont, notoSans8)
                     .Prop(Label.StylePropertyFontColor, Color.FromHex("#757575")),

Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs

@@ -148,15 +148,34 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, float priceMo
                     }
                 }
 
-                // This block exists to allow the VendPrice flag to set a vending machine item price.
-                if (prototype != null && prototype.TryGetComponent<StaticPriceComponent>(out var vendPriceComponent) && vendPriceComponent.VendPrice != 0 && cost <= (float) vendPriceComponent.VendPrice)
+                // Frontier: calculate vending price (this duplicates Content.Server.PricingSystem.GetVendPrice - this should be moved to Content.Shared if possible)
+                if (prototype != null)
                 {
-                    var price = (float) vendPriceComponent.VendPrice;
-                    cost = (int) price;
+                    var price = 0.0;
+
+                    if (prototype.TryGetComponent<StaticPriceComponent>(out var staticComp) && staticComp.VendPrice > 0.0)
+                    {
+                        price += staticComp.VendPrice;
+                    }
+                    else if (prototype.TryGetComponent<StackPriceComponent>(out var stackComp) && stackComp.VendPrice > 0.0)
+                    {
+                        price += stackComp.VendPrice;
+                    }
+
+                    // If there is anything that explicitly sets vending price - higher OR lower, override the base.
+                    if (price > 0.0) {
+                        cost = (int) price;
+                    }
                 }
-                // This block exists to allow the VendPrice flag to set a vending machine item price.
+                // End Frontier
 
-                vendingItem.Text = $"[${cost}] {itemName} [{entry.Amount}]";
+                // 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}]";
+                else
+                    vendingItem.Text = $"[${cost}] {itemName}";
+                // End of modified code
                 vendingItem.Icon = icon;
                 filteredInventory.Add(i);
             }

Content.Client/_NF/Contraband/BUI/ContrabandPalletConsoleBoundUserInterface.cs

@@ -1,6 +1,8 @@
 using Content.Client._NF.Contraband.UI;
 using Content.Shared._NF.Contraband.BUI;
+using Content.Shared._NF.Contraband.Components;
 using Content.Shared._NF.Contraband.Events;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
 namespace Content.Client._NF.Contraband.BUI;
@@ -10,16 +12,21 @@ public sealed class ContrabandPalletConsoleBoundUserInterface : BoundUserInterfa
     [ViewVariables]
     private ContrabandPalletMenu? _menu;
 
+    [ViewVariables]
+    private string _locPrefix = string.Empty;
+
     public ContrabandPalletConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
+        if (EntMan.TryGetComponent<ContrabandPalletConsoleComponent>(owner, out var console))
+            _locPrefix = console.LocStringPrefix ?? string.Empty;
     }
 
     protected override void Open()
     {
         base.Open();
         var disclaimer = new FormattedMessage();
-        disclaimer.AddText(Loc.GetString($"contraband-pallet-disclaimer"));
-        _menu = new ContrabandPalletMenu();
+        disclaimer.AddText(Loc.GetString($"{_locPrefix}contraband-pallet-disclaimer"));
+        _menu = new ContrabandPalletMenu(_locPrefix);
         _menu.AppraiseRequested += OnAppraisal;
         _menu.SellRequested += OnSell;
         _menu.OnClose += Close;

Content.Client/_NF/Contraband/UI/ContrabandPalletMenu.xaml

@@ -5,13 +5,13 @@
             MinSize="300 196">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal" SetHeight="24">
-            <Label Text="{Loc 'contraband-pallet-menu-appraisal-label'}"
+            <Label Name="AppraisalLabelLeft" Text="{Loc 'contraband-pallet-menu-appraisal-label'}"
                    StyleClasses="LabelKeyText" />
             <Label Name="AppraisalLabel"
                    Text="{Loc 'contraband-pallet-menu-no-goods-text'}" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" SetHeight="24">
-            <Label Text="{Loc 'contraband-pallet-menu-count-label'}"
+            <Label Name="CountLabelLeft" Text="{Loc 'contraband-pallet-menu-count-label'}"
                    StyleClasses="LabelKeyText" />
             <Label Name="CountLabel"
                    Text="{Loc 'contraband-pallet-menu-no-goods-text'}" />

Content.Client/_NF/Contraband/UI/ContrabandPalletMenu.xaml.cs

@@ -12,17 +12,32 @@ public sealed partial class ContrabandPalletMenu : FancyWindow
     public Action? SellRequested;
     public Action? AppraiseRequested;
 
-    public ContrabandPalletMenu()
+    private string _locPrefix = string.Empty;
+
+    public ContrabandPalletMenu(string locPrefix)
     {
         RobustXamlLoader.Load(this);
         SellButton.OnPressed += OnSellPressed;
         AppraiseButton.OnPressed += OnAppraisePressed;
-        Title = Loc.GetString("contraband-pallet-console-menu-title");
+
+        _locPrefix = locPrefix ?? string.Empty;
+
+        Title = Loc.GetString($"{_locPrefix}contraband-pallet-console-menu-title");
+
+        if (!string.IsNullOrEmpty(_locPrefix))
+        {
+            AppraisalLabelLeft.Text = Loc.GetString($"{_locPrefix}contraband-pallet-menu-appraisal-label");
+            AppraisalLabel.Text = Loc.GetString($"{_locPrefix}contraband-pallet-menu-no-goods-text");
+            CountLabelLeft.Text = Loc.GetString($"{_locPrefix}contraband-pallet-menu-count-label");
+            CountLabel.Text = Loc.GetString($"{_locPrefix}contraband-pallet-menu-no-goods-text");
+            AppraiseButton.Text = Loc.GetString($"{_locPrefix}contraband-pallet-appraise-button");
+            SellButton.Text = Loc.GetString($"{_locPrefix}contraband-pallet-sell-button");
+        }
     }
 
     public void SetAppraisal(int amount)
     {
-        AppraisalLabel.Text = Loc.GetString("contraband-console-menu-points-amount", ("amount", amount.ToString()));
+        AppraisalLabel.Text = Loc.GetString($"{_locPrefix}contraband-console-menu-points-amount", ("amount", amount.ToString()));
     }
 
     public void SetCount(int count)

Content.Client/_NF/Latejoin/NFLateJoinGui.xaml.cs

@@ -18,7 +18,7 @@ public sealed partial class NFLateJoinGui : FancyWindow
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IConsoleHost _consoleHost = default!;
-    [Dependency] private readonly JobRequirementsManager _playManager = default!;
+    [Dependency] private readonly JobRequirementsManager _jobReqs = default!;
 
     private ClientGameTicker _gameTicker;
 
@@ -85,15 +85,15 @@ public void UpdateUi(IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobProtot
 
 
 
-            var newButton = new NewFrontierLateJoinJobButton(station, jobId, _gameTicker, _prototypeManager);
+            var newButton = new NewFrontierLateJoinJobButton(station, jobId, _gameTicker, _prototypeManager, _jobReqs);
             newButton.OnPressed += args =>
             {
                 Logger.InfoS("latejoin", $"Late joining as ID: {jobId}");
                 _consoleHost.ExecuteCommand($"joingame {CommandParsing.Escape(jobId)} {station}");
                 Close();
             };
 
-            if (!_playManager.IsAllowed(job, out var denyReason))
+            if (!_jobReqs.IsAllowed(job, out var denyReason))
             {
                 newButton.Disabled = true;
                 newButton.ToolTip = denyReason.ToString();

Content.Client/_NF/Latejoin/NewFrontierLateJoinJobButton.xaml.cs

@@ -1,4 +1,5 @@
 using Content.Client.GameTicking.Managers;
+using Content.Client.Players.PlayTimeTracking;
 using Content.Shared.Roles;
 using Content.Shared.StatusIcon;
 using Robust.Client.AutoGenerated;
@@ -16,15 +17,17 @@ public sealed partial class NewFrontierLateJoinJobButton : Button
     private readonly IPrototypeManager _prototypeManager;
     private readonly ClientGameTicker _gameTicker;
     private readonly NetEntity _station;
+    private readonly JobRequirementsManager _jobReqs;
     private readonly string _jobId;
 
-    public NewFrontierLateJoinJobButton(NetEntity station, string jobId, ClientGameTicker gameTicker, IPrototypeManager prototypeManager)
+    public NewFrontierLateJoinJobButton(NetEntity station, string jobId, ClientGameTicker gameTicker, IPrototypeManager prototypeManager, JobRequirementsManager jobReqs)
     {
         RobustXamlLoader.Load(this);
         _prototypeManager = prototypeManager;
         _gameTicker = gameTicker;
         _station = station;
         _jobId = jobId;
+        _jobReqs = jobReqs;
 
         _gameTicker.LobbyJobsAvailableUpdated += UpdateButton;
         UpdateButton(_gameTicker.JobsAvailable);
@@ -53,6 +56,6 @@ private void UpdateButton(IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobP
 
         JobText.Text = $"{prototype.LocalizedName} ({obj[_station][_jobId]?.ToString() ?? "Unlimited"})";
 
-        Disabled = obj[_station][_jobId] == 0;
+        Disabled = obj[_station][_jobId] == 0 || !_jobReqs.IsAllowed(prototype, out var _);
     }
 }

Content.Client/_NF/Latejoin/VesselListControl.xaml.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.GameTicking.Managers;
+using Content.Client.UserInterface.Systems.Chat.Controls;
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -21,6 +22,9 @@ public NetEntity? Selected
     {
         get
         {
+            if (_selected is not null)
+                return _selected;
+
             var i = VesselItemList.GetSelected().FirstOrDefault();
             if (i is null)
                 return null;
@@ -31,13 +35,16 @@ public NetEntity? Selected
 
     private IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>>? _lastJobState;
 
+    private NetEntity? _selected = null;
+
     public VesselListControl()
     {
         _gameTicker = EntitySystem.Get<ClientGameTicker>();
         IoCManager.InjectDependencies(this);
         RobustXamlLoader.Load(this);
         _gameTicker.LobbyJobsAvailableUpdated += UpdateUi;
         Comparison = DefaultComparison;
+        VesselItemList.OnItemSelected += OnItemSelected;
 
         UpdateUi(_gameTicker.JobsAvailable);
 
@@ -107,13 +114,19 @@ private void Sort()
             VesselItemList.Sort((a, b) => Comparison((NetEntity) a.Metadata!, (NetEntity) b.Metadata!));
     }
 
+    private void OnItemSelected(ItemList.ItemListSelectedEventArgs args)
+    {
+        _selected = (NetEntity?) args.ItemList[args.ItemIndex].Metadata;
+    }
+
     private void UpdateUi(IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>> obj)
     {
         VesselItemList.Clear();
 
+        bool selectedFound = false;
         foreach (var (key, name) in _gameTicker.StationNames)
         {
-            if (VesselItemList.Any(x => ((NetEntity) x.Metadata!) == key))
+            if (VesselItemList.Any(x => (NetEntity) x.Metadata! == key))
                 continue;
 
             var jobsAvailable = _gameTicker.JobsAvailable[key].Values.Sum(a => a ?? 0);
@@ -122,6 +135,11 @@ private void UpdateUi(IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobProto
                 Metadata = key,
                 Text = name + $" ({jobsAvailable})"
             };
+            if (_selected == key)
+            {
+                selectedFound = true;
+                item.Selected = true;
+            }
             if (!string.IsNullOrEmpty(FilterLineEdit.Text) &&
                 !name.ToLowerInvariant().Contains(FilterLineEdit.Text.Trim().ToLowerInvariant()))
             {
@@ -134,9 +152,14 @@ private void UpdateUi(IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobProto
         _lastJobState = obj;
         Sort();
 
-        if (Selected == null && VesselItemList.Count > 0)
+        if (!selectedFound)
         {
-            VesselItemList.First().Selected = true;
+            _selected = null;
+            if (VesselItemList.Count > 0)
+            {
+                VesselItemList.First().Selected = true;
+                _selected = (NetEntity) VesselItemList.First().Metadata!;
+            }
         }
     }
 }