diff --git a/game/campaignloader/defaultsquadronassigner.py b/game/campaignloader/defaultsquadronassigner.py index 763d31d5..624dc317 100644 --- a/game/campaignloader/defaultsquadronassigner.py +++ b/game/campaignloader/defaultsquadronassigner.py @@ -74,7 +74,7 @@ class DefaultSquadronAssigner: # If we can't find any squadron matching the requirement, we should # create one. return self.air_wing.squadron_def_generator.generate_for_task( - config.primary, control_point, self.game.settings.squadron_random_chance + config.primary, control_point ) def find_preferred_squadron( diff --git a/game/campaignloader/squadrondefgenerator.py b/game/campaignloader/squadrondefgenerator.py index f8b775db..f5e38552 100644 --- a/game/campaignloader/squadrondefgenerator.py +++ b/game/campaignloader/squadrondefgenerator.py @@ -21,8 +21,10 @@ class SquadronDefGenerator: self.used_nicknames: set[str] = set() def generate_for_task( - self, task: FlightType, control_point: ControlPoint, squadron_random_chance: int + self, task: FlightType, control_point: ControlPoint ) -> Optional[SquadronDef]: + settings = control_point.coalition.game.settings + squadron_random_chance = settings.squadron_random_chance aircraft_choice: Optional[AircraftType] = None for aircraft in AircraftType.priority_list_for_task(task): if aircraft not in self.faction.all_aircrafts: diff --git a/game/pretense/pretenseaircraftgenerator.py b/game/pretense/pretenseaircraftgenerator.py index a88c4a2f..81d9e935 100644 --- a/game/pretense/pretenseaircraftgenerator.py +++ b/game/pretense/pretenseaircraftgenerator.py @@ -33,6 +33,7 @@ from game.radio.tacan import TacanRegistry from game.runways import RunwayData from game.settings import Settings from game.squadrons import AirWing +from game.squadrons import Squadron from game.theater.controlpoint import ( ControlPoint, OffMapSpawn, @@ -43,7 +44,6 @@ from game.theater.controlpoint import ( ) from game.theater.theatergroundobject import EwrGroundObject, SamGroundObject from game.unitmap import UnitMap -from game.squadrons import Squadron if TYPE_CHECKING: from game import Game @@ -193,13 +193,13 @@ class PretenseAircraftGenerator: """ squadron_def = coalition.air_wing.squadron_def_generator.generate_for_task( - flight_type, cp, self.game.settings.squadron_random_chance + flight_type, cp ) for retries in range(num_retries): if squadron_def is None or fixed_wing == squadron_def.aircraft.helicopter: squadron_def = ( coalition.air_wing.squadron_def_generator.generate_for_task( - flight_type, cp, self.game.settings.squadron_random_chance + flight_type, cp ) )