Avoid random squadrons in config using livery overrides

Avoids choosing random squadrons during air wing configuration so that livery overrides takes precedence by default for a given aircraft type, unless the campaign file specifies a specific squadron. Users can still add a squadron manually which will automatically set the correct livery if they use a squadron preset.

Resolves #52
This commit is contained in:
Raffson 2022-12-26 14:06:58 +01:00
parent 09807b25a8
commit 650b06d7c8
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99

View File

@ -94,8 +94,9 @@ class DefaultSquadronAssigner:
if aircraft not in self.coalition.faction.aircrafts:
return None
lo = self.coalition.faction.liveries_overrides
squadron_def = self.find_squadron_for_airframe(aircraft, task, control_point)
if squadron_def is not None:
if squadron_def is not None and lo.get(aircraft) is None:
return squadron_def
# No premade squadron available for this aircraft that meets the requirements,