From b7d95819c1876b73e676333e6c383bc1b82cd0d5 Mon Sep 17 00:00:00 2001 From: Raffson Date: Sun, 29 Jan 2023 18:18:29 +0100 Subject: [PATCH] Don't strip all digits from air support's callsign --- game/callsigns.py | 2 +- .../aircraft/waypoints/racetrack.py | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/game/callsigns.py b/game/callsigns.py index cd1d7bf1..34af6b14 100644 --- a/game/callsigns.py +++ b/game/callsigns.py @@ -15,7 +15,7 @@ def callsign_for_support_unit(group: FlyingGroup[Any]) -> str: try: return f"Flight {int(raw_callsign)}" except ValueError: - return raw_callsign.rstrip("1234567890") + return f"{raw_callsign[:-2]} {raw_callsign[-2]}" def create_group_callsign_from_unit(lead: FlyingUnit) -> str: diff --git a/game/missiongenerator/aircraft/waypoints/racetrack.py b/game/missiongenerator/aircraft/waypoints/racetrack.py index a0722261..3f3ef944 100644 --- a/game/missiongenerator/aircraft/waypoints/racetrack.py +++ b/game/missiongenerator/aircraft/waypoints/racetrack.py @@ -72,11 +72,17 @@ class RaceTrackBuilder(PydcsWaypointBuilder): tanker_info = self.mission_data.tankers[-1] tacan = tanker_info.tacan if self.flight.tcn_name is None: + cs = tanker_info.callsign[:-2] + csn = tanker_info.callsign[-2] tacan_callsign = { - "Texaco": "TEX", - "Arco": "ARC", - "Shell": "SHL", - }.get(tanker_info.callsign) + "Texaco": "TX", + "Arco": "AC", + "Shell": "SH", + }.get(cs) + if tacan_callsign: + tacan_callsign = tacan_callsign + csn + else: + tacan_callsign = cs[0:2] + csn else: tacan_callsign = self.flight.tcn_name