From 33a75b5450f1557715a4ef17cba1d5e9f7d47f87 Mon Sep 17 00:00:00 2001 From: Khopa Date: Sun, 6 Feb 2022 14:40:35 +0100 Subject: [PATCH 1/6] #1966 : Added female_pilot_ratio param in squadrons. Also possible to force name or nickname for squadrons in campaign yaml files. --- game/campaignloader/campaignairwingconfig.py | 13 ++++++-- .../campaignloader/defaultsquadronassigner.py | 32 +++++++++++++++---- game/campaignloader/squadrondefgenerator.py | 1 + game/squadrons/squadron.py | 9 +++++- game/squadrons/squadrondef.py | 3 ++ 5 files changed, 48 insertions(+), 10 deletions(-) diff --git a/game/campaignloader/campaignairwingconfig.py b/game/campaignloader/campaignairwingconfig.py index 89d0a664..fc5b4e6a 100644 --- a/game/campaignloader/campaignairwingconfig.py +++ b/game/campaignloader/campaignairwingconfig.py @@ -3,7 +3,7 @@ from __future__ import annotations import logging from collections import defaultdict from dataclasses import dataclass -from typing import Any, TYPE_CHECKING, Union +from typing import Any, TYPE_CHECKING, Union, Optional from game.ato.flighttype import FlightType from game.theater.controlpoint import ControlPoint @@ -18,6 +18,10 @@ class SquadronConfig: secondary: list[FlightType] aircraft: list[str] + name: Optional[str] + nickname: Optional[str] + female_pilot_ratio: Optional[int] + @property def auto_assignable(self) -> set[FlightType]: return set(self.secondary) | {self.primary} @@ -33,7 +37,12 @@ class SquadronConfig: secondary = [FlightType(s) for s in secondary_raw] return SquadronConfig( - FlightType(data["primary"]), secondary, data.get("aircraft", []) + FlightType(data["primary"]), + secondary, + data.get("aircraft", []), + data.get("name", None), + data.get("nickname", None), + data.get("female_pilot_ratio", None), ) @staticmethod diff --git a/game/campaignloader/defaultsquadronassigner.py b/game/campaignloader/defaultsquadronassigner.py index 54cd66e5..883f1f57 100644 --- a/game/campaignloader/defaultsquadronassigner.py +++ b/game/campaignloader/defaultsquadronassigner.py @@ -1,5 +1,6 @@ from __future__ import annotations +import dataclasses import logging from typing import Optional, TYPE_CHECKING @@ -48,24 +49,41 @@ class DefaultSquadronAssigner: def find_squadron_for( self, config: SquadronConfig, control_point: ControlPoint ) -> Optional[SquadronDef]: + squadron_def = None for preferred_aircraft in config.aircraft: squadron_def = self.find_preferred_squadron( preferred_aircraft, config.primary, control_point ) if squadron_def is not None: - return squadron_def + break # If we didn't find any of the preferred types we should use any squadron # compatible with the primary task. - squadron_def = self.find_squadron_for_task(config.primary, control_point) - if squadron_def is not None: - return squadron_def + if squadron_def is None: + squadron_def = self.find_squadron_for_task(config.primary, control_point) # 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 - ) + if squadron_def is None: + squadron_def = self.air_wing.squadron_def_generator.generate_for_task( + config.primary, control_point + ) + + # Override squadron def with squadron config parameters from campaign file, if defined + if squadron_def is not None: + + overrides = {} + if config.name is not None: + overrides["name"] = config.name + if config.nickname is not None: + overrides["nickname"] = config.nickname + if config.female_pilot_ratio is not None: + overrides["female_pilot_ratio"] = config.female_pilot_ratio + + squadron_copy = dataclasses.replace(squadron_def, **overrides) + return squadron_copy + else: + return None def find_preferred_squadron( self, preferred_aircraft: str, task: FlightType, control_point: ControlPoint diff --git a/game/campaignloader/squadrondefgenerator.py b/game/campaignloader/squadrondefgenerator.py index 82462910..6b8203d8 100644 --- a/game/campaignloader/squadrondefgenerator.py +++ b/game/campaignloader/squadrondefgenerator.py @@ -50,6 +50,7 @@ class SquadronDefGenerator: livery=None, mission_types=tuple(tasks_for_aircraft(aircraft)), operating_bases=OperatingBases.default_for_aircraft(aircraft), + female_pilot_ratio=6, pilot_pool=[], ) diff --git a/game/squadrons/squadron.py b/game/squadrons/squadron.py index f2078bd9..b3f359c6 100644 --- a/game/squadrons/squadron.py +++ b/game/squadrons/squadron.py @@ -1,6 +1,7 @@ from __future__ import annotations import logging +import random from collections.abc import Iterable from dataclasses import dataclass, field from typing import Optional, Sequence, TYPE_CHECKING @@ -32,6 +33,7 @@ class Squadron: livery: Optional[str] mission_types: tuple[FlightType, ...] operating_bases: OperatingBases + female_pilot_ratio: int #: The pool of pilots that have not yet been assigned to the squadron. This only #: happens when a preset squadron defines more preset pilots than the squadron limit @@ -159,7 +161,11 @@ class Squadron: new_pilots = self.pilot_pool[:count] self.pilot_pool = self.pilot_pool[count:] count -= len(new_pilots) - new_pilots.extend([Pilot(self.faker.name()) for _ in range(count)]) + for _ in range(count): + if random.randint(1, 100) > self.female_pilot_ratio: + new_pilots.append(Pilot(self.faker.name_male())) + else: + new_pilots.append(Pilot(self.faker.name_female())) self.current_roster.extend(new_pilots) self.available_pilots.extend(new_pilots) @@ -428,6 +434,7 @@ class Squadron: squadron_def.livery, squadron_def.mission_types, squadron_def.operating_bases, + squadron_def.female_pilot_ratio, squadron_def.pilot_pool, coalition, game.settings, diff --git a/game/squadrons/squadrondef.py b/game/squadrons/squadrondef.py index 6ed28815..f74fdabb 100644 --- a/game/squadrons/squadrondef.py +++ b/game/squadrons/squadrondef.py @@ -27,6 +27,7 @@ class SquadronDef: livery: Optional[str] mission_types: tuple[FlightType, ...] operating_bases: OperatingBases + female_pilot_ratio: int pilot_pool: list[Pilot] claimed: bool = False @@ -75,6 +76,7 @@ class SquadronDef: pilots = [Pilot(n, player=False) for n in data.get("pilots", [])] pilots.extend([Pilot(n, player=True) for n in data.get("players", [])]) + female_pilot_ratio = data.get("female_pilot_ratio", 6) mission_types = [FlightType.from_name(n) for n in data["mission_types"]] tasks = tasks_for_aircraft(unit_type) @@ -95,5 +97,6 @@ class SquadronDef: livery=data.get("livery"), mission_types=tuple(mission_types), operating_bases=OperatingBases.from_yaml(unit_type, data.get("bases", {})), + female_pilot_ratio=female_pilot_ratio, pilot_pool=pilots, ) From 3932e28417788af4967aad6c9f4d0dd24f08608b Mon Sep 17 00:00:00 2001 From: Khopa Date: Sun, 6 Feb 2022 21:58:54 +0100 Subject: [PATCH 2/6] #1966 : Updated squadrons files with the new female_pilot_ratio parameters --- resources/squadrons/A-10C Warthog I/104th FS.yaml | 1 + resources/squadrons/A-10C Warthog I/118th FS.yaml | 1 + resources/squadrons/A-10C Warthog I/172nd FS.yaml | 3 ++- resources/squadrons/A-10C Warthog I/184th FS.yaml | 1 + resources/squadrons/A-10C Warthog I/190th FS.yaml | 1 + resources/squadrons/A-10C Warthog I/25th FS.yaml | 1 + resources/squadrons/A-10C Warthog I/354th FS.yaml | 1 + resources/squadrons/A-10C Warthog I/355th FS.yaml | 1 + resources/squadrons/A-10C Warthog I/357th FS.yaml | 1 + resources/squadrons/A-10C Warthog I/358th FS.yaml | 1 + resources/squadrons/A-10C Warthog I/47th FS.yaml | 1 + resources/squadrons/A-10C Warthog I/74th TFS.yaml | 1 + resources/squadrons/A-10C Warthog I/81st FS.yaml | 1 + resources/squadrons/A-10C Warthog II/25th FS.yaml | 1 + resources/squadrons/A-10C Warthog II/354th FS.yaml | 1 + resources/squadrons/A-10C Warthog II/355th FS.yaml | 1 + resources/squadrons/A-10C Warthog II/357th FS.yaml | 1 + resources/squadrons/A-10C Warthog II/358th FS.yaml | 1 + resources/squadrons/A-10C Warthog II/81st FS.yaml | 1 + resources/squadrons/A-4E Skyhawk/IAF 110th Sqn.yaml | 1 + resources/squadrons/A-4E Skyhawk/VA-144.yaml | 1 + resources/squadrons/A-4E Skyhawk/VA-153.yaml | 1 + resources/squadrons/A-4E Skyhawk/VA-163.yaml | 1 + resources/squadrons/A-4E Skyhawk/VA-164.yaml | 1 + resources/squadrons/A-4E Skyhawk/VA-195.yaml | 1 + resources/squadrons/A-4E Skyhawk/VA-212.yaml | 1 + resources/squadrons/A-4E Skyhawk/VA-45.yaml | 1 + resources/squadrons/A-4E Skyhawk/VA-55.yaml | 1 + resources/squadrons/A-4E Skyhawk/VA-64.yaml | 1 + resources/squadrons/A-4E Skyhawk/VMA-121.yaml | 1 + resources/squadrons/A-4E Skyhawk/VMA-124.yaml | 1 + resources/squadrons/A-4E Skyhawk/VMA-131.yaml | 1 + resources/squadrons/A-4E Skyhawk/VMA-142.yaml | 1 + resources/squadrons/A-4E Skyhawk/VMA-211.yaml | 1 + resources/squadrons/A-4E Skyhawk/VMA-311.yaml | 1 + resources/squadrons/A-4E Skyhawk/VMA-322.yaml | 1 + resources/squadrons/A20/no_107_squadron_raf.yaml | 1 + resources/squadrons/AH-1X/HMLA-169-AH1W.yaml | 3 ++- resources/squadrons/AH-1X/HMLA-269-AH1W.yaml | 3 ++- resources/squadrons/AH-1X/IAF 160th Sqn.yaml | 1 + resources/squadrons/AH-64D/IAF 113th Sqn.yaml | 1 + .../squadrons/AH-64D/US Army 229th Aviation Battalion.yaml | 1 + resources/squadrons/AV-8BNA/VMA-214.yaml | 1 + resources/squadrons/AV-8BNA/VMA-223.yaml | 1 + resources/squadrons/BF-109K4/Jagdgeschwader_53.yaml | 1 + resources/squadrons/E-2 Hawkeye/VAW-125.yaml | 1 + resources/squadrons/E-3 Sentry/USAF 960th AACS.yaml | 1 + resources/squadrons/Eagle/IAF 106th Sqn.yaml | 1 + resources/squadrons/Eagle/USAF 12th FS.yaml | 1 + resources/squadrons/Eagle/USAF 390th FS.yaml | 1 + resources/squadrons/Eagle/USAF 493rd FS.yaml | 1 + resources/squadrons/Eagle/USAF 58th FS.yaml | 1 + resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-11.yaml | 1 + resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-111.yaml | 1 + resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-21.yaml | 1 + resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-211.yaml | 1 + resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-33.yaml | 1 + resources/squadrons/F-14B Tomcat/VF-101.yaml | 1 + resources/squadrons/F-14B Tomcat/VF-102.yaml | 1 + resources/squadrons/F-14B Tomcat/VF-142.yaml | 1 + resources/squadrons/F-14B Tomcat/VF-143.yaml | 1 + resources/squadrons/F-14B Tomcat/VF-211.yaml | 1 + resources/squadrons/F-4E/IAF 201th Sqn.yaml | 1 + resources/squadrons/F-4E/IRIAF 32nd TFW.yaml | 1 + resources/squadrons/FW-190A8/Jagdgeschwader_26.yaml | 1 + resources/squadrons/FW-190D9/Jagdgeschwader_54.yaml | 1 + resources/squadrons/Ju88A4/Kustenfliegergruppe_106.yaml | 2 ++ resources/squadrons/KC-130/VMGR-352.yaml | 1 + resources/squadrons/KC-135/18th ARS.yaml | 1 + resources/squadrons/KC-135/TuAF 101st Tanker Squadron.yaml | 1 + resources/squadrons/KC-135MPRS/340th EARS.yaml | 1 + resources/squadrons/Mi-24/SAAF 765th Sqn.yaml | 1 + resources/squadrons/Mi-24/SAAF 766th Sqn.yaml | 1 + resources/squadrons/Mi-8/SAAF 253th Sqn.yaml | 1 + resources/squadrons/Mi-8/SAAF 255th Sqn.yaml | 1 + resources/squadrons/Mig-21/SAAF 679th Sqn.yaml | 1 + resources/squadrons/Mig-21/SAAF 680th Sqn.yaml | 1 + resources/squadrons/Mig-21/SAAF 825th Sqn.yaml | 1 + resources/squadrons/Mig-21/SAAF 8th Sqn.yaml | 1 + resources/squadrons/Mig-23/SAAF 678th Sqn.yaml | 1 + resources/squadrons/Mig-25/SAAF 1st Sqn.yaml | 1 + resources/squadrons/Mig-29/Russia VVS 115th GvIAP.yaml | 1 + resources/squadrons/Mig-29/Russia VVS 28th GvIAP.yaml | 1 + resources/squadrons/Mig-29/Russia VVS 31st GvIAP.yaml | 1 + resources/squadrons/Mig-29/Russia VVS 773rd IAP.yaml | 1 + resources/squadrons/Mig-29/SAAF 697th Sqn.yaml | 1 + resources/squadrons/Mig-29/SAAF 699th Sqn.yaml | 1 + resources/squadrons/MosquitoFBMkVI/no_21_squadron_raf.yaml | 1 + resources/squadrons/S-3B/VS-35.yaml | 1 + resources/squadrons/S-3B/VS-35F.yaml | 3 ++- resources/squadrons/SH-60B/HSM-40.yaml | 3 ++- resources/squadrons/SpitfireLFMkIX/no_145_squadron_raf.yaml | 1 + resources/squadrons/SpitfireLFMkIX/no_16_squadron_raf.yaml | 1 + resources/squadrons/SpitfireLFMkIXCW/no_126_squadron_raf.yaml | 1 + resources/squadrons/Strike Eagle/335th FS.yaml | 1 + resources/squadrons/Strike Eagle/492nd FS.yaml | 1 + resources/squadrons/Strike Eagle/IAF 69th Sqn.yaml | 1 + resources/squadrons/Su-17/SAAF 677th Sqn.yaml | 1 + resources/squadrons/Su-17/SAAF 685th Sqn.yaml | 1 + resources/squadrons/Su-17/SAAF 827th Sqn.yaml | 1 + resources/squadrons/Su-24/SAAF 819th Sqn.yaml | 1 + resources/squadrons/Tornado/RAF No12 Squadron.yaml | 1 + resources/squadrons/UH-1/HMLA-169-UH1H.yaml | 3 ++- resources/squadrons/UH-1/HMLA-269-UH1H.yaml | 3 ++- .../squadrons/UH-60/US Army 101st Combat Aviation Brigade.yaml | 3 ++- resources/squadrons/globemaster/15th-Airlift.yaml | 1 + resources/squadrons/hornet/VFA-106.yaml | 1 + resources/squadrons/hornet/VFA-113.yaml | 1 + resources/squadrons/hornet/VFA-192.yaml | 1 + resources/squadrons/hornet/VMFA-122.yaml | 1 + resources/squadrons/hornet/VMFA-251.yaml | 1 + .../squadrons/m2000-5/ADA_EscadronDeChasse_1-2_Cigognes.yaml | 1 + .../squadrons/m2000-5/ADA_EscadronDeChasse_2-2_CoteDOr.yaml | 1 + .../squadrons/m2000c/ADA_EscadronDeChasse_1-12_Cambresis.yaml | 1 + .../squadrons/m2000c/ADA_EscadronDeChasse_1-30_Alsace.yaml | 1 + .../squadrons/m2000c/ADA_EscadronDeChasse_2-5_IleDeFrance.yaml | 1 + resources/squadrons/sa342/ALAT_1er_RHC.yaml | 1 + resources/squadrons/sa342/ALAT_3eme_RHC.yaml | 1 + resources/squadrons/sa342/ALAT_5eme_RHC.yaml | 1 + resources/squadrons/sa342/ALAT_DOAS.yaml | 1 + resources/squadrons/sa342/SAAF 976th Sqn.yaml | 1 + resources/squadrons/sa342/SAAF 977th Sqn.yaml | 1 + resources/squadrons/sa342/SAAF 988th Sqn.yaml | 1 + resources/squadrons/sa342/SAAF 989th Sqn.yaml | 1 + resources/squadrons/viper/191-Filo.yaml | 1 + resources/squadrons/viper/HAF 335 Tiger Squadron.yaml | 1 + resources/squadrons/viper/HAF 336 Olympus Squadron.yaml | 1 + resources/squadrons/viper/HAF 337 Ghost Squadron.yaml | 1 + resources/squadrons/viper/HAF 340 Fox Squadron.yaml | 1 + resources/squadrons/viper/HAF 341 Arrow Squadron.yaml | 1 + resources/squadrons/viper/HAF 343 Star Squadron.yaml | 1 + resources/squadrons/viper/HAF 346 Jason Squadron.yaml | 1 + resources/squadrons/viper/HAF 347 Perseus Squadron.yaml | 1 + resources/squadrons/viper/HAF_330_Thunder_squadron.yaml | 1 + resources/squadrons/viper/IAF 101st Sqn.yaml | 1 + resources/squadrons/viper/IAF 110th Sqn.yaml | 1 + resources/squadrons/viper/IAF 117th Sqn.yaml | 1 + resources/squadrons/viper/USAF 132nd WG.yaml | 1 + resources/squadrons/viper/USAF 13th FS.yaml | 1 + resources/squadrons/viper/USAF 14th FS.yaml | 1 + resources/squadrons/viper/USAF 152nd FS.yaml | 1 + resources/squadrons/viper/USAF 174th FS.yaml | 1 + resources/squadrons/viper/USAF 179th FS.yaml | 1 + resources/squadrons/viper/USAF 22nd FS.yaml | 1 + resources/squadrons/viper/USAF 23rd FS.yaml | 1 + resources/squadrons/viper/USAF 36th FS.yaml | 1 + resources/squadrons/viper/USAF 480th FS.yaml | 1 + resources/squadrons/viper/USAF 522nd FS.yaml | 1 + resources/squadrons/viper/USAF 55th FS.yaml | 1 + resources/squadrons/viper/USAF 77th FS.yaml | 1 + resources/squadrons/viper/USAF 79th FS.yaml | 1 + resources/squadrons/viper/USAF 80th FS.yaml | 1 + 152 files changed, 161 insertions(+), 8 deletions(-) diff --git a/resources/squadrons/A-10C Warthog I/104th FS.yaml b/resources/squadrons/A-10C Warthog I/104th FS.yaml index e4bb9f2d..80990d32 100644 --- a/resources/squadrons/A-10C Warthog I/104th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/104th FS.yaml @@ -1,6 +1,7 @@ --- name: 104th FS nickname: Eagles +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/118th FS.yaml b/resources/squadrons/A-10C Warthog I/118th FS.yaml index 11cedcdc..49f90680 100644 --- a/resources/squadrons/A-10C Warthog I/118th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/118th FS.yaml @@ -1,6 +1,7 @@ --- name: 118th FS nickname: Flying Yankees +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/172nd FS.yaml b/resources/squadrons/A-10C Warthog I/172nd FS.yaml index bb1d09b5..cf53b3e2 100644 --- a/resources/squadrons/A-10C Warthog I/172nd FS.yaml +++ b/resources/squadrons/A-10C Warthog I/172nd FS.yaml @@ -1,6 +1,7 @@ --- name: 172nd FS -nickname: +nickname: +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/184th FS.yaml b/resources/squadrons/A-10C Warthog I/184th FS.yaml index b2454521..305cc6bd 100644 --- a/resources/squadrons/A-10C Warthog I/184th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/184th FS.yaml @@ -1,6 +1,7 @@ --- name: 184th FS nickname: Flying Razorbacks +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/190th FS.yaml b/resources/squadrons/A-10C Warthog I/190th FS.yaml index 5d0ef18b..74428b99 100644 --- a/resources/squadrons/A-10C Warthog I/190th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/190th FS.yaml @@ -1,6 +1,7 @@ --- name: 190th FS nickname: Skull Bangers +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/25th FS.yaml b/resources/squadrons/A-10C Warthog I/25th FS.yaml index 0544c46a..2eb4d299 100644 --- a/resources/squadrons/A-10C Warthog I/25th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/25th FS.yaml @@ -1,6 +1,7 @@ --- name: 25th FS nickname: Assam Draggins +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/354th FS.yaml b/resources/squadrons/A-10C Warthog I/354th FS.yaml index 129a4e44..06073259 100644 --- a/resources/squadrons/A-10C Warthog I/354th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/354th FS.yaml @@ -1,6 +1,7 @@ --- name: 354th FS nickname: Bulldogs +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/355th FS.yaml b/resources/squadrons/A-10C Warthog I/355th FS.yaml index 23ed34d6..154b404a 100644 --- a/resources/squadrons/A-10C Warthog I/355th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/355th FS.yaml @@ -1,6 +1,7 @@ --- name: 355th FS nickname: Fightin' Falcons +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/357th FS.yaml b/resources/squadrons/A-10C Warthog I/357th FS.yaml index 0e2c1c9e..856673a9 100644 --- a/resources/squadrons/A-10C Warthog I/357th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/357th FS.yaml @@ -1,6 +1,7 @@ --- name: 357th FS nickname: Dragons +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/358th FS.yaml b/resources/squadrons/A-10C Warthog I/358th FS.yaml index 073cb394..b29ea514 100644 --- a/resources/squadrons/A-10C Warthog I/358th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/358th FS.yaml @@ -1,6 +1,7 @@ --- name: 358th FS nickname: Lobos +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/47th FS.yaml b/resources/squadrons/A-10C Warthog I/47th FS.yaml index f81376f0..c0ab9e59 100644 --- a/resources/squadrons/A-10C Warthog I/47th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/47th FS.yaml @@ -1,6 +1,7 @@ --- name: 47th FS nickname: Termites +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/74th TFS.yaml b/resources/squadrons/A-10C Warthog I/74th TFS.yaml index 3480d961..42fc7232 100644 --- a/resources/squadrons/A-10C Warthog I/74th TFS.yaml +++ b/resources/squadrons/A-10C Warthog I/74th TFS.yaml @@ -1,6 +1,7 @@ --- name: 74th TFS nickname: Flying Tigers +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/81st FS.yaml b/resources/squadrons/A-10C Warthog I/81st FS.yaml index 1ebc3393..9e86a4f6 100644 --- a/resources/squadrons/A-10C Warthog I/81st FS.yaml +++ b/resources/squadrons/A-10C Warthog I/81st FS.yaml @@ -1,6 +1,7 @@ --- name: 81st FS nickname: Termites +female_pilot_ratio: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog II/25th FS.yaml b/resources/squadrons/A-10C Warthog II/25th FS.yaml index 8162da45..084a447f 100644 --- a/resources/squadrons/A-10C Warthog II/25th FS.yaml +++ b/resources/squadrons/A-10C Warthog II/25th FS.yaml @@ -1,6 +1,7 @@ --- name: 25th FS nickname: Assam Draggins +female_pilot_ratio: 6 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 7) diff --git a/resources/squadrons/A-10C Warthog II/354th FS.yaml b/resources/squadrons/A-10C Warthog II/354th FS.yaml index b96e7b46..d74b5d6c 100644 --- a/resources/squadrons/A-10C Warthog II/354th FS.yaml +++ b/resources/squadrons/A-10C Warthog II/354th FS.yaml @@ -1,6 +1,7 @@ --- name: 354th FS nickname: Bulldogs +female_pilot_ratio: 6 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 7) diff --git a/resources/squadrons/A-10C Warthog II/355th FS.yaml b/resources/squadrons/A-10C Warthog II/355th FS.yaml index 4946fa15..78060853 100644 --- a/resources/squadrons/A-10C Warthog II/355th FS.yaml +++ b/resources/squadrons/A-10C Warthog II/355th FS.yaml @@ -1,6 +1,7 @@ --- name: 355th FS nickname: Fightin' Falcons +female_pilot_ratio: 6 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 7) diff --git a/resources/squadrons/A-10C Warthog II/357th FS.yaml b/resources/squadrons/A-10C Warthog II/357th FS.yaml index c8cad8dd..8e56a1ea 100644 --- a/resources/squadrons/A-10C Warthog II/357th FS.yaml +++ b/resources/squadrons/A-10C Warthog II/357th FS.yaml @@ -1,6 +1,7 @@ --- name: 357th FS nickname: Dragons +female_pilot_ratio: 6 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 7) diff --git a/resources/squadrons/A-10C Warthog II/358th FS.yaml b/resources/squadrons/A-10C Warthog II/358th FS.yaml index f742d72a..1e44be90 100644 --- a/resources/squadrons/A-10C Warthog II/358th FS.yaml +++ b/resources/squadrons/A-10C Warthog II/358th FS.yaml @@ -1,6 +1,7 @@ --- name: 358th FS nickname: Lobos +female_pilot_ratio: 6 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 7) diff --git a/resources/squadrons/A-10C Warthog II/81st FS.yaml b/resources/squadrons/A-10C Warthog II/81st FS.yaml index 2380b8bc..d116b5db 100644 --- a/resources/squadrons/A-10C Warthog II/81st FS.yaml +++ b/resources/squadrons/A-10C Warthog II/81st FS.yaml @@ -1,6 +1,7 @@ --- name: 81st FS nickname: Termites +female_pilot_ratio: 6 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 7) diff --git a/resources/squadrons/A-4E Skyhawk/IAF 110th Sqn.yaml b/resources/squadrons/A-4E Skyhawk/IAF 110th Sqn.yaml index a623cb47..86c35b9d 100644 --- a/resources/squadrons/A-4E Skyhawk/IAF 110th Sqn.yaml +++ b/resources/squadrons/A-4E Skyhawk/IAF 110th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 110th Squadron nickname: Knights of the North +female_pilot_ratio: 0 country: Israel role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-144.yaml b/resources/squadrons/A-4E Skyhawk/VA-144.yaml index ae99623f..6ac04d65 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-144.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-144.yaml @@ -1,6 +1,7 @@ --- name: VA-144 nickname: Roadrunners +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-153.yaml b/resources/squadrons/A-4E Skyhawk/VA-153.yaml index b95d78c9..4b41d71f 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-153.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-153.yaml @@ -1,6 +1,7 @@ --- name: VA-153 nickname: Blue Tail Flies +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-163.yaml b/resources/squadrons/A-4E Skyhawk/VA-163.yaml index 014b42b6..608a18ed 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-163.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-163.yaml @@ -1,6 +1,7 @@ --- name: VA-163 nickname: Saints +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-164.yaml b/resources/squadrons/A-4E Skyhawk/VA-164.yaml index c537c44d..294582b2 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-164.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-164.yaml @@ -1,6 +1,7 @@ --- name: VA-164 nickname: Ghostriders +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-195.yaml b/resources/squadrons/A-4E Skyhawk/VA-195.yaml index 8e9ea89b..e8cdec5c 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-195.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-195.yaml @@ -1,6 +1,7 @@ --- name: VA-195 nickname: Dambusters +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-212.yaml b/resources/squadrons/A-4E Skyhawk/VA-212.yaml index daf1d305..a7065efb 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-212.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-212.yaml @@ -1,6 +1,7 @@ --- name: VA-212 nickname: Rampant Raiders +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-45.yaml b/resources/squadrons/A-4E Skyhawk/VA-45.yaml index 014641cf..f5419985 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-45.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-45.yaml @@ -1,6 +1,7 @@ --- name: VA-45 nickname: Blackbirds +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-55.yaml b/resources/squadrons/A-4E Skyhawk/VA-55.yaml index 8bb7403f..e61239e8 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-55.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-55.yaml @@ -1,6 +1,7 @@ --- name: VA-55 nickname: Warhorses +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-64.yaml b/resources/squadrons/A-4E Skyhawk/VA-64.yaml index 40698d91..a255a577 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-64.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-64.yaml @@ -1,6 +1,7 @@ --- name: VA-64 nickname: Black Lancers +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-121.yaml b/resources/squadrons/A-4E Skyhawk/VMA-121.yaml index 30c17e85..29b67f59 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-121.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-121.yaml @@ -1,6 +1,7 @@ --- name: VMA-121 nickname: Green Knights +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-124.yaml b/resources/squadrons/A-4E Skyhawk/VMA-124.yaml index 4f09da87..a53b98d1 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-124.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-124.yaml @@ -1,6 +1,7 @@ --- name: VMA-124 nickname: Memphis Marines +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-131.yaml b/resources/squadrons/A-4E Skyhawk/VMA-131.yaml index 77f66440..7a4dd001 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-131.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-131.yaml @@ -1,6 +1,7 @@ --- name: VMA-131 nickname: Diamondbacks +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-142.yaml b/resources/squadrons/A-4E Skyhawk/VMA-142.yaml index bcac1985..0dd0f7f4 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-142.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-142.yaml @@ -1,6 +1,7 @@ --- name: VMA-142 nickname: Flying Gators +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-211.yaml b/resources/squadrons/A-4E Skyhawk/VMA-211.yaml index 36d9b8a2..9c0c0138 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-211.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-211.yaml @@ -1,6 +1,7 @@ --- name: VMA-211 nickname: Avengers +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-311.yaml b/resources/squadrons/A-4E Skyhawk/VMA-311.yaml index 2db0b3e1..93acbd4c 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-311.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-311.yaml @@ -1,6 +1,7 @@ --- name: VMA-311 nickname: Tomcats +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-322.yaml b/resources/squadrons/A-4E Skyhawk/VMA-322.yaml index 462d0dd9..3ee2661a 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-322.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-322.yaml @@ -1,6 +1,7 @@ --- name: VMA-322 nickname: Fighting Gamecocks +female_pilot_ratio: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A20/no_107_squadron_raf.yaml b/resources/squadrons/A20/no_107_squadron_raf.yaml index a598c6df..6a7ec0f3 100644 --- a/resources/squadrons/A20/no_107_squadron_raf.yaml +++ b/resources/squadrons/A20/no_107_squadron_raf.yaml @@ -1,6 +1,7 @@ --- name: RAF, No. 107 Squadron nickname: Lowestoft's 'own' Squadron +female_pilot_ratio: 0 country: UK role: Medium Bomber aircraft: Boston Mk.III diff --git a/resources/squadrons/AH-1X/HMLA-169-AH1W.yaml b/resources/squadrons/AH-1X/HMLA-169-AH1W.yaml index a4e29150..77803937 100644 --- a/resources/squadrons/AH-1X/HMLA-169-AH1W.yaml +++ b/resources/squadrons/AH-1X/HMLA-169-AH1W.yaml @@ -1,6 +1,7 @@ --- name: HMLA-169 (AH-1W) nickname: Vipers +female_pilot_ratio: 0 country: USA role: Attack aircraft: AH-1W SuperCobra @@ -10,4 +11,4 @@ mission_types: - BAI - CAS - DEAD - - OCA/Aircraft \ No newline at end of file + - OCA/Aircraft diff --git a/resources/squadrons/AH-1X/HMLA-269-AH1W.yaml b/resources/squadrons/AH-1X/HMLA-269-AH1W.yaml index 62df5046..c823783c 100644 --- a/resources/squadrons/AH-1X/HMLA-269-AH1W.yaml +++ b/resources/squadrons/AH-1X/HMLA-269-AH1W.yaml @@ -1,6 +1,7 @@ --- name: HMLA-269 (AH-1W) nickname: Gunrunners +female_pilot_ratio: 0 country: USA role: Attack aircraft: AH-1W SuperCobra @@ -10,4 +11,4 @@ mission_types: - BAI - CAS - DEAD - - OCA/Aircraft \ No newline at end of file + - OCA/Aircraft diff --git a/resources/squadrons/AH-1X/IAF 160th Sqn.yaml b/resources/squadrons/AH-1X/IAF 160th Sqn.yaml index 736902a5..4602655c 100644 --- a/resources/squadrons/AH-1X/IAF 160th Sqn.yaml +++ b/resources/squadrons/AH-1X/IAF 160th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 160th Squadron nickname: Northern Cobra Squadron +female_pilot_ratio: 0 country: Israel role: Attack Helicopter aircraft: AH-1W SuperCobra diff --git a/resources/squadrons/AH-64D/IAF 113th Sqn.yaml b/resources/squadrons/AH-64D/IAF 113th Sqn.yaml index 28fcbe94..189597f9 100644 --- a/resources/squadrons/AH-64D/IAF 113th Sqn.yaml +++ b/resources/squadrons/AH-64D/IAF 113th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 113th Squadron nickname: The Hornet Squadron +female_pilot_ratio: 5 country: Israel role: Attack Helicopter aircraft: AH-64D Apache Longbow diff --git a/resources/squadrons/AH-64D/US Army 229th Aviation Battalion.yaml b/resources/squadrons/AH-64D/US Army 229th Aviation Battalion.yaml index 4f83df1b..02316300 100644 --- a/resources/squadrons/AH-64D/US Army 229th Aviation Battalion.yaml +++ b/resources/squadrons/AH-64D/US Army 229th Aviation Battalion.yaml @@ -1,6 +1,7 @@ --- name: 229th Aviation Battalion nickname: Serpents +female_pilot_ratio: 6 country: USA role: Attack Helicopter aircraft: AH-64D Apache Longbow diff --git a/resources/squadrons/AV-8BNA/VMA-214.yaml b/resources/squadrons/AV-8BNA/VMA-214.yaml index 14448b7a..b214d377 100644 --- a/resources/squadrons/AV-8BNA/VMA-214.yaml +++ b/resources/squadrons/AV-8BNA/VMA-214.yaml @@ -1,6 +1,7 @@ --- name: VMA-214 nickname: Black Sheep +female_pilot_ratio: 0 country: USA role: V/STOL Attack aircraft: AV-8B Harrier II Night Attack diff --git a/resources/squadrons/AV-8BNA/VMA-223.yaml b/resources/squadrons/AV-8BNA/VMA-223.yaml index c24fac74..9d9e87a3 100644 --- a/resources/squadrons/AV-8BNA/VMA-223.yaml +++ b/resources/squadrons/AV-8BNA/VMA-223.yaml @@ -1,6 +1,7 @@ --- name: VMA-223 nickname: Bulldogs +female_pilot_ratio: 0 country: USA role: V/STOL Attack aircraft: AV-8B Harrier II Night Attack diff --git a/resources/squadrons/BF-109K4/Jagdgeschwader_53.yaml b/resources/squadrons/BF-109K4/Jagdgeschwader_53.yaml index ab672601..f4067853 100644 --- a/resources/squadrons/BF-109K4/Jagdgeschwader_53.yaml +++ b/resources/squadrons/BF-109K4/Jagdgeschwader_53.yaml @@ -1,5 +1,6 @@ name: Jagdgeschwader 53 nickname: Pik As +female_pilot_ratio: 0 country: Third Reich role: Fighter aircraft: Bf 109 K-4 Kurfürst diff --git a/resources/squadrons/E-2 Hawkeye/VAW-125.yaml b/resources/squadrons/E-2 Hawkeye/VAW-125.yaml index 351fe490..6c8287e3 100644 --- a/resources/squadrons/E-2 Hawkeye/VAW-125.yaml +++ b/resources/squadrons/E-2 Hawkeye/VAW-125.yaml @@ -1,6 +1,7 @@ --- name: VAW-125 nickname: Tigertails +female_pilot_ratio: 6 country: USA role: AEW&C aircraft: E-2C Hawkeye diff --git a/resources/squadrons/E-3 Sentry/USAF 960th AACS.yaml b/resources/squadrons/E-3 Sentry/USAF 960th AACS.yaml index ba780809..51cbffdb 100644 --- a/resources/squadrons/E-3 Sentry/USAF 960th AACS.yaml +++ b/resources/squadrons/E-3 Sentry/USAF 960th AACS.yaml @@ -1,6 +1,7 @@ --- name: 960th AAC Squadron nickname: Vikings +female_pilot_ratio: 6 country: USA role: AEW&C aircraft: E-3A diff --git a/resources/squadrons/Eagle/IAF 106th Sqn.yaml b/resources/squadrons/Eagle/IAF 106th Sqn.yaml index 5c01b39b..2cc2c299 100644 --- a/resources/squadrons/Eagle/IAF 106th Sqn.yaml +++ b/resources/squadrons/Eagle/IAF 106th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 106th Squadron nickname: Spearhead +female_pilot_ratio: 6 country: Israel role: Air Superiority Fighter aircraft: F-15C Eagle diff --git a/resources/squadrons/Eagle/USAF 12th FS.yaml b/resources/squadrons/Eagle/USAF 12th FS.yaml index d211bb74..f347507c 100644 --- a/resources/squadrons/Eagle/USAF 12th FS.yaml +++ b/resources/squadrons/Eagle/USAF 12th FS.yaml @@ -1,6 +1,7 @@ --- name: 12th FS nickname: Dirty Dozen +female_pilot_ratio: 6 country: USA role: Air Superiority Fighter aircraft: F-15C Eagle diff --git a/resources/squadrons/Eagle/USAF 390th FS.yaml b/resources/squadrons/Eagle/USAF 390th FS.yaml index 0de922bc..273fd9f6 100644 --- a/resources/squadrons/Eagle/USAF 390th FS.yaml +++ b/resources/squadrons/Eagle/USAF 390th FS.yaml @@ -1,6 +1,7 @@ --- name: 390th FS nickname: Wild Boars +female_pilot_ratio: 6 country: USA role: Air Superiority Fighter aircraft: F-15C Eagle diff --git a/resources/squadrons/Eagle/USAF 493rd FS.yaml b/resources/squadrons/Eagle/USAF 493rd FS.yaml index 99ed9693..30539c6d 100644 --- a/resources/squadrons/Eagle/USAF 493rd FS.yaml +++ b/resources/squadrons/Eagle/USAF 493rd FS.yaml @@ -1,6 +1,7 @@ --- name: 493rd FS nickname: Grim Reapers +female_pilot_ratio: 6 country: USA role: Air Superiority Fighter aircraft: F-15C Eagle diff --git a/resources/squadrons/Eagle/USAF 58th FS.yaml b/resources/squadrons/Eagle/USAF 58th FS.yaml index 27a7c818..c7358878 100644 --- a/resources/squadrons/Eagle/USAF 58th FS.yaml +++ b/resources/squadrons/Eagle/USAF 58th FS.yaml @@ -1,6 +1,7 @@ --- name: 58th FS nickname: Gorillas +female_pilot_ratio: 6 country: USA role: Air Superiority Fighter aircraft: F-15C Eagle diff --git a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-11.yaml b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-11.yaml index dd1f329e..ff323250 100644 --- a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-11.yaml +++ b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-11.yaml @@ -1,6 +1,7 @@ --- name: VF-11 nickname: Red Rippers +female_pilot_ratio: 0 country: USA role: Strike Fighter aircraft: F-14A Tomcat (Block 135-GR Late) diff --git a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-111.yaml b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-111.yaml index 12fc4ed7..6a9a2621 100644 --- a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-111.yaml +++ b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-111.yaml @@ -1,6 +1,7 @@ --- name: VF-111 nickname: Sundowners +female_pilot_ratio: 0 country: USA role: Strike Fighter aircraft: F-14A Tomcat (Block 135-GR Late) diff --git a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-21.yaml b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-21.yaml index 170e3670..e9562435 100644 --- a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-21.yaml +++ b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-21.yaml @@ -1,6 +1,7 @@ --- name: VF-21 nickname: Freelancers +female_pilot_ratio: 0 country: USA role: Strike Fighter aircraft: F-14A Tomcat (Block 135-GR Late) diff --git a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-211.yaml b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-211.yaml index 225df805..053d6eab 100644 --- a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-211.yaml +++ b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-211.yaml @@ -1,6 +1,7 @@ --- name: VF-211 nickname: Fighting Checkmates +female_pilot_ratio: 0 country: USA role: Strike Fighter aircraft: F-14A Tomcat (Block 135-GR Late) diff --git a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-33.yaml b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-33.yaml index 54f54737..071a6584 100644 --- a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-33.yaml +++ b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-33.yaml @@ -1,6 +1,7 @@ --- name: VF-33 nickname: Starfighters +female_pilot_ratio: 0 country: USA role: Strike Fighter aircraft: F-14A Tomcat (Block 135-GR Late) diff --git a/resources/squadrons/F-14B Tomcat/VF-101.yaml b/resources/squadrons/F-14B Tomcat/VF-101.yaml index 8f62a5ee..c4af1f8a 100644 --- a/resources/squadrons/F-14B Tomcat/VF-101.yaml +++ b/resources/squadrons/F-14B Tomcat/VF-101.yaml @@ -1,6 +1,7 @@ --- name: VF-101 nickname: Grim Reapers +female_pilot_ratio: 7 country: USA role: Strike Fighter aircraft: F-14B Tomcat diff --git a/resources/squadrons/F-14B Tomcat/VF-102.yaml b/resources/squadrons/F-14B Tomcat/VF-102.yaml index 57853d51..2dafe69f 100644 --- a/resources/squadrons/F-14B Tomcat/VF-102.yaml +++ b/resources/squadrons/F-14B Tomcat/VF-102.yaml @@ -1,6 +1,7 @@ --- name: VF-102 nickname: Diamond Backs +female_pilot_ratio: 7 country: USA role: Strike Fighter aircraft: F-14B Tomcat diff --git a/resources/squadrons/F-14B Tomcat/VF-142.yaml b/resources/squadrons/F-14B Tomcat/VF-142.yaml index fabec9ea..79b87d86 100644 --- a/resources/squadrons/F-14B Tomcat/VF-142.yaml +++ b/resources/squadrons/F-14B Tomcat/VF-142.yaml @@ -1,6 +1,7 @@ --- name: VF-142 nickname: Ghostriders +female_pilot_ratio: 7 country: USA role: Strike Fighter aircraft: F-14B Tomcat diff --git a/resources/squadrons/F-14B Tomcat/VF-143.yaml b/resources/squadrons/F-14B Tomcat/VF-143.yaml index 14a1a13d..093f5aa0 100644 --- a/resources/squadrons/F-14B Tomcat/VF-143.yaml +++ b/resources/squadrons/F-14B Tomcat/VF-143.yaml @@ -1,6 +1,7 @@ --- name: VF-143 nickname: Pukin' Dogs +female_pilot_ratio: 7 country: USA role: Strike Fighter aircraft: F-14B Tomcat diff --git a/resources/squadrons/F-14B Tomcat/VF-211.yaml b/resources/squadrons/F-14B Tomcat/VF-211.yaml index 56af916a..87fa9125 100644 --- a/resources/squadrons/F-14B Tomcat/VF-211.yaml +++ b/resources/squadrons/F-14B Tomcat/VF-211.yaml @@ -1,6 +1,7 @@ --- name: VF-211 nickname: Fighting Checkmates +female_pilot_ratio: 7 country: USA role: Strike Fighter aircraft: F-14B Tomcat diff --git a/resources/squadrons/F-4E/IAF 201th Sqn.yaml b/resources/squadrons/F-4E/IAF 201th Sqn.yaml index 9354b912..61f1e7ff 100644 --- a/resources/squadrons/F-4E/IAF 201th Sqn.yaml +++ b/resources/squadrons/F-4E/IAF 201th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 201th Squadron nickname: The One +female_pilot_ratio: 0 country: Israel role: Air Superiority Fighter aircraft: F-4E Phantom II diff --git a/resources/squadrons/F-4E/IRIAF 32nd TFW.yaml b/resources/squadrons/F-4E/IRIAF 32nd TFW.yaml index 750c624c..0fd2352b 100644 --- a/resources/squadrons/F-4E/IRIAF 32nd TFW.yaml +++ b/resources/squadrons/F-4E/IRIAF 32nd TFW.yaml @@ -1,6 +1,7 @@ --- name: IRIAF 32nd TFW nickname: 32nd TFW +female_pilot_ratio: 0 country: Iran role: Air Superiority Fighter aircraft: F-4E Phantom II diff --git a/resources/squadrons/FW-190A8/Jagdgeschwader_26.yaml b/resources/squadrons/FW-190A8/Jagdgeschwader_26.yaml index 8d6c4121..6a541a66 100644 --- a/resources/squadrons/FW-190A8/Jagdgeschwader_26.yaml +++ b/resources/squadrons/FW-190A8/Jagdgeschwader_26.yaml @@ -1,5 +1,6 @@ name: Jagdgeschwader 26 nickname: Schlageter +female_pilot_ratio: 0 country: Third Reich role: Fighter aircraft: Fw 190 A-8 Anton diff --git a/resources/squadrons/FW-190D9/Jagdgeschwader_54.yaml b/resources/squadrons/FW-190D9/Jagdgeschwader_54.yaml index 3f988237..088b1449 100644 --- a/resources/squadrons/FW-190D9/Jagdgeschwader_54.yaml +++ b/resources/squadrons/FW-190D9/Jagdgeschwader_54.yaml @@ -1,5 +1,6 @@ name: Jagdgeschwader 54 nickname: Grünherz +female_pilot_ratio: 0 country: Third Reich role: Fighter aircraft: Fw 190 D-9 Dora diff --git a/resources/squadrons/Ju88A4/Kustenfliegergruppe_106.yaml b/resources/squadrons/Ju88A4/Kustenfliegergruppe_106.yaml index 17dee20d..0fa4957a 100644 --- a/resources/squadrons/Ju88A4/Kustenfliegergruppe_106.yaml +++ b/resources/squadrons/Ju88A4/Kustenfliegergruppe_106.yaml @@ -1,9 +1,11 @@ --- name: Küstenfliegergruppe 106 nickname: Kü.Fl.Gr.206. +female_pilot_ratio: 0 country: Third Reich role: Medium Bomber aircraft: Ju 88 A-4 +female_pilot_ratio: 0 mission_types: - Anti-ship - BAI diff --git a/resources/squadrons/KC-130/VMGR-352.yaml b/resources/squadrons/KC-130/VMGR-352.yaml index 950aecc1..4de0cc98 100644 --- a/resources/squadrons/KC-130/VMGR-352.yaml +++ b/resources/squadrons/KC-130/VMGR-352.yaml @@ -1,6 +1,7 @@ --- name: VMGR-352 nickname: Raiders +female_pilot_ratio: 6 country: USA role: Air-to-Air Refueling aircraft: KC-130 diff --git a/resources/squadrons/KC-135/18th ARS.yaml b/resources/squadrons/KC-135/18th ARS.yaml index 161012c2..04580faa 100644 --- a/resources/squadrons/KC-135/18th ARS.yaml +++ b/resources/squadrons/KC-135/18th ARS.yaml @@ -1,6 +1,7 @@ --- name: 18th Air Refueling Squadron nickname: Kanza +female_pilot_ratio: 6 country: USA role: Air-to-Air Refueling aircraft: KC-135 Stratotanker diff --git a/resources/squadrons/KC-135/TuAF 101st Tanker Squadron.yaml b/resources/squadrons/KC-135/TuAF 101st Tanker Squadron.yaml index d2fdfddf..ec08f193 100644 --- a/resources/squadrons/KC-135/TuAF 101st Tanker Squadron.yaml +++ b/resources/squadrons/KC-135/TuAF 101st Tanker Squadron.yaml @@ -1,6 +1,7 @@ --- name: 101st Tanker Squadron nickname: Asena +female_pilot_ratio: 6 country: Turkey role: Air-to-Air Refueling aircraft: KC-135 Stratotanker diff --git a/resources/squadrons/KC-135MPRS/340th EARS.yaml b/resources/squadrons/KC-135MPRS/340th EARS.yaml index ffab6013..13947211 100644 --- a/resources/squadrons/KC-135MPRS/340th EARS.yaml +++ b/resources/squadrons/KC-135MPRS/340th EARS.yaml @@ -1,6 +1,7 @@ --- name: 340th Expeditionary Air Refueling Squadron nickname: Pythons +female_pilot_ratio: 6 country: USA role: Air-to-Air Refueling aircraft: KC-135 Stratotanker MPRS diff --git a/resources/squadrons/Mi-24/SAAF 765th Sqn.yaml b/resources/squadrons/Mi-24/SAAF 765th Sqn.yaml index 84e5df0e..85afe895 100644 --- a/resources/squadrons/Mi-24/SAAF 765th Sqn.yaml +++ b/resources/squadrons/Mi-24/SAAF 765th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 765th Squadron nickname: 765th +female_pilot_ratio: 0 country: Syria role: Attack Helicopter aircraft: Mi-24P Hind-F diff --git a/resources/squadrons/Mi-24/SAAF 766th Sqn.yaml b/resources/squadrons/Mi-24/SAAF 766th Sqn.yaml index 65649243..5c11fc11 100644 --- a/resources/squadrons/Mi-24/SAAF 766th Sqn.yaml +++ b/resources/squadrons/Mi-24/SAAF 766th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 766th Squadron nickname: 766th +female_pilot_ratio: 0 country: Syria role: Attack Helicopter aircraft: Mi-24V Hind-E diff --git a/resources/squadrons/Mi-8/SAAF 253th Sqn.yaml b/resources/squadrons/Mi-8/SAAF 253th Sqn.yaml index afa2ae50..397c0583 100644 --- a/resources/squadrons/Mi-8/SAAF 253th Sqn.yaml +++ b/resources/squadrons/Mi-8/SAAF 253th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 253th Squadron nickname: 253th +female_pilot_ratio: 0 country: Syria role: Transport Helicopter aircraft: Mi-8MTV2 Hip diff --git a/resources/squadrons/Mi-8/SAAF 255th Sqn.yaml b/resources/squadrons/Mi-8/SAAF 255th Sqn.yaml index f1fbca2b..8d011e4d 100644 --- a/resources/squadrons/Mi-8/SAAF 255th Sqn.yaml +++ b/resources/squadrons/Mi-8/SAAF 255th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 255th Squadron nickname: 255th +female_pilot_ratio: 0 country: Syria role: Transport Helicopter aircraft: Mi-8MTV2 Hip diff --git a/resources/squadrons/Mig-21/SAAF 679th Sqn.yaml b/resources/squadrons/Mig-21/SAAF 679th Sqn.yaml index 2e519123..ba9543dd 100644 --- a/resources/squadrons/Mig-21/SAAF 679th Sqn.yaml +++ b/resources/squadrons/Mig-21/SAAF 679th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 679th Squadron nickname: 679th +female_pilot_ratio: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-21bis Fishbed-N diff --git a/resources/squadrons/Mig-21/SAAF 680th Sqn.yaml b/resources/squadrons/Mig-21/SAAF 680th Sqn.yaml index 56b8987b..db07c12f 100644 --- a/resources/squadrons/Mig-21/SAAF 680th Sqn.yaml +++ b/resources/squadrons/Mig-21/SAAF 680th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 680th Squadron nickname: 680th +female_pilot_ratio: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-21bis Fishbed-N diff --git a/resources/squadrons/Mig-21/SAAF 825th Sqn.yaml b/resources/squadrons/Mig-21/SAAF 825th Sqn.yaml index 794e24c3..ee81ad51 100644 --- a/resources/squadrons/Mig-21/SAAF 825th Sqn.yaml +++ b/resources/squadrons/Mig-21/SAAF 825th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 825th Squadron nickname: 825th +female_pilot_ratio: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-21bis Fishbed-N diff --git a/resources/squadrons/Mig-21/SAAF 8th Sqn.yaml b/resources/squadrons/Mig-21/SAAF 8th Sqn.yaml index 1d29d2fa..8eb8c063 100644 --- a/resources/squadrons/Mig-21/SAAF 8th Sqn.yaml +++ b/resources/squadrons/Mig-21/SAAF 8th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 8th Squadron nickname: 8th +female_pilot_ratio: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-21bis Fishbed-N diff --git a/resources/squadrons/Mig-23/SAAF 678th Sqn.yaml b/resources/squadrons/Mig-23/SAAF 678th Sqn.yaml index 39fde573..b828566a 100644 --- a/resources/squadrons/Mig-23/SAAF 678th Sqn.yaml +++ b/resources/squadrons/Mig-23/SAAF 678th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 678th Squadron nickname: 678th +female_pilot_ratio: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-23MLD Flogger-K diff --git a/resources/squadrons/Mig-25/SAAF 1st Sqn.yaml b/resources/squadrons/Mig-25/SAAF 1st Sqn.yaml index 0eb4e6e7..bc5d7350 100644 --- a/resources/squadrons/Mig-25/SAAF 1st Sqn.yaml +++ b/resources/squadrons/Mig-25/SAAF 1st Sqn.yaml @@ -1,6 +1,7 @@ --- name: 1st Squadron nickname: 1st +female_pilot_ratio: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-25PD Foxbat-E diff --git a/resources/squadrons/Mig-29/Russia VVS 115th GvIAP.yaml b/resources/squadrons/Mig-29/Russia VVS 115th GvIAP.yaml index 6b0a035c..7307b645 100644 --- a/resources/squadrons/Mig-29/Russia VVS 115th GvIAP.yaml +++ b/resources/squadrons/Mig-29/Russia VVS 115th GvIAP.yaml @@ -1,6 +1,7 @@ --- name: 115th Guards Aviation Regiment nickname: 115th GvIAP +female_pilot_ratio: 0 country: Russia role: Air Superiority Fighter aircraft: MiG-29S Fulcrum-C diff --git a/resources/squadrons/Mig-29/Russia VVS 28th GvIAP.yaml b/resources/squadrons/Mig-29/Russia VVS 28th GvIAP.yaml index 7d77d1db..2248fb9d 100644 --- a/resources/squadrons/Mig-29/Russia VVS 28th GvIAP.yaml +++ b/resources/squadrons/Mig-29/Russia VVS 28th GvIAP.yaml @@ -1,6 +1,7 @@ --- name: 28th Guards Aviation Regiment nickname: 28th GvIAP +female_pilot_ratio: 0 country: Russia role: Air Superiority Fighter aircraft: MiG-29S Fulcrum-C diff --git a/resources/squadrons/Mig-29/Russia VVS 31st GvIAP.yaml b/resources/squadrons/Mig-29/Russia VVS 31st GvIAP.yaml index 7b5aa8c0..38eccef8 100644 --- a/resources/squadrons/Mig-29/Russia VVS 31st GvIAP.yaml +++ b/resources/squadrons/Mig-29/Russia VVS 31st GvIAP.yaml @@ -1,6 +1,7 @@ --- name: 31st Guards Aviation Regiment nickname: 31st GvIAP +female_pilot_ratio: 0 country: Russia role: Air Superiority Fighter aircraft: MiG-29S Fulcrum-C diff --git a/resources/squadrons/Mig-29/Russia VVS 773rd IAP.yaml b/resources/squadrons/Mig-29/Russia VVS 773rd IAP.yaml index 9275f965..38aea8bb 100644 --- a/resources/squadrons/Mig-29/Russia VVS 773rd IAP.yaml +++ b/resources/squadrons/Mig-29/Russia VVS 773rd IAP.yaml @@ -1,6 +1,7 @@ --- name: 773rd Aviation Regiment nickname: 773rd IAP +female_pilot_ratio: 0 country: Russia role: Air Superiority Fighter aircraft: MiG-29S Fulcrum-C diff --git a/resources/squadrons/Mig-29/SAAF 697th Sqn.yaml b/resources/squadrons/Mig-29/SAAF 697th Sqn.yaml index e0208144..f4e8e82f 100644 --- a/resources/squadrons/Mig-29/SAAF 697th Sqn.yaml +++ b/resources/squadrons/Mig-29/SAAF 697th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 697th Squadron nickname: 697th +female_pilot_ratio: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-29S Fulcrum-C diff --git a/resources/squadrons/Mig-29/SAAF 699th Sqn.yaml b/resources/squadrons/Mig-29/SAAF 699th Sqn.yaml index 5229f239..3228943c 100644 --- a/resources/squadrons/Mig-29/SAAF 699th Sqn.yaml +++ b/resources/squadrons/Mig-29/SAAF 699th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 699th Squadron nickname: 699th +female_pilot_ratio: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-29S Fulcrum-C diff --git a/resources/squadrons/MosquitoFBMkVI/no_21_squadron_raf.yaml b/resources/squadrons/MosquitoFBMkVI/no_21_squadron_raf.yaml index a4d03738..06a2edcd 100644 --- a/resources/squadrons/MosquitoFBMkVI/no_21_squadron_raf.yaml +++ b/resources/squadrons/MosquitoFBMkVI/no_21_squadron_raf.yaml @@ -1,6 +1,7 @@ --- name: RAF, No. 21 Squadron nickname: No. 21 +female_pilot_ratio: 0 country: UK role: Fighter Bomber aircraft: MosquitoFBMkVI diff --git a/resources/squadrons/S-3B/VS-35.yaml b/resources/squadrons/S-3B/VS-35.yaml index 0a5dcba3..8f989a76 100644 --- a/resources/squadrons/S-3B/VS-35.yaml +++ b/resources/squadrons/S-3B/VS-35.yaml @@ -1,6 +1,7 @@ --- name: VS-35 nickname: Blue Wolves +female_pilot_ratio: 0 country: USA role: Carrier-based Attack aircraft: S-3B Viking diff --git a/resources/squadrons/S-3B/VS-35F.yaml b/resources/squadrons/S-3B/VS-35F.yaml index 939dc887..1edc7043 100644 --- a/resources/squadrons/S-3B/VS-35F.yaml +++ b/resources/squadrons/S-3B/VS-35F.yaml @@ -1,9 +1,10 @@ --- name: VS-35 (Tanker) nickname: Blue Wolves +female_pilot_ratio: 0 country: USA role: Tanker aircraft: S-3B Tanker livery: NAVY Standard mission_types: - - Refueling \ No newline at end of file + - Refueling diff --git a/resources/squadrons/SH-60B/HSM-40.yaml b/resources/squadrons/SH-60B/HSM-40.yaml index 7d7ccd23..56de763f 100644 --- a/resources/squadrons/SH-60B/HSM-40.yaml +++ b/resources/squadrons/SH-60B/HSM-40.yaml @@ -1,10 +1,11 @@ --- name: HSM-40 nickname: Airwolves +female_pilot_ratio: 0 country: USA role: Transport/Anti-Ship aircraft: SH-60B Seahawk livery: standard mission_types: - Transport - - Anti-ship \ No newline at end of file + - Anti-ship diff --git a/resources/squadrons/SpitfireLFMkIX/no_145_squadron_raf.yaml b/resources/squadrons/SpitfireLFMkIX/no_145_squadron_raf.yaml index f033fb7f..2fc7a532 100644 --- a/resources/squadrons/SpitfireLFMkIX/no_145_squadron_raf.yaml +++ b/resources/squadrons/SpitfireLFMkIX/no_145_squadron_raf.yaml @@ -1,6 +1,7 @@ --- name: RAF, No. 145 Squadron nickname: No. 145 +female_pilot_ratio: 0 country: UK role: Fighter aircraft: Spitfire LF Mk IX diff --git a/resources/squadrons/SpitfireLFMkIX/no_16_squadron_raf.yaml b/resources/squadrons/SpitfireLFMkIX/no_16_squadron_raf.yaml index aaa99750..d926b3aa 100644 --- a/resources/squadrons/SpitfireLFMkIX/no_16_squadron_raf.yaml +++ b/resources/squadrons/SpitfireLFMkIX/no_16_squadron_raf.yaml @@ -1,6 +1,7 @@ --- name: RAF, No. 16 Squadron nickname: No. 16 +female_pilot_ratio: 0 country: UK role: Fighter aircraft: Spitfire LF Mk IX diff --git a/resources/squadrons/SpitfireLFMkIXCW/no_126_squadron_raf.yaml b/resources/squadrons/SpitfireLFMkIXCW/no_126_squadron_raf.yaml index 78f6395c..246ae900 100644 --- a/resources/squadrons/SpitfireLFMkIXCW/no_126_squadron_raf.yaml +++ b/resources/squadrons/SpitfireLFMkIXCW/no_126_squadron_raf.yaml @@ -1,6 +1,7 @@ --- name: RAF, No. 126 Squadron nickname: Harrowbeer +female_pilot_ratio: 0 country: UK role: Fighter aircraft: Spitfire LF Mk IX (Clipped Wings) diff --git a/resources/squadrons/Strike Eagle/335th FS.yaml b/resources/squadrons/Strike Eagle/335th FS.yaml index a7f0b3ed..56be3caf 100644 --- a/resources/squadrons/Strike Eagle/335th FS.yaml +++ b/resources/squadrons/Strike Eagle/335th FS.yaml @@ -1,6 +1,7 @@ --- name: 335th FS nickname: Chiefs +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-15E Strike Eagle diff --git a/resources/squadrons/Strike Eagle/492nd FS.yaml b/resources/squadrons/Strike Eagle/492nd FS.yaml index e86dcdb9..b5131d2d 100644 --- a/resources/squadrons/Strike Eagle/492nd FS.yaml +++ b/resources/squadrons/Strike Eagle/492nd FS.yaml @@ -1,6 +1,7 @@ --- name: 492nd FS nickname: Chiefs +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-15E Strike Eagle diff --git a/resources/squadrons/Strike Eagle/IAF 69th Sqn.yaml b/resources/squadrons/Strike Eagle/IAF 69th Sqn.yaml index 4962c03b..92faed7b 100644 --- a/resources/squadrons/Strike Eagle/IAF 69th Sqn.yaml +++ b/resources/squadrons/Strike Eagle/IAF 69th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 69th Squadron nickname: Hammers +female_pilot_ratio: 6 country: Israel role: Strike Fighter aircraft: F-15E Strike Eagle diff --git a/resources/squadrons/Su-17/SAAF 677th Sqn.yaml b/resources/squadrons/Su-17/SAAF 677th Sqn.yaml index 81ee48e7..d182fb9a 100644 --- a/resources/squadrons/Su-17/SAAF 677th Sqn.yaml +++ b/resources/squadrons/Su-17/SAAF 677th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 677th Squadron nickname: 677th +female_pilot_ratio: 0 country: Syria role: Bomber aircraft: Su-17M4 Fitter-K diff --git a/resources/squadrons/Su-17/SAAF 685th Sqn.yaml b/resources/squadrons/Su-17/SAAF 685th Sqn.yaml index e26abc6e..53f6d802 100644 --- a/resources/squadrons/Su-17/SAAF 685th Sqn.yaml +++ b/resources/squadrons/Su-17/SAAF 685th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 685th Squadron nickname: 685th +female_pilot_ratio: 0 country: Syria role: Bomber aircraft: Su-17M4 Fitter-K diff --git a/resources/squadrons/Su-17/SAAF 827th Sqn.yaml b/resources/squadrons/Su-17/SAAF 827th Sqn.yaml index 413b813f..dc4304c9 100644 --- a/resources/squadrons/Su-17/SAAF 827th Sqn.yaml +++ b/resources/squadrons/Su-17/SAAF 827th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 827th Squadron nickname: 827th +female_pilot_ratio: 0 country: Syria role: Bomber aircraft: Su-17M4 Fitter-K diff --git a/resources/squadrons/Su-24/SAAF 819th Sqn.yaml b/resources/squadrons/Su-24/SAAF 819th Sqn.yaml index 3e539d1d..4587ffbe 100644 --- a/resources/squadrons/Su-24/SAAF 819th Sqn.yaml +++ b/resources/squadrons/Su-24/SAAF 819th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 819th Squadron nickname: 819th +female_pilot_ratio: 0 country: Syria role: Bomber aircraft: Su-24M Fencer-D diff --git a/resources/squadrons/Tornado/RAF No12 Squadron.yaml b/resources/squadrons/Tornado/RAF No12 Squadron.yaml index f271fa9b..ceaa99ba 100644 --- a/resources/squadrons/Tornado/RAF No12 Squadron.yaml +++ b/resources/squadrons/Tornado/RAF No12 Squadron.yaml @@ -1,6 +1,7 @@ --- name: No. 12 Squadron nickname: Shiny Twelve +female_pilot_ratio: 6 country: UK role: Strike Fighter aircraft: Tornado GR4 diff --git a/resources/squadrons/UH-1/HMLA-169-UH1H.yaml b/resources/squadrons/UH-1/HMLA-169-UH1H.yaml index 9f573077..3157c806 100644 --- a/resources/squadrons/UH-1/HMLA-169-UH1H.yaml +++ b/resources/squadrons/UH-1/HMLA-169-UH1H.yaml @@ -1,6 +1,7 @@ --- name: HMLA-169 (UH-1H) nickname: Vipers +female_pilot_ratio: 0 country: USA role: Transport/Light Attack aircraft: UH-1H Iroquois @@ -8,4 +9,4 @@ livery: US NAVY mission_types: - CAS - OCA/Aircraft - - Transport \ No newline at end of file + - Transport diff --git a/resources/squadrons/UH-1/HMLA-269-UH1H.yaml b/resources/squadrons/UH-1/HMLA-269-UH1H.yaml index 39ac0767..86963a98 100644 --- a/resources/squadrons/UH-1/HMLA-269-UH1H.yaml +++ b/resources/squadrons/UH-1/HMLA-269-UH1H.yaml @@ -1,6 +1,7 @@ --- name: HMLA-269 (UH-1H) nickname: Gunrunners +female_pilot_ratio: 0 country: USA role: Transport/Light Attack aircraft: UH-1H Iroquois @@ -8,4 +9,4 @@ livery: US NAVY mission_types: - CAS - OCA/Aircraft - - Transport \ No newline at end of file + - Transport diff --git a/resources/squadrons/UH-60/US Army 101st Combat Aviation Brigade.yaml b/resources/squadrons/UH-60/US Army 101st Combat Aviation Brigade.yaml index c727a3b5..5e420af8 100644 --- a/resources/squadrons/UH-60/US Army 101st Combat Aviation Brigade.yaml +++ b/resources/squadrons/UH-60/US Army 101st Combat Aviation Brigade.yaml @@ -1,6 +1,7 @@ --- name: 101st Combat Aviation Brigade nickname: Bearcats +female_pilot_ratio: 0 country: USA role: Transport/Light Attack aircraft: UH-60A @@ -8,4 +9,4 @@ livery: standard mission_types: - CAS - OCA/Aircraft - - Transport \ No newline at end of file + - Transport diff --git a/resources/squadrons/globemaster/15th-Airlift.yaml b/resources/squadrons/globemaster/15th-Airlift.yaml index 510352f6..4d7304a9 100644 --- a/resources/squadrons/globemaster/15th-Airlift.yaml +++ b/resources/squadrons/globemaster/15th-Airlift.yaml @@ -1,6 +1,7 @@ --- name: 15th Airlift Squadron nickname: Global Eagles +female_pilot_ratio: 6 country: USA role: Airlift aircraft: C-17A diff --git a/resources/squadrons/hornet/VFA-106.yaml b/resources/squadrons/hornet/VFA-106.yaml index 9f20d0d4..a46a1b9c 100644 --- a/resources/squadrons/hornet/VFA-106.yaml +++ b/resources/squadrons/hornet/VFA-106.yaml @@ -1,6 +1,7 @@ --- name: VFA-106 nickname: Gladiators +female_pilot_ratio: 7 country: USA role: Strike Fighter aircraft: F/A-18C Hornet (Lot 20) diff --git a/resources/squadrons/hornet/VFA-113.yaml b/resources/squadrons/hornet/VFA-113.yaml index b59d32a8..266b0d3f 100644 --- a/resources/squadrons/hornet/VFA-113.yaml +++ b/resources/squadrons/hornet/VFA-113.yaml @@ -1,6 +1,7 @@ --- name: VFA-113 nickname: Stingers +female_pilot_ratio: 7 country: USA role: Strike Fighter aircraft: F/A-18C Hornet (Lot 20) diff --git a/resources/squadrons/hornet/VFA-192.yaml b/resources/squadrons/hornet/VFA-192.yaml index 7ca4c4b5..64de21a5 100644 --- a/resources/squadrons/hornet/VFA-192.yaml +++ b/resources/squadrons/hornet/VFA-192.yaml @@ -1,6 +1,7 @@ --- name: VFA-192 nickname: Golden Dragons +female_pilot_ratio: 7 country: USA role: Strike Fighter aircraft: F/A-18C Hornet (Lot 20) diff --git a/resources/squadrons/hornet/VMFA-122.yaml b/resources/squadrons/hornet/VMFA-122.yaml index 5c595928..40f1893e 100644 --- a/resources/squadrons/hornet/VMFA-122.yaml +++ b/resources/squadrons/hornet/VMFA-122.yaml @@ -1,6 +1,7 @@ --- name: VMFA-122 nickname: Werewolves +female_pilot_ratio: 7 country: USA role: Strike Fighter aircraft: F/A-18C Hornet (Lot 20) diff --git a/resources/squadrons/hornet/VMFA-251.yaml b/resources/squadrons/hornet/VMFA-251.yaml index da7f962b..be7b19df 100644 --- a/resources/squadrons/hornet/VMFA-251.yaml +++ b/resources/squadrons/hornet/VMFA-251.yaml @@ -1,6 +1,7 @@ --- name: VMFA-251 nickname: Thunderbolts +female_pilot_ratio: 7 country: USA role: Strike Fighter aircraft: F/A-18C Hornet (Lot 20) diff --git a/resources/squadrons/m2000-5/ADA_EscadronDeChasse_1-2_Cigognes.yaml b/resources/squadrons/m2000-5/ADA_EscadronDeChasse_1-2_Cigognes.yaml index 113cea5c..6ba701fb 100644 --- a/resources/squadrons/m2000-5/ADA_EscadronDeChasse_1-2_Cigognes.yaml +++ b/resources/squadrons/m2000-5/ADA_EscadronDeChasse_1-2_Cigognes.yaml @@ -1,6 +1,7 @@ --- name: Escadron de chasse 1/2 nickname: Cigognes +female_pilot_ratio: 6 country: France role: Fighter aircraft: Mirage 2000-5 diff --git a/resources/squadrons/m2000-5/ADA_EscadronDeChasse_2-2_CoteDOr.yaml b/resources/squadrons/m2000-5/ADA_EscadronDeChasse_2-2_CoteDOr.yaml index 67d07228..d934a37a 100644 --- a/resources/squadrons/m2000-5/ADA_EscadronDeChasse_2-2_CoteDOr.yaml +++ b/resources/squadrons/m2000-5/ADA_EscadronDeChasse_2-2_CoteDOr.yaml @@ -1,6 +1,7 @@ --- name: Escadron de chasse 2/2 nickname: Côte d'Or +female_pilot_ratio: 6 country: France role: Fighter aircraft: Mirage 2000-5 diff --git a/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-12_Cambresis.yaml b/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-12_Cambresis.yaml index a76fcfcc..b71a51ff 100644 --- a/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-12_Cambresis.yaml +++ b/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-12_Cambresis.yaml @@ -1,6 +1,7 @@ --- name: Escadron de chasse 1/12 nickname: Cambrésis +female_pilot_ratio: 6 country: France role: Fighter aircraft: Mirage 2000C diff --git a/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-30_Alsace.yaml b/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-30_Alsace.yaml index 350c3a7e..4a61c20b 100644 --- a/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-30_Alsace.yaml +++ b/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-30_Alsace.yaml @@ -1,6 +1,7 @@ --- name: Escadron de chasse 1/30 nickname: Alsace +female_pilot_ratio: 6 country: France role: Fighter aircraft: Mirage 2000C diff --git a/resources/squadrons/m2000c/ADA_EscadronDeChasse_2-5_IleDeFrance.yaml b/resources/squadrons/m2000c/ADA_EscadronDeChasse_2-5_IleDeFrance.yaml index dd663aa9..37904b5e 100644 --- a/resources/squadrons/m2000c/ADA_EscadronDeChasse_2-5_IleDeFrance.yaml +++ b/resources/squadrons/m2000c/ADA_EscadronDeChasse_2-5_IleDeFrance.yaml @@ -1,6 +1,7 @@ --- name: Escadron de chasse 2/5 nickname: Île De France +female_pilot_ratio: 6 country: France role: Fighter aircraft: Mirage 2000C diff --git a/resources/squadrons/sa342/ALAT_1er_RHC.yaml b/resources/squadrons/sa342/ALAT_1er_RHC.yaml index 78218c74..c9b26ec0 100644 --- a/resources/squadrons/sa342/ALAT_1er_RHC.yaml +++ b/resources/squadrons/sa342/ALAT_1er_RHC.yaml @@ -1,6 +1,7 @@ --- name: 1er régiment d'hélicoptères de combat nickname: +female_pilot_ratio: 6 country: France role: Anti-Aircraft Helicopter aircraft: SA 342M Gazelle Mistral diff --git a/resources/squadrons/sa342/ALAT_3eme_RHC.yaml b/resources/squadrons/sa342/ALAT_3eme_RHC.yaml index ce4da5e4..f88bb1c3 100644 --- a/resources/squadrons/sa342/ALAT_3eme_RHC.yaml +++ b/resources/squadrons/sa342/ALAT_3eme_RHC.yaml @@ -1,6 +1,7 @@ --- name: 3ème régiment d'hélicoptères de combat nickname: Grand 3 +female_pilot_ratio: 6 country: France role: Anti-Tank Helicopter aircraft: SA 342M Gazelle diff --git a/resources/squadrons/sa342/ALAT_5eme_RHC.yaml b/resources/squadrons/sa342/ALAT_5eme_RHC.yaml index 0af3bb80..be105046 100644 --- a/resources/squadrons/sa342/ALAT_5eme_RHC.yaml +++ b/resources/squadrons/sa342/ALAT_5eme_RHC.yaml @@ -1,6 +1,7 @@ --- name: 5ème régiment d'hélicoptères de combat nickname: Le régiment du Béarn +female_pilot_ratio: 6 country: France role: Combat Helicopter aircraft: SA 342L Gazelle diff --git a/resources/squadrons/sa342/ALAT_DOAS.yaml b/resources/squadrons/sa342/ALAT_DOAS.yaml index a10b6748..8a7082f4 100644 --- a/resources/squadrons/sa342/ALAT_DOAS.yaml +++ b/resources/squadrons/sa342/ALAT_DOAS.yaml @@ -1,6 +1,7 @@ --- name: Détachement ALAT des opérations spéciales nickname: DOAS +female_pilot_ratio: 6 country: France role: Combat Helicopter aircraft: SA342Minigun diff --git a/resources/squadrons/sa342/SAAF 976th Sqn.yaml b/resources/squadrons/sa342/SAAF 976th Sqn.yaml index 310a6c78..81af7b42 100644 --- a/resources/squadrons/sa342/SAAF 976th Sqn.yaml +++ b/resources/squadrons/sa342/SAAF 976th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 976th Squadron nickname: 976th +female_pilot_ratio: 6 country: Syria role: Anti-Tank Helicopter aircraft: SA 342L Gazelle diff --git a/resources/squadrons/sa342/SAAF 977th Sqn.yaml b/resources/squadrons/sa342/SAAF 977th Sqn.yaml index 3089b764..16d2004f 100644 --- a/resources/squadrons/sa342/SAAF 977th Sqn.yaml +++ b/resources/squadrons/sa342/SAAF 977th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 977th Squadron nickname: 977th +female_pilot_ratio: 6 country: Syria role: Anti-Tank Helicopter aircraft: SA 342L Gazelle diff --git a/resources/squadrons/sa342/SAAF 988th Sqn.yaml b/resources/squadrons/sa342/SAAF 988th Sqn.yaml index 9b19d7ee..817fabbe 100644 --- a/resources/squadrons/sa342/SAAF 988th Sqn.yaml +++ b/resources/squadrons/sa342/SAAF 988th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 988th Squadron nickname: 988th +female_pilot_ratio: 6 country: Syria role: Anti-Tank Helicopter aircraft: SA 342M Gazelle diff --git a/resources/squadrons/sa342/SAAF 989th Sqn.yaml b/resources/squadrons/sa342/SAAF 989th Sqn.yaml index 08f08958..1476b3a0 100644 --- a/resources/squadrons/sa342/SAAF 989th Sqn.yaml +++ b/resources/squadrons/sa342/SAAF 989th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 989th Squadron nickname: 989th +female_pilot_ratio: 6 country: Syria role: Anti-Tank Helicopter aircraft: SA 342M Gazelle diff --git a/resources/squadrons/viper/191-Filo.yaml b/resources/squadrons/viper/191-Filo.yaml index 3a57adf4..34bbe18b 100644 --- a/resources/squadrons/viper/191-Filo.yaml +++ b/resources/squadrons/viper/191-Filo.yaml @@ -1,6 +1,7 @@ --- name: 191. Filo nickname: Kobra +female_pilot_ratio: 6 country: Turkey role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 335 Tiger Squadron.yaml b/resources/squadrons/viper/HAF 335 Tiger Squadron.yaml index 5a356605..8b4da1eb 100644 --- a/resources/squadrons/viper/HAF 335 Tiger Squadron.yaml +++ b/resources/squadrons/viper/HAF 335 Tiger Squadron.yaml @@ -1,6 +1,7 @@ --- name: 335 Squadron nickname: Tiger +female_pilot_ratio: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 336 Olympus Squadron.yaml b/resources/squadrons/viper/HAF 336 Olympus Squadron.yaml index ba79c32a..bf35247d 100644 --- a/resources/squadrons/viper/HAF 336 Olympus Squadron.yaml +++ b/resources/squadrons/viper/HAF 336 Olympus Squadron.yaml @@ -1,6 +1,7 @@ --- name: 336 Squadron nickname: Olympus +female_pilot_ratio: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 337 Ghost Squadron.yaml b/resources/squadrons/viper/HAF 337 Ghost Squadron.yaml index 1403d701..313fb433 100644 --- a/resources/squadrons/viper/HAF 337 Ghost Squadron.yaml +++ b/resources/squadrons/viper/HAF 337 Ghost Squadron.yaml @@ -1,6 +1,7 @@ --- name: 337 Squadron nickname: Ghost +female_pilot_ratio: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 340 Fox Squadron.yaml b/resources/squadrons/viper/HAF 340 Fox Squadron.yaml index 466277d4..bdf0200e 100644 --- a/resources/squadrons/viper/HAF 340 Fox Squadron.yaml +++ b/resources/squadrons/viper/HAF 340 Fox Squadron.yaml @@ -1,6 +1,7 @@ --- name: 340 Squadron nickname: Fox +female_pilot_ratio: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 341 Arrow Squadron.yaml b/resources/squadrons/viper/HAF 341 Arrow Squadron.yaml index 23471331..569a04e6 100644 --- a/resources/squadrons/viper/HAF 341 Arrow Squadron.yaml +++ b/resources/squadrons/viper/HAF 341 Arrow Squadron.yaml @@ -1,6 +1,7 @@ --- name: 341 Squadron nickname: Arrow +female_pilot_ratio: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 343 Star Squadron.yaml b/resources/squadrons/viper/HAF 343 Star Squadron.yaml index 8510e71c..60cedafb 100644 --- a/resources/squadrons/viper/HAF 343 Star Squadron.yaml +++ b/resources/squadrons/viper/HAF 343 Star Squadron.yaml @@ -1,6 +1,7 @@ --- name: 343 Squadron nickname: Star +female_pilot_ratio: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 346 Jason Squadron.yaml b/resources/squadrons/viper/HAF 346 Jason Squadron.yaml index 6c2a022d..a388a32f 100644 --- a/resources/squadrons/viper/HAF 346 Jason Squadron.yaml +++ b/resources/squadrons/viper/HAF 346 Jason Squadron.yaml @@ -1,6 +1,7 @@ --- name: 346 Squadron nickname: Jason +female_pilot_ratio: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 347 Perseus Squadron.yaml b/resources/squadrons/viper/HAF 347 Perseus Squadron.yaml index f4d067dc..22f16888 100644 --- a/resources/squadrons/viper/HAF 347 Perseus Squadron.yaml +++ b/resources/squadrons/viper/HAF 347 Perseus Squadron.yaml @@ -1,6 +1,7 @@ --- name: 347 Squadron nickname: Perseus +female_pilot_ratio: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF_330_Thunder_squadron.yaml b/resources/squadrons/viper/HAF_330_Thunder_squadron.yaml index 80d5c08a..b47558d3 100644 --- a/resources/squadrons/viper/HAF_330_Thunder_squadron.yaml +++ b/resources/squadrons/viper/HAF_330_Thunder_squadron.yaml @@ -1,6 +1,7 @@ --- name: 330 Squadron nickname: Thunder +female_pilot_ratio: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/IAF 101st Sqn.yaml b/resources/squadrons/viper/IAF 101st Sqn.yaml index 9caf7d62..dfa17b63 100644 --- a/resources/squadrons/viper/IAF 101st Sqn.yaml +++ b/resources/squadrons/viper/IAF 101st Sqn.yaml @@ -1,6 +1,7 @@ --- name: 101st Squadron nickname: First Fighter +female_pilot_ratio: 6 country: Israel role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/IAF 110th Sqn.yaml b/resources/squadrons/viper/IAF 110th Sqn.yaml index 95971631..92970ff5 100644 --- a/resources/squadrons/viper/IAF 110th Sqn.yaml +++ b/resources/squadrons/viper/IAF 110th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 110th Squadron nickname: Knights of the North +female_pilot_ratio: 6 country: Israel role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/IAF 117th Sqn.yaml b/resources/squadrons/viper/IAF 117th Sqn.yaml index 7b049f90..8b59da8c 100644 --- a/resources/squadrons/viper/IAF 117th Sqn.yaml +++ b/resources/squadrons/viper/IAF 117th Sqn.yaml @@ -1,6 +1,7 @@ --- name: 117th Squadron nickname: First Jet +female_pilot_ratio: 6 country: Israel role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 132nd WG.yaml b/resources/squadrons/viper/USAF 132nd WG.yaml index d4b71f2b..bd8ffb5d 100644 --- a/resources/squadrons/viper/USAF 132nd WG.yaml +++ b/resources/squadrons/viper/USAF 132nd WG.yaml @@ -1,6 +1,7 @@ --- name: 132nd FW nickname: Hawkeyes +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 13th FS.yaml b/resources/squadrons/viper/USAF 13th FS.yaml index 2246490a..a3115b50 100644 --- a/resources/squadrons/viper/USAF 13th FS.yaml +++ b/resources/squadrons/viper/USAF 13th FS.yaml @@ -1,6 +1,7 @@ --- name: 13th FS nickname: Panthers +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 14th FS.yaml b/resources/squadrons/viper/USAF 14th FS.yaml index 8908e3d3..019fad27 100644 --- a/resources/squadrons/viper/USAF 14th FS.yaml +++ b/resources/squadrons/viper/USAF 14th FS.yaml @@ -1,6 +1,7 @@ --- name: 14th FS nickname: Samurais +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 152nd FS.yaml b/resources/squadrons/viper/USAF 152nd FS.yaml index d86230de..002bf40c 100644 --- a/resources/squadrons/viper/USAF 152nd FS.yaml +++ b/resources/squadrons/viper/USAF 152nd FS.yaml @@ -1,6 +1,7 @@ --- name: 152nd FS nickname: Las Vaqueros +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 174th FS.yaml b/resources/squadrons/viper/USAF 174th FS.yaml index 771553d7..c5d60d59 100644 --- a/resources/squadrons/viper/USAF 174th FS.yaml +++ b/resources/squadrons/viper/USAF 174th FS.yaml @@ -1,6 +1,7 @@ --- name: 174th FS nickname: Bulldogs +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 179th FS.yaml b/resources/squadrons/viper/USAF 179th FS.yaml index 42739cd9..1bb95c90 100644 --- a/resources/squadrons/viper/USAF 179th FS.yaml +++ b/resources/squadrons/viper/USAF 179th FS.yaml @@ -1,6 +1,7 @@ --- name: 179th FS nickname: Bulldogs +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 22nd FS.yaml b/resources/squadrons/viper/USAF 22nd FS.yaml index a9701f77..bdbaba9a 100644 --- a/resources/squadrons/viper/USAF 22nd FS.yaml +++ b/resources/squadrons/viper/USAF 22nd FS.yaml @@ -1,6 +1,7 @@ --- name: 22nd FS nickname: Stingers +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 23rd FS.yaml b/resources/squadrons/viper/USAF 23rd FS.yaml index d2a1df75..e7b4a8f8 100644 --- a/resources/squadrons/viper/USAF 23rd FS.yaml +++ b/resources/squadrons/viper/USAF 23rd FS.yaml @@ -1,6 +1,7 @@ --- name: 23rd FS nickname: Fighting Hawks +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 36th FS.yaml b/resources/squadrons/viper/USAF 36th FS.yaml index f31f1c44..d1e5ad48 100644 --- a/resources/squadrons/viper/USAF 36th FS.yaml +++ b/resources/squadrons/viper/USAF 36th FS.yaml @@ -1,6 +1,7 @@ --- name: 36th FS nickname: Flying Fiends +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 480th FS.yaml b/resources/squadrons/viper/USAF 480th FS.yaml index 6b50ddea..63857993 100644 --- a/resources/squadrons/viper/USAF 480th FS.yaml +++ b/resources/squadrons/viper/USAF 480th FS.yaml @@ -1,6 +1,7 @@ --- name: 480th FS nickname: Warhawks +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 522nd FS.yaml b/resources/squadrons/viper/USAF 522nd FS.yaml index cf65b38a..ed59e582 100644 --- a/resources/squadrons/viper/USAF 522nd FS.yaml +++ b/resources/squadrons/viper/USAF 522nd FS.yaml @@ -1,6 +1,7 @@ --- name: 522nd FS nickname: Fireballs +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 55th FS.yaml b/resources/squadrons/viper/USAF 55th FS.yaml index ddf2814e..57d068f2 100644 --- a/resources/squadrons/viper/USAF 55th FS.yaml +++ b/resources/squadrons/viper/USAF 55th FS.yaml @@ -1,6 +1,7 @@ --- name: 55th FS nickname: Fifty Fifth +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 77th FS.yaml b/resources/squadrons/viper/USAF 77th FS.yaml index 145d9c04..5e303a1e 100644 --- a/resources/squadrons/viper/USAF 77th FS.yaml +++ b/resources/squadrons/viper/USAF 77th FS.yaml @@ -1,6 +1,7 @@ --- name: 77th FS nickname: Gamblers +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 79th FS.yaml b/resources/squadrons/viper/USAF 79th FS.yaml index 6a53d958..155932d0 100644 --- a/resources/squadrons/viper/USAF 79th FS.yaml +++ b/resources/squadrons/viper/USAF 79th FS.yaml @@ -1,6 +1,7 @@ --- name: 79th FS nickname: Tigers +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 80th FS.yaml b/resources/squadrons/viper/USAF 80th FS.yaml index 0324a4fe..fbc7a20a 100644 --- a/resources/squadrons/viper/USAF 80th FS.yaml +++ b/resources/squadrons/viper/USAF 80th FS.yaml @@ -1,6 +1,7 @@ --- name: 80th FS nickname: Headhunters +female_pilot_ratio: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) From ffedd2e1ad8d7cf3abde0490bf1379c25e0f0f89 Mon Sep 17 00:00:00 2001 From: Khopa Date: Sun, 6 Feb 2022 22:44:53 +0100 Subject: [PATCH 3/6] #1966 : Updated campaign file version & updated golan heights campaign with an example usage --- game/version.py | 7 ++++++- resources/campaigns/golan_heights_lite.yaml | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/game/version.py b/game/version.py index 55d27d74..3e71fcae 100644 --- a/game/version.py +++ b/game/version.py @@ -123,4 +123,9 @@ VERSION = _build_version_string() #: Version 9.1 #: * Campaign files can optionally define a start date with #: `recommended_start_date: YYYY-MM-DD`. -CAMPAIGN_FORMAT_VERSION = (9, 1) +#: +#: Version 9.2 +#: * Squadrons defined in campaign files can optionally setup squadrons' name, +#: nickname and/or generated female pilot name ratio +#: +CAMPAIGN_FORMAT_VERSION = (9, 2) diff --git a/resources/campaigns/golan_heights_lite.yaml b/resources/campaigns/golan_heights_lite.yaml index 3619701d..99fc3aca 100644 --- a/resources/campaigns/golan_heights_lite.yaml +++ b/resources/campaigns/golan_heights_lite.yaml @@ -40,10 +40,14 @@ squadrons: Golan South: - primary: CAS secondary: air-to-ground + nickname: Golan Heights Heroes + female_pilot_ratio: 15 aircraft: - AH-1W SuperCobra - primary: CAS secondary: air-to-ground + nickname: Defenders of Golan + female_pilot_ratio: 25 aircraft: - AH-64D Apache Longbow - primary: Transport From 05d69ba0036277abde042115776870dab12cc5ac Mon Sep 17 00:00:00 2001 From: Khopa Date: Sun, 6 Feb 2022 23:11:29 +0100 Subject: [PATCH 4/6] Mypy fix --- game/campaignloader/defaultsquadronassigner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game/campaignloader/defaultsquadronassigner.py b/game/campaignloader/defaultsquadronassigner.py index 883f1f57..de88e736 100644 --- a/game/campaignloader/defaultsquadronassigner.py +++ b/game/campaignloader/defaultsquadronassigner.py @@ -2,7 +2,7 @@ from __future__ import annotations import dataclasses import logging -from typing import Optional, TYPE_CHECKING +from typing import Optional, TYPE_CHECKING, Dict, Union from game.squadrons import Squadron from game.squadrons.squadrondef import SquadronDef @@ -72,7 +72,7 @@ class DefaultSquadronAssigner: # Override squadron def with squadron config parameters from campaign file, if defined if squadron_def is not None: - overrides = {} + overrides: Dict[str, Union[str, int]] = {} if config.name is not None: overrides["name"] = config.name if config.nickname is not None: From dc0562b3bede6de161a44bfaf2a87595e90961af Mon Sep 17 00:00:00 2001 From: Khopa Date: Mon, 7 Feb 2022 18:01:43 +0100 Subject: [PATCH 5/6] Fix #1966 : Naming; replaced female_pilot_ratio by female_pilot_percentage --- game/campaignloader/campaignairwingconfig.py | 4 ++-- game/campaignloader/defaultsquadronassigner.py | 4 ++-- game/campaignloader/squadrondefgenerator.py | 2 +- game/squadrons/squadron.py | 6 +++--- game/squadrons/squadrondef.py | 6 +++--- game/version.py | 2 +- resources/campaigns/golan_heights_lite.yaml | 4 ++-- resources/squadrons/A-10C Warthog I/104th FS.yaml | 2 +- resources/squadrons/A-10C Warthog I/118th FS.yaml | 2 +- resources/squadrons/A-10C Warthog I/172nd FS.yaml | 2 +- resources/squadrons/A-10C Warthog I/184th FS.yaml | 2 +- resources/squadrons/A-10C Warthog I/190th FS.yaml | 2 +- resources/squadrons/A-10C Warthog I/25th FS.yaml | 2 +- resources/squadrons/A-10C Warthog I/354th FS.yaml | 2 +- resources/squadrons/A-10C Warthog I/355th FS.yaml | 2 +- resources/squadrons/A-10C Warthog I/357th FS.yaml | 2 +- resources/squadrons/A-10C Warthog I/358th FS.yaml | 2 +- resources/squadrons/A-10C Warthog I/47th FS.yaml | 2 +- resources/squadrons/A-10C Warthog I/74th TFS.yaml | 2 +- resources/squadrons/A-10C Warthog I/81st FS.yaml | 2 +- resources/squadrons/A-10C Warthog II/25th FS.yaml | 2 +- resources/squadrons/A-10C Warthog II/354th FS.yaml | 2 +- resources/squadrons/A-10C Warthog II/355th FS.yaml | 2 +- resources/squadrons/A-10C Warthog II/357th FS.yaml | 2 +- resources/squadrons/A-10C Warthog II/358th FS.yaml | 2 +- resources/squadrons/A-10C Warthog II/81st FS.yaml | 2 +- resources/squadrons/A-4E Skyhawk/IAF 110th Sqn.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VA-144.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VA-153.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VA-163.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VA-164.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VA-195.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VA-212.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VA-45.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VA-55.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VA-64.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VMA-121.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VMA-124.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VMA-131.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VMA-142.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VMA-211.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VMA-311.yaml | 2 +- resources/squadrons/A-4E Skyhawk/VMA-322.yaml | 2 +- resources/squadrons/A20/no_107_squadron_raf.yaml | 2 +- resources/squadrons/AH-1X/HMLA-169-AH1W.yaml | 2 +- resources/squadrons/AH-1X/HMLA-269-AH1W.yaml | 2 +- resources/squadrons/AH-1X/IAF 160th Sqn.yaml | 2 +- resources/squadrons/AH-64D/IAF 113th Sqn.yaml | 2 +- .../squadrons/AH-64D/US Army 229th Aviation Battalion.yaml | 2 +- resources/squadrons/AV-8BNA/VMA-214.yaml | 2 +- resources/squadrons/AV-8BNA/VMA-223.yaml | 2 +- resources/squadrons/BF-109K4/Jagdgeschwader_53.yaml | 2 +- resources/squadrons/E-2 Hawkeye/VAW-125.yaml | 2 +- resources/squadrons/E-3 Sentry/USAF 960th AACS.yaml | 2 +- resources/squadrons/Eagle/IAF 106th Sqn.yaml | 2 +- resources/squadrons/Eagle/USAF 12th FS.yaml | 2 +- resources/squadrons/Eagle/USAF 390th FS.yaml | 2 +- resources/squadrons/Eagle/USAF 493rd FS.yaml | 2 +- resources/squadrons/Eagle/USAF 58th FS.yaml | 2 +- resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-11.yaml | 2 +- resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-111.yaml | 2 +- resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-21.yaml | 2 +- resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-211.yaml | 2 +- resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-33.yaml | 2 +- resources/squadrons/F-14B Tomcat/VF-101.yaml | 2 +- resources/squadrons/F-14B Tomcat/VF-102.yaml | 2 +- resources/squadrons/F-14B Tomcat/VF-142.yaml | 2 +- resources/squadrons/F-14B Tomcat/VF-143.yaml | 2 +- resources/squadrons/F-14B Tomcat/VF-211.yaml | 2 +- resources/squadrons/F-4E/IAF 201th Sqn.yaml | 2 +- resources/squadrons/F-4E/IRIAF 32nd TFW.yaml | 2 +- resources/squadrons/FW-190A8/Jagdgeschwader_26.yaml | 2 +- resources/squadrons/FW-190D9/Jagdgeschwader_54.yaml | 2 +- resources/squadrons/Ju88A4/Kustenfliegergruppe_106.yaml | 4 ++-- resources/squadrons/KC-130/VMGR-352.yaml | 2 +- resources/squadrons/KC-135/18th ARS.yaml | 2 +- resources/squadrons/KC-135/TuAF 101st Tanker Squadron.yaml | 2 +- resources/squadrons/KC-135MPRS/340th EARS.yaml | 2 +- resources/squadrons/Mi-24/SAAF 765th Sqn.yaml | 2 +- resources/squadrons/Mi-24/SAAF 766th Sqn.yaml | 2 +- resources/squadrons/Mi-8/SAAF 253th Sqn.yaml | 2 +- resources/squadrons/Mi-8/SAAF 255th Sqn.yaml | 2 +- resources/squadrons/Mig-21/SAAF 679th Sqn.yaml | 2 +- resources/squadrons/Mig-21/SAAF 680th Sqn.yaml | 2 +- resources/squadrons/Mig-21/SAAF 825th Sqn.yaml | 2 +- resources/squadrons/Mig-21/SAAF 8th Sqn.yaml | 2 +- resources/squadrons/Mig-23/SAAF 678th Sqn.yaml | 2 +- resources/squadrons/Mig-25/SAAF 1st Sqn.yaml | 2 +- resources/squadrons/Mig-29/Russia VVS 115th GvIAP.yaml | 2 +- resources/squadrons/Mig-29/Russia VVS 28th GvIAP.yaml | 2 +- resources/squadrons/Mig-29/Russia VVS 31st GvIAP.yaml | 2 +- resources/squadrons/Mig-29/Russia VVS 773rd IAP.yaml | 2 +- resources/squadrons/Mig-29/SAAF 697th Sqn.yaml | 2 +- resources/squadrons/Mig-29/SAAF 699th Sqn.yaml | 2 +- resources/squadrons/MosquitoFBMkVI/no_21_squadron_raf.yaml | 2 +- resources/squadrons/S-3B/VS-35.yaml | 2 +- resources/squadrons/S-3B/VS-35F.yaml | 2 +- resources/squadrons/SH-60B/HSM-40.yaml | 2 +- resources/squadrons/SpitfireLFMkIX/no_145_squadron_raf.yaml | 2 +- resources/squadrons/SpitfireLFMkIX/no_16_squadron_raf.yaml | 2 +- .../squadrons/SpitfireLFMkIXCW/no_126_squadron_raf.yaml | 2 +- resources/squadrons/Strike Eagle/335th FS.yaml | 2 +- resources/squadrons/Strike Eagle/492nd FS.yaml | 2 +- resources/squadrons/Strike Eagle/IAF 69th Sqn.yaml | 2 +- resources/squadrons/Su-17/SAAF 677th Sqn.yaml | 2 +- resources/squadrons/Su-17/SAAF 685th Sqn.yaml | 2 +- resources/squadrons/Su-17/SAAF 827th Sqn.yaml | 2 +- resources/squadrons/Su-24/SAAF 819th Sqn.yaml | 2 +- resources/squadrons/Tornado/RAF No12 Squadron.yaml | 2 +- resources/squadrons/UH-1/HMLA-169-UH1H.yaml | 2 +- resources/squadrons/UH-1/HMLA-269-UH1H.yaml | 2 +- .../UH-60/US Army 101st Combat Aviation Brigade.yaml | 2 +- resources/squadrons/globemaster/15th-Airlift.yaml | 2 +- resources/squadrons/hornet/VFA-106.yaml | 2 +- resources/squadrons/hornet/VFA-113.yaml | 2 +- resources/squadrons/hornet/VFA-192.yaml | 2 +- resources/squadrons/hornet/VMFA-122.yaml | 2 +- resources/squadrons/hornet/VMFA-251.yaml | 2 +- .../m2000-5/ADA_EscadronDeChasse_1-2_Cigognes.yaml | 2 +- .../squadrons/m2000-5/ADA_EscadronDeChasse_2-2_CoteDOr.yaml | 2 +- .../m2000c/ADA_EscadronDeChasse_1-12_Cambresis.yaml | 2 +- .../squadrons/m2000c/ADA_EscadronDeChasse_1-30_Alsace.yaml | 2 +- .../m2000c/ADA_EscadronDeChasse_2-5_IleDeFrance.yaml | 2 +- resources/squadrons/sa342/ALAT_1er_RHC.yaml | 2 +- resources/squadrons/sa342/ALAT_3eme_RHC.yaml | 2 +- resources/squadrons/sa342/ALAT_5eme_RHC.yaml | 2 +- resources/squadrons/sa342/ALAT_DOAS.yaml | 2 +- resources/squadrons/sa342/SAAF 976th Sqn.yaml | 2 +- resources/squadrons/sa342/SAAF 977th Sqn.yaml | 2 +- resources/squadrons/sa342/SAAF 988th Sqn.yaml | 2 +- resources/squadrons/sa342/SAAF 989th Sqn.yaml | 2 +- resources/squadrons/viper/191-Filo.yaml | 2 +- resources/squadrons/viper/HAF 335 Tiger Squadron.yaml | 2 +- resources/squadrons/viper/HAF 336 Olympus Squadron.yaml | 2 +- resources/squadrons/viper/HAF 337 Ghost Squadron.yaml | 2 +- resources/squadrons/viper/HAF 340 Fox Squadron.yaml | 2 +- resources/squadrons/viper/HAF 341 Arrow Squadron.yaml | 2 +- resources/squadrons/viper/HAF 343 Star Squadron.yaml | 2 +- resources/squadrons/viper/HAF 346 Jason Squadron.yaml | 2 +- resources/squadrons/viper/HAF 347 Perseus Squadron.yaml | 2 +- resources/squadrons/viper/HAF_330_Thunder_squadron.yaml | 2 +- resources/squadrons/viper/IAF 101st Sqn.yaml | 2 +- resources/squadrons/viper/IAF 110th Sqn.yaml | 2 +- resources/squadrons/viper/IAF 117th Sqn.yaml | 2 +- resources/squadrons/viper/USAF 132nd WG.yaml | 2 +- resources/squadrons/viper/USAF 13th FS.yaml | 2 +- resources/squadrons/viper/USAF 14th FS.yaml | 2 +- resources/squadrons/viper/USAF 152nd FS.yaml | 2 +- resources/squadrons/viper/USAF 174th FS.yaml | 2 +- resources/squadrons/viper/USAF 179th FS.yaml | 2 +- resources/squadrons/viper/USAF 22nd FS.yaml | 2 +- resources/squadrons/viper/USAF 23rd FS.yaml | 2 +- resources/squadrons/viper/USAF 36th FS.yaml | 2 +- resources/squadrons/viper/USAF 480th FS.yaml | 2 +- resources/squadrons/viper/USAF 522nd FS.yaml | 2 +- resources/squadrons/viper/USAF 55th FS.yaml | 2 +- resources/squadrons/viper/USAF 77th FS.yaml | 2 +- resources/squadrons/viper/USAF 79th FS.yaml | 2 +- resources/squadrons/viper/USAF 80th FS.yaml | 2 +- 159 files changed, 167 insertions(+), 167 deletions(-) diff --git a/game/campaignloader/campaignairwingconfig.py b/game/campaignloader/campaignairwingconfig.py index fc5b4e6a..e64e75b4 100644 --- a/game/campaignloader/campaignairwingconfig.py +++ b/game/campaignloader/campaignairwingconfig.py @@ -20,7 +20,7 @@ class SquadronConfig: name: Optional[str] nickname: Optional[str] - female_pilot_ratio: Optional[int] + female_pilot_percentage: Optional[int] @property def auto_assignable(self) -> set[FlightType]: @@ -42,7 +42,7 @@ class SquadronConfig: data.get("aircraft", []), data.get("name", None), data.get("nickname", None), - data.get("female_pilot_ratio", None), + data.get("female_pilot_percentage", None), ) @staticmethod diff --git a/game/campaignloader/defaultsquadronassigner.py b/game/campaignloader/defaultsquadronassigner.py index de88e736..43807f23 100644 --- a/game/campaignloader/defaultsquadronassigner.py +++ b/game/campaignloader/defaultsquadronassigner.py @@ -77,8 +77,8 @@ class DefaultSquadronAssigner: overrides["name"] = config.name if config.nickname is not None: overrides["nickname"] = config.nickname - if config.female_pilot_ratio is not None: - overrides["female_pilot_ratio"] = config.female_pilot_ratio + if config.female_pilot_percentage is not None: + overrides["female_pilot_percentage"] = config.female_pilot_percentage squadron_copy = dataclasses.replace(squadron_def, **overrides) return squadron_copy diff --git a/game/campaignloader/squadrondefgenerator.py b/game/campaignloader/squadrondefgenerator.py index 6b8203d8..4f57ec1e 100644 --- a/game/campaignloader/squadrondefgenerator.py +++ b/game/campaignloader/squadrondefgenerator.py @@ -50,7 +50,7 @@ class SquadronDefGenerator: livery=None, mission_types=tuple(tasks_for_aircraft(aircraft)), operating_bases=OperatingBases.default_for_aircraft(aircraft), - female_pilot_ratio=6, + female_pilot_percentage=6, pilot_pool=[], ) diff --git a/game/squadrons/squadron.py b/game/squadrons/squadron.py index b3f359c6..8d081fd5 100644 --- a/game/squadrons/squadron.py +++ b/game/squadrons/squadron.py @@ -33,7 +33,7 @@ class Squadron: livery: Optional[str] mission_types: tuple[FlightType, ...] operating_bases: OperatingBases - female_pilot_ratio: int + female_pilot_percentage: int #: The pool of pilots that have not yet been assigned to the squadron. This only #: happens when a preset squadron defines more preset pilots than the squadron limit @@ -162,7 +162,7 @@ class Squadron: self.pilot_pool = self.pilot_pool[count:] count -= len(new_pilots) for _ in range(count): - if random.randint(1, 100) > self.female_pilot_ratio: + if random.randint(1, 100) > self.female_pilot_percentage: new_pilots.append(Pilot(self.faker.name_male())) else: new_pilots.append(Pilot(self.faker.name_female())) @@ -434,7 +434,7 @@ class Squadron: squadron_def.livery, squadron_def.mission_types, squadron_def.operating_bases, - squadron_def.female_pilot_ratio, + squadron_def.female_pilot_percentage, squadron_def.pilot_pool, coalition, game.settings, diff --git a/game/squadrons/squadrondef.py b/game/squadrons/squadrondef.py index f74fdabb..59589d83 100644 --- a/game/squadrons/squadrondef.py +++ b/game/squadrons/squadrondef.py @@ -27,7 +27,7 @@ class SquadronDef: livery: Optional[str] mission_types: tuple[FlightType, ...] operating_bases: OperatingBases - female_pilot_ratio: int + female_pilot_percentage: int pilot_pool: list[Pilot] claimed: bool = False @@ -76,7 +76,7 @@ class SquadronDef: pilots = [Pilot(n, player=False) for n in data.get("pilots", [])] pilots.extend([Pilot(n, player=True) for n in data.get("players", [])]) - female_pilot_ratio = data.get("female_pilot_ratio", 6) + female_pilot_percentage = data.get("female_pilot_percentage", 6) mission_types = [FlightType.from_name(n) for n in data["mission_types"]] tasks = tasks_for_aircraft(unit_type) @@ -97,6 +97,6 @@ class SquadronDef: livery=data.get("livery"), mission_types=tuple(mission_types), operating_bases=OperatingBases.from_yaml(unit_type, data.get("bases", {})), - female_pilot_ratio=female_pilot_ratio, + female_pilot_percentage=female_pilot_percentage, pilot_pool=pilots, ) diff --git a/game/version.py b/game/version.py index 3e71fcae..8db413b6 100644 --- a/game/version.py +++ b/game/version.py @@ -126,6 +126,6 @@ VERSION = _build_version_string() #: #: Version 9.2 #: * Squadrons defined in campaign files can optionally setup squadrons' name, -#: nickname and/or generated female pilot name ratio +#: nickname and/or generated female pilot name percentage #: CAMPAIGN_FORMAT_VERSION = (9, 2) diff --git a/resources/campaigns/golan_heights_lite.yaml b/resources/campaigns/golan_heights_lite.yaml index 99fc3aca..d10a2e9c 100644 --- a/resources/campaigns/golan_heights_lite.yaml +++ b/resources/campaigns/golan_heights_lite.yaml @@ -41,13 +41,13 @@ squadrons: - primary: CAS secondary: air-to-ground nickname: Golan Heights Heroes - female_pilot_ratio: 15 + female_pilot_percentage: 15 aircraft: - AH-1W SuperCobra - primary: CAS secondary: air-to-ground nickname: Defenders of Golan - female_pilot_ratio: 25 + female_pilot_percentage: 25 aircraft: - AH-64D Apache Longbow - primary: Transport diff --git a/resources/squadrons/A-10C Warthog I/104th FS.yaml b/resources/squadrons/A-10C Warthog I/104th FS.yaml index 80990d32..f76fb400 100644 --- a/resources/squadrons/A-10C Warthog I/104th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/104th FS.yaml @@ -1,7 +1,7 @@ --- name: 104th FS nickname: Eagles -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/118th FS.yaml b/resources/squadrons/A-10C Warthog I/118th FS.yaml index 49f90680..f6636464 100644 --- a/resources/squadrons/A-10C Warthog I/118th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/118th FS.yaml @@ -1,7 +1,7 @@ --- name: 118th FS nickname: Flying Yankees -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/172nd FS.yaml b/resources/squadrons/A-10C Warthog I/172nd FS.yaml index cf53b3e2..052bcda5 100644 --- a/resources/squadrons/A-10C Warthog I/172nd FS.yaml +++ b/resources/squadrons/A-10C Warthog I/172nd FS.yaml @@ -1,7 +1,7 @@ --- name: 172nd FS nickname: -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/184th FS.yaml b/resources/squadrons/A-10C Warthog I/184th FS.yaml index 305cc6bd..946d9987 100644 --- a/resources/squadrons/A-10C Warthog I/184th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/184th FS.yaml @@ -1,7 +1,7 @@ --- name: 184th FS nickname: Flying Razorbacks -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/190th FS.yaml b/resources/squadrons/A-10C Warthog I/190th FS.yaml index 74428b99..f0b3da72 100644 --- a/resources/squadrons/A-10C Warthog I/190th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/190th FS.yaml @@ -1,7 +1,7 @@ --- name: 190th FS nickname: Skull Bangers -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/25th FS.yaml b/resources/squadrons/A-10C Warthog I/25th FS.yaml index 2eb4d299..f7b32459 100644 --- a/resources/squadrons/A-10C Warthog I/25th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/25th FS.yaml @@ -1,7 +1,7 @@ --- name: 25th FS nickname: Assam Draggins -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/354th FS.yaml b/resources/squadrons/A-10C Warthog I/354th FS.yaml index 06073259..8ecc28f7 100644 --- a/resources/squadrons/A-10C Warthog I/354th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/354th FS.yaml @@ -1,7 +1,7 @@ --- name: 354th FS nickname: Bulldogs -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/355th FS.yaml b/resources/squadrons/A-10C Warthog I/355th FS.yaml index 154b404a..fea5ff9b 100644 --- a/resources/squadrons/A-10C Warthog I/355th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/355th FS.yaml @@ -1,7 +1,7 @@ --- name: 355th FS nickname: Fightin' Falcons -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/357th FS.yaml b/resources/squadrons/A-10C Warthog I/357th FS.yaml index 856673a9..eaabd3a9 100644 --- a/resources/squadrons/A-10C Warthog I/357th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/357th FS.yaml @@ -1,7 +1,7 @@ --- name: 357th FS nickname: Dragons -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/358th FS.yaml b/resources/squadrons/A-10C Warthog I/358th FS.yaml index b29ea514..2240e73e 100644 --- a/resources/squadrons/A-10C Warthog I/358th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/358th FS.yaml @@ -1,7 +1,7 @@ --- name: 358th FS nickname: Lobos -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/47th FS.yaml b/resources/squadrons/A-10C Warthog I/47th FS.yaml index c0ab9e59..93db63e0 100644 --- a/resources/squadrons/A-10C Warthog I/47th FS.yaml +++ b/resources/squadrons/A-10C Warthog I/47th FS.yaml @@ -1,7 +1,7 @@ --- name: 47th FS nickname: Termites -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/74th TFS.yaml b/resources/squadrons/A-10C Warthog I/74th TFS.yaml index 42fc7232..dcbfe4c8 100644 --- a/resources/squadrons/A-10C Warthog I/74th TFS.yaml +++ b/resources/squadrons/A-10C Warthog I/74th TFS.yaml @@ -1,7 +1,7 @@ --- name: 74th TFS nickname: Flying Tigers -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog I/81st FS.yaml b/resources/squadrons/A-10C Warthog I/81st FS.yaml index 9e86a4f6..0324751d 100644 --- a/resources/squadrons/A-10C Warthog I/81st FS.yaml +++ b/resources/squadrons/A-10C Warthog I/81st FS.yaml @@ -1,7 +1,7 @@ --- name: 81st FS nickname: Termites -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 3) diff --git a/resources/squadrons/A-10C Warthog II/25th FS.yaml b/resources/squadrons/A-10C Warthog II/25th FS.yaml index 084a447f..5cee12a6 100644 --- a/resources/squadrons/A-10C Warthog II/25th FS.yaml +++ b/resources/squadrons/A-10C Warthog II/25th FS.yaml @@ -1,7 +1,7 @@ --- name: 25th FS nickname: Assam Draggins -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 7) diff --git a/resources/squadrons/A-10C Warthog II/354th FS.yaml b/resources/squadrons/A-10C Warthog II/354th FS.yaml index d74b5d6c..5f039961 100644 --- a/resources/squadrons/A-10C Warthog II/354th FS.yaml +++ b/resources/squadrons/A-10C Warthog II/354th FS.yaml @@ -1,7 +1,7 @@ --- name: 354th FS nickname: Bulldogs -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 7) diff --git a/resources/squadrons/A-10C Warthog II/355th FS.yaml b/resources/squadrons/A-10C Warthog II/355th FS.yaml index 78060853..c7574a02 100644 --- a/resources/squadrons/A-10C Warthog II/355th FS.yaml +++ b/resources/squadrons/A-10C Warthog II/355th FS.yaml @@ -1,7 +1,7 @@ --- name: 355th FS nickname: Fightin' Falcons -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 7) diff --git a/resources/squadrons/A-10C Warthog II/357th FS.yaml b/resources/squadrons/A-10C Warthog II/357th FS.yaml index 8e56a1ea..e4210f52 100644 --- a/resources/squadrons/A-10C Warthog II/357th FS.yaml +++ b/resources/squadrons/A-10C Warthog II/357th FS.yaml @@ -1,7 +1,7 @@ --- name: 357th FS nickname: Dragons -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 7) diff --git a/resources/squadrons/A-10C Warthog II/358th FS.yaml b/resources/squadrons/A-10C Warthog II/358th FS.yaml index 1e44be90..7f2bff23 100644 --- a/resources/squadrons/A-10C Warthog II/358th FS.yaml +++ b/resources/squadrons/A-10C Warthog II/358th FS.yaml @@ -1,7 +1,7 @@ --- name: 358th FS nickname: Lobos -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 7) diff --git a/resources/squadrons/A-10C Warthog II/81st FS.yaml b/resources/squadrons/A-10C Warthog II/81st FS.yaml index d116b5db..91af7ae4 100644 --- a/resources/squadrons/A-10C Warthog II/81st FS.yaml +++ b/resources/squadrons/A-10C Warthog II/81st FS.yaml @@ -1,7 +1,7 @@ --- name: 81st FS nickname: Termites -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Close Air Support aircraft: A-10C Thunderbolt II (Suite 7) diff --git a/resources/squadrons/A-4E Skyhawk/IAF 110th Sqn.yaml b/resources/squadrons/A-4E Skyhawk/IAF 110th Sqn.yaml index 86c35b9d..228f9618 100644 --- a/resources/squadrons/A-4E Skyhawk/IAF 110th Sqn.yaml +++ b/resources/squadrons/A-4E Skyhawk/IAF 110th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 110th Squadron nickname: Knights of the North -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Israel role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-144.yaml b/resources/squadrons/A-4E Skyhawk/VA-144.yaml index 6ac04d65..facb5d35 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-144.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-144.yaml @@ -1,7 +1,7 @@ --- name: VA-144 nickname: Roadrunners -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-153.yaml b/resources/squadrons/A-4E Skyhawk/VA-153.yaml index 4b41d71f..247c625d 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-153.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-153.yaml @@ -1,7 +1,7 @@ --- name: VA-153 nickname: Blue Tail Flies -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-163.yaml b/resources/squadrons/A-4E Skyhawk/VA-163.yaml index 608a18ed..aedf7f98 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-163.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-163.yaml @@ -1,7 +1,7 @@ --- name: VA-163 nickname: Saints -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-164.yaml b/resources/squadrons/A-4E Skyhawk/VA-164.yaml index 294582b2..c6b0094f 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-164.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-164.yaml @@ -1,7 +1,7 @@ --- name: VA-164 nickname: Ghostriders -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-195.yaml b/resources/squadrons/A-4E Skyhawk/VA-195.yaml index e8cdec5c..028d7494 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-195.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-195.yaml @@ -1,7 +1,7 @@ --- name: VA-195 nickname: Dambusters -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-212.yaml b/resources/squadrons/A-4E Skyhawk/VA-212.yaml index a7065efb..3a504511 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-212.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-212.yaml @@ -1,7 +1,7 @@ --- name: VA-212 nickname: Rampant Raiders -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-45.yaml b/resources/squadrons/A-4E Skyhawk/VA-45.yaml index f5419985..88ae45ec 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-45.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-45.yaml @@ -1,7 +1,7 @@ --- name: VA-45 nickname: Blackbirds -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-55.yaml b/resources/squadrons/A-4E Skyhawk/VA-55.yaml index e61239e8..d974233c 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-55.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-55.yaml @@ -1,7 +1,7 @@ --- name: VA-55 nickname: Warhorses -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VA-64.yaml b/resources/squadrons/A-4E Skyhawk/VA-64.yaml index a255a577..0ba2c5ca 100644 --- a/resources/squadrons/A-4E Skyhawk/VA-64.yaml +++ b/resources/squadrons/A-4E Skyhawk/VA-64.yaml @@ -1,7 +1,7 @@ --- name: VA-64 nickname: Black Lancers -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-121.yaml b/resources/squadrons/A-4E Skyhawk/VMA-121.yaml index 29b67f59..8a6afcb6 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-121.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-121.yaml @@ -1,7 +1,7 @@ --- name: VMA-121 nickname: Green Knights -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-124.yaml b/resources/squadrons/A-4E Skyhawk/VMA-124.yaml index a53b98d1..ba8cb556 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-124.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-124.yaml @@ -1,7 +1,7 @@ --- name: VMA-124 nickname: Memphis Marines -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-131.yaml b/resources/squadrons/A-4E Skyhawk/VMA-131.yaml index 7a4dd001..a28b90c1 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-131.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-131.yaml @@ -1,7 +1,7 @@ --- name: VMA-131 nickname: Diamondbacks -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-142.yaml b/resources/squadrons/A-4E Skyhawk/VMA-142.yaml index 0dd0f7f4..793a2c73 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-142.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-142.yaml @@ -1,7 +1,7 @@ --- name: VMA-142 nickname: Flying Gators -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-211.yaml b/resources/squadrons/A-4E Skyhawk/VMA-211.yaml index 9c0c0138..3e3be7d8 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-211.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-211.yaml @@ -1,7 +1,7 @@ --- name: VMA-211 nickname: Avengers -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-311.yaml b/resources/squadrons/A-4E Skyhawk/VMA-311.yaml index 93acbd4c..032b4fbf 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-311.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-311.yaml @@ -1,7 +1,7 @@ --- name: VMA-311 nickname: Tomcats -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A-4E Skyhawk/VMA-322.yaml b/resources/squadrons/A-4E Skyhawk/VMA-322.yaml index 3ee2661a..2eba9d99 100644 --- a/resources/squadrons/A-4E Skyhawk/VMA-322.yaml +++ b/resources/squadrons/A-4E Skyhawk/VMA-322.yaml @@ -1,7 +1,7 @@ --- name: VMA-322 nickname: Fighting Gamecocks -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack/Light Fighter aircraft: A-4E Skyhawk diff --git a/resources/squadrons/A20/no_107_squadron_raf.yaml b/resources/squadrons/A20/no_107_squadron_raf.yaml index 6a7ec0f3..1a72d892 100644 --- a/resources/squadrons/A20/no_107_squadron_raf.yaml +++ b/resources/squadrons/A20/no_107_squadron_raf.yaml @@ -1,7 +1,7 @@ --- name: RAF, No. 107 Squadron nickname: Lowestoft's 'own' Squadron -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: UK role: Medium Bomber aircraft: Boston Mk.III diff --git a/resources/squadrons/AH-1X/HMLA-169-AH1W.yaml b/resources/squadrons/AH-1X/HMLA-169-AH1W.yaml index 77803937..d435c737 100644 --- a/resources/squadrons/AH-1X/HMLA-169-AH1W.yaml +++ b/resources/squadrons/AH-1X/HMLA-169-AH1W.yaml @@ -1,7 +1,7 @@ --- name: HMLA-169 (AH-1W) nickname: Vipers -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Attack aircraft: AH-1W SuperCobra diff --git a/resources/squadrons/AH-1X/HMLA-269-AH1W.yaml b/resources/squadrons/AH-1X/HMLA-269-AH1W.yaml index c823783c..b64b3f1d 100644 --- a/resources/squadrons/AH-1X/HMLA-269-AH1W.yaml +++ b/resources/squadrons/AH-1X/HMLA-269-AH1W.yaml @@ -1,7 +1,7 @@ --- name: HMLA-269 (AH-1W) nickname: Gunrunners -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Attack aircraft: AH-1W SuperCobra diff --git a/resources/squadrons/AH-1X/IAF 160th Sqn.yaml b/resources/squadrons/AH-1X/IAF 160th Sqn.yaml index 4602655c..72a3f0c9 100644 --- a/resources/squadrons/AH-1X/IAF 160th Sqn.yaml +++ b/resources/squadrons/AH-1X/IAF 160th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 160th Squadron nickname: Northern Cobra Squadron -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Israel role: Attack Helicopter aircraft: AH-1W SuperCobra diff --git a/resources/squadrons/AH-64D/IAF 113th Sqn.yaml b/resources/squadrons/AH-64D/IAF 113th Sqn.yaml index 189597f9..323e41b5 100644 --- a/resources/squadrons/AH-64D/IAF 113th Sqn.yaml +++ b/resources/squadrons/AH-64D/IAF 113th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 113th Squadron nickname: The Hornet Squadron -female_pilot_ratio: 5 +female_pilot_percentage: 5 country: Israel role: Attack Helicopter aircraft: AH-64D Apache Longbow diff --git a/resources/squadrons/AH-64D/US Army 229th Aviation Battalion.yaml b/resources/squadrons/AH-64D/US Army 229th Aviation Battalion.yaml index 02316300..1d081b63 100644 --- a/resources/squadrons/AH-64D/US Army 229th Aviation Battalion.yaml +++ b/resources/squadrons/AH-64D/US Army 229th Aviation Battalion.yaml @@ -1,7 +1,7 @@ --- name: 229th Aviation Battalion nickname: Serpents -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Attack Helicopter aircraft: AH-64D Apache Longbow diff --git a/resources/squadrons/AV-8BNA/VMA-214.yaml b/resources/squadrons/AV-8BNA/VMA-214.yaml index b214d377..1d5d44e3 100644 --- a/resources/squadrons/AV-8BNA/VMA-214.yaml +++ b/resources/squadrons/AV-8BNA/VMA-214.yaml @@ -1,7 +1,7 @@ --- name: VMA-214 nickname: Black Sheep -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: V/STOL Attack aircraft: AV-8B Harrier II Night Attack diff --git a/resources/squadrons/AV-8BNA/VMA-223.yaml b/resources/squadrons/AV-8BNA/VMA-223.yaml index 9d9e87a3..c044416c 100644 --- a/resources/squadrons/AV-8BNA/VMA-223.yaml +++ b/resources/squadrons/AV-8BNA/VMA-223.yaml @@ -1,7 +1,7 @@ --- name: VMA-223 nickname: Bulldogs -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: V/STOL Attack aircraft: AV-8B Harrier II Night Attack diff --git a/resources/squadrons/BF-109K4/Jagdgeschwader_53.yaml b/resources/squadrons/BF-109K4/Jagdgeschwader_53.yaml index f4067853..858eaf99 100644 --- a/resources/squadrons/BF-109K4/Jagdgeschwader_53.yaml +++ b/resources/squadrons/BF-109K4/Jagdgeschwader_53.yaml @@ -1,6 +1,6 @@ name: Jagdgeschwader 53 nickname: Pik As -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Third Reich role: Fighter aircraft: Bf 109 K-4 Kurfürst diff --git a/resources/squadrons/E-2 Hawkeye/VAW-125.yaml b/resources/squadrons/E-2 Hawkeye/VAW-125.yaml index 6c8287e3..3e694b41 100644 --- a/resources/squadrons/E-2 Hawkeye/VAW-125.yaml +++ b/resources/squadrons/E-2 Hawkeye/VAW-125.yaml @@ -1,7 +1,7 @@ --- name: VAW-125 nickname: Tigertails -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: AEW&C aircraft: E-2C Hawkeye diff --git a/resources/squadrons/E-3 Sentry/USAF 960th AACS.yaml b/resources/squadrons/E-3 Sentry/USAF 960th AACS.yaml index 51cbffdb..ea97f613 100644 --- a/resources/squadrons/E-3 Sentry/USAF 960th AACS.yaml +++ b/resources/squadrons/E-3 Sentry/USAF 960th AACS.yaml @@ -1,7 +1,7 @@ --- name: 960th AAC Squadron nickname: Vikings -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: AEW&C aircraft: E-3A diff --git a/resources/squadrons/Eagle/IAF 106th Sqn.yaml b/resources/squadrons/Eagle/IAF 106th Sqn.yaml index 2cc2c299..7b598be1 100644 --- a/resources/squadrons/Eagle/IAF 106th Sqn.yaml +++ b/resources/squadrons/Eagle/IAF 106th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 106th Squadron nickname: Spearhead -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Israel role: Air Superiority Fighter aircraft: F-15C Eagle diff --git a/resources/squadrons/Eagle/USAF 12th FS.yaml b/resources/squadrons/Eagle/USAF 12th FS.yaml index f347507c..36daa233 100644 --- a/resources/squadrons/Eagle/USAF 12th FS.yaml +++ b/resources/squadrons/Eagle/USAF 12th FS.yaml @@ -1,7 +1,7 @@ --- name: 12th FS nickname: Dirty Dozen -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Air Superiority Fighter aircraft: F-15C Eagle diff --git a/resources/squadrons/Eagle/USAF 390th FS.yaml b/resources/squadrons/Eagle/USAF 390th FS.yaml index 273fd9f6..8f93a0c2 100644 --- a/resources/squadrons/Eagle/USAF 390th FS.yaml +++ b/resources/squadrons/Eagle/USAF 390th FS.yaml @@ -1,7 +1,7 @@ --- name: 390th FS nickname: Wild Boars -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Air Superiority Fighter aircraft: F-15C Eagle diff --git a/resources/squadrons/Eagle/USAF 493rd FS.yaml b/resources/squadrons/Eagle/USAF 493rd FS.yaml index 30539c6d..cb2ec5fc 100644 --- a/resources/squadrons/Eagle/USAF 493rd FS.yaml +++ b/resources/squadrons/Eagle/USAF 493rd FS.yaml @@ -1,7 +1,7 @@ --- name: 493rd FS nickname: Grim Reapers -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Air Superiority Fighter aircraft: F-15C Eagle diff --git a/resources/squadrons/Eagle/USAF 58th FS.yaml b/resources/squadrons/Eagle/USAF 58th FS.yaml index c7358878..3f95bfb8 100644 --- a/resources/squadrons/Eagle/USAF 58th FS.yaml +++ b/resources/squadrons/Eagle/USAF 58th FS.yaml @@ -1,7 +1,7 @@ --- name: 58th FS nickname: Gorillas -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Air Superiority Fighter aircraft: F-15C Eagle diff --git a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-11.yaml b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-11.yaml index ff323250..4b5dfc99 100644 --- a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-11.yaml +++ b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-11.yaml @@ -1,7 +1,7 @@ --- name: VF-11 nickname: Red Rippers -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Strike Fighter aircraft: F-14A Tomcat (Block 135-GR Late) diff --git a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-111.yaml b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-111.yaml index 6a9a2621..dd3713b0 100644 --- a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-111.yaml +++ b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-111.yaml @@ -1,7 +1,7 @@ --- name: VF-111 nickname: Sundowners -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Strike Fighter aircraft: F-14A Tomcat (Block 135-GR Late) diff --git a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-21.yaml b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-21.yaml index e9562435..fd6416f5 100644 --- a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-21.yaml +++ b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-21.yaml @@ -1,7 +1,7 @@ --- name: VF-21 nickname: Freelancers -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Strike Fighter aircraft: F-14A Tomcat (Block 135-GR Late) diff --git a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-211.yaml b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-211.yaml index 053d6eab..3d02f4c8 100644 --- a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-211.yaml +++ b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-211.yaml @@ -1,7 +1,7 @@ --- name: VF-211 nickname: Fighting Checkmates -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Strike Fighter aircraft: F-14A Tomcat (Block 135-GR Late) diff --git a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-33.yaml b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-33.yaml index 071a6584..fc55f29a 100644 --- a/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-33.yaml +++ b/resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-33.yaml @@ -1,7 +1,7 @@ --- name: VF-33 nickname: Starfighters -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Strike Fighter aircraft: F-14A Tomcat (Block 135-GR Late) diff --git a/resources/squadrons/F-14B Tomcat/VF-101.yaml b/resources/squadrons/F-14B Tomcat/VF-101.yaml index c4af1f8a..ea5ee1fc 100644 --- a/resources/squadrons/F-14B Tomcat/VF-101.yaml +++ b/resources/squadrons/F-14B Tomcat/VF-101.yaml @@ -1,7 +1,7 @@ --- name: VF-101 nickname: Grim Reapers -female_pilot_ratio: 7 +female_pilot_percentage: 7 country: USA role: Strike Fighter aircraft: F-14B Tomcat diff --git a/resources/squadrons/F-14B Tomcat/VF-102.yaml b/resources/squadrons/F-14B Tomcat/VF-102.yaml index 2dafe69f..5ee59260 100644 --- a/resources/squadrons/F-14B Tomcat/VF-102.yaml +++ b/resources/squadrons/F-14B Tomcat/VF-102.yaml @@ -1,7 +1,7 @@ --- name: VF-102 nickname: Diamond Backs -female_pilot_ratio: 7 +female_pilot_percentage: 7 country: USA role: Strike Fighter aircraft: F-14B Tomcat diff --git a/resources/squadrons/F-14B Tomcat/VF-142.yaml b/resources/squadrons/F-14B Tomcat/VF-142.yaml index 79b87d86..7d4eedeb 100644 --- a/resources/squadrons/F-14B Tomcat/VF-142.yaml +++ b/resources/squadrons/F-14B Tomcat/VF-142.yaml @@ -1,7 +1,7 @@ --- name: VF-142 nickname: Ghostriders -female_pilot_ratio: 7 +female_pilot_percentage: 7 country: USA role: Strike Fighter aircraft: F-14B Tomcat diff --git a/resources/squadrons/F-14B Tomcat/VF-143.yaml b/resources/squadrons/F-14B Tomcat/VF-143.yaml index 093f5aa0..22ee9a65 100644 --- a/resources/squadrons/F-14B Tomcat/VF-143.yaml +++ b/resources/squadrons/F-14B Tomcat/VF-143.yaml @@ -1,7 +1,7 @@ --- name: VF-143 nickname: Pukin' Dogs -female_pilot_ratio: 7 +female_pilot_percentage: 7 country: USA role: Strike Fighter aircraft: F-14B Tomcat diff --git a/resources/squadrons/F-14B Tomcat/VF-211.yaml b/resources/squadrons/F-14B Tomcat/VF-211.yaml index 87fa9125..16741d3b 100644 --- a/resources/squadrons/F-14B Tomcat/VF-211.yaml +++ b/resources/squadrons/F-14B Tomcat/VF-211.yaml @@ -1,7 +1,7 @@ --- name: VF-211 nickname: Fighting Checkmates -female_pilot_ratio: 7 +female_pilot_percentage: 7 country: USA role: Strike Fighter aircraft: F-14B Tomcat diff --git a/resources/squadrons/F-4E/IAF 201th Sqn.yaml b/resources/squadrons/F-4E/IAF 201th Sqn.yaml index 61f1e7ff..9491dd7f 100644 --- a/resources/squadrons/F-4E/IAF 201th Sqn.yaml +++ b/resources/squadrons/F-4E/IAF 201th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 201th Squadron nickname: The One -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Israel role: Air Superiority Fighter aircraft: F-4E Phantom II diff --git a/resources/squadrons/F-4E/IRIAF 32nd TFW.yaml b/resources/squadrons/F-4E/IRIAF 32nd TFW.yaml index 0fd2352b..61b9c034 100644 --- a/resources/squadrons/F-4E/IRIAF 32nd TFW.yaml +++ b/resources/squadrons/F-4E/IRIAF 32nd TFW.yaml @@ -1,7 +1,7 @@ --- name: IRIAF 32nd TFW nickname: 32nd TFW -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Iran role: Air Superiority Fighter aircraft: F-4E Phantom II diff --git a/resources/squadrons/FW-190A8/Jagdgeschwader_26.yaml b/resources/squadrons/FW-190A8/Jagdgeschwader_26.yaml index 6a541a66..907d80dd 100644 --- a/resources/squadrons/FW-190A8/Jagdgeschwader_26.yaml +++ b/resources/squadrons/FW-190A8/Jagdgeschwader_26.yaml @@ -1,6 +1,6 @@ name: Jagdgeschwader 26 nickname: Schlageter -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Third Reich role: Fighter aircraft: Fw 190 A-8 Anton diff --git a/resources/squadrons/FW-190D9/Jagdgeschwader_54.yaml b/resources/squadrons/FW-190D9/Jagdgeschwader_54.yaml index 088b1449..8d0d8c32 100644 --- a/resources/squadrons/FW-190D9/Jagdgeschwader_54.yaml +++ b/resources/squadrons/FW-190D9/Jagdgeschwader_54.yaml @@ -1,6 +1,6 @@ name: Jagdgeschwader 54 nickname: Grünherz -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Third Reich role: Fighter aircraft: Fw 190 D-9 Dora diff --git a/resources/squadrons/Ju88A4/Kustenfliegergruppe_106.yaml b/resources/squadrons/Ju88A4/Kustenfliegergruppe_106.yaml index 0fa4957a..fd9eaaa5 100644 --- a/resources/squadrons/Ju88A4/Kustenfliegergruppe_106.yaml +++ b/resources/squadrons/Ju88A4/Kustenfliegergruppe_106.yaml @@ -1,11 +1,11 @@ --- name: Küstenfliegergruppe 106 nickname: Kü.Fl.Gr.206. -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Third Reich role: Medium Bomber aircraft: Ju 88 A-4 -female_pilot_ratio: 0 +female_pilot_percentage: 0 mission_types: - Anti-ship - BAI diff --git a/resources/squadrons/KC-130/VMGR-352.yaml b/resources/squadrons/KC-130/VMGR-352.yaml index 4de0cc98..87fe0f5e 100644 --- a/resources/squadrons/KC-130/VMGR-352.yaml +++ b/resources/squadrons/KC-130/VMGR-352.yaml @@ -1,7 +1,7 @@ --- name: VMGR-352 nickname: Raiders -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Air-to-Air Refueling aircraft: KC-130 diff --git a/resources/squadrons/KC-135/18th ARS.yaml b/resources/squadrons/KC-135/18th ARS.yaml index 04580faa..87a5f6c6 100644 --- a/resources/squadrons/KC-135/18th ARS.yaml +++ b/resources/squadrons/KC-135/18th ARS.yaml @@ -1,7 +1,7 @@ --- name: 18th Air Refueling Squadron nickname: Kanza -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Air-to-Air Refueling aircraft: KC-135 Stratotanker diff --git a/resources/squadrons/KC-135/TuAF 101st Tanker Squadron.yaml b/resources/squadrons/KC-135/TuAF 101st Tanker Squadron.yaml index ec08f193..4ff0bd10 100644 --- a/resources/squadrons/KC-135/TuAF 101st Tanker Squadron.yaml +++ b/resources/squadrons/KC-135/TuAF 101st Tanker Squadron.yaml @@ -1,7 +1,7 @@ --- name: 101st Tanker Squadron nickname: Asena -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Turkey role: Air-to-Air Refueling aircraft: KC-135 Stratotanker diff --git a/resources/squadrons/KC-135MPRS/340th EARS.yaml b/resources/squadrons/KC-135MPRS/340th EARS.yaml index 13947211..762bee1c 100644 --- a/resources/squadrons/KC-135MPRS/340th EARS.yaml +++ b/resources/squadrons/KC-135MPRS/340th EARS.yaml @@ -1,7 +1,7 @@ --- name: 340th Expeditionary Air Refueling Squadron nickname: Pythons -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Air-to-Air Refueling aircraft: KC-135 Stratotanker MPRS diff --git a/resources/squadrons/Mi-24/SAAF 765th Sqn.yaml b/resources/squadrons/Mi-24/SAAF 765th Sqn.yaml index 85afe895..eb9524a6 100644 --- a/resources/squadrons/Mi-24/SAAF 765th Sqn.yaml +++ b/resources/squadrons/Mi-24/SAAF 765th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 765th Squadron nickname: 765th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Attack Helicopter aircraft: Mi-24P Hind-F diff --git a/resources/squadrons/Mi-24/SAAF 766th Sqn.yaml b/resources/squadrons/Mi-24/SAAF 766th Sqn.yaml index 5c11fc11..e080e529 100644 --- a/resources/squadrons/Mi-24/SAAF 766th Sqn.yaml +++ b/resources/squadrons/Mi-24/SAAF 766th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 766th Squadron nickname: 766th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Attack Helicopter aircraft: Mi-24V Hind-E diff --git a/resources/squadrons/Mi-8/SAAF 253th Sqn.yaml b/resources/squadrons/Mi-8/SAAF 253th Sqn.yaml index 397c0583..5d1ee4a6 100644 --- a/resources/squadrons/Mi-8/SAAF 253th Sqn.yaml +++ b/resources/squadrons/Mi-8/SAAF 253th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 253th Squadron nickname: 253th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Transport Helicopter aircraft: Mi-8MTV2 Hip diff --git a/resources/squadrons/Mi-8/SAAF 255th Sqn.yaml b/resources/squadrons/Mi-8/SAAF 255th Sqn.yaml index 8d011e4d..e9588acb 100644 --- a/resources/squadrons/Mi-8/SAAF 255th Sqn.yaml +++ b/resources/squadrons/Mi-8/SAAF 255th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 255th Squadron nickname: 255th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Transport Helicopter aircraft: Mi-8MTV2 Hip diff --git a/resources/squadrons/Mig-21/SAAF 679th Sqn.yaml b/resources/squadrons/Mig-21/SAAF 679th Sqn.yaml index ba9543dd..68076171 100644 --- a/resources/squadrons/Mig-21/SAAF 679th Sqn.yaml +++ b/resources/squadrons/Mig-21/SAAF 679th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 679th Squadron nickname: 679th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-21bis Fishbed-N diff --git a/resources/squadrons/Mig-21/SAAF 680th Sqn.yaml b/resources/squadrons/Mig-21/SAAF 680th Sqn.yaml index db07c12f..90271f63 100644 --- a/resources/squadrons/Mig-21/SAAF 680th Sqn.yaml +++ b/resources/squadrons/Mig-21/SAAF 680th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 680th Squadron nickname: 680th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-21bis Fishbed-N diff --git a/resources/squadrons/Mig-21/SAAF 825th Sqn.yaml b/resources/squadrons/Mig-21/SAAF 825th Sqn.yaml index ee81ad51..50319ce3 100644 --- a/resources/squadrons/Mig-21/SAAF 825th Sqn.yaml +++ b/resources/squadrons/Mig-21/SAAF 825th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 825th Squadron nickname: 825th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-21bis Fishbed-N diff --git a/resources/squadrons/Mig-21/SAAF 8th Sqn.yaml b/resources/squadrons/Mig-21/SAAF 8th Sqn.yaml index 8eb8c063..a529e577 100644 --- a/resources/squadrons/Mig-21/SAAF 8th Sqn.yaml +++ b/resources/squadrons/Mig-21/SAAF 8th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 8th Squadron nickname: 8th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-21bis Fishbed-N diff --git a/resources/squadrons/Mig-23/SAAF 678th Sqn.yaml b/resources/squadrons/Mig-23/SAAF 678th Sqn.yaml index b828566a..7bd815ef 100644 --- a/resources/squadrons/Mig-23/SAAF 678th Sqn.yaml +++ b/resources/squadrons/Mig-23/SAAF 678th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 678th Squadron nickname: 678th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-23MLD Flogger-K diff --git a/resources/squadrons/Mig-25/SAAF 1st Sqn.yaml b/resources/squadrons/Mig-25/SAAF 1st Sqn.yaml index bc5d7350..8a59004e 100644 --- a/resources/squadrons/Mig-25/SAAF 1st Sqn.yaml +++ b/resources/squadrons/Mig-25/SAAF 1st Sqn.yaml @@ -1,7 +1,7 @@ --- name: 1st Squadron nickname: 1st -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-25PD Foxbat-E diff --git a/resources/squadrons/Mig-29/Russia VVS 115th GvIAP.yaml b/resources/squadrons/Mig-29/Russia VVS 115th GvIAP.yaml index 7307b645..cda2c3fb 100644 --- a/resources/squadrons/Mig-29/Russia VVS 115th GvIAP.yaml +++ b/resources/squadrons/Mig-29/Russia VVS 115th GvIAP.yaml @@ -1,7 +1,7 @@ --- name: 115th Guards Aviation Regiment nickname: 115th GvIAP -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Russia role: Air Superiority Fighter aircraft: MiG-29S Fulcrum-C diff --git a/resources/squadrons/Mig-29/Russia VVS 28th GvIAP.yaml b/resources/squadrons/Mig-29/Russia VVS 28th GvIAP.yaml index 2248fb9d..29bd2ab2 100644 --- a/resources/squadrons/Mig-29/Russia VVS 28th GvIAP.yaml +++ b/resources/squadrons/Mig-29/Russia VVS 28th GvIAP.yaml @@ -1,7 +1,7 @@ --- name: 28th Guards Aviation Regiment nickname: 28th GvIAP -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Russia role: Air Superiority Fighter aircraft: MiG-29S Fulcrum-C diff --git a/resources/squadrons/Mig-29/Russia VVS 31st GvIAP.yaml b/resources/squadrons/Mig-29/Russia VVS 31st GvIAP.yaml index 38eccef8..019b6c6c 100644 --- a/resources/squadrons/Mig-29/Russia VVS 31st GvIAP.yaml +++ b/resources/squadrons/Mig-29/Russia VVS 31st GvIAP.yaml @@ -1,7 +1,7 @@ --- name: 31st Guards Aviation Regiment nickname: 31st GvIAP -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Russia role: Air Superiority Fighter aircraft: MiG-29S Fulcrum-C diff --git a/resources/squadrons/Mig-29/Russia VVS 773rd IAP.yaml b/resources/squadrons/Mig-29/Russia VVS 773rd IAP.yaml index 38aea8bb..36e4c2d7 100644 --- a/resources/squadrons/Mig-29/Russia VVS 773rd IAP.yaml +++ b/resources/squadrons/Mig-29/Russia VVS 773rd IAP.yaml @@ -1,7 +1,7 @@ --- name: 773rd Aviation Regiment nickname: 773rd IAP -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Russia role: Air Superiority Fighter aircraft: MiG-29S Fulcrum-C diff --git a/resources/squadrons/Mig-29/SAAF 697th Sqn.yaml b/resources/squadrons/Mig-29/SAAF 697th Sqn.yaml index f4e8e82f..c6741314 100644 --- a/resources/squadrons/Mig-29/SAAF 697th Sqn.yaml +++ b/resources/squadrons/Mig-29/SAAF 697th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 697th Squadron nickname: 697th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-29S Fulcrum-C diff --git a/resources/squadrons/Mig-29/SAAF 699th Sqn.yaml b/resources/squadrons/Mig-29/SAAF 699th Sqn.yaml index 3228943c..83e1f2c6 100644 --- a/resources/squadrons/Mig-29/SAAF 699th Sqn.yaml +++ b/resources/squadrons/Mig-29/SAAF 699th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 699th Squadron nickname: 699th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Air Superiority Fighter aircraft: MiG-29S Fulcrum-C diff --git a/resources/squadrons/MosquitoFBMkVI/no_21_squadron_raf.yaml b/resources/squadrons/MosquitoFBMkVI/no_21_squadron_raf.yaml index 06a2edcd..02cd4cdd 100644 --- a/resources/squadrons/MosquitoFBMkVI/no_21_squadron_raf.yaml +++ b/resources/squadrons/MosquitoFBMkVI/no_21_squadron_raf.yaml @@ -1,7 +1,7 @@ --- name: RAF, No. 21 Squadron nickname: No. 21 -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: UK role: Fighter Bomber aircraft: MosquitoFBMkVI diff --git a/resources/squadrons/S-3B/VS-35.yaml b/resources/squadrons/S-3B/VS-35.yaml index 8f989a76..c0455b34 100644 --- a/resources/squadrons/S-3B/VS-35.yaml +++ b/resources/squadrons/S-3B/VS-35.yaml @@ -1,7 +1,7 @@ --- name: VS-35 nickname: Blue Wolves -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Carrier-based Attack aircraft: S-3B Viking diff --git a/resources/squadrons/S-3B/VS-35F.yaml b/resources/squadrons/S-3B/VS-35F.yaml index 1edc7043..0898c2f6 100644 --- a/resources/squadrons/S-3B/VS-35F.yaml +++ b/resources/squadrons/S-3B/VS-35F.yaml @@ -1,7 +1,7 @@ --- name: VS-35 (Tanker) nickname: Blue Wolves -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Tanker aircraft: S-3B Tanker diff --git a/resources/squadrons/SH-60B/HSM-40.yaml b/resources/squadrons/SH-60B/HSM-40.yaml index 56de763f..21707857 100644 --- a/resources/squadrons/SH-60B/HSM-40.yaml +++ b/resources/squadrons/SH-60B/HSM-40.yaml @@ -1,7 +1,7 @@ --- name: HSM-40 nickname: Airwolves -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Transport/Anti-Ship aircraft: SH-60B Seahawk diff --git a/resources/squadrons/SpitfireLFMkIX/no_145_squadron_raf.yaml b/resources/squadrons/SpitfireLFMkIX/no_145_squadron_raf.yaml index 2fc7a532..bd921f0c 100644 --- a/resources/squadrons/SpitfireLFMkIX/no_145_squadron_raf.yaml +++ b/resources/squadrons/SpitfireLFMkIX/no_145_squadron_raf.yaml @@ -1,7 +1,7 @@ --- name: RAF, No. 145 Squadron nickname: No. 145 -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: UK role: Fighter aircraft: Spitfire LF Mk IX diff --git a/resources/squadrons/SpitfireLFMkIX/no_16_squadron_raf.yaml b/resources/squadrons/SpitfireLFMkIX/no_16_squadron_raf.yaml index d926b3aa..23ba6f8a 100644 --- a/resources/squadrons/SpitfireLFMkIX/no_16_squadron_raf.yaml +++ b/resources/squadrons/SpitfireLFMkIX/no_16_squadron_raf.yaml @@ -1,7 +1,7 @@ --- name: RAF, No. 16 Squadron nickname: No. 16 -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: UK role: Fighter aircraft: Spitfire LF Mk IX diff --git a/resources/squadrons/SpitfireLFMkIXCW/no_126_squadron_raf.yaml b/resources/squadrons/SpitfireLFMkIXCW/no_126_squadron_raf.yaml index 246ae900..2c89d965 100644 --- a/resources/squadrons/SpitfireLFMkIXCW/no_126_squadron_raf.yaml +++ b/resources/squadrons/SpitfireLFMkIXCW/no_126_squadron_raf.yaml @@ -1,7 +1,7 @@ --- name: RAF, No. 126 Squadron nickname: Harrowbeer -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: UK role: Fighter aircraft: Spitfire LF Mk IX (Clipped Wings) diff --git a/resources/squadrons/Strike Eagle/335th FS.yaml b/resources/squadrons/Strike Eagle/335th FS.yaml index 56be3caf..e0ddb8fb 100644 --- a/resources/squadrons/Strike Eagle/335th FS.yaml +++ b/resources/squadrons/Strike Eagle/335th FS.yaml @@ -1,7 +1,7 @@ --- name: 335th FS nickname: Chiefs -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-15E Strike Eagle diff --git a/resources/squadrons/Strike Eagle/492nd FS.yaml b/resources/squadrons/Strike Eagle/492nd FS.yaml index b5131d2d..1898fa79 100644 --- a/resources/squadrons/Strike Eagle/492nd FS.yaml +++ b/resources/squadrons/Strike Eagle/492nd FS.yaml @@ -1,7 +1,7 @@ --- name: 492nd FS nickname: Chiefs -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-15E Strike Eagle diff --git a/resources/squadrons/Strike Eagle/IAF 69th Sqn.yaml b/resources/squadrons/Strike Eagle/IAF 69th Sqn.yaml index 92faed7b..ab736b18 100644 --- a/resources/squadrons/Strike Eagle/IAF 69th Sqn.yaml +++ b/resources/squadrons/Strike Eagle/IAF 69th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 69th Squadron nickname: Hammers -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Israel role: Strike Fighter aircraft: F-15E Strike Eagle diff --git a/resources/squadrons/Su-17/SAAF 677th Sqn.yaml b/resources/squadrons/Su-17/SAAF 677th Sqn.yaml index d182fb9a..e2a77b53 100644 --- a/resources/squadrons/Su-17/SAAF 677th Sqn.yaml +++ b/resources/squadrons/Su-17/SAAF 677th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 677th Squadron nickname: 677th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Bomber aircraft: Su-17M4 Fitter-K diff --git a/resources/squadrons/Su-17/SAAF 685th Sqn.yaml b/resources/squadrons/Su-17/SAAF 685th Sqn.yaml index 53f6d802..bb89e8b1 100644 --- a/resources/squadrons/Su-17/SAAF 685th Sqn.yaml +++ b/resources/squadrons/Su-17/SAAF 685th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 685th Squadron nickname: 685th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Bomber aircraft: Su-17M4 Fitter-K diff --git a/resources/squadrons/Su-17/SAAF 827th Sqn.yaml b/resources/squadrons/Su-17/SAAF 827th Sqn.yaml index dc4304c9..51688576 100644 --- a/resources/squadrons/Su-17/SAAF 827th Sqn.yaml +++ b/resources/squadrons/Su-17/SAAF 827th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 827th Squadron nickname: 827th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Bomber aircraft: Su-17M4 Fitter-K diff --git a/resources/squadrons/Su-24/SAAF 819th Sqn.yaml b/resources/squadrons/Su-24/SAAF 819th Sqn.yaml index 4587ffbe..6e03e16b 100644 --- a/resources/squadrons/Su-24/SAAF 819th Sqn.yaml +++ b/resources/squadrons/Su-24/SAAF 819th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 819th Squadron nickname: 819th -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: Syria role: Bomber aircraft: Su-24M Fencer-D diff --git a/resources/squadrons/Tornado/RAF No12 Squadron.yaml b/resources/squadrons/Tornado/RAF No12 Squadron.yaml index ceaa99ba..7d4581f8 100644 --- a/resources/squadrons/Tornado/RAF No12 Squadron.yaml +++ b/resources/squadrons/Tornado/RAF No12 Squadron.yaml @@ -1,7 +1,7 @@ --- name: No. 12 Squadron nickname: Shiny Twelve -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: UK role: Strike Fighter aircraft: Tornado GR4 diff --git a/resources/squadrons/UH-1/HMLA-169-UH1H.yaml b/resources/squadrons/UH-1/HMLA-169-UH1H.yaml index 3157c806..4075dcfe 100644 --- a/resources/squadrons/UH-1/HMLA-169-UH1H.yaml +++ b/resources/squadrons/UH-1/HMLA-169-UH1H.yaml @@ -1,7 +1,7 @@ --- name: HMLA-169 (UH-1H) nickname: Vipers -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Transport/Light Attack aircraft: UH-1H Iroquois diff --git a/resources/squadrons/UH-1/HMLA-269-UH1H.yaml b/resources/squadrons/UH-1/HMLA-269-UH1H.yaml index 86963a98..d02b98fb 100644 --- a/resources/squadrons/UH-1/HMLA-269-UH1H.yaml +++ b/resources/squadrons/UH-1/HMLA-269-UH1H.yaml @@ -1,7 +1,7 @@ --- name: HMLA-269 (UH-1H) nickname: Gunrunners -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Transport/Light Attack aircraft: UH-1H Iroquois diff --git a/resources/squadrons/UH-60/US Army 101st Combat Aviation Brigade.yaml b/resources/squadrons/UH-60/US Army 101st Combat Aviation Brigade.yaml index 5e420af8..b209274a 100644 --- a/resources/squadrons/UH-60/US Army 101st Combat Aviation Brigade.yaml +++ b/resources/squadrons/UH-60/US Army 101st Combat Aviation Brigade.yaml @@ -1,7 +1,7 @@ --- name: 101st Combat Aviation Brigade nickname: Bearcats -female_pilot_ratio: 0 +female_pilot_percentage: 0 country: USA role: Transport/Light Attack aircraft: UH-60A diff --git a/resources/squadrons/globemaster/15th-Airlift.yaml b/resources/squadrons/globemaster/15th-Airlift.yaml index 4d7304a9..86566583 100644 --- a/resources/squadrons/globemaster/15th-Airlift.yaml +++ b/resources/squadrons/globemaster/15th-Airlift.yaml @@ -1,7 +1,7 @@ --- name: 15th Airlift Squadron nickname: Global Eagles -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Airlift aircraft: C-17A diff --git a/resources/squadrons/hornet/VFA-106.yaml b/resources/squadrons/hornet/VFA-106.yaml index a46a1b9c..f8effee3 100644 --- a/resources/squadrons/hornet/VFA-106.yaml +++ b/resources/squadrons/hornet/VFA-106.yaml @@ -1,7 +1,7 @@ --- name: VFA-106 nickname: Gladiators -female_pilot_ratio: 7 +female_pilot_percentage: 7 country: USA role: Strike Fighter aircraft: F/A-18C Hornet (Lot 20) diff --git a/resources/squadrons/hornet/VFA-113.yaml b/resources/squadrons/hornet/VFA-113.yaml index 266b0d3f..e4a13602 100644 --- a/resources/squadrons/hornet/VFA-113.yaml +++ b/resources/squadrons/hornet/VFA-113.yaml @@ -1,7 +1,7 @@ --- name: VFA-113 nickname: Stingers -female_pilot_ratio: 7 +female_pilot_percentage: 7 country: USA role: Strike Fighter aircraft: F/A-18C Hornet (Lot 20) diff --git a/resources/squadrons/hornet/VFA-192.yaml b/resources/squadrons/hornet/VFA-192.yaml index 64de21a5..1ffd8e4a 100644 --- a/resources/squadrons/hornet/VFA-192.yaml +++ b/resources/squadrons/hornet/VFA-192.yaml @@ -1,7 +1,7 @@ --- name: VFA-192 nickname: Golden Dragons -female_pilot_ratio: 7 +female_pilot_percentage: 7 country: USA role: Strike Fighter aircraft: F/A-18C Hornet (Lot 20) diff --git a/resources/squadrons/hornet/VMFA-122.yaml b/resources/squadrons/hornet/VMFA-122.yaml index 40f1893e..79fdb66c 100644 --- a/resources/squadrons/hornet/VMFA-122.yaml +++ b/resources/squadrons/hornet/VMFA-122.yaml @@ -1,7 +1,7 @@ --- name: VMFA-122 nickname: Werewolves -female_pilot_ratio: 7 +female_pilot_percentage: 7 country: USA role: Strike Fighter aircraft: F/A-18C Hornet (Lot 20) diff --git a/resources/squadrons/hornet/VMFA-251.yaml b/resources/squadrons/hornet/VMFA-251.yaml index be7b19df..82344eb4 100644 --- a/resources/squadrons/hornet/VMFA-251.yaml +++ b/resources/squadrons/hornet/VMFA-251.yaml @@ -1,7 +1,7 @@ --- name: VMFA-251 nickname: Thunderbolts -female_pilot_ratio: 7 +female_pilot_percentage: 7 country: USA role: Strike Fighter aircraft: F/A-18C Hornet (Lot 20) diff --git a/resources/squadrons/m2000-5/ADA_EscadronDeChasse_1-2_Cigognes.yaml b/resources/squadrons/m2000-5/ADA_EscadronDeChasse_1-2_Cigognes.yaml index 6ba701fb..fe970062 100644 --- a/resources/squadrons/m2000-5/ADA_EscadronDeChasse_1-2_Cigognes.yaml +++ b/resources/squadrons/m2000-5/ADA_EscadronDeChasse_1-2_Cigognes.yaml @@ -1,7 +1,7 @@ --- name: Escadron de chasse 1/2 nickname: Cigognes -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: France role: Fighter aircraft: Mirage 2000-5 diff --git a/resources/squadrons/m2000-5/ADA_EscadronDeChasse_2-2_CoteDOr.yaml b/resources/squadrons/m2000-5/ADA_EscadronDeChasse_2-2_CoteDOr.yaml index d934a37a..63bd1e4b 100644 --- a/resources/squadrons/m2000-5/ADA_EscadronDeChasse_2-2_CoteDOr.yaml +++ b/resources/squadrons/m2000-5/ADA_EscadronDeChasse_2-2_CoteDOr.yaml @@ -1,7 +1,7 @@ --- name: Escadron de chasse 2/2 nickname: Côte d'Or -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: France role: Fighter aircraft: Mirage 2000-5 diff --git a/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-12_Cambresis.yaml b/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-12_Cambresis.yaml index b71a51ff..71a29214 100644 --- a/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-12_Cambresis.yaml +++ b/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-12_Cambresis.yaml @@ -1,7 +1,7 @@ --- name: Escadron de chasse 1/12 nickname: Cambrésis -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: France role: Fighter aircraft: Mirage 2000C diff --git a/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-30_Alsace.yaml b/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-30_Alsace.yaml index 4a61c20b..166cedac 100644 --- a/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-30_Alsace.yaml +++ b/resources/squadrons/m2000c/ADA_EscadronDeChasse_1-30_Alsace.yaml @@ -1,7 +1,7 @@ --- name: Escadron de chasse 1/30 nickname: Alsace -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: France role: Fighter aircraft: Mirage 2000C diff --git a/resources/squadrons/m2000c/ADA_EscadronDeChasse_2-5_IleDeFrance.yaml b/resources/squadrons/m2000c/ADA_EscadronDeChasse_2-5_IleDeFrance.yaml index 37904b5e..9b890157 100644 --- a/resources/squadrons/m2000c/ADA_EscadronDeChasse_2-5_IleDeFrance.yaml +++ b/resources/squadrons/m2000c/ADA_EscadronDeChasse_2-5_IleDeFrance.yaml @@ -1,7 +1,7 @@ --- name: Escadron de chasse 2/5 nickname: Île De France -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: France role: Fighter aircraft: Mirage 2000C diff --git a/resources/squadrons/sa342/ALAT_1er_RHC.yaml b/resources/squadrons/sa342/ALAT_1er_RHC.yaml index c9b26ec0..d547ad3b 100644 --- a/resources/squadrons/sa342/ALAT_1er_RHC.yaml +++ b/resources/squadrons/sa342/ALAT_1er_RHC.yaml @@ -1,7 +1,7 @@ --- name: 1er régiment d'hélicoptères de combat nickname: -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: France role: Anti-Aircraft Helicopter aircraft: SA 342M Gazelle Mistral diff --git a/resources/squadrons/sa342/ALAT_3eme_RHC.yaml b/resources/squadrons/sa342/ALAT_3eme_RHC.yaml index f88bb1c3..48dc8c15 100644 --- a/resources/squadrons/sa342/ALAT_3eme_RHC.yaml +++ b/resources/squadrons/sa342/ALAT_3eme_RHC.yaml @@ -1,7 +1,7 @@ --- name: 3ème régiment d'hélicoptères de combat nickname: Grand 3 -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: France role: Anti-Tank Helicopter aircraft: SA 342M Gazelle diff --git a/resources/squadrons/sa342/ALAT_5eme_RHC.yaml b/resources/squadrons/sa342/ALAT_5eme_RHC.yaml index be105046..4254413a 100644 --- a/resources/squadrons/sa342/ALAT_5eme_RHC.yaml +++ b/resources/squadrons/sa342/ALAT_5eme_RHC.yaml @@ -1,7 +1,7 @@ --- name: 5ème régiment d'hélicoptères de combat nickname: Le régiment du Béarn -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: France role: Combat Helicopter aircraft: SA 342L Gazelle diff --git a/resources/squadrons/sa342/ALAT_DOAS.yaml b/resources/squadrons/sa342/ALAT_DOAS.yaml index 8a7082f4..9bc4e677 100644 --- a/resources/squadrons/sa342/ALAT_DOAS.yaml +++ b/resources/squadrons/sa342/ALAT_DOAS.yaml @@ -1,7 +1,7 @@ --- name: Détachement ALAT des opérations spéciales nickname: DOAS -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: France role: Combat Helicopter aircraft: SA342Minigun diff --git a/resources/squadrons/sa342/SAAF 976th Sqn.yaml b/resources/squadrons/sa342/SAAF 976th Sqn.yaml index 81af7b42..dbba8338 100644 --- a/resources/squadrons/sa342/SAAF 976th Sqn.yaml +++ b/resources/squadrons/sa342/SAAF 976th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 976th Squadron nickname: 976th -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Syria role: Anti-Tank Helicopter aircraft: SA 342L Gazelle diff --git a/resources/squadrons/sa342/SAAF 977th Sqn.yaml b/resources/squadrons/sa342/SAAF 977th Sqn.yaml index 16d2004f..c1fa87e6 100644 --- a/resources/squadrons/sa342/SAAF 977th Sqn.yaml +++ b/resources/squadrons/sa342/SAAF 977th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 977th Squadron nickname: 977th -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Syria role: Anti-Tank Helicopter aircraft: SA 342L Gazelle diff --git a/resources/squadrons/sa342/SAAF 988th Sqn.yaml b/resources/squadrons/sa342/SAAF 988th Sqn.yaml index 817fabbe..6c0ab728 100644 --- a/resources/squadrons/sa342/SAAF 988th Sqn.yaml +++ b/resources/squadrons/sa342/SAAF 988th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 988th Squadron nickname: 988th -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Syria role: Anti-Tank Helicopter aircraft: SA 342M Gazelle diff --git a/resources/squadrons/sa342/SAAF 989th Sqn.yaml b/resources/squadrons/sa342/SAAF 989th Sqn.yaml index 1476b3a0..78e666a2 100644 --- a/resources/squadrons/sa342/SAAF 989th Sqn.yaml +++ b/resources/squadrons/sa342/SAAF 989th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 989th Squadron nickname: 989th -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Syria role: Anti-Tank Helicopter aircraft: SA 342M Gazelle diff --git a/resources/squadrons/viper/191-Filo.yaml b/resources/squadrons/viper/191-Filo.yaml index 34bbe18b..6d276de7 100644 --- a/resources/squadrons/viper/191-Filo.yaml +++ b/resources/squadrons/viper/191-Filo.yaml @@ -1,7 +1,7 @@ --- name: 191. Filo nickname: Kobra -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Turkey role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 335 Tiger Squadron.yaml b/resources/squadrons/viper/HAF 335 Tiger Squadron.yaml index 8b4da1eb..43b19d12 100644 --- a/resources/squadrons/viper/HAF 335 Tiger Squadron.yaml +++ b/resources/squadrons/viper/HAF 335 Tiger Squadron.yaml @@ -1,7 +1,7 @@ --- name: 335 Squadron nickname: Tiger -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 336 Olympus Squadron.yaml b/resources/squadrons/viper/HAF 336 Olympus Squadron.yaml index bf35247d..76a2934d 100644 --- a/resources/squadrons/viper/HAF 336 Olympus Squadron.yaml +++ b/resources/squadrons/viper/HAF 336 Olympus Squadron.yaml @@ -1,7 +1,7 @@ --- name: 336 Squadron nickname: Olympus -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 337 Ghost Squadron.yaml b/resources/squadrons/viper/HAF 337 Ghost Squadron.yaml index 313fb433..423e8bb1 100644 --- a/resources/squadrons/viper/HAF 337 Ghost Squadron.yaml +++ b/resources/squadrons/viper/HAF 337 Ghost Squadron.yaml @@ -1,7 +1,7 @@ --- name: 337 Squadron nickname: Ghost -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 340 Fox Squadron.yaml b/resources/squadrons/viper/HAF 340 Fox Squadron.yaml index bdf0200e..d320a135 100644 --- a/resources/squadrons/viper/HAF 340 Fox Squadron.yaml +++ b/resources/squadrons/viper/HAF 340 Fox Squadron.yaml @@ -1,7 +1,7 @@ --- name: 340 Squadron nickname: Fox -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 341 Arrow Squadron.yaml b/resources/squadrons/viper/HAF 341 Arrow Squadron.yaml index 569a04e6..576c6a1e 100644 --- a/resources/squadrons/viper/HAF 341 Arrow Squadron.yaml +++ b/resources/squadrons/viper/HAF 341 Arrow Squadron.yaml @@ -1,7 +1,7 @@ --- name: 341 Squadron nickname: Arrow -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 343 Star Squadron.yaml b/resources/squadrons/viper/HAF 343 Star Squadron.yaml index 60cedafb..77cdc88a 100644 --- a/resources/squadrons/viper/HAF 343 Star Squadron.yaml +++ b/resources/squadrons/viper/HAF 343 Star Squadron.yaml @@ -1,7 +1,7 @@ --- name: 343 Squadron nickname: Star -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 346 Jason Squadron.yaml b/resources/squadrons/viper/HAF 346 Jason Squadron.yaml index a388a32f..a3ab2f83 100644 --- a/resources/squadrons/viper/HAF 346 Jason Squadron.yaml +++ b/resources/squadrons/viper/HAF 346 Jason Squadron.yaml @@ -1,7 +1,7 @@ --- name: 346 Squadron nickname: Jason -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF 347 Perseus Squadron.yaml b/resources/squadrons/viper/HAF 347 Perseus Squadron.yaml index 22f16888..1b112d06 100644 --- a/resources/squadrons/viper/HAF 347 Perseus Squadron.yaml +++ b/resources/squadrons/viper/HAF 347 Perseus Squadron.yaml @@ -1,7 +1,7 @@ --- name: 347 Squadron nickname: Perseus -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/HAF_330_Thunder_squadron.yaml b/resources/squadrons/viper/HAF_330_Thunder_squadron.yaml index b47558d3..8ae79ae7 100644 --- a/resources/squadrons/viper/HAF_330_Thunder_squadron.yaml +++ b/resources/squadrons/viper/HAF_330_Thunder_squadron.yaml @@ -1,7 +1,7 @@ --- name: 330 Squadron nickname: Thunder -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Greece role: Multirole Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/IAF 101st Sqn.yaml b/resources/squadrons/viper/IAF 101st Sqn.yaml index dfa17b63..333ace45 100644 --- a/resources/squadrons/viper/IAF 101st Sqn.yaml +++ b/resources/squadrons/viper/IAF 101st Sqn.yaml @@ -1,7 +1,7 @@ --- name: 101st Squadron nickname: First Fighter -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Israel role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/IAF 110th Sqn.yaml b/resources/squadrons/viper/IAF 110th Sqn.yaml index 92970ff5..0bb484a4 100644 --- a/resources/squadrons/viper/IAF 110th Sqn.yaml +++ b/resources/squadrons/viper/IAF 110th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 110th Squadron nickname: Knights of the North -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Israel role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/IAF 117th Sqn.yaml b/resources/squadrons/viper/IAF 117th Sqn.yaml index 8b59da8c..931e4499 100644 --- a/resources/squadrons/viper/IAF 117th Sqn.yaml +++ b/resources/squadrons/viper/IAF 117th Sqn.yaml @@ -1,7 +1,7 @@ --- name: 117th Squadron nickname: First Jet -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: Israel role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 132nd WG.yaml b/resources/squadrons/viper/USAF 132nd WG.yaml index bd8ffb5d..04614d29 100644 --- a/resources/squadrons/viper/USAF 132nd WG.yaml +++ b/resources/squadrons/viper/USAF 132nd WG.yaml @@ -1,7 +1,7 @@ --- name: 132nd FW nickname: Hawkeyes -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 13th FS.yaml b/resources/squadrons/viper/USAF 13th FS.yaml index a3115b50..4268c340 100644 --- a/resources/squadrons/viper/USAF 13th FS.yaml +++ b/resources/squadrons/viper/USAF 13th FS.yaml @@ -1,7 +1,7 @@ --- name: 13th FS nickname: Panthers -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 14th FS.yaml b/resources/squadrons/viper/USAF 14th FS.yaml index 019fad27..681c7962 100644 --- a/resources/squadrons/viper/USAF 14th FS.yaml +++ b/resources/squadrons/viper/USAF 14th FS.yaml @@ -1,7 +1,7 @@ --- name: 14th FS nickname: Samurais -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 152nd FS.yaml b/resources/squadrons/viper/USAF 152nd FS.yaml index 002bf40c..ce1682b8 100644 --- a/resources/squadrons/viper/USAF 152nd FS.yaml +++ b/resources/squadrons/viper/USAF 152nd FS.yaml @@ -1,7 +1,7 @@ --- name: 152nd FS nickname: Las Vaqueros -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 174th FS.yaml b/resources/squadrons/viper/USAF 174th FS.yaml index c5d60d59..8778a4cf 100644 --- a/resources/squadrons/viper/USAF 174th FS.yaml +++ b/resources/squadrons/viper/USAF 174th FS.yaml @@ -1,7 +1,7 @@ --- name: 174th FS nickname: Bulldogs -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 179th FS.yaml b/resources/squadrons/viper/USAF 179th FS.yaml index 1bb95c90..1f82e509 100644 --- a/resources/squadrons/viper/USAF 179th FS.yaml +++ b/resources/squadrons/viper/USAF 179th FS.yaml @@ -1,7 +1,7 @@ --- name: 179th FS nickname: Bulldogs -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 22nd FS.yaml b/resources/squadrons/viper/USAF 22nd FS.yaml index bdbaba9a..97979b54 100644 --- a/resources/squadrons/viper/USAF 22nd FS.yaml +++ b/resources/squadrons/viper/USAF 22nd FS.yaml @@ -1,7 +1,7 @@ --- name: 22nd FS nickname: Stingers -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 23rd FS.yaml b/resources/squadrons/viper/USAF 23rd FS.yaml index e7b4a8f8..cf117411 100644 --- a/resources/squadrons/viper/USAF 23rd FS.yaml +++ b/resources/squadrons/viper/USAF 23rd FS.yaml @@ -1,7 +1,7 @@ --- name: 23rd FS nickname: Fighting Hawks -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 36th FS.yaml b/resources/squadrons/viper/USAF 36th FS.yaml index d1e5ad48..07397dac 100644 --- a/resources/squadrons/viper/USAF 36th FS.yaml +++ b/resources/squadrons/viper/USAF 36th FS.yaml @@ -1,7 +1,7 @@ --- name: 36th FS nickname: Flying Fiends -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 480th FS.yaml b/resources/squadrons/viper/USAF 480th FS.yaml index 63857993..8280c684 100644 --- a/resources/squadrons/viper/USAF 480th FS.yaml +++ b/resources/squadrons/viper/USAF 480th FS.yaml @@ -1,7 +1,7 @@ --- name: 480th FS nickname: Warhawks -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 522nd FS.yaml b/resources/squadrons/viper/USAF 522nd FS.yaml index ed59e582..ad779f63 100644 --- a/resources/squadrons/viper/USAF 522nd FS.yaml +++ b/resources/squadrons/viper/USAF 522nd FS.yaml @@ -1,7 +1,7 @@ --- name: 522nd FS nickname: Fireballs -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 55th FS.yaml b/resources/squadrons/viper/USAF 55th FS.yaml index 57d068f2..4ab3c56d 100644 --- a/resources/squadrons/viper/USAF 55th FS.yaml +++ b/resources/squadrons/viper/USAF 55th FS.yaml @@ -1,7 +1,7 @@ --- name: 55th FS nickname: Fifty Fifth -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 77th FS.yaml b/resources/squadrons/viper/USAF 77th FS.yaml index 5e303a1e..d94f2fb9 100644 --- a/resources/squadrons/viper/USAF 77th FS.yaml +++ b/resources/squadrons/viper/USAF 77th FS.yaml @@ -1,7 +1,7 @@ --- name: 77th FS nickname: Gamblers -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 79th FS.yaml b/resources/squadrons/viper/USAF 79th FS.yaml index 155932d0..7bc89d04 100644 --- a/resources/squadrons/viper/USAF 79th FS.yaml +++ b/resources/squadrons/viper/USAF 79th FS.yaml @@ -1,7 +1,7 @@ --- name: 79th FS nickname: Tigers -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) diff --git a/resources/squadrons/viper/USAF 80th FS.yaml b/resources/squadrons/viper/USAF 80th FS.yaml index fbc7a20a..9ce08965 100644 --- a/resources/squadrons/viper/USAF 80th FS.yaml +++ b/resources/squadrons/viper/USAF 80th FS.yaml @@ -1,7 +1,7 @@ --- name: 80th FS nickname: Headhunters -female_pilot_ratio: 6 +female_pilot_percentage: 6 country: USA role: Strike Fighter aircraft: F-16CM Fighting Falcon (Block 50) From 61c1d12a86bf1e21aa3470a2996ea23b9052096f Mon Sep 17 00:00:00 2001 From: Khopa Date: Mon, 7 Feb 2022 18:14:35 +0100 Subject: [PATCH 6/6] Fix #1966 : Refactored squadron default overrides in dedicated function --- .../campaignloader/defaultsquadronassigner.py | 57 +++++++++++-------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/game/campaignloader/defaultsquadronassigner.py b/game/campaignloader/defaultsquadronassigner.py index 43807f23..59356b01 100644 --- a/game/campaignloader/defaultsquadronassigner.py +++ b/game/campaignloader/defaultsquadronassigner.py @@ -30,7 +30,12 @@ class DefaultSquadronAssigner: self.coalition.player ): for squadron_config in self.config.by_location[control_point]: - squadron_def = self.find_squadron_for(squadron_config, control_point) + + squadron_def = self.override_squadron_defaults( + self.find_squadron_for(squadron_config, control_point), + squadron_config, + ) + if squadron_def is None: logging.info( f"{self.coalition.faction.name} has no aircraft compatible " @@ -49,41 +54,25 @@ class DefaultSquadronAssigner: def find_squadron_for( self, config: SquadronConfig, control_point: ControlPoint ) -> Optional[SquadronDef]: - squadron_def = None + for preferred_aircraft in config.aircraft: squadron_def = self.find_preferred_squadron( preferred_aircraft, config.primary, control_point ) if squadron_def is not None: - break + return squadron_def # If we didn't find any of the preferred types we should use any squadron # compatible with the primary task. - if squadron_def is None: - squadron_def = self.find_squadron_for_task(config.primary, control_point) + squadron_def = self.find_squadron_for_task(config.primary, control_point) + if squadron_def is not None: + return squadron_def # If we can't find any squadron matching the requirement, we should # create one. - if squadron_def is None: - squadron_def = self.air_wing.squadron_def_generator.generate_for_task( - config.primary, control_point - ) - - # Override squadron def with squadron config parameters from campaign file, if defined - if squadron_def is not None: - - overrides: Dict[str, Union[str, int]] = {} - if config.name is not None: - overrides["name"] = config.name - if config.nickname is not None: - overrides["nickname"] = config.nickname - if config.female_pilot_percentage is not None: - overrides["female_pilot_percentage"] = config.female_pilot_percentage - - squadron_copy = dataclasses.replace(squadron_def, **overrides) - return squadron_copy - else: - return None + return self.air_wing.squadron_def_generator.generate_for_task( + config.primary, control_point + ) def find_preferred_squadron( self, preferred_aircraft: str, task: FlightType, control_point: ControlPoint @@ -160,3 +149,21 @@ class DefaultSquadronAssigner: ): return squadron return None + + @staticmethod + def override_squadron_defaults( + squadron_def: Optional[SquadronDef], config: SquadronConfig + ) -> Optional[SquadronDef]: + + if squadron_def is None: + return None + + overrides: Dict[str, Union[str, int]] = {} + if config.name is not None: + overrides["name"] = config.name + if config.nickname is not None: + overrides["nickname"] = config.nickname + if config.female_pilot_percentage is not None: + overrides["female_pilot_percentage"] = config.female_pilot_percentage + + return dataclasses.replace(squadron_def, **overrides)