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

Refactor invisible FARP remover

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

44
game/missiongenerator/aircraft/flightgroupspawner.py
View File

@ -497,7 +497,7 @@ class FlightGroupSpawner:
) -> Optional[FlyingGroup[Any]]: ) -> Optional[FlyingGroup[Any]]:
is_airbase = False is_airbase = False
is_roadbase = False is_roadbase = False
ground_spawn = None ground_spawn: Optional[Tuple[StaticGroup, Point]] = None
if not is_large and len(self.ground_spawns_roadbase[cp]) > 0: if not is_large and len(self.ground_spawns_roadbase[cp]) > 0:
ground_spawn = self.ground_spawns_roadbase[cp].pop() ground_spawn = self.ground_spawns_roadbase[cp].pop()
@ -520,17 +520,7 @@ class FlightGroupSpawner:
group.points[0].type = "TakeOffGround" group.points[0].type = "TakeOffGround"
group.units[0].heading = ground_spawn[0].units[0].heading group.units[0].heading = ground_spawn[0].units[0].heading
if ( self._remove_invisible_farps_if_requested(cp, ground_spawn[0], group)
cp.coalition.game.settings.ground_start_airbase_statics_farps_remove
and isinstance(cp, Airfield)
):
# Remove invisible FARPs from airfields because they are unnecessary
neutral_country = self.mission.country(
cp.coalition.game.neutral_country.name
)
neutral_country.remove_static_group(ground_spawn[0])
group.points[0].link_unit = None
group.points[0].helipad_id = None
# Hot start aircraft which require ground power to start, when ground power # Hot start aircraft which require ground power to start, when ground power
# trucks have been disabled for performance reasons # trucks have been disabled for performance reasons
@ -591,22 +581,32 @@ class FlightGroupSpawner:
) )
group.units[1 + i].heading = ground_spawn[0].units[0].heading group.units[1 + i].heading = ground_spawn[0].units[0].heading
if ( self._remove_invisible_farps_if_requested(cp, ground_spawn[0])
cp.coalition.game.settings.ground_start_airbase_statics_farps_remove
and isinstance(cp, Airfield)
):
# Remove invisible FARPs from airfields because they are unnecessary
neutral_country = self.mission.country(
cp.coalition.game.neutral_country.name
)
neutral_country.remove_static_group(ground_spawn[0])
except IndexError as ex: except IndexError as ex:
raise NoParkingSlotError( raise NoParkingSlotError(
f"Not enough STOL slots available at {cp}" f"Not enough STOL slots available at {cp}"
) from ex ) from ex
return group return group
def _remove_invisible_farps_if_requested(
self,
cp: ControlPoint,
ground_spawn: StaticGroup,
group: Optional[FlyingGroup[Any]] = None,
) -> None:
if (
cp.coalition.game.settings.ground_start_airbase_statics_farps_remove
and isinstance(cp, Airfield)
):
# Remove invisible FARPs from airfields because they are unnecessary
neutral_country = self.mission.country(
cp.coalition.game.neutral_country.name
)
neutral_country.remove_static_group(ground_spawn)
if group:
group.points[0].link_unit = None
group.points[0].helipad_id = None
def dcs_start_type(self) -> DcsStartType: def dcs_start_type(self) -> DcsStartType:
if self.start_type is StartType.RUNWAY: if self.start_type is StartType.RUNWAY:
return DcsStartType.Runway return DcsStartType.Runway