Finish moving gen into game.

This commit is contained in:
Dan Albert
2022-02-22 00:10:31 -08:00
parent 3e08e0e8b6
commit ac80c4adc1
68 changed files with 129 additions and 149 deletions

View File

@@ -5,9 +5,8 @@ from collections import defaultdict
from typing import Sequence, Iterator, TYPE_CHECKING, Optional
from game.dcs.aircrafttype import AircraftType
from gen.flights.ai_flight_planner_db import aircraft_for_task
from gen.flights.closestairfields import ObjectiveDistanceCache
from .squadrondef import SquadronDef
from game.ato.ai_flight_planner_db import aircraft_for_task
from game.ato.closestairfields import ObjectiveDistanceCache
from .squadrondefloader import SquadronDefLoader
from ..campaignloader.squadrondefgenerator import SquadronDefGenerator
from ..factions.faction import Faction

View File

@@ -10,7 +10,7 @@ from faker import Faker
from game.ato import Flight, FlightType, Package
from game.settings import AutoAtoBehavior, Settings
from gen.flights.flightplan import FlightPlanBuilder
from game.ato.flightplan import FlightPlanBuilder
from .pilot import Pilot, PilotStatus
from ..db.database import Database
from ..utils import meters

View File

@@ -62,7 +62,7 @@ class SquadronDef:
@classmethod
def from_yaml(cls, path: Path) -> SquadronDef:
from gen.flights.ai_flight_planner_db import tasks_for_aircraft
from game.ato.ai_flight_planner_db import tasks_for_aircraft
from game.ato import FlightType
with path.open(encoding="utf8") as squadron_file: