Add minimum fuel per waypoint on the kneeboard.

gen/flights/flight.py

@@ -2,13 +2,14 @@ from __future__ import annotations
 
 from datetime import timedelta
 from enum import Enum
-from typing import List, Optional, TYPE_CHECKING, Union, Sequence
+from typing import List, Optional, TYPE_CHECKING, Union, Sequence, Any
 
 from dcs.mapping import Point
 from dcs.point import MovingPoint, PointAction
 from dcs.unit import Unit
 
 from game.dcs.aircrafttype import AircraftType
+from game.savecompat import has_save_compat_for
 from game.squadrons import Pilot, Squadron
 from game.theater.controlpoint import ControlPoint, MissionTarget
 from game.utils import Distance, meters
@@ -138,7 +139,7 @@ class FlightWaypoint:
 
         Args:
             waypoint_type: The waypoint type.
-            x: X cooidinate of the waypoint.
+            x: X coordinate of the waypoint.
             y: Y coordinate of the waypoint.
             alt: Altitude of the waypoint. By default this is AGL, but it can be
             changed to MSL by setting alt_type to "RADIO".
@@ -158,6 +159,8 @@ class FlightWaypoint:
         self.pretty_name = ""
         self.only_for_player = False
         self.flyover = False
+        # The minimum amount of fuel remaining at this waypoint in pounds.
+        self.min_fuel: Optional[float] = None
 
         # These are set very late by the air conflict generator (part of mission
         # generation). We do it late so that we don't need to propagate changes
@@ -166,6 +169,12 @@ class FlightWaypoint:
         self.tot: Optional[timedelta] = None
         self.departure_time: Optional[timedelta] = None
 
+    @has_save_compat_for(5)
+    def __setstate__(self, state: dict[str, Any]) -> None:
+        if "min_fuel" not in state:
+            state["min_fuel"] = None
+        self.__dict__.update(state)
+
     @property
     def position(self) -> Point:
         return Point(self.x, self.y)

gen/flights/flightplan.py

@@ -20,6 +20,7 @@ from dcs.unit import Unit
 from shapely.geometry import Point as ShapelyPoint
 
 from game.data.doctrine import Doctrine
+from game.dcs.aircrafttype import FuelConsumption
 from game.flightplan import IpZoneGeometry, JoinZoneGeometry, HoldZoneGeometry
 from game.theater import (
     Airfield,
@@ -138,6 +139,17 @@ class FlightPlan:
     @cached_property
     def bingo_fuel(self) -> int:
         """Bingo fuel value for the FlightPlan"""
+        if (fuel := self.flight.unit_type.fuel_consumption) is not None:
+            return self._bingo_estimate(fuel)
+        return self._legacy_bingo_estimate()
+
+    def _bingo_estimate(self, fuel: FuelConsumption) -> int:
+        distance_to_arrival = self.max_distance_from(self.flight.arrival)
+        fuel_consumed = fuel.cruise * distance_to_arrival.nautical_miles
+        bingo = fuel_consumed + fuel.min_safe
+        return math.ceil(bingo / 100) * 100
+
+    def _legacy_bingo_estimate(self) -> int:
         distance_to_arrival = self.max_distance_from(self.flight.arrival)
 
         bingo = 1000.0  # Minimum Emergency Fuel