diff --git a/game/missiongenerator/beacons.py b/game/dcs/beacons.py similarity index 95% rename from game/missiongenerator/beacons.py rename to game/dcs/beacons.py index 3bb9fdc3..e74d2414 100644 --- a/game/missiongenerator/beacons.py +++ b/game/dcs/beacons.py @@ -1,13 +1,17 @@ +from __future__ import annotations + import json from collections.abc import Iterator from dataclasses import dataclass from enum import IntEnum, auto from pathlib import Path -from typing import Optional +from typing import Optional, TYPE_CHECKING from game.radio.radios import RadioFrequency from game.radio.tacan import TacanBand, TacanChannel -from game.theater import ConflictTheater + +if TYPE_CHECKING: + from game.theater import ConflictTheater BEACONS_RESOURCE_PATH = Path("resources/dcs/beacons") diff --git a/game/missiongenerator/missiongenerator.py b/game/missiongenerator/missiongenerator.py index 0d05f0c4..fc8818f2 100644 --- a/game/missiongenerator/missiongenerator.py +++ b/game/missiongenerator/missiongenerator.py @@ -11,6 +11,7 @@ from dcs.coalition import Coalition from dcs.countries import country_dict from game.airfields import AtcData +from game.dcs.beacons import Beacons from game.dcs.helpers import unit_type_from_name from game.missiongenerator.aircraft.aircraftgenerator import ( AircraftGenerator, @@ -23,7 +24,6 @@ from game.theater.bullseye import Bullseye from game.unitmap import UnitMap from .airconflictdescription import AirConflictDescription from .airsupportgenerator import AirSupportGenerator -from .beacons import Beacons from .briefinggenerator import BriefingGenerator, MissionInfoGenerator from .cargoshipgenerator import CargoShipGenerator from .convoygenerator import ConvoyGenerator diff --git a/resources/tools/import_beacons.py b/resources/tools/import_beacons.py index a4d24dab..026b9c99 100644 --- a/resources/tools/import_beacons.py +++ b/resources/tools/import_beacons.py @@ -33,7 +33,7 @@ from typing import Dict, Iterable, Union import lupa -from game.missiongenerator.beacons import BEACONS_RESOURCE_PATH, Beacon, BeaconType +from game.dcs.beacons import BEACONS_RESOURCE_PATH, Beacon, BeaconType THIS_DIR = Path(__file__).parent.resolve() SRC_DIR = THIS_DIR.parents[1]