From e7b84e18d19a3427d6de6dac151e351b54a6a62d Mon Sep 17 00:00:00 2001 From: Raffson Date: Wed, 4 Oct 2023 19:49:34 +0200 Subject: [PATCH] Fix errors due to LaserCodeRegistry move --- game/pretense/pretenseaircraftgenerator.py | 2 +- .../pretenseflightgroupconfigurator.py | 15 +++------ game/pretense/pretensemissiongenerator.py | 32 ++++++------------- 3 files changed, 15 insertions(+), 34 deletions(-) diff --git a/game/pretense/pretenseaircraftgenerator.py b/game/pretense/pretenseaircraftgenerator.py index 5157e3c6..85a29793 100644 --- a/game/pretense/pretenseaircraftgenerator.py +++ b/game/pretense/pretenseaircraftgenerator.py @@ -21,8 +21,8 @@ from game.ato.starttype import StartType from game.coalition import Coalition from game.data.weapons import WeaponType from game.dcs.aircrafttype import AircraftType +from game.lasercodes.lasercoderegistry import LaserCodeRegistry from game.missiongenerator.aircraft.flightdata import FlightData -from game.missiongenerator.lasercoderegistry import LaserCodeRegistry from game.missiongenerator.missiondata import MissionData from game.pretense.pretenseflightgroupconfigurator import ( PretenseFlightGroupConfigurator, diff --git a/game/pretense/pretenseflightgroupconfigurator.py b/game/pretense/pretenseflightgroupconfigurator.py index b6a6c7a6..18a75981 100644 --- a/game/pretense/pretenseflightgroupconfigurator.py +++ b/game/pretense/pretenseflightgroupconfigurator.py @@ -1,32 +1,27 @@ from __future__ import annotations -import logging from datetime import datetime from typing import Any, Optional, TYPE_CHECKING from dcs import Mission -from dcs.flyingunit import FlyingUnit -from dcs.unit import Skill from dcs.unitgroup import FlyingGroup from game.ato import Flight, FlightType from game.data.weapons import Pylon +from game.lasercodes.lasercoderegistry import LaserCodeRegistry +from game.missiongenerator.aircraft.aircraftbehavior import AircraftBehavior +from game.missiongenerator.aircraft.aircraftpainter import AircraftPainter +from game.missiongenerator.aircraft.flightdata import FlightData from game.missiongenerator.aircraft.flightgroupconfigurator import ( FlightGroupConfigurator, ) -from game.missiongenerator.lasercoderegistry import LaserCodeRegistry +from game.missiongenerator.aircraft.waypoints import WaypointGenerator from game.missiongenerator.missiondata import MissionData from game.radio.radios import RadioRegistry from game.radio.tacan import ( TacanRegistry, ) from game.runways import RunwayData -from game.squadrons import Pilot -from game.missiongenerator.aircraft.aircraftbehavior import AircraftBehavior -from game.missiongenerator.aircraft.aircraftpainter import AircraftPainter -from game.missiongenerator.aircraft.flightdata import FlightData -from game.missiongenerator.aircraft.waypoints import WaypointGenerator -from game.theater import Fob if TYPE_CHECKING: from game import Game diff --git a/game/pretense/pretensemissiongenerator.py b/game/pretense/pretensemissiongenerator.py index 8894aaf3..79bf3eec 100644 --- a/game/pretense/pretensemissiongenerator.py +++ b/game/pretense/pretensemissiongenerator.py @@ -1,12 +1,10 @@ from __future__ import annotations -import logging from datetime import datetime from pathlib import Path -from typing import TYPE_CHECKING, cast, List +from typing import TYPE_CHECKING import dcs.lua -from dataclasses import field from dcs import Mission, Point from dcs.coalition import Coalition from dcs.countries import ( @@ -14,22 +12,8 @@ from dcs.countries import ( CombinedJointTaskForcesBlue, CombinedJointTaskForcesRed, ) -from dcs.task import OptReactOnThreat -from game.atcdata import AtcData -from game.dcs.beacons import Beacons - -from game.naming import namegen -from game.radio.radios import RadioFrequency, RadioRegistry, MHz -from game.radio.tacan import TacanRegistry -from game.theater import Airfield -from game.theater.bullseye import Bullseye -from game.unitmap import UnitMap -from game.pretense.pretenseaircraftgenerator import PretenseAircraftGenerator -from game.missiongenerator.briefinggenerator import ( - BriefingGenerator, - MissionInfoGenerator, -) +from game.lasercodes.lasercoderegistry import LaserCodeRegistry from game.missiongenerator.convoygenerator import ConvoyGenerator from game.missiongenerator.environmentgenerator import EnvironmentGenerator from game.missiongenerator.flotgenerator import FlotGenerator @@ -37,18 +21,20 @@ from game.missiongenerator.forcedoptionsgenerator import ForcedOptionsGenerator from game.missiongenerator.frontlineconflictdescription import ( FrontLineConflictDescription, ) -from game.missiongenerator.kneeboard import KneeboardGenerator -from game.missiongenerator.lasercoderegistry import LaserCodeRegistry from game.missiongenerator.missiondata import MissionData from game.missiongenerator.tgogenerator import TgoGenerator +from game.missiongenerator.visualsgenerator import VisualsGenerator +from game.naming import namegen +from game.pretense.pretenseaircraftgenerator import PretenseAircraftGenerator +from game.radio.radios import RadioRegistry +from game.radio.tacan import TacanRegistry +from game.theater.bullseye import Bullseye +from game.unitmap import UnitMap from .pretenseluagenerator import PretenseLuaGenerator from .pretensetgogenerator import PretenseTgoGenerator from .pretensetriggergenerator import PretenseTriggerGenerator -from game.missiongenerator.visualsgenerator import VisualsGenerator -from ..ato import Flight from ..ato.airtaaskingorder import AirTaskingOrder from ..missiongenerator import MissionGenerator -from ..radio.TacanContainer import TacanContainer if TYPE_CHECKING: from game import Game