From 9ddaf50ad4cb5af97245c2c1765568c7d16af084 Mon Sep 17 00:00:00 2001 From: Raffson Date: Sun, 1 Jan 2023 16:06:36 +0100 Subject: [PATCH] Refactor logic wrt "disable idle aircraft" --- game/missiongenerator/aircraft/aircraftgenerator.py | 3 --- game/missiongenerator/missiongenerator.py | 9 +++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/game/missiongenerator/aircraft/aircraftgenerator.py b/game/missiongenerator/aircraft/aircraftgenerator.py index 400078b4..876667ef 100644 --- a/game/missiongenerator/aircraft/aircraftgenerator.py +++ b/game/missiongenerator/aircraft/aircraftgenerator.py @@ -151,9 +151,6 @@ class AircraftGenerator: def _spawn_unused_for( self, squadron: Squadron, country: Country, faction: Faction ) -> None: - if self.game.settings.perf_disable_idle_aircraft: - return - assert isinstance(squadron.location, Airfield) for _ in range(squadron.untasked_aircraft): # Creating a flight even those this isn't a fragged mission lets us diff --git a/game/missiongenerator/missiongenerator.py b/game/missiongenerator/missiongenerator.py index 7a351666..e325ec5d 100644 --- a/game/missiongenerator/missiongenerator.py +++ b/game/missiongenerator/missiongenerator.py @@ -244,10 +244,11 @@ class MissionGenerator: self.game.red.ato, tgo_generator.runways, ) - aircraft_generator.spawn_unused_aircraft( - self.mission.country(self.game.blue.country_name), - self.mission.country(self.game.red.country_name), - ) + if not self.game.settings.perf_disable_idle_aircraft: + aircraft_generator.spawn_unused_aircraft( + self.mission.country(self.game.blue.country_name), + self.mission.country(self.game.red.country_name), + ) for flight in aircraft_generator.flights: if not flight.client_units: