Merge pull request #2002 from dcs-liberation/fix_issue_1966

Fix issue 1966

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_percentage: 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_percentage", None),
         )
 
     @staticmethod

game/campaignloader/defaultsquadronassigner.py

@@ -1,7 +1,8 @@
 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
@@ -29,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 "
@@ -48,6 +54,7 @@ class DefaultSquadronAssigner:
     def find_squadron_for(
         self, config: SquadronConfig, control_point: ControlPoint
     ) -> Optional[SquadronDef]:
+
         for preferred_aircraft in config.aircraft:
             squadron_def = self.find_preferred_squadron(
                 preferred_aircraft, config.primary, control_point
@@ -142,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)

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_percentage=6,
             pilot_pool=[],
         )
 

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_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
@@ -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_percentage:
+                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_percentage,
             squadron_def.pilot_pool,
             coalition,
             game.settings,

game/squadrons/squadrondef.py

@@ -27,6 +27,7 @@ class SquadronDef:
     livery: Optional[str]
     mission_types: tuple[FlightType, ...]
     operating_bases: OperatingBases
+    female_pilot_percentage: 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_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)
@@ -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_percentage=female_pilot_percentage,
             pilot_pool=pilots,
         )

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 percentage
+#:
+CAMPAIGN_FORMAT_VERSION = (9, 2)

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_percentage: 15
       aircraft:
         - AH-1W SuperCobra
     - primary: CAS
       secondary: air-to-ground
+      nickname: Defenders of Golan
+      female_pilot_percentage: 25
       aircraft:
         - AH-64D Apache Longbow
     - primary: Transport

resources/squadrons/A-10C Warthog I/104th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 104th FS
 nickname: Eagles
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog I/118th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 118th FS
 nickname: Flying Yankees
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog I/172nd FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 172nd FS
-nickname: 
+nickname:
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog I/184th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 184th FS
 nickname: Flying Razorbacks
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog I/190th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 190th FS
 nickname: Skull Bangers
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog I/25th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 25th FS
 nickname: Assam Draggins
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog I/354th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 354th FS
 nickname: Bulldogs
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog I/355th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 355th FS
 nickname: Fightin' Falcons
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog I/357th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 357th FS
 nickname: Dragons
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog I/358th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 358th FS
 nickname: Lobos
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog I/47th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 47th FS
 nickname: Termites
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog I/74th TFS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 74th TFS
 nickname: Flying Tigers
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog I/81st FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 81st FS
 nickname: Termites
+female_pilot_percentage: 0
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 3)

resources/squadrons/A-10C Warthog II/25th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 25th FS
 nickname: Assam Draggins
+female_pilot_percentage: 6
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 7)

resources/squadrons/A-10C Warthog II/354th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 354th FS
 nickname: Bulldogs
+female_pilot_percentage: 6
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 7)

resources/squadrons/A-10C Warthog II/355th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 355th FS
 nickname: Fightin' Falcons
+female_pilot_percentage: 6
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 7)

resources/squadrons/A-10C Warthog II/357th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 357th FS
 nickname: Dragons
+female_pilot_percentage: 6
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 7)

resources/squadrons/A-10C Warthog II/358th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 358th FS
 nickname: Lobos
+female_pilot_percentage: 6
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 7)

resources/squadrons/A-10C Warthog II/81st FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 81st FS
 nickname: Termites
+female_pilot_percentage: 6
 country: USA
 role: Close Air Support
 aircraft: A-10C Thunderbolt II (Suite 7)

resources/squadrons/A-4E Skyhawk/IAF 110th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 110th Squadron
 nickname: Knights of the North
+female_pilot_percentage: 0
 country: Israel
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VA-144.yaml

@@ -1,6 +1,7 @@
 ---
 name: VA-144
 nickname: Roadrunners
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VA-153.yaml

@@ -1,6 +1,7 @@
 ---
 name: VA-153
 nickname: Blue Tail Flies
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VA-163.yaml

@@ -1,6 +1,7 @@
 ---
 name: VA-163
 nickname: Saints
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VA-164.yaml

@@ -1,6 +1,7 @@
 ---
 name: VA-164
 nickname: Ghostriders
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VA-195.yaml

@@ -1,6 +1,7 @@
 ---
 name: VA-195
 nickname: Dambusters
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VA-212.yaml

@@ -1,6 +1,7 @@
 ---
 name: VA-212
 nickname: Rampant Raiders
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VA-45.yaml

@@ -1,6 +1,7 @@
 ---
 name: VA-45
 nickname: Blackbirds
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VA-55.yaml

@@ -1,6 +1,7 @@
 ---
 name: VA-55
 nickname: Warhorses
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VA-64.yaml

@@ -1,6 +1,7 @@
 ---
 name: VA-64
 nickname: Black Lancers
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VMA-121.yaml

@@ -1,6 +1,7 @@
 ---
 name: VMA-121
 nickname: Green Knights
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VMA-124.yaml

@@ -1,6 +1,7 @@
 ---
 name: VMA-124
 nickname: Memphis Marines
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VMA-131.yaml

@@ -1,6 +1,7 @@
 ---
 name: VMA-131
 nickname: Diamondbacks
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VMA-142.yaml

@@ -1,6 +1,7 @@
 ---
 name: VMA-142
 nickname: Flying Gators
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VMA-211.yaml

@@ -1,6 +1,7 @@
 ---
 name: VMA-211
 nickname: Avengers
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VMA-311.yaml

@@ -1,6 +1,7 @@
 ---
 name: VMA-311
 nickname: Tomcats
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A-4E Skyhawk/VMA-322.yaml

@@ -1,6 +1,7 @@
 ---
 name: VMA-322
 nickname: Fighting Gamecocks
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack/Light Fighter
 aircraft: A-4E Skyhawk

resources/squadrons/A20/no_107_squadron_raf.yaml

@@ -1,6 +1,7 @@
 ---
 name: RAF, No. 107 Squadron
 nickname: Lowestoft's 'own' Squadron
+female_pilot_percentage: 0
 country: UK
 role: Medium Bomber
 aircraft: Boston Mk.III

resources/squadrons/AH-1X/HMLA-169-AH1W.yaml

@@ -1,6 +1,7 @@
 ---
 name: HMLA-169 (AH-1W)
 nickname: Vipers
+female_pilot_percentage: 0
 country: USA
 role: Attack
 aircraft: AH-1W SuperCobra
@@ -10,4 +11,4 @@ mission_types:
   - BAI
   - CAS
   - DEAD
-  - OCA/Aircraft
+  - OCA/Aircraft

resources/squadrons/AH-1X/HMLA-269-AH1W.yaml

@@ -1,6 +1,7 @@
 ---
 name: HMLA-269 (AH-1W)
 nickname: Gunrunners
+female_pilot_percentage: 0
 country: USA
 role: Attack
 aircraft: AH-1W SuperCobra
@@ -10,4 +11,4 @@ mission_types:
   - BAI
   - CAS
   - DEAD
-  - OCA/Aircraft
+  - OCA/Aircraft

resources/squadrons/AH-1X/IAF 160th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 160th Squadron
 nickname: Northern Cobra Squadron
+female_pilot_percentage: 0
 country: Israel
 role: Attack Helicopter
 aircraft: AH-1W SuperCobra

resources/squadrons/AH-64D/IAF 113th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 113th Squadron
 nickname: The Hornet Squadron
+female_pilot_percentage: 5
 country: Israel
 role: Attack Helicopter
 aircraft: AH-64D Apache Longbow

resources/squadrons/AH-64D/US Army 229th Aviation Battalion.yaml

@@ -1,6 +1,7 @@
 ---
 name: 229th Aviation Battalion
 nickname: Serpents
+female_pilot_percentage: 6
 country: USA
 role: Attack Helicopter
 aircraft: AH-64D Apache Longbow

resources/squadrons/AV-8BNA/VMA-214.yaml

@@ -1,6 +1,7 @@
 ---
 name: VMA-214
 nickname: Black Sheep
+female_pilot_percentage: 0
 country: USA
 role: V/STOL Attack
 aircraft: AV-8B Harrier II Night Attack

resources/squadrons/AV-8BNA/VMA-223.yaml

@@ -1,6 +1,7 @@
 ---
 name: VMA-223
 nickname: Bulldogs
+female_pilot_percentage: 0
 country: USA
 role: V/STOL Attack
 aircraft: AV-8B Harrier II Night Attack

resources/squadrons/BF-109K4/Jagdgeschwader_53.yaml

@@ -1,5 +1,6 @@
 name: Jagdgeschwader 53
 nickname: Pik As
+female_pilot_percentage: 0
 country: Third Reich
 role: Fighter
 aircraft: Bf 109 K-4 Kurfürst

resources/squadrons/E-2 Hawkeye/VAW-125.yaml

@@ -1,6 +1,7 @@
 ---
 name: VAW-125
 nickname: Tigertails
+female_pilot_percentage: 6
 country: USA
 role: AEW&C
 aircraft: E-2C Hawkeye

resources/squadrons/E-3 Sentry/USAF 960th AACS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 960th AAC Squadron
 nickname: Vikings
+female_pilot_percentage: 6
 country: USA
 role: AEW&C
 aircraft: E-3A

resources/squadrons/Eagle/IAF 106th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 106th Squadron
 nickname: Spearhead
+female_pilot_percentage: 6
 country: Israel
 role: Air Superiority Fighter
 aircraft: F-15C Eagle

resources/squadrons/Eagle/USAF 12th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 12th FS
 nickname: Dirty Dozen
+female_pilot_percentage: 6
 country: USA
 role: Air Superiority Fighter
 aircraft: F-15C Eagle

resources/squadrons/Eagle/USAF 390th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 390th FS
 nickname: Wild Boars
+female_pilot_percentage: 6
 country: USA
 role: Air Superiority Fighter
 aircraft: F-15C Eagle

resources/squadrons/Eagle/USAF 493rd FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 493rd FS
 nickname: Grim Reapers
+female_pilot_percentage: 6
 country: USA
 role: Air Superiority Fighter
 aircraft: F-15C Eagle

resources/squadrons/Eagle/USAF 58th FS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 58th FS
 nickname: Gorillas
+female_pilot_percentage: 6
 country: USA
 role: Air Superiority Fighter
 aircraft: F-15C Eagle

resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-11.yaml

@@ -1,6 +1,7 @@
 ---
 name: VF-11
 nickname: Red Rippers
+female_pilot_percentage: 0
 country: USA
 role: Strike Fighter
 aircraft: F-14A Tomcat (Block 135-GR Late)

resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-111.yaml

@@ -1,6 +1,7 @@
 ---
 name: VF-111
 nickname: Sundowners
+female_pilot_percentage: 0
 country: USA
 role: Strike Fighter
 aircraft: F-14A Tomcat (Block 135-GR Late)

resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-21.yaml

@@ -1,6 +1,7 @@
 ---
 name: VF-21
 nickname: Freelancers
+female_pilot_percentage: 0
 country: USA
 role: Strike Fighter
 aircraft: F-14A Tomcat (Block 135-GR Late)

resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-211.yaml

@@ -1,6 +1,7 @@
 ---
 name: VF-211
 nickname: Fighting Checkmates
+female_pilot_percentage: 0
 country: USA
 role: Strike Fighter
 aircraft: F-14A Tomcat (Block 135-GR Late)

resources/squadrons/F-14A 135-GR Tomcat (Late)/VF-33.yaml

@@ -1,6 +1,7 @@
 ---
 name: VF-33
 nickname: Starfighters
+female_pilot_percentage: 0
 country: USA
 role: Strike Fighter
 aircraft: F-14A Tomcat (Block 135-GR Late)

resources/squadrons/F-14B Tomcat/VF-101.yaml

@@ -1,6 +1,7 @@
 ---
 name: VF-101
 nickname: Grim Reapers
+female_pilot_percentage: 7
 country: USA
 role: Strike Fighter
 aircraft: F-14B Tomcat

resources/squadrons/F-14B Tomcat/VF-102.yaml

@@ -1,6 +1,7 @@
 ---
 name: VF-102
 nickname: Diamond Backs
+female_pilot_percentage: 7
 country: USA
 role: Strike Fighter
 aircraft: F-14B Tomcat

resources/squadrons/F-14B Tomcat/VF-142.yaml

@@ -1,6 +1,7 @@
 ---
 name: VF-142
 nickname: Ghostriders
+female_pilot_percentage: 7
 country: USA
 role: Strike Fighter
 aircraft: F-14B Tomcat

resources/squadrons/F-14B Tomcat/VF-143.yaml

@@ -1,6 +1,7 @@
 ---
 name: VF-143
 nickname: Pukin' Dogs
+female_pilot_percentage: 7
 country: USA
 role: Strike Fighter
 aircraft: F-14B Tomcat

resources/squadrons/F-14B Tomcat/VF-211.yaml

@@ -1,6 +1,7 @@
 ---
 name: VF-211
 nickname: Fighting Checkmates
+female_pilot_percentage: 7
 country: USA
 role: Strike Fighter
 aircraft: F-14B Tomcat

resources/squadrons/F-4E/IAF 201th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 201th Squadron
 nickname: The One
+female_pilot_percentage: 0
 country: Israel
 role: Air Superiority Fighter
 aircraft: F-4E Phantom II

resources/squadrons/F-4E/IRIAF 32nd TFW.yaml

@@ -1,6 +1,7 @@
 ---
 name: IRIAF 32nd TFW
 nickname: 32nd TFW
+female_pilot_percentage: 0
 country: Iran
 role: Air Superiority Fighter
 aircraft: F-4E Phantom II

resources/squadrons/FW-190A8/Jagdgeschwader_26.yaml

@@ -1,5 +1,6 @@
 name: Jagdgeschwader 26
 nickname: Schlageter
+female_pilot_percentage: 0
 country: Third Reich
 role: Fighter
 aircraft: Fw 190 A-8 Anton

resources/squadrons/FW-190D9/Jagdgeschwader_54.yaml

@@ -1,5 +1,6 @@
 name: Jagdgeschwader 54
 nickname: Grünherz
+female_pilot_percentage: 0
 country: Third Reich
 role: Fighter
 aircraft: Fw 190 D-9 Dora

resources/squadrons/Ju88A4/Kustenfliegergruppe_106.yaml

@@ -1,9 +1,11 @@
 ---
 name: Küstenfliegergruppe 106
 nickname: Kü.Fl.Gr.206.
+female_pilot_percentage: 0
 country: Third Reich
 role: Medium Bomber
 aircraft: Ju 88 A-4
+female_pilot_percentage: 0
 mission_types:
   - Anti-ship
   - BAI

resources/squadrons/KC-130/VMGR-352.yaml

@@ -1,6 +1,7 @@
 ---
 name: VMGR-352
 nickname: Raiders
+female_pilot_percentage: 6
 country: USA
 role: Air-to-Air Refueling
 aircraft: KC-130

resources/squadrons/KC-135/18th ARS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 18th Air Refueling Squadron
 nickname: Kanza
+female_pilot_percentage: 6
 country: USA
 role: Air-to-Air Refueling
 aircraft: KC-135 Stratotanker

resources/squadrons/KC-135/TuAF 101st Tanker Squadron.yaml

@@ -1,6 +1,7 @@
 ---
 name: 101st Tanker Squadron
 nickname: Asena
+female_pilot_percentage: 6
 country: Turkey
 role: Air-to-Air Refueling
 aircraft: KC-135 Stratotanker

resources/squadrons/KC-135MPRS/340th EARS.yaml

@@ -1,6 +1,7 @@
 ---
 name: 340th Expeditionary Air Refueling Squadron
 nickname: Pythons
+female_pilot_percentage: 6
 country: USA
 role: Air-to-Air Refueling
 aircraft: KC-135 Stratotanker MPRS

resources/squadrons/Mi-24/SAAF 765th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 765th Squadron
 nickname: 765th
+female_pilot_percentage: 0
 country: Syria
 role: Attack Helicopter
 aircraft: Mi-24P Hind-F

resources/squadrons/Mi-24/SAAF 766th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 766th Squadron
 nickname: 766th
+female_pilot_percentage: 0
 country: Syria
 role: Attack Helicopter
 aircraft: Mi-24V Hind-E

resources/squadrons/Mi-8/SAAF 253th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 253th Squadron
 nickname: 253th
+female_pilot_percentage: 0
 country: Syria
 role: Transport Helicopter
 aircraft: Mi-8MTV2 Hip

resources/squadrons/Mi-8/SAAF 255th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 255th Squadron
 nickname: 255th
+female_pilot_percentage: 0
 country: Syria
 role: Transport Helicopter
 aircraft: Mi-8MTV2 Hip

resources/squadrons/Mig-21/SAAF 679th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 679th Squadron
 nickname: 679th
+female_pilot_percentage: 0
 country: Syria
 role: Air Superiority Fighter
 aircraft: MiG-21bis Fishbed-N

resources/squadrons/Mig-21/SAAF 680th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 680th Squadron
 nickname: 680th
+female_pilot_percentage: 0
 country: Syria
 role: Air Superiority Fighter
 aircraft: MiG-21bis Fishbed-N

resources/squadrons/Mig-21/SAAF 825th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 825th Squadron
 nickname: 825th
+female_pilot_percentage: 0
 country: Syria
 role: Air Superiority Fighter
 aircraft: MiG-21bis Fishbed-N

resources/squadrons/Mig-21/SAAF 8th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 8th Squadron
 nickname: 8th
+female_pilot_percentage: 0
 country: Syria
 role: Air Superiority Fighter
 aircraft: MiG-21bis Fishbed-N

resources/squadrons/Mig-23/SAAF 678th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 678th Squadron
 nickname: 678th
+female_pilot_percentage: 0
 country: Syria
 role: Air Superiority Fighter
 aircraft: MiG-23MLD Flogger-K

resources/squadrons/Mig-25/SAAF 1st Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 1st Squadron
 nickname: 1st
+female_pilot_percentage: 0
 country: Syria
 role: Air Superiority Fighter
 aircraft: MiG-25PD Foxbat-E

resources/squadrons/Mig-29/Russia VVS 115th GvIAP.yaml

@@ -1,6 +1,7 @@
 ---
 name: 115th Guards Aviation Regiment
 nickname: 115th GvIAP
+female_pilot_percentage: 0
 country: Russia
 role: Air Superiority Fighter
 aircraft: MiG-29S Fulcrum-C

resources/squadrons/Mig-29/Russia VVS 28th GvIAP.yaml

@@ -1,6 +1,7 @@
 ---
 name: 28th Guards Aviation Regiment
 nickname: 28th GvIAP
+female_pilot_percentage: 0
 country: Russia
 role: Air Superiority Fighter
 aircraft: MiG-29S Fulcrum-C

resources/squadrons/Mig-29/Russia VVS 31st GvIAP.yaml

@@ -1,6 +1,7 @@
 ---
 name: 31st Guards Aviation Regiment
 nickname: 31st GvIAP
+female_pilot_percentage: 0
 country: Russia
 role: Air Superiority Fighter
 aircraft: MiG-29S Fulcrum-C

resources/squadrons/Mig-29/Russia VVS 773rd IAP.yaml

@@ -1,6 +1,7 @@
 ---
 name: 773rd Aviation Regiment
 nickname: 773rd IAP
+female_pilot_percentage: 0
 country: Russia
 role: Air Superiority Fighter
 aircraft: MiG-29S Fulcrum-C

resources/squadrons/Mig-29/SAAF 697th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 697th Squadron
 nickname: 697th
+female_pilot_percentage: 0
 country: Syria
 role: Air Superiority Fighter
 aircraft: MiG-29S Fulcrum-C

resources/squadrons/Mig-29/SAAF 699th Sqn.yaml

@@ -1,6 +1,7 @@
 ---
 name: 699th Squadron
 nickname: 699th
+female_pilot_percentage: 0
 country: Syria
 role: Air Superiority Fighter
 aircraft: MiG-29S Fulcrum-C

resources/squadrons/MosquitoFBMkVI/no_21_squadron_raf.yaml

@@ -1,6 +1,7 @@
 ---
 name: RAF, No. 21 Squadron
 nickname: No. 21
+female_pilot_percentage: 0
 country: UK
 role: Fighter Bomber
 aircraft: MosquitoFBMkVI

resources/squadrons/S-3B/VS-35.yaml

@@ -1,6 +1,7 @@
 ---
 name: VS-35
 nickname: Blue Wolves
+female_pilot_percentage: 0
 country: USA
 role: Carrier-based Attack
 aircraft: S-3B Viking

resources/squadrons/S-3B/VS-35F.yaml

@@ -1,9 +1,10 @@
 ---
 name: VS-35 (Tanker)
 nickname: Blue Wolves
+female_pilot_percentage: 0
 country: USA
 role: Tanker
 aircraft: S-3B Tanker
 livery: NAVY Standard
 mission_types:
-  - Refueling
+  - Refueling

resources/squadrons/SH-60B/HSM-40.yaml

@@ -1,10 +1,11 @@
 ---
 name: HSM-40
 nickname: Airwolves
+female_pilot_percentage: 0
 country: USA
 role: Transport/Anti-Ship
 aircraft: SH-60B Seahawk
 livery: standard
 mission_types:
   - Transport
-  - Anti-ship
+  - Anti-ship

resources/squadrons/SpitfireLFMkIX/no_145_squadron_raf.yaml

@@ -1,6 +1,7 @@
 ---
 name: RAF, No. 145 Squadron
 nickname: No. 145
+female_pilot_percentage: 0
 country: UK
 role: Fighter
 aircraft: Spitfire LF Mk IX

resources/squadrons/SpitfireLFMkIX/no_16_squadron_raf.yaml

@@ -1,6 +1,7 @@
 ---
 name: RAF, No. 16 Squadron
 nickname: No. 16
+female_pilot_percentage: 0
 country: UK
 role: Fighter
 aircraft: Spitfire LF Mk IX