From 6034c899d376856d9b64c5f8a432928614f0a59c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kangwook=20Lee=20=28=EC=9D=B4=EA=B0=95=EC=9A=B1=29?=
 <pbzweihander@gmail.com>
Date: Sun, 1 Aug 2021 04:34:49 +0900
Subject: [PATCH] Add flight intra radio channel to mission briefing (#1475)

---
 gen/briefinggen.py                                  | 11 +++++++++++
 resources/briefing/templates/briefingtemplate_CN.j2 |  1 +
 resources/briefing/templates/briefingtemplate_EN.j2 |  1 +
 resources/briefing/templates/briefingtemplate_FR.j2 |  1 +
 4 files changed, 14 insertions(+)

diff --git a/gen/briefinggen.py b/gen/briefinggen.py
index 87029d7b..5a6911f0 100644
--- a/gen/briefinggen.py
+++ b/gen/briefinggen.py
@@ -136,6 +136,16 @@ def format_waypoint_time(waypoint: FlightWaypoint, depart_prefix: str) -> str:
     return ""
 
 
+def format_intra_flight_channel(flight: FlightData) -> str:
+    frequency = flight.intra_flight_channel
+    channel = flight.channel_for(frequency)
+    if channel is None:
+        return str(frequency)
+
+    channel_name = flight.aircraft_type.channel_name(channel.radio_id, channel.channel)
+    return f"{channel_name} ({frequency})"
+
+
 class BriefingGenerator(MissionInfoGenerator):
     def __init__(self, mission: Mission, game: Game):
         super().__init__(mission, game)
@@ -151,6 +161,7 @@ class BriefingGenerator(MissionInfoGenerator):
             lstrip_blocks=True,
         )
         env.filters["waypoint_timing"] = format_waypoint_time
+        env.filters["intra_flight_channel"] = format_intra_flight_channel
         self.template = env.get_template("briefingtemplate_EN.j2")
 
     def generate(self) -> None:
diff --git a/resources/briefing/templates/briefingtemplate_CN.j2 b/resources/briefing/templates/briefingtemplate_CN.j2
index 5b4e38cc..3d6e3823 100644
--- a/resources/briefing/templates/briefingtemplate_CN.j2
+++ b/resources/briefing/templates/briefingtemplate_CN.j2
@@ -67,6 +67,7 @@ DCS Liberation 第 {{ game.turn }} 回合
 {% for flight in flights if flight.client_units %}
 --------------------------------------------------
 {{ flight.flight_type }} {{ flight.units[0].type }} x {{flight.size}}, departing in {{ flight.departure_delay }}, {{ flight.package.target.name}}
+频率 : {{ intra_flight_channel(flight) }}
 {% for waypoint in flight.waypoints %}
 {{ loop.index0 }} {{waypoint|waypoint_timing("Depart ")}}-- {{waypoint.name}} : {{ waypoint.description}}
 {% endfor %}
diff --git a/resources/briefing/templates/briefingtemplate_EN.j2 b/resources/briefing/templates/briefingtemplate_EN.j2
index ce5b7220..b10ed378 100644
--- a/resources/briefing/templates/briefingtemplate_EN.j2
+++ b/resources/briefing/templates/briefingtemplate_EN.j2
@@ -67,6 +67,7 @@ Your flights:
 {% for flight in flights if flight.client_units %}
 --------------------------------------------------
 {{ flight.flight_type }} {{ flight.units[0].type }} x {{ flight.size }}, departing in {{ flight.departure_delay }}, {{ flight.package.target.name}}
+Freq : {{ intra_flight_channel(flight) }}
 {% for waypoint in flight.waypoints %}
 {{ loop.index0 }} {{waypoint|waypoint_timing("Depart ")}}-- {{waypoint.name}} : {{ waypoint.description}}
 {% endfor %}
diff --git a/resources/briefing/templates/briefingtemplate_FR.j2 b/resources/briefing/templates/briefingtemplate_FR.j2
index 61cf6b2e..b8a12372 100644
--- a/resources/briefing/templates/briefingtemplate_FR.j2
+++ b/resources/briefing/templates/briefingtemplate_FR.j2
@@ -67,6 +67,7 @@ Vols :
 {% for flight in flights if flight.client_units %}
 --------------------------------------------------
 {{ flight.flight_type }} {{ flight.units[0].type }} x {{flight.size}}, départ dans {{ flight.departure_delay }}, {{ flight.package.target.name}}
+Fréq : {{ intra_flight_channel(flight) }}
 {% for waypoint in flight.waypoints %}
 {{ loop.index0 }} {{waypoint|waypoint_timing("Départ dans ")}}-- {{waypoint.name}} : {{ waypoint.description}}
 {% endfor %}