Cargo Containers: An alternative to crate hauling

Content.Server/Cargo/Systems/CargoSystem.cs

@@ -74,6 +74,7 @@ public override void Initialize()
         InitializeBounty();
         // Frontier: add specific initialization calls here.
         InitializePirateBounty();
+        InitializeShipmentPrice();
         // End Frontier
     }
 

Content.Server/Shipyard/Components/ShipyardVoucherComponent.cs

@@ -34,4 +34,11 @@ public sealed partial class ShipyardVoucherComponent : Component
     /// </summary>
     [DataField(required: true)]
     public ShipyardConsoleUiKey ConsoleType;
+
+    // Frontier
+    /// <summary>
+    ///  Whether this voucher allows for free purchase/sale or if it still costs money to purchase. Useful for allowing multiple ships without multiple IDs.
+    /// </summary>
+    [DataField]
+    public bool NoValue = true;
 }

Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs

@@ -140,6 +140,7 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp
         // Keep track of whether or not a voucher was used.
         // TODO: voucher purchase should be done in a separate function.
         bool voucherUsed = false;
+        bool hasValue = false;
         if (voucher is not null)
         {
             if (voucher!.RedemptionsLeft <= 0)
@@ -161,7 +162,8 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp
             voucher.RedemptionsLeft--;
             voucherUsed = true;
         }
-        else
+        // not using an else here because the voucher might still require a purchase cost
+        if (voucher is null || voucher.NoValue is false)
         {
             if (bank.Balance <= vessel.Price)
             {
@@ -176,6 +178,7 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp
                 PlayDenySound(player, shipyardConsoleUid, component);
                 return;
             }
+            hasValue = true;
         }
 
 
@@ -213,10 +216,10 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp
         var deedID = EnsureComp<ShuttleDeedComponent>(targetId);
 
         var shuttleOwner = Name(player).Trim();
-        AssignShuttleDeedProperties(deedID, shuttleUid, name, shuttleOwner, voucherUsed);
+        AssignShuttleDeedProperties(deedID, shuttleUid, name, shuttleOwner, !hasValue); // replace voucherUsed with hasValue for this, so resale has some value.
 
         var deedShuttle = EnsureComp<ShuttleDeedComponent>(shuttleUid);
-        AssignShuttleDeedProperties(deedShuttle, shuttleUid, name, shuttleOwner, voucherUsed);
+        AssignShuttleDeedProperties(deedShuttle, shuttleUid, name, shuttleOwner, !hasValue); // replace voucherUsed with hasValue for this, so resale has some value.
 
         if (!voucherUsed)
         {
@@ -267,7 +270,7 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp
         EnsureComp<LinkedLifecycleGridParentComponent>(shuttleUid);
 
         var sellValue = 0;
-        if (!voucherUsed)
+        if (hasValue)
         {
             if (TryComp<ShuttleDeedComponent>(targetId, out var deed))
                 sellValue = (int)_pricing.AppraiseGrid((EntityUid)(deed?.ShuttleUid!));
@@ -281,7 +284,7 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp
             SendPurchaseMessage(shipyardConsoleUid, player, name, secretChannel, secret: true);
 
         PlayConfirmSound(player, shipyardConsoleUid, component);
-        if (voucherUsed)
+        if (voucherUsed && !hasValue)
             _adminLogger.Add(LogType.ShipYardUsage, LogImpact.Low, $"{ToPrettyString(player):actor} used {ToPrettyString(targetId)} to purchase shuttle {ToPrettyString(shuttleUid)} with a voucher via {ToPrettyString(component.Owner)}");
         else
             _adminLogger.Add(LogType.ShipYardUsage, LogImpact.Low, $"{ToPrettyString(player):actor} used {ToPrettyString(targetId)} to purchase shuttle {ToPrettyString(shuttleUid)} for {vessel.Price} credits via {ToPrettyString(component.Owner)}");
@@ -296,13 +299,13 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp
                     suffix: deedShuttle.ShuttleNameSuffix ?? "",
                     ownerName: shuttleOwner,
                     entityUid: _entityManager.GetNetEntity(shuttleUid),
-                    purchasedWithVoucher: voucherUsed,
+                    purchasedWithVoucher: !hasValue, // replace voucherUsed with hasValue for this, so resale has some value.
                     purchasePrice: (uint)vessel.Price
                 )
             );
         }
 
-        RefreshState(shipyardConsoleUid, bank.Balance, true, name, sellValue, targetId, (ShipyardConsoleUiKey)args.UiKey, voucherUsed);
+        RefreshState(shipyardConsoleUid, bank.Balance, true, name, sellValue, targetId, (ShipyardConsoleUiKey)args.UiKey, !hasValue);
     }
 
     private void TryParseShuttleName(ShuttleDeedComponent deed, string name)
@@ -477,7 +480,7 @@ private void OnConsoleUIOpened(EntityUid uid, ShipyardConsoleComponent component
             }
         }
 
-        var voucherUsed = HasComp<ShipyardVoucherComponent>(targetId);
+        var voucherUsed = TryComp<ShipyardVoucherComponent>(targetId, out var voucher) && voucher.NoValue is true;
 
         int sellValue = 0;
         if (deed?.ShuttleUid != null)
@@ -569,11 +572,11 @@ private void OnItemSlotChanged(EntityUid uid, ShipyardConsoleComponent component
                 }
             }
 
-            var voucherUsed = HasComp<ShipyardVoucherComponent>(targetId);
+            var voucherUsed = TryComp<ShipyardVoucherComponent>(targetId, out var voucher) && voucher.NoValue is true;
 
             int sellValue = 0;
             if (deed?.ShuttleUid != null)
-                sellValue = (int) _pricing.AppraiseGrid(deed.ShuttleUid.Value);
+                sellValue = (int)_pricing.AppraiseGrid(deed.ShuttleUid.Value);
 
             sellValue -= CalculateTotalSalesTax(component, sellValue);
 
@@ -795,7 +798,7 @@ private void OnInitDeedSpawner(EntityUid uid, StationDeedSpawnerComponent compon
         if (xform.GridUid == null)
             return;
 
-        if (!TryComp<ShuttleDeedComponent>(xform.GridUid.Value, out var shuttleDeed) || !TryComp<ShuttleComponent>(xform.GridUid.Value, out var shuttle) || !HasComp<TransformComponent>(xform.GridUid.Value) || shuttle == null  || ShipyardMap == null)
+        if (!TryComp<ShuttleDeedComponent>(xform.GridUid.Value, out var shuttleDeed) || !TryComp<ShuttleComponent>(xform.GridUid.Value, out var shuttle) || !HasComp<TransformComponent>(xform.GridUid.Value) || shuttle == null || ShipyardMap == null)
             return;
 
         var output = Regex.Replace($"{shuttleDeed.ShuttleOwner}", @"\s*\([^()]*\)", ""); // Removes content inside parentheses along with parentheses and a preceding space

Content.Server/_NF/Cargo/Components/ShipmentPriceComponent.cs

@@ -0,0 +1,14 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Cargo.Components;
+
+// Component to give an object an inflated apprasial price at certain shipyards.
+[RegisterComponent]
+public sealed partial class ShipmentPriceComponent : Component
+{
+    /// <summary>
+    /// The price of the object at the destination shipyard.
+    /// </summary>
+    [DataField("bonusPrice", required: true)]
+    public int BonusPrice;
+}

Content.Server/_NF/Cargo/Components/ShipmentRecieveComponent.cs

@@ -0,0 +1,10 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Cargo.Components;
+
+// Component to mark a station as a valid destination for shipments
+[RegisterComponent]
+public sealed partial class ShipmentRecieveComponent : Component
+{
+
+}

Content.Server/_NF/Cargo/Systems/ShipmentPriceSystem.cs

@@ -0,0 +1,36 @@
+using Content.Server.Cargo.Components;
+using Content.Server.Shuttles.Systems;
+
+namespace Content.Server.Cargo.Systems; // Needs to collide with base namespace
+
+public sealed partial class CargoSystem
+{
+
+    [Dependency] private readonly DockingSystem _docking = default!;
+    private void InitializeShipmentPrice()
+    {
+        SubscribeLocalEvent<ShipmentPriceComponent, PriceCalculationEvent>(OnShipmentGetPriceEvent);
+    }
+
+    private void OnShipmentGetPriceEvent(Entity<ShipmentPriceComponent> entity, ref PriceCalculationEvent ev)
+    {
+        if (!TryComp(entity, out TransformComponent? xform))
+        {
+            return; //how do we not have a transform?
+        }
+        var currentShuttle = xform.GridUid;
+        if (currentShuttle != null)
+        {
+            var shuttleDocks = _docking.GetDocks((EntityUid)currentShuttle); //check we're docked to a destination grid
+            foreach (var shuttleDock in shuttleDocks)
+            {
+                // If the ship we're on is docked with a dock that is on a grid that is tagged, add bonus price and break.
+                if (shuttleDock.Comp.DockedWith != null && TryComp<TransformComponent>(shuttleDock.Comp.DockedWith, out var dock) && HasComp<ShipmentRecieveComponent>(dock.GridUid))
+                {
+                    ev.Price = entity.Comp.BonusPrice;
+                    break;
+                }
+            }
+        }
+    }
+}

Content.Shared/Shipyard/SharedShipyardSystem.cs

@@ -18,6 +18,7 @@ public enum ShipyardConsoleUiKey : byte
     Expedition,
     Scrap,
     Sr,
+    Cargo,
     Medical,
     // Add ships to this key if they are only available from mothership consoles. Shipyards using it are inherently empty and are populated using the ShipyardListingComponent.
     Custom

Resources/Maps/_NF/POI/trade.yml

@@ -2516,6 +2516,7 @@ entities:
     - type: NavMap
     - type: BecomesStation
       id: Trade
+    - type: ShipmentRecieve
 - proto: AirAlarm
   entities:
   - uid: 6079

Resources/Maps/_NF/POI/trademall.yml

@@ -5326,6 +5326,7 @@ entities:
     - type: IFF
     - type: StationMember
     - type: NavMap
+    - type: ShipmentRecieve
 - proto: AirAlarm
   entities:
   - uid: 216