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

Fix bug introduced in improvements to livery-selector

Browse Source 
This will fix the bug I missed where the squadron needs to be using the livery-set before it could take effect for flight-members.
This commit is contained in:
Raffson 2024-08-03 20:40:57 +02:00
parent 532515fad7
commit d2547def51
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
game/missiongenerator/aircraft/aircraftpainter.py
View File

@ -27,18 +27,17 @@ class AircraftPainter:
def livery_from_squadron(self) -> Optional[str]: def livery_from_squadron(self) -> Optional[str]:
return self.flight.squadron.livery return self.flight.squadron.livery
def livery_from_squadron_set(self) -> Optional[str]: def livery_from_squadron_set(self, member_uses_livery_set: bool) -> Optional[str]:
if not ( if not (
self.flight.squadron.livery_set and self.flight.squadron.use_livery_set self.flight.squadron.livery_set
and (self.flight.squadron.use_livery_set or member_uses_livery_set)
): ):
return None return None
return random.choice(self.flight.squadron.livery_set) return random.choice(self.flight.squadron.livery_set)
def determine_livery(self, member_uses_livery_set: bool) -> Optional[str]: def determine_livery(self, member_uses_livery_set: bool) -> Optional[str]:
if ( livery = self.livery_from_squadron_set(member_uses_livery_set)
member_uses_livery_set if livery is not None:
and (livery := self.livery_from_squadron_set()) is not None
):
return livery return livery
if (livery := self.livery_from_squadron()) is not None: if (livery := self.livery_from_squadron()) is not None:
return livery return livery