Move beacons module.

This isn't related to the missiongenerator, and importing this file from
some places (such as runway data) will cause a circular reference when
importing the rest of the missiongenerator package.
This commit is contained in:
Dan Albert 2022-09-27 17:59:01 -07:00
parent a9348154af
commit 9ab3430cc4
3 changed files with 8 additions and 4 deletions

View File

@ -1,13 +1,17 @@
from __future__ import annotations
import json import json
from collections.abc import Iterator from collections.abc import Iterator
from dataclasses import dataclass from dataclasses import dataclass
from enum import IntEnum, auto from enum import IntEnum, auto
from pathlib import Path from pathlib import Path
from typing import Optional from typing import Optional, TYPE_CHECKING
from game.radio.radios import RadioFrequency from game.radio.radios import RadioFrequency
from game.radio.tacan import TacanBand, TacanChannel 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") BEACONS_RESOURCE_PATH = Path("resources/dcs/beacons")

View File

@ -11,6 +11,7 @@ from dcs.coalition import Coalition
from dcs.countries import country_dict from dcs.countries import country_dict
from game.airfields import AtcData from game.airfields import AtcData
from game.dcs.beacons import Beacons
from game.dcs.helpers import unit_type_from_name from game.dcs.helpers import unit_type_from_name
from game.missiongenerator.aircraft.aircraftgenerator import ( from game.missiongenerator.aircraft.aircraftgenerator import (
AircraftGenerator, AircraftGenerator,
@ -23,7 +24,6 @@ from game.theater.bullseye import Bullseye
from game.unitmap import UnitMap from game.unitmap import UnitMap
from .airconflictdescription import AirConflictDescription from .airconflictdescription import AirConflictDescription
from .airsupportgenerator import AirSupportGenerator from .airsupportgenerator import AirSupportGenerator
from .beacons import Beacons
from .briefinggenerator import BriefingGenerator, MissionInfoGenerator from .briefinggenerator import BriefingGenerator, MissionInfoGenerator
from .cargoshipgenerator import CargoShipGenerator from .cargoshipgenerator import CargoShipGenerator
from .convoygenerator import ConvoyGenerator from .convoygenerator import ConvoyGenerator

View File

@ -33,7 +33,7 @@ from typing import Dict, Iterable, Union
import lupa 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() THIS_DIR = Path(__file__).parent.resolve()
SRC_DIR = THIS_DIR.parents[1] SRC_DIR = THIS_DIR.parents[1]