diff --git a/changelog.md b/changelog.md index 5eef3f90..96edd054 100644 --- a/changelog.md +++ b/changelog.md @@ -16,7 +16,8 @@ Saves from 2.5 are not compatible with 2.6. ## Features/Improvements -* **[UI]** BARCAP commit ranges are now displayed by default. +* **[UI]** Engagement ranges are now displayed by default. +* **[UI]** Engagement range display generalized to work for all patrolling flight plans (BARCAP, TARCAP, and CAS). ## Fixes diff --git a/qt_ui/displayoptions.py b/qt_ui/displayoptions.py index d3224a3c..2abf369c 100644 --- a/qt_ui/displayoptions.py +++ b/qt_ui/displayoptions.py @@ -103,7 +103,9 @@ class DisplayOptions: waypoint_info = DisplayRule("Waypoint Information", True) culling = DisplayRule("Display Culling Zones", False) actual_frontline_pos = DisplayRule("Display Actual Frontline Location", False) - barcap_commit_range = DisplayRule("Display selected BARCAP commit range", True) + patrol_engagement_range = DisplayRule( + "Display selected patrol engagement range", True + ) flight_paths = FlightPathOptions() blue_threat_zones = ThreatZoneOptions("Blue") red_threat_zones = ThreatZoneOptions("Red") diff --git a/qt_ui/widgets/map/QLiberationMap.py b/qt_ui/widgets/map/QLiberationMap.py index 540f9e0c..3d54b651 100644 --- a/qt_ui/widgets/map/QLiberationMap.py +++ b/qt_ui/widgets/map/QLiberationMap.py @@ -59,6 +59,8 @@ from gen.flights.flightplan import ( FlightPlan, FlightPlanBuilder, InvalidObjectiveLocation, + PatrollingFlightPlan, + TarCapFlightPlan, ) from gen.flights.traveltime import TotEstimator from qt_ui.displayoptions import DisplayOptions, ThreatZoneOptions @@ -716,13 +718,11 @@ class QLiberationMap(QGraphicsView): ) prev_pos = tuple(new_pos) - if selected and DisplayOptions.barcap_commit_range: - self.draw_barcap_commit_range(scene, flight) + if selected and DisplayOptions.patrol_engagement_range: + self.draw_patrol_commit_range(scene, flight) - def draw_barcap_commit_range(self, scene: QGraphicsScene, flight: Flight) -> None: - if flight.flight_type is not FlightType.BARCAP: - return - if not isinstance(flight.flight_plan, BarCapFlightPlan): + def draw_patrol_commit_range(self, scene: QGraphicsScene, flight: Flight) -> None: + if not isinstance(flight.flight_plan, PatrollingFlightPlan): return start = flight.flight_plan.patrol_start end = flight.flight_plan.patrol_end