weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Streamlining after merge

Browse Source
This commit is contained in:
Raffson 2024-07-28 17:13:26 +02:00
parent 5bb70626d2
commit d604905f52
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/campaignloader/defaultsquadronassigner.py
View File

@ -74,7 +74,7 @@ class DefaultSquadronAssigner:
# If we can't find any squadron matching the requirement, we should # If we can't find any squadron matching the requirement, we should
# create one. # create one.
return self.air_wing.squadron_def_generator.generate_for_task( 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( def find_preferred_squadron(

4
game/campaignloader/squadrondefgenerator.py
View File

@ -21,8 +21,10 @@ class SquadronDefGenerator:
self.used_nicknames: set[str] = set() self.used_nicknames: set[str] = set()
def generate_for_task( def generate_for_task(
self, task: FlightType, control_point: ControlPoint, squadron_random_chance: int self, task: FlightType, control_point: ControlPoint
) -> Optional[SquadronDef]: ) -> Optional[SquadronDef]:
settings = control_point.coalition.game.settings
squadron_random_chance = settings.squadron_random_chance
aircraft_choice: Optional[AircraftType] = None aircraft_choice: Optional[AircraftType] = None
for aircraft in AircraftType.priority_list_for_task(task): for aircraft in AircraftType.priority_list_for_task(task):
if aircraft not in self.faction.all_aircrafts: if aircraft not in self.faction.all_aircrafts:

6
game/pretense/pretenseaircraftgenerator.py
View File

@ -33,6 +33,7 @@ from game.radio.tacan import TacanRegistry
from game.runways import RunwayData from game.runways import RunwayData
from game.settings import Settings from game.settings import Settings
from game.squadrons import AirWing from game.squadrons import AirWing
from game.squadrons import Squadron
from game.theater.controlpoint import ( from game.theater.controlpoint import (
ControlPoint, ControlPoint,
OffMapSpawn, OffMapSpawn,
@ -43,7 +44,6 @@ from game.theater.controlpoint import (
) )
from game.theater.theatergroundobject import EwrGroundObject, SamGroundObject from game.theater.theatergroundobject import EwrGroundObject, SamGroundObject
from game.unitmap import UnitMap from game.unitmap import UnitMap
from game.squadrons import Squadron
if TYPE_CHECKING: if TYPE_CHECKING:
from game import Game from game import Game
@ -193,13 +193,13 @@ class PretenseAircraftGenerator:
""" """
squadron_def = coalition.air_wing.squadron_def_generator.generate_for_task( 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): for retries in range(num_retries):
if squadron_def is None or fixed_wing == squadron_def.aircraft.helicopter: if squadron_def is None or fixed_wing == squadron_def.aircraft.helicopter:
squadron_def = ( squadron_def = (
coalition.air_wing.squadron_def_generator.generate_for_task( coalition.air_wing.squadron_def_generator.generate_for_task(
flight_type, cp, self.game.settings.squadron_random_chance flight_type, cp
) )
) )