ntentionally don't spawn anything at OffMapSpawns in Pretense

This commit is contained in:
MetalStormGhost 2023-09-11 21:42:42 +03:00
parent c126d1dff7
commit 84c20e8d81
2 changed files with 9 additions and 2 deletions

View File

@ -32,6 +32,7 @@ from game.theater.controlpoint import (
Airfield, Airfield,
ControlPoint, ControlPoint,
Fob, Fob,
OffMapSpawn,
) )
from game.unitmap import UnitMap from game.unitmap import UnitMap
from game.missiongenerator.aircraft.aircraftpainter import AircraftPainter from game.missiongenerator.aircraft.aircraftpainter import AircraftPainter
@ -121,6 +122,10 @@ class PretenseAircraftGenerator:
num_of_strike = 0 num_of_strike = 0
num_of_cap = 0 num_of_cap = 0
for squadron in cp.squadrons: 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.owned_aircraft += 1
squadron.untasked_aircraft += 1 squadron.untasked_aircraft += 1
package = Package(cp, squadron.flight_db, auto_asap=False) package = Package(cp, squadron.flight_db, auto_asap=False)

View File

@ -17,7 +17,7 @@ from game.ato.starttype import StartType
from game.missiongenerator.aircraft.flightgroupspawner import FlightGroupSpawner from game.missiongenerator.aircraft.flightgroupspawner import FlightGroupSpawner
from game.missiongenerator.missiondata import MissionData from game.missiongenerator.missiondata import MissionData
from game.naming import NameGenerator 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 from game.utils import feet, meters
@ -67,11 +67,13 @@ class PretenseFlightGroupSpawner(FlightGroupSpawner):
cp = self.flight.departure cp = self.flight.departure
name = namegen.next_pretense_aircraft_name(cp, self.flight) name = namegen.next_pretense_aircraft_name(cp, self.flight)
print(name)
try: try:
if self.start_type is StartType.IN_FLIGHT: if self.start_type is StartType.IN_FLIGHT:
group = self._generate_over_departure(name, cp) group = self._generate_over_departure(name, cp)
return group 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): elif isinstance(cp, NavalControlPoint):
group_name = cp.get_carrier_group_name() group_name = cp.get_carrier_group_name()
carrier_group = self.mission.find_group(group_name) carrier_group = self.mission.find_group(group_name)