From d1e50a5bbee2cf1d10b370c2c932428f5b0be237 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Sat, 6 Nov 2021 16:53:55 -0700 Subject: [PATCH] Fix fixed wing squadrons retreating to FARPs. Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1615 (cherry picked from commit 35900c2350d56ae7354e842dd914dcef7923c973) --- game/squadrons/squadron.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/game/squadrons/squadron.py b/game/squadrons/squadron.py index 33106740..307907d7 100644 --- a/game/squadrons/squadron.py +++ b/game/squadrons/squadron.py @@ -3,17 +3,13 @@ from __future__ import annotations import logging from collections import Iterable from dataclasses import dataclass, field -from typing import ( - TYPE_CHECKING, - Optional, - Sequence, -) +from typing import Optional, Sequence, TYPE_CHECKING from faker import Faker from game.settings import AutoAtoBehavior, Settings from gen.ato import Package -from gen.flights.flight import FlightType, Flight +from gen.flights.flight import Flight, FlightType from gen.flights.flightplan import FlightPlanBuilder from .pilot import Pilot, PilotStatus from ..utils import meters @@ -265,6 +261,8 @@ class Squadron: return distance_to_target <= self.aircraft.max_mission_range 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: