fix: improve Ship->ShipType lookup

Author: eseidel

packages/cli/bin/report_balance_sheet.dart

@@ -24,10 +24,17 @@ Future<int> computeShipValue(
   ShipyardShipCache shipyardShips,
   ShipyardPriceSnapshot shipyardPrices,
 ) async {
+  ShipType shipTypeForShip(Ship ship) {
+    final type = guessShipType(shipyardShips, ship);
+    if (type == null) {
+      throw StateError('Unknown ship type for frame: ${ship.frame.symbol}');
+    }
+    return type;
+  }
+
+  // Ignoring the first two ships, since they come for free.
   final purchasedShips = ships.ships.skip(2).toList();
-  final purchaseShipTypes = purchasedShips
-      .map((s) => shipyardShips.shipTypeFromFrame(s.frame.symbol)!)
-      .toList();
+  final purchaseShipTypes = purchasedShips.map(shipTypeForShip).toList();
   final totalShipCost =
       purchaseShipTypes.map((s) => shipyardPrices.medianPurchasePrice(s)!).sum;
 

packages/cli/bin/squads.dart

@@ -12,23 +12,6 @@ String describeJob(ExtractionJob job) {
   return '$action @ $sourceName';
 }
 
-ShipType? guessType(ShipyardShipCache shipyardShipCache, Ship ship) {
-  final frame = ship.frame;
-  final type = shipyardShipCache.shipTypeFromFrame(frame.symbol);
-  if (type != null) {
-    return type;
-  }
-  if (frame.symbol == ShipFrameSymbolEnum.DRONE) {
-    if (ship.hasMiningLaser) {
-      return ShipType.MINING_DRONE;
-    }
-    if (ship.hasSurveyor) {
-      return ShipType.SURVEYOR;
-    }
-  }
-  return null;
-}
-
 Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
   final systems = await SystemsCache.loadOrFetch(fs);
   final charting = ChartingCache(db);
@@ -48,7 +31,7 @@ Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
     final squad = squads[i];
     logger.info('Squad $i: ${describeJob(squad.job)}');
     for (final ship in squad.ships) {
-      final type = guessType(shipyardShipCache, ship)!;
+      final type = guessShipType(shipyardShipCache, ship)!;
       final typeName = type.value.substring('SHIP_'.length);
       final cargoStatus = ship.cargo.capacity == 0
           ? ''

packages/cli/lib/ships.dart

@@ -89,6 +89,33 @@ extension ShipTypeToFrame on ShipyardShipCache {
   }
 }
 
+/// Attempt to determine ShipType from a Ship.  Since Ships can be modified
+/// after purchase there is not always a 1:1 mapping from Ship back to ShipType.
+ShipType? guessShipType(ShipyardShipCache shipyardShipCache, Ship ship) {
+  final frame = ship.frame;
+  final type = shipyardShipCache.shipTypeFromFrame(frame.symbol);
+  if (type != null) {
+    return type;
+  }
+  if (frame.symbol == ShipFrameSymbolEnum.DRONE) {
+    if (ship.hasMiningLaser) {
+      return ShipType.MINING_DRONE;
+    }
+    if (ship.hasSiphon) {
+      return ShipType.SIPHON_DRONE;
+    }
+    if (ship.hasSurveyor) {
+      return ShipType.SURVEYOR;
+    }
+  }
+  if (frame.symbol == ShipFrameSymbolEnum.HEAVY_FREIGHTER) {
+    if (ship.hasOreRefinery) {
+      return ShipType.REFINING_FREIGHTER;
+    }
+  }
+  return null;
+}
+
 /// Provides Ship data that ShipyardShip does not.
 /// Right now that's only Role, but it could be more in the future.
 @immutable

packages/types/lib/api.dart

@@ -183,6 +183,10 @@ extension ShipUtils on Ship {
   bool get hasSiphon =>
       mounts.any((m) => kSiphonMountSymbols.contains(m.symbol));
 
+  /// Returns true if the ship has a refinery mount.
+  bool get hasOreRefinery =>
+      modules.any((m) => m.symbol == ShipModuleSymbolEnum.ORE_REFINERY_I);
+
   /// Returns true if the ship is in transit.
   bool get isInTransit => nav.status == ShipNavStatus.IN_TRANSIT;