Release (ss14Starlight#4897)

Almost exclusively bugfixes

Author: redmushie

.github/workflows/directory-validator.yml

@@ -11,16 +11,16 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: List Prototypes directory
-        run: ls -l Resources/Prototypes
-
-      - name: Check for Resources/Prototypes/_StarLight directory
+      - name: Check for StarLight folders
         run: |
-          if [ -d "Resources/Prototypes/_StarLight" ]; then
-            echo "::error::Directory Resources/Prototypes/_StarLight exists! It should be _Starlight."
+          bad_paths="$(find . -path './.git' -prune -o -type d -name '*StarLight*' -print)"
+
+          if [ -n "$bad_paths" ]; then
+            echo "::error::Found folders using StarLight. They should use Starlight."
+            echo "$bad_paths"
             exit 1
           else
-            echo "No typo directory found."
+            echo "No StarLight folders found."
           fi
 
       - name: Validate _Starlight namespaces

Content.Client/_Starlight/Cargo/TamperSeal/TamperSealSystem.cs

@@ -0,0 +1,24 @@
+using Content.Shared._Starlight.Cargo.TamperSeal;
+using Content.Shared._Starlight.Cargo.TamperSeal.Components;
+using Robust.Shared.GameObjects;
+
+namespace Content.Client._Starlight.Cargo.TamperSeal;
+
+/// <inheritdoc/>
+public sealed class TamperSealSystem : SharedTamperSealSystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<TamperSealComponent, AfterAutoHandleStateEvent>(OnAfterHandleState);
+    }
+
+    /// <summary>
+    /// Trigger a visuals update on state change. This makes VV writes trigger a visuals update.
+    /// </summary>
+    private void OnAfterHandleState(EntityUid uid, TamperSealComponent seal, ref AfterAutoHandleStateEvent args)
+    {
+        if (TryComp<AppearanceComponent>(uid, out var appearance))
+            Appearance.QueueUpdate(uid, appearance);
+    }
+}

Content.Client/_Starlight/Cargo/TamperSeal/TamperSealVisualizerSystem.cs

@@ -0,0 +1,43 @@
+using Content.Shared._Starlight.Cargo.TamperSeal.Components;
+using Robust.Client.GameObjects;
+
+namespace Content.Client._Starlight.Cargo.TamperSeal;
+
+/// <summary>
+/// Visualizes a container that is tamper-sealed.
+/// </summary>
+public sealed partial class TamperSealVisualizerSystem : VisualizerSystem<TamperSealComponent>
+{
+    [Dependency] private AppearanceSystem _appearance = default!;
+    [Dependency] private SpriteSystem _sprite = default!;
+
+    protected override void OnAppearanceChange(EntityUid uid, TamperSealComponent component,
+        ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite == null)
+            return;
+
+        var opened = component.Opened;
+        var destroyed = component.Destroyed;
+        var color = component.Color;
+
+        var ent = (uid, args.Sprite);
+        ShowLayerConditional(ent, TamperSealLayers.Base, color, true);
+        ShowLayerConditional(ent, TamperSealLayers.Sealed, color, !opened);
+        ShowLayerConditional(ent, TamperSealLayers.Opened, color, opened);
+        ShowLayerConditional(ent, TamperSealLayers.Destroyed, color, opened && destroyed);
+    }
+
+    /// <summary>
+    /// Sets layer visibility and color if it exists.
+    /// </summary>
+    private void ShowLayerConditional(Entity<SpriteComponent?> sprite, Enum layerKey, Color color, bool value)
+    {
+        if (_sprite.LayerMapTryGet(sprite, layerKey, out var layer, false))
+        {
+            _sprite.LayerSetVisible(sprite, layer, value);
+            _sprite.LayerSetColor(sprite, layer, color);
+        }
+    }
+
+}

Content.Client/_Starlight/ViewVariables/ClientViewVariablesSystem.cs

@@ -1,5 +1,7 @@
 using Content.Shared._Starlight.ViewVariables;
 using Robust.Client.Console;
+using Robust.Client.ViewVariables;
+using Robust.Shared.Localization;
 
 namespace Content.Client._Starlight.ViewVariables;
 
@@ -9,11 +11,14 @@ namespace Content.Client._Starlight.ViewVariables;
 public sealed partial class ClientViewVariablesSystem : EntitySystem
 {
     [Dependency] private IClientConsoleHost _shell = default!;
+    [Dependency] private IViewVariableControlFactory _vvFactory = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
+        _vvFactory.RegisterForType<LocId>(_ => new VVPropEditorLocId());
+
         SubscribeNetworkEvent<OpenViewVariablesEvent>(OnOpenViewVariables);
     }
 

Content.Client/_Starlight/ViewVariables/VVPropEditorLocId.cs

@@ -0,0 +1,28 @@
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.ViewVariables;
+
+namespace Content.Client._Starlight.ViewVariables;
+
+/// <summary>
+/// Adds a text editor field for LocId properties in ViewVariables.
+/// </summary>
+// ReSharper disable once InconsistentNaming
+internal sealed class VVPropEditorLocId : VVPropEditor
+{
+    protected override Control MakeUI(object? value)
+    {
+        var locId = value is LocId l ? l : default;
+        var lineEdit = new LineEdit
+        {
+            Text = locId.Id ?? "",
+            Editable = !ReadOnly,
+            HorizontalExpand = true,
+        };
+
+        if (!ReadOnly)
+            lineEdit.OnTextEntered += e => ValueChanged(new LocId(e.Text));
+
+        return lineEdit;
+    }
+}

…onTests/Tests/_StarLight/Body/LegTest.cs …onTests/Tests/_Starlight/Body/LegTest.csContent.IntegrationTests/Tests/_StarLight/Body/LegTest.cs renamed to Content.IntegrationTests/Tests/_Starlight/Body/LegTest.cs Content.IntegrationTests/Tests/_StarLight/Body/LegTest.cs renamed to Content.IntegrationTests/Tests/_Starlight/Body/LegTest.cs

@@ -13,12 +13,20 @@
 using Content.Shared.Labels.Components;
 using Content.Shared.Paper;
 using Content.Shared.Station.Components;
+using Content.Shared.Tools;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
+#region Starlight
+using Content.Shared._Starlight.Cargo.TamperSeal.Components;
+using Content.Server._Starlight.Cargo.TamperSeal.Components;
+using Content.Shared._Starlight.CCVar;
+using Content.Shared.Access;
+#endregion
+
 namespace Content.Server.Cargo.Systems
 {
     public sealed partial class CargoSystem
@@ -27,6 +35,12 @@ public sealed partial class CargoSystem
         [Dependency] private EmagSystem _emag = default!;
         [Dependency] private IGameTiming _timing = default!;
 
+        #region Starlight
+        private float _tamperSealRewardMultiplier = 0.1f;
+        private float _tamperSealPenaltyMultiplier = 0.1f;
+        private float _tamperSealRefundMultiplier = 0.5f;
+        #endregion
+
         private void InitializeConsole()
         {
             SubscribeLocalEvent<CargoOrderConsoleComponent, CargoConsoleAddOrderMessage>(OnAddOrderMessage);
@@ -36,6 +50,12 @@ private void InitializeConsole()
             SubscribeLocalEvent<CargoOrderConsoleComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<CargoOrderConsoleComponent, InteractUsingEvent>(OnInteractUsing);
             SubscribeLocalEvent<CargoOrderConsoleComponent, GotEmaggedEvent>(OnEmagged);
+
+            // Starlight BEGIN
+            _cfg.OnValueChanged(StarlightCCVars.TamperSealRewardMultiplier, v => _tamperSealRewardMultiplier = v, true);
+            _cfg.OnValueChanged(StarlightCCVars.TamperSealPenaltyMultiplier, v => _tamperSealPenaltyMultiplier = v, true);
+            _cfg.OnValueChanged(StarlightCCVars.TamperSealRefundMultiplier, v => _tamperSealRefundMultiplier = v, true);
+            // Starlight END
         }
 
         private void OnInteractUsingCash(EntityUid uid, CargoOrderConsoleComponent component, ref InteractUsingEvent args)
@@ -76,7 +96,7 @@ private void OnInteractUsingSlip(Entity<CargoOrderConsoleComponent> ent, ref Int
                 return;
 
             var orderId = GenerateOrderId(orderDatabase);
-            var data = new CargoOrderData(orderId, product.Product, product.Name, product.Cost, slip.OrderQuantity, slip.Requester, slip.Reason, slip.Account);
+            var data = new CargoOrderData(orderId, product.Product, product.Name, product.Cost, slip.OrderQuantity, slip.Requester, slip.Reason, slip.Account, GetNetEntity(stationUid.Value)); // Starlight: +stationUid
 
             if (!TryAddOrder(stationUid.Value, ent.Comp.Account, data, orderDatabase))
             {
@@ -386,7 +406,7 @@ private void OnAddOrderMessage(EntityUid uid, CargoOrderConsoleComponent compone
 
             var targetAccount = component.Mode == CargoOrderConsoleMode.SendToPrimary ? bank.PrimaryAccount : component.Account;
 
-            var data = GetOrderData(args, product, GenerateOrderId(orderDatabase), component.Account);
+            var data = new CargoOrderData(GenerateOrderId(orderDatabase), product.Product, product.Name, product.Cost, args.Amount, args.Requester, args.Reason, component.Account, GetNetEntity(stationUid.Value)); // Starlight: +stationUid
 
             if (!TryAddOrder(stationUid.Value, targetAccount, data, orderDatabase))
             {
@@ -464,10 +484,15 @@ private void PlayDenySound(EntityUid uid, CargoOrderConsoleComponent component)
             }
         }
 
+        #region Starlight
+        // This is an upstream method, but it is now unused due to our changes elsewhere in this file.
+        /*
         private static CargoOrderData GetOrderData(CargoConsoleAddOrderMessage args, CargoProductPrototype cargoProduct, int id, ProtoId<CargoAccountPrototype> account)
         {
             return new CargoOrderData(id, cargoProduct.Product, cargoProduct.Name, cargoProduct.Cost, args.Amount, args.Requester, args.Reason, account);
         }
+        */
+        #endregion
 
         public int GetOutstandingOrderCount(Entity<StationCargoOrderDatabaseComponent> station, ProtoId<CargoAccountPrototype> account)
         {
@@ -534,7 +559,7 @@ Entity<StationDataComponent> stationData
             DebugTools.Assert(_protoMan.HasIndex<EntityPrototype>(spawnId));
             // Make an order
             var id = GenerateOrderId(component);
-            var order = new CargoOrderData(id, spawnId, name, cost, qty, sender, description, account);
+            var order = new CargoOrderData(id, spawnId, name, cost, qty, sender, description, account, GetNetEntity(stationData.Owner)); // Starlight: +stationUid
 
             // Approve it now
             order.SetApproverData(dest, sender);
@@ -652,8 +677,37 @@ private bool FulfillOrder(CargoOrderData order, ProtoId<CargoAccountPrototype> a
                 }
             }
 
+            // Starlight BEGIN
+            // If the entity does not support tamper seals, do not apply one.
+            if (!TryComp<TamperSealableComponent>(item, out var tamperSealable))
+                return true;
+
+            var recipient = _protoMan.Index(account);
+
+            // Apply a tamper seal to the entity. This does the actual sealing logic.
+            var seal = EnsureComp<TamperSealComponent>(item);
+            seal.Recipient = account;
+            seal.RecipientName = recipient.TamperSealName;
+            seal.RecipientExamineColor = recipient.Color;
+            seal.Color = recipient.TamperSealColor;
+            seal.Accesses = new List<TamperSealAccessPattern>(recipient.TamperSealAccesses);
+            seal.DestroyToolQualities = new HashSet<ProtoId<ToolQualityPrototype>>(tamperSealable.DestroyToolQualities);
+
+            // Attach a tamper seal value component to enable reward/penalty on unseal/destroy.
+            var value = EnsureComp<TamperSealValueComponent>(item);
+            value.StationId = GetEntity(order.StationId);
+            value.Value = order.Price;
+            value.Reward = (int) Math.Floor(_tamperSealRewardMultiplier * order.Price); // Rewards rounded down.
+            value.Penalty = (int) Math.Ceiling(_tamperSealPenaltyMultiplier * order.Price); // Penalties rounded up.
+            value.Refund = (int) Math.Ceiling(_tamperSealRefundMultiplier * order.Price); // Refunds rounded up.
+
+            // Attach an integrity component. This is used by the integrity system to detect repeat tampering.
+            var integrity = EnsureComp<TamperSealIntegrityBeaconComponent>(item);
+            integrity.StationId = GetEntity(order.StationId);
+
+            DirtyEntity(item);
             return true;
-
+            // Starlight END
         }
 
         public List<ProtoId<CargoProductPrototype>> GetAvailableProducts(Entity<CargoOrderConsoleComponent> ent)