Merge remote-tracking branch 'khopa/develop' into develop

This commit is contained in:
Khopa 2021-02-07 21:16:04 +01:00
commit 7a077a0d21
3 changed files with 26 additions and 2 deletions

View File

@ -73,6 +73,7 @@ DCS Liberation 第 {{ game.turn }} 回合
--------------------------------------------------{% endfor %} --------------------------------------------------{% endfor %}
{%- if allied_flights_by_departure|length > 0 %}
其他友军单位飞行计划: 其他友军单位飞行计划:
==================== ====================
{% for dep in allied_flights_by_departure %} {% for dep in allied_flights_by_departure %}
@ -82,7 +83,9 @@ DCS Liberation 第 {{ game.turn }} 回合
{{ flight.flight_type }} {{ flight.units[0].type }} x {{flight.size}}, departing in {{ flight.departure_delay }}, {{ flight.package.target.name}} {{ flight.flight_type }} {{ flight.units[0].type }} x {{flight.size}}, departing in {{ flight.departure_delay }}, {{ flight.package.target.name}}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% endif %}
{%- if dynamic_runways|length > 0 %}
航母及FARPs 航母及FARPs
==================== ====================
{% for runway in dynamic_runways %} {% for runway in dynamic_runways %}
@ -94,12 +97,17 @@ TACAN : {{ runway.tacan }} {{ runway.tacan_callsign }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %}
{%- if awacs|length > 0 %}
AWACS: AWACS:
==================== ====================
{% for i in awacs %}{{ i.callsign }} -- 频率 : {{i.freq.mhz}} {% for i in awacs %}{{ i.callsign }} -- 频率 : {{i.freq.mhz}}
{% endfor %} {% endfor %}
{% endif %}
{%- if jtacs|length > 0 %}
JTACS [F-10 菜单] : JTACS [F-10 菜单] :
==================== ====================
{% for jtac in jtacs %}前线 {{ jtac.region }} -- 激光编码 : {{ jtac.code }} {% for jtac in jtacs %}前线 {{ jtac.region }} -- 激光编码 : {{ jtac.code }}
{% endfor %} {% endfor %}
{% endif %}

View File

@ -73,6 +73,7 @@ Your flights:
--------------------------------------------------{% endfor %} --------------------------------------------------{% endfor %}
{%- if allied_flights_by_departure|length > 0 %}
Planned ally flights: Planned ally flights:
==================== ====================
{% for dep in allied_flights_by_departure %} {% for dep in allied_flights_by_departure %}
@ -82,7 +83,9 @@ Planned ally flights:
{{ flight.flight_type }} {{ flight.units[0].type }} x {{flight.size}}, departing in {{ flight.departure_delay }}, {{ flight.package.target.name}} {{ flight.flight_type }} {{ flight.units[0].type }} x {{flight.size}}, departing in {{ flight.departure_delay }}, {{ flight.package.target.name}}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% endif %}
{%- if dynamic_runways|length > 0 %}
Carriers and FARPs: Carriers and FARPs:
==================== ====================
{% for runway in dynamic_runways %} {% for runway in dynamic_runways %}
@ -94,12 +97,17 @@ TACAN : {{ runway.tacan }} {{ runway.tacan_callsign }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %}
{%- if awacs|length > 0 %}
AWACS: AWACS:
==================== ====================
{% for i in awacs %}{{ i.callsign }} -- Freq : {{i.freq.mhz}} {% for i in awacs %}{{ i.callsign }} -- Freq : {{i.freq.mhz}}
{% endfor %} {% endfor %}
{% endif %}
{%- if jtacs|length > 0 %}
JTACS [F-10 Menu] : JTACS [F-10 Menu] :
==================== ====================
{% for jtac in jtacs %}Frontline {{ jtac.region }} -- Code : {{ jtac.code }} {% for jtac in jtacs %}Frontline {{ jtac.region }} -- Code : {{ jtac.code }}
{% endfor %} {% endfor %}
{% endif %}

View File

@ -73,6 +73,7 @@ Vols :
--------------------------------------------------{% endfor %} --------------------------------------------------{% endfor %}
{%- if allied_flights_by_departure|length > 0 %}
Vols alliés prévus : Vols alliés prévus :
==================== ====================
{% for dep in allied_flights_by_departure %} {% for dep in allied_flights_by_departure %}
@ -82,7 +83,9 @@ Vols alliés prévus :
{{ flight.flight_type }} {{ flight.units[0].type }} x {{flight.size}}, départ dans {{ flight.departure_delay }}, {{ flight.package.target.name}} {{ flight.flight_type }} {{ flight.units[0].type }} x {{flight.size}}, départ dans {{ flight.departure_delay }}, {{ flight.package.target.name}}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% endif %}
{%- if dynamic_runways|length > 0 %}
Porte-avions et FARPS : Porte-avions et FARPS :
======================= =======================
{% for runway in dynamic_runways %} {% for runway in dynamic_runways %}
@ -92,14 +95,19 @@ RADIO : {{ runway.atc }}
TACAN : {{ runway.tacan }} {{ runway.tacan_callsign }} TACAN : {{ runway.tacan }} {{ runway.tacan_callsign }}
{% if runway.icls %}Channel ICLS : {{ runway.icls }} {% if runway.icls %}Channel ICLS : {{ runway.icls }}
{% endif %} {% endif %}
{% endif %}
{% endfor %} {% endfor %}
{%- if awacs|length > 0 %}
AWACS: AWACS:
==================== ====================
{% for i in awacs %}{{ i.callsign }} -- Fréq : {{i.freq.mhz}} {% for i in awacs %}{{ i.callsign }} -- Fréq : {{i.freq.mhz}}
{% endfor %} {% endfor %}
{% endif %}
{%- if jtacs|length > 0 %}
JTACS [Menu F-10] : JTACS [Menu F-10] :
==================== ====================
{% for jtac in jtacs %}Ligne de front {{ jtac.region }} -- Code : {{ jtac.code }} {% for jtac in jtacs %}Ligne de front {{ jtac.region }} -- Code : {{ jtac.code }}
{% endfor %} {% endfor %}
{% endif %}