Merge pull request #53 from new-frontiers-14/salvage_rewards

Salvage Rewards
new-frontiers-14 · Jul 19, 2023 · 96f5305 · 96f5305
2 parents e78caf9 + ba1f8d2
commit 96f5305
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
@@ -10,9 +10,12 @@
 using System.Linq;
 using System.Threading;
 using Content.Server.Shuttles.Systems;
+using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
+using Content.Shared.Coordinates;
 using Content.Shared.Salvage.Expeditions;
 using Robust.Shared.GameStates;
+using Robust.Shared.Random;
 
 namespace Content.Server.Salvage;
 
@@ -293,18 +296,22 @@ private void OnStructureExamine(EntityUid uid, SalvageStructureComponent compone
 
     private void GiveRewards(SalvageExpeditionComponent comp)
     {
-        // send it to cargo, no rewards otherwise.
-        if (!TryComp<StationCargoOrderDatabaseComponent>(comp.Station, out var cargoDb))
+        var palletList = new List<EntityUid>();
+        var pallets = EntityQueryEnumerator<CargoPalletComponent>();
+        while (pallets.MoveNext(out var pallet, out var palletComp))
         {
-            return;
+            if (_stationSystem.GetOwningStation(pallet) == comp.Station)
+            {
+                palletList.Add(pallet);
+            }
         }
 
+        if (!(palletList.Count > 0))
+            return;
+
         foreach (var reward in comp.Rewards)
         {
-            var sender = Loc.GetString("cargo-gift-default-sender");
-            var desc = Loc.GetString("salvage-expedition-reward-description");
-            var dest = Loc.GetString("cargo-gift-default-dest");
-            _cargo.AddAndApproveOrder(cargoDb, reward, 0, 1, sender, desc, dest);
+            Spawn(reward, (_random.Pick(palletList)).ToCoordinates());
         }
     }
 }
diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -158,7 +158,7 @@ protected override async Task<bool> Process()
         if (shuttleUid is { Valid : true } vesselUid)
         {
             var shuttle = _entManager.GetComponent<ShuttleComponent>(vesselUid);
-            _shuttle.FTLTravel(vesselUid, shuttle, new EntityCoordinates(mapUid, Vector2.Zero), 8f, 50f);
+            _shuttle.FTLTravel(vesselUid, shuttle, new EntityCoordinates(mapUid, Vector2.Zero), 5.5f, 50f);
         }
 
         var landingPadRadius = 38; //we go a liiitle bigger for the shipses