From 52d96b8518c1c499bf89e932b52c369b7708527e Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 20 May 2021 00:20:48 -0700 Subject: [PATCH] Include steerpoint number in strike page. https://github.com/dcs-liberation/dcs_liberation/issues/1001 --- gen/kneeboard.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gen/kneeboard.py b/gen/kneeboard.py index f781776e..c0035b06 100644 --- a/gen/kneeboard.py +++ b/gen/kneeboard.py @@ -481,10 +481,10 @@ class StrikeTaskPage(KneeboardPage): self.theater = theater @property - def targets(self) -> Iterator[FlightWaypoint]: - for waypoint in self.flight.waypoints: + def targets(self) -> Iterator[NumberedWaypoint]: + for idx, waypoint in enumerate(self.flight.waypoints): if waypoint.waypoint_type == FlightWaypointType.TARGET_POINT: - yield waypoint + yield NumberedWaypoint(idx, waypoint) def write(self, path: Path) -> None: writer = KneeboardPageWriter(dark_theme=self.dark_kneeboard) @@ -492,18 +492,18 @@ class StrikeTaskPage(KneeboardPage): custom_name_title = ' ("{}")'.format(self.flight.custom_name) else: custom_name_title = "" - writer.title(f"{self.flight.callsign} Target Info{custom_name_title}") + writer.title(f"{self.flight.callsign} Strike Task Info{custom_name_title}") writer.table( [self.target_info_row(t) for t in self.targets], - headers=["Description", "Location"], + headers=["Steerpoint", "Description", "Location"], ) writer.write(path) - def target_info_row(self, target: FlightWaypoint) -> List[str]: - ll = self.theater.point_to_ll(target.position) - return [target.pretty_name, self.format_ll(ll)] + def target_info_row(self, target: NumberedWaypoint) -> List[str]: + ll = self.theater.point_to_ll(target.waypoint.position) + return [str(target.number), target.waypoint.pretty_name, self.format_ll(ll)] class KneeboardGenerator(MissionInfoGenerator):