From 84c20e8d81cc57e9eedaf9ed5dbd6f8853c7b5d1 Mon Sep 17 00:00:00 2001 From: MetalStormGhost Date: Mon, 11 Sep 2023 21:42:42 +0300 Subject: [PATCH] ntentionally don't spawn anything at OffMapSpawns in Pretense --- game/pretense/pretenseaircraftgenerator.py | 5 +++++ game/pretense/pretenseflightgroupspawner.py | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/game/pretense/pretenseaircraftgenerator.py b/game/pretense/pretenseaircraftgenerator.py index 5abec403..2437bab3 100644 --- a/game/pretense/pretenseaircraftgenerator.py +++ b/game/pretense/pretenseaircraftgenerator.py @@ -32,6 +32,7 @@ from game.theater.controlpoint import ( Airfield, ControlPoint, Fob, + OffMapSpawn, ) from game.unitmap import UnitMap from game.missiongenerator.aircraft.aircraftpainter import AircraftPainter @@ -121,6 +122,10 @@ class PretenseAircraftGenerator: num_of_strike = 0 num_of_cap = 0 for squadron in cp.squadrons: + # Intentionally don't spawn anything at OffMapSpawns in Pretense + if isinstance(squadron.location, OffMapSpawn): + continue + squadron.owned_aircraft += 1 squadron.untasked_aircraft += 1 package = Package(cp, squadron.flight_db, auto_asap=False) diff --git a/game/pretense/pretenseflightgroupspawner.py b/game/pretense/pretenseflightgroupspawner.py index 908edcc0..880ad88d 100644 --- a/game/pretense/pretenseflightgroupspawner.py +++ b/game/pretense/pretenseflightgroupspawner.py @@ -17,7 +17,7 @@ from game.ato.starttype import StartType from game.missiongenerator.aircraft.flightgroupspawner import FlightGroupSpawner from game.missiongenerator.missiondata import MissionData from game.naming import NameGenerator -from game.theater import Airfield, ControlPoint, Fob, NavalControlPoint +from game.theater import Airfield, ControlPoint, Fob, NavalControlPoint, OffMapSpawn from game.utils import feet, meters @@ -67,11 +67,13 @@ class PretenseFlightGroupSpawner(FlightGroupSpawner): cp = self.flight.departure name = namegen.next_pretense_aircraft_name(cp, self.flight) - print(name) try: if self.start_type is StartType.IN_FLIGHT: group = self._generate_over_departure(name, cp) return group + elif isinstance(cp, OffMapSpawn): + # Intentionally don't spawn anything at OffMapSpawns in Pretense + logging.info(f"Skipping flight generation for off-map spawn {cp}.") elif isinstance(cp, NavalControlPoint): group_name = cp.get_carrier_group_name() carrier_group = self.mission.find_group(group_name)