fix: make nearest shipyards fancier

eseidel · Mar 24, 2024 · dff0d38 · dff0d38
1 parent 525d22c
commit dff0d38
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/packages/cli/lib/behavior/mount_from_buy.dart b/packages/cli/lib/behavior/mount_from_buy.dart
@@ -48,8 +48,7 @@ Future<MountRequest?> mountRequestForShip(
   const mountCost = 100000;
   final creditsNeeded = buyCost + mountCost;
 
-  final shipyard =
-      await nearestShipyard(routePlanner, shipyards, ship.waypointSymbol);
+  final shipyard = await nearestShipyard(routePlanner, shipyards, ship);
   if (shipyard == null) {
     return null;
   }

diff --git a/packages/cli/lib/behavior/scrap.dart b/packages/cli/lib/behavior/scrap.dart
@@ -25,7 +25,7 @@ Future<JobResult> doScrapJob(
     await nearestShipyard(
       caches.routePlanner,
       shipyardListings,
-      ship.waypointSymbol,
+      ship,
     ),
     'No shipyard found.',
     const Duration(minutes: 5),

diff --git a/packages/cli/lib/nav/route.dart b/packages/cli/lib/nav/route.dart
@@ -619,15 +619,31 @@ String describeRoutePlan(RoutePlan plan) {
 Future<ShipyardListing?> nearestShipyard(
   RoutePlanner routePlanner,
   ShipyardListingSnapshot shipyards,
-  WaypointSymbol start,
+  Ship ship,
 ) async {
+  final start = ship.waypointSymbol;
   final listings = shipyards.listingsInSystem(start.system);
 
   // If not in this system.  Should list all shipyardListings.
   // Filter by ones which are reachable (e.g. if this ship can warp).
   // Pick the one with the shortest route.
+  final systemConnectivity = routePlanner.systemConnectivity;
 
-  // TODO(eseidel): Sort by distance.
-  // TODO(eseidel): Consider reachable systems not just this one.
-  return listings.firstOrNull;
+  final reachableShipyards = listings.where((listing) {
+    return systemConnectivity.existsJumpPathBetween(
+      start.system,
+      listing.waypointSymbol.system,
+    );
+  });
+  // Sort by system distance.
+  final listing = minBy(reachableShipyards, (listing) {
+    return routePlanner
+        .planRoute(
+          ship.shipSpec,
+          start: start,
+          end: listing.waypointSymbol,
+        )!
+        .duration;
+  });
+  return listing;
 }