From e9bfd58ee1216729602d3b68644e4d519942197e Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 23 Oct 2020 22:52:32 -0700 Subject: [PATCH] Shorten strike waypoint descriptions. We don't really need this much detail in these, and it was overflowing the kneeboard. --- gen/flights/flightplan.py | 6 +----- gen/flights/waypointbuilder.py | 9 +++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/gen/flights/flightplan.py b/gen/flights/flightplan.py index 2d8eda20..e7bbb1b0 100644 --- a/gen/flights/flightplan.py +++ b/gen/flights/flightplan.py @@ -157,11 +157,7 @@ class FlightPlanBuilder: if building.is_dead: continue - builder.strike_point( - building, - f"{building.obj_name} {building.category}", - location - ) + builder.strike_point(building, building.category, location) builder.egress(self.package.waypoints.egress, location) builder.split(self.package.waypoints.split) diff --git a/gen/flights/waypointbuilder.py b/gen/flights/waypointbuilder.py index 14583c6b..46801280 100644 --- a/gen/flights/waypointbuilder.py +++ b/gen/flights/waypointbuilder.py @@ -173,24 +173,21 @@ class WaypointBuilder: def dead_point(self, target: Union[TheaterGroundObject, Unit], name: str, location: MissionTarget) -> None: - self._target_point(target, name, f"STRIKE [{location.name}]: {name}", - location) + self._target_point(target, name, f"STRIKE {name}", location) # TODO: Seems fishy. if self.ingress_point is not None: self.ingress_point.targetGroup = location def sead_point(self, target: Union[TheaterGroundObject, Unit], name: str, location: MissionTarget) -> None: - self._target_point(target, name, f"STRIKE [{location.name}]: {name}", - location) + self._target_point(target, name, f"STRIKE {name}", location) # TODO: Seems fishy. if self.ingress_point is not None: self.ingress_point.targetGroup = location def strike_point(self, target: Union[TheaterGroundObject, Unit], name: str, location: MissionTarget) -> None: - self._target_point(target, name, f"STRIKE [{location.name}]: {name}", - location) + self._target_point(target, name, f"STRIKE {name}", location) def _target_point(self, target: Union[TheaterGroundObject, Unit], name: str, description: str, location: MissionTarget) -> None: