From e9634b7066664671724bdbfc5c86d4c5731a37d1 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Sat, 6 Nov 2021 18:34:23 -0700 Subject: [PATCH] Prevent assigning fixed wing squadrons to FARPs. Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1671 --- game/squadrons/squadrondef.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/game/squadrons/squadrondef.py b/game/squadrons/squadrondef.py index f913c2a4..3893e101 100644 --- a/game/squadrons/squadrondef.py +++ b/game/squadrons/squadrondef.py @@ -4,10 +4,7 @@ import logging from collections import Iterable from dataclasses import dataclass, field from pathlib import Path -from typing import ( - TYPE_CHECKING, - Optional, -) +from typing import Optional, TYPE_CHECKING import yaml @@ -52,6 +49,8 @@ class SquadronDef: return task in self.auto_assignable_mission_types def operates_from(self, control_point: ControlPoint) -> bool: + if not control_point.can_operate(self.aircraft): + return False if control_point.is_carrier: return self.operating_bases.carrier elif control_point.is_lha: