diff --git a/game/armedforces/armedforces.py b/game/armedforces/armedforces.py index b8d34a61..b829a604 100644 --- a/game/armedforces/armedforces.py +++ b/game/armedforces/armedforces.py @@ -2,8 +2,9 @@ from __future__ import annotations import random from typing import TYPE_CHECKING, Iterator, Optional -from game.data.groups import GroupTask + from game.armedforces.forcegroup import ForceGroup +from game.data.groups import GroupTask from game.layout import LAYOUTS from game.profiling import logged_duration diff --git a/game/armedforces/forcegroup.py b/game/armedforces/forcegroup.py index c0f7bf59..16508b19 100644 --- a/game/armedforces/forcegroup.py +++ b/game/armedforces/forcegroup.py @@ -10,19 +10,18 @@ import yaml from dcs.unittype import ShipType, StaticType, UnitType as DcsUnitType, VehicleType from game.data.groups import GroupTask -from game.data.radar_db import UNITS_WITH_RADAR from game.dcs.groundunittype import GroundUnitType from game.dcs.helpers import static_type_from_name from game.dcs.shipunittype import ShipUnitType from game.dcs.unittype import UnitType +from game.layout import LAYOUTS +from game.layout.layout import TgoLayout, TgoLayoutUnitGroup +from game.point_with_heading import PointWithHeading from game.theater.theatergroundobject import ( IadsGroundObject, IadsBuildingGroundObject, NavalGroundObject, ) -from game.layout import LAYOUTS -from game.layout.layout import TgoLayout, TgoLayoutUnitGroup -from game.point_with_heading import PointWithHeading from game.theater.theatergroup import IadsGroundGroup, IadsRole, TheaterGroup from game.utils import escape_string_for_lua diff --git a/game/ato/loadouts.py b/game/ato/loadouts.py index 0038227a..18388261 100644 --- a/game/ato/loadouts.py +++ b/game/ato/loadouts.py @@ -3,7 +3,7 @@ from __future__ import annotations import datetime import logging from collections.abc import Iterable -from typing import Iterator, Mapping, Optional, TYPE_CHECKING, Type, Dict, Any +from typing import Iterator, Mapping, Optional, TYPE_CHECKING, Type, Dict from dcs.unittype import FlyingType diff --git a/game/callsigns.py b/game/callsigns.py index a722606f..cd1d7bf1 100644 --- a/game/callsigns.py +++ b/game/callsigns.py @@ -3,8 +3,8 @@ import logging import re from typing import Any -from dcs.unitgroup import FlyingGroup from dcs.flyingunit import FlyingUnit +from dcs.unitgroup import FlyingGroup def callsign_for_support_unit(group: FlyingGroup[Any]) -> str: diff --git a/game/campaignloader/defaultsquadronassigner.py b/game/campaignloader/defaultsquadronassigner.py index 8911c9b4..6575883d 100644 --- a/game/campaignloader/defaultsquadronassigner.py +++ b/game/campaignloader/defaultsquadronassigner.py @@ -1,13 +1,12 @@ from __future__ import annotations -import dataclasses import logging -from typing import Optional, TYPE_CHECKING, Dict, Union +from typing import Optional, TYPE_CHECKING from game.squadrons import Squadron from game.squadrons.squadrondef import SquadronDef -from ..ato.flighttype import FlightType from .campaignairwingconfig import CampaignAirWingConfig, SquadronConfig +from ..ato.flighttype import FlightType from ..dcs.aircrafttype import AircraftType from ..theater import ControlPoint diff --git a/game/campaignloader/squadrondefgenerator.py b/game/campaignloader/squadrondefgenerator.py index 26e65b8d..0bf87ea7 100644 --- a/game/campaignloader/squadrondefgenerator.py +++ b/game/campaignloader/squadrondefgenerator.py @@ -4,12 +4,12 @@ import itertools import random from typing import Optional, TYPE_CHECKING +from game.ato.ai_flight_planner_db import aircraft_for_task, tasks_for_aircraft from game.ato.flighttype import FlightType from game.dcs.aircrafttype import AircraftType from game.squadrons.operatingbases import OperatingBases from game.squadrons.squadrondef import SquadronDef from game.theater import ControlPoint -from game.ato.ai_flight_planner_db import aircraft_for_task, tasks_for_aircraft if TYPE_CHECKING: from game.factions.faction import Faction diff --git a/game/commander/missionproposals.py b/game/commander/missionproposals.py index 8749a76c..7f712422 100644 --- a/game/commander/missionproposals.py +++ b/game/commander/missionproposals.py @@ -2,8 +2,8 @@ from dataclasses import field, dataclass from enum import Enum, auto from typing import Optional -from game.theater import MissionTarget from game.ato.flighttype import FlightType +from game.theater import MissionTarget class EscortType(Enum): diff --git a/game/commander/missionscheduler.py b/game/commander/missionscheduler.py index 257747aa..5423d8d3 100644 --- a/game/commander/missionscheduler.py +++ b/game/commander/missionscheduler.py @@ -6,9 +6,9 @@ from collections import defaultdict from datetime import timedelta from typing import Iterator, Dict, TYPE_CHECKING -from game.theater import MissionTarget from game.ato.flighttype import FlightType from game.ato.traveltime import TotEstimator +from game.theater import MissionTarget if TYPE_CHECKING: from game.coalition import Coalition diff --git a/game/commander/objectivefinder.py b/game/commander/objectivefinder.py index 14934b9d..9f5767b6 100644 --- a/game/commander/objectivefinder.py +++ b/game/commander/objectivefinder.py @@ -5,6 +5,7 @@ import operator from collections.abc import Iterable, Iterator from typing import TYPE_CHECKING, TypeVar +from game.ato.closestairfields import ClosestAirfields, ObjectiveDistanceCache from game.theater import ( Airfield, ControlPoint, @@ -20,7 +21,6 @@ from game.theater.theatergroundobject import ( IadsBuildingGroundObject, ) from game.utils import meters, nautical_miles -from game.ato.closestairfields import ClosestAirfields, ObjectiveDistanceCache if TYPE_CHECKING: from game import Game diff --git a/game/commander/tasks/compound/nextaction.py b/game/commander/tasks/compound/nextaction.py index 56c6bad2..e09b4054 100644 --- a/game/commander/tasks/compound/nextaction.py +++ b/game/commander/tasks/compound/nextaction.py @@ -4,8 +4,8 @@ from dataclasses import dataclass from game.commander.tasks.compound.attackairinfrastructure import ( AttackAirInfrastructure, ) -from game.commander.tasks.compound.attackbuildings import AttackBuildings from game.commander.tasks.compound.attackbattlepositions import AttackBattlePositions +from game.commander.tasks.compound.attackbuildings import AttackBuildings from game.commander.tasks.compound.capturebases import CaptureBases from game.commander.tasks.compound.defendbases import DefendBases from game.commander.tasks.compound.degradeiads import DegradeIads diff --git a/game/commander/tasks/primitive/aewc.py b/game/commander/tasks/primitive/aewc.py index 3811dd44..8d4a80e7 100644 --- a/game/commander/tasks/primitive/aewc.py +++ b/game/commander/tasks/primitive/aewc.py @@ -2,10 +2,10 @@ from __future__ import annotations from dataclasses import dataclass +from game.ato.flighttype import FlightType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState from game.theater import MissionTarget -from game.ato.flighttype import FlightType @dataclass diff --git a/game/commander/tasks/primitive/airassault.py b/game/commander/tasks/primitive/airassault.py index bac5d86e..82704b23 100644 --- a/game/commander/tasks/primitive/airassault.py +++ b/game/commander/tasks/primitive/airassault.py @@ -3,10 +3,10 @@ from __future__ import annotations from dataclasses import dataclass from random import randint +from game.ato.flighttype import FlightType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState from game.theater import ControlPoint -from game.ato.flighttype import FlightType @dataclass diff --git a/game/commander/tasks/primitive/antiship.py b/game/commander/tasks/primitive/antiship.py index 31b06724..e90800eb 100644 --- a/game/commander/tasks/primitive/antiship.py +++ b/game/commander/tasks/primitive/antiship.py @@ -3,11 +3,11 @@ from __future__ import annotations from dataclasses import dataclass from random import randint +from game.ato.flighttype import FlightType from game.commander.missionproposals import EscortType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState from game.theater.theatergroundobject import NavalGroundObject -from game.ato.flighttype import FlightType @dataclass diff --git a/game/commander/tasks/primitive/antishipping.py b/game/commander/tasks/primitive/antishipping.py index cafefb4f..fa084c4e 100644 --- a/game/commander/tasks/primitive/antishipping.py +++ b/game/commander/tasks/primitive/antishipping.py @@ -3,10 +3,10 @@ from __future__ import annotations from dataclasses import dataclass from random import randint +from game.ato.flighttype import FlightType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState from game.transfers import CargoShip -from game.ato.flighttype import FlightType @dataclass diff --git a/game/commander/tasks/primitive/bai.py b/game/commander/tasks/primitive/bai.py index 6b6f8d9f..1984247a 100644 --- a/game/commander/tasks/primitive/bai.py +++ b/game/commander/tasks/primitive/bai.py @@ -2,10 +2,10 @@ from __future__ import annotations from dataclasses import dataclass +from game.ato.flighttype import FlightType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState from game.theater.theatergroundobject import VehicleGroupGroundObject -from game.ato.flighttype import FlightType @dataclass diff --git a/game/commander/tasks/primitive/barcap.py b/game/commander/tasks/primitive/barcap.py index ba752ea0..f83f9c54 100644 --- a/game/commander/tasks/primitive/barcap.py +++ b/game/commander/tasks/primitive/barcap.py @@ -3,10 +3,10 @@ from __future__ import annotations from dataclasses import dataclass from random import randint +from game.ato.flighttype import FlightType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState from game.theater import ControlPoint -from game.ato.flighttype import FlightType @dataclass diff --git a/game/commander/tasks/primitive/cas.py b/game/commander/tasks/primitive/cas.py index 2c4d8740..3f036c2b 100644 --- a/game/commander/tasks/primitive/cas.py +++ b/game/commander/tasks/primitive/cas.py @@ -3,10 +3,10 @@ from __future__ import annotations from dataclasses import dataclass from random import randint +from game.ato.flighttype import FlightType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState from game.theater import FrontLine -from game.ato.flighttype import FlightType @dataclass diff --git a/game/commander/tasks/primitive/convoyinterdiction.py b/game/commander/tasks/primitive/convoyinterdiction.py index 063d7a76..98368056 100644 --- a/game/commander/tasks/primitive/convoyinterdiction.py +++ b/game/commander/tasks/primitive/convoyinterdiction.py @@ -2,11 +2,10 @@ from __future__ import annotations from dataclasses import dataclass +from game.ato.flighttype import FlightType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState -from game.data.doctrine import Doctrine from game.transfers import Convoy -from game.ato.flighttype import FlightType @dataclass diff --git a/game/commander/tasks/primitive/dead.py b/game/commander/tasks/primitive/dead.py index a8211c89..5687e45c 100644 --- a/game/commander/tasks/primitive/dead.py +++ b/game/commander/tasks/primitive/dead.py @@ -2,11 +2,11 @@ from __future__ import annotations from dataclasses import dataclass +from game.ato.flighttype import FlightType from game.commander.missionproposals import EscortType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState from game.theater.theatergroundobject import IadsGroundObject -from game.ato.flighttype import FlightType @dataclass diff --git a/game/commander/tasks/primitive/oca.py b/game/commander/tasks/primitive/oca.py index de62b54c..bbe73e15 100644 --- a/game/commander/tasks/primitive/oca.py +++ b/game/commander/tasks/primitive/oca.py @@ -3,10 +3,10 @@ from __future__ import annotations from dataclasses import dataclass from random import randint +from game.ato.flighttype import FlightType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState from game.theater import ControlPoint -from game.ato.flighttype import FlightType @dataclass diff --git a/game/commander/tasks/primitive/refueling.py b/game/commander/tasks/primitive/refueling.py index f43e4941..bd228de8 100644 --- a/game/commander/tasks/primitive/refueling.py +++ b/game/commander/tasks/primitive/refueling.py @@ -2,10 +2,10 @@ from __future__ import annotations from dataclasses import dataclass +from game.ato.flighttype import FlightType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState from game.theater import MissionTarget -from game.ato.flighttype import FlightType @dataclass diff --git a/game/commander/tasks/primitive/strike.py b/game/commander/tasks/primitive/strike.py index bf230ed0..4e142e16 100644 --- a/game/commander/tasks/primitive/strike.py +++ b/game/commander/tasks/primitive/strike.py @@ -1,12 +1,11 @@ from __future__ import annotations from dataclasses import dataclass -from typing import Any +from game.ato.flighttype import FlightType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState from game.theater.theatergroundobject import TheaterGroundObject -from game.ato.flighttype import FlightType @dataclass diff --git a/game/dcs/helpers.py b/game/dcs/helpers.py index b8bcb751..a6c75b3c 100644 --- a/game/dcs/helpers.py +++ b/game/dcs/helpers.py @@ -3,9 +3,9 @@ from typing import Optional, Type from dcs.helicopters import helicopter_map from dcs.planes import plane_map from dcs.ships import ship_map +from dcs.statics import fortification_map, groundobject_map, warehouse_map, cargo_map from dcs.unittype import UnitType from dcs.vehicles import vehicle_map -from dcs.statics import fortification_map, groundobject_map, warehouse_map, cargo_map def unit_type_from_name(name: str) -> Optional[Type[UnitType]]: diff --git a/game/factions/faction.py b/game/factions/faction.py index f5b7c7a5..94805c15 100644 --- a/game/factions/faction.py +++ b/game/factions/faction.py @@ -11,6 +11,7 @@ from dcs.countries import country_dict from dcs.unittype import ShipType, StaticType from dcs.unittype import UnitType as DcsUnitType +from game.armedforces.forcegroup import ForceGroup from game.data.building_data import ( WW2_ALLIES_BUILDINGS, DEFAULT_AVAILABLE_BUILDINGS, @@ -25,12 +26,11 @@ from game.data.doctrine import ( COLDWAR_DOCTRINE, WWII_DOCTRINE, ) -from game.data.units import UnitClass from game.data.groups import GroupRole +from game.data.units import UnitClass from game.dcs.aircrafttype import AircraftType from game.dcs.groundunittype import GroundUnitType from game.dcs.shipunittype import ShipUnitType -from game.armedforces.forcegroup import ForceGroup from game.dcs.unittype import UnitType if TYPE_CHECKING: diff --git a/game/factions/factionloader.py b/game/factions/factionloader.py index d0722a00..2a513127 100644 --- a/game/factions/factionloader.py +++ b/game/factions/factionloader.py @@ -1,4 +1,5 @@ from __future__ import annotations + import json import logging from pathlib import Path diff --git a/game/layout/layout.py b/game/layout/layout.py index 38c0fac0..d5b946d4 100644 --- a/game/layout/layout.py +++ b/game/layout/layout.py @@ -1,7 +1,5 @@ from __future__ import annotations -from collections import defaultdict -import logging import random from dataclasses import dataclass, field from typing import TYPE_CHECKING, Iterator, Type, Optional @@ -28,7 +26,6 @@ from game.theater.theatergroundobject import ( IadsGroundObject, ) from game.theater.theatergroup import TheaterUnit -from game.utils import Heading if TYPE_CHECKING: from game.factions.faction import Faction diff --git a/game/layout/layoutloader.py b/game/layout/layoutloader.py index 98bbedf2..ade8c0e5 100644 --- a/game/layout/layoutloader.py +++ b/game/layout/layoutloader.py @@ -1,9 +1,9 @@ from __future__ import annotations -from collections import defaultdict import itertools import logging import pickle +from collections import defaultdict from concurrent.futures import ThreadPoolExecutor from pathlib import Path from typing import Iterator diff --git a/game/layout/layoutmapping.py b/game/layout/layoutmapping.py index 12da9b08..7f4a617a 100644 --- a/game/layout/layoutmapping.py +++ b/game/layout/layoutmapping.py @@ -1,6 +1,6 @@ from __future__ import annotations -from collections import defaultdict +from collections import defaultdict from dataclasses import dataclass, field from typing import Any, Optional, Type diff --git a/game/missiongenerator/aircraft/aircraftgenerator.py b/game/missiongenerator/aircraft/aircraftgenerator.py index 223bc00e..62614509 100644 --- a/game/missiongenerator/aircraft/aircraftgenerator.py +++ b/game/missiongenerator/aircraft/aircraftgenerator.py @@ -17,8 +17,8 @@ from game.ato.flighttype import FlightType from game.ato.package import Package from game.ato.starttype import StartType from game.factions.faction import Faction -from game.missiongenerator.missiondata import MissionData from game.missiongenerator.lasercoderegistry import LaserCodeRegistry +from game.missiongenerator.missiondata import MissionData from game.radio.radios import RadioRegistry from game.radio.tacan import TacanRegistry from game.runways import RunwayData diff --git a/game/missiongenerator/aircraft/flightgroupconfigurator.py b/game/missiongenerator/aircraft/flightgroupconfigurator.py index baeb284d..6e40caa2 100644 --- a/game/missiongenerator/aircraft/flightgroupconfigurator.py +++ b/game/missiongenerator/aircraft/flightgroupconfigurator.py @@ -12,9 +12,9 @@ from dcs.unitgroup import FlyingGroup from game.ato import Flight, FlightType from game.callsigns import callsign_for_support_unit from game.data.weapons import Pylon, WeaponType as WeaponTypeEnum -from game.missiongenerator.missiondata import MissionData, AwacsInfo, TankerInfo from game.missiongenerator.lasercoderegistry import LaserCodeRegistry from game.missiongenerator.logisticsgenerator import LogisticsGenerator +from game.missiongenerator.missiondata import MissionData, AwacsInfo, TankerInfo from game.radio.radios import RadioFrequency, RadioRegistry from game.radio.tacan import TacanBand, TacanRegistry, TacanUsage from game.runways import RunwayData diff --git a/game/missiongenerator/aircraft/waypoints/cargostop.py b/game/missiongenerator/aircraft/waypoints/cargostop.py index ea0302b7..08a57585 100644 --- a/game/missiongenerator/aircraft/waypoints/cargostop.py +++ b/game/missiongenerator/aircraft/waypoints/cargostop.py @@ -1,10 +1,8 @@ from dcs.point import MovingPoint +from dcs.point import PointAction from dcs.task import Land from game.utils import feet -from dcs.point import PointAction - - from .pydcswaypointbuilder import PydcsWaypointBuilder diff --git a/game/missiongenerator/aircraft/waypoints/refuel.py b/game/missiongenerator/aircraft/waypoints/refuel.py index c87036f8..775051f4 100644 --- a/game/missiongenerator/aircraft/waypoints/refuel.py +++ b/game/missiongenerator/aircraft/waypoints/refuel.py @@ -1,5 +1,6 @@ from dcs.point import MovingPoint from dcs.task import RefuelingTaskAction + from .pydcswaypointbuilder import PydcsWaypointBuilder diff --git a/game/missiongenerator/aircraft/waypoints/seadingress.py b/game/missiongenerator/aircraft/waypoints/seadingress.py index 3bbbcf81..0c0cd416 100644 --- a/game/missiongenerator/aircraft/waypoints/seadingress.py +++ b/game/missiongenerator/aircraft/waypoints/seadingress.py @@ -8,8 +8,8 @@ from dcs.task import ( OptECMUsing, WeaponType as DcsWeaponType, ) -from game.data.weapons import WeaponType +from game.data.weapons import WeaponType from game.theater import TheaterGroundObject from .pydcswaypointbuilder import PydcsWaypointBuilder diff --git a/game/missiongenerator/aircraft/waypoints/stopover.py b/game/missiongenerator/aircraft/waypoints/stopover.py index 9c292881..69732cb4 100644 --- a/game/missiongenerator/aircraft/waypoints/stopover.py +++ b/game/missiongenerator/aircraft/waypoints/stopover.py @@ -1,5 +1,4 @@ from dcs.point import MovingPoint, PointAction -from dcs.task import Land from .pydcswaypointbuilder import PydcsWaypointBuilder diff --git a/game/missiongenerator/logisticsgenerator.py b/game/missiongenerator/logisticsgenerator.py index 3ee7c12f..e6aa7f38 100644 --- a/game/missiongenerator/logisticsgenerator.py +++ b/game/missiongenerator/logisticsgenerator.py @@ -1,7 +1,9 @@ from typing import Any, Optional + from dcs import Mission -from dcs.unitgroup import FlyingGroup from dcs.statics import Fortification +from dcs.unitgroup import FlyingGroup + from game.ato import Flight from game.ato.flightplans.airassault import AirAssaultFlightPlan from game.ato.flightwaypointtype import FlightWaypointType @@ -9,7 +11,6 @@ from game.missiongenerator.missiondata import CargoInfo, LogisticsInfo from game.settings.settings import Settings from game.transfers import TransferOrder - ZONE_RADIUS = 300 CRATE_ZONE_RADIUS = 50 diff --git a/game/missiongenerator/luagenerator.py b/game/missiongenerator/luagenerator.py index e29350dd..09e98925 100644 --- a/game/missiongenerator/luagenerator.py +++ b/game/missiongenerator/luagenerator.py @@ -17,7 +17,6 @@ from game.plugins import LuaPluginManager from game.theater import TheaterGroundObject from game.theater.iadsnetwork.iadsrole import IadsRole from game.utils import escape_string_for_lua - from .missiondata import MissionData if TYPE_CHECKING: diff --git a/game/missiongenerator/missiondata.py b/game/missiongenerator/missiondata.py index 935f962b..566cbf75 100644 --- a/game/missiongenerator/missiondata.py +++ b/game/missiongenerator/missiondata.py @@ -3,9 +3,9 @@ from __future__ import annotations from dataclasses import dataclass, field from datetime import timedelta from typing import Optional, TYPE_CHECKING + from game.dcs.aircrafttype import AircraftType from game.missiongenerator.aircraft.flightdata import FlightData - from game.runways import RunwayData if TYPE_CHECKING: diff --git a/game/missiongenerator/tgogenerator.py b/game/missiongenerator/tgogenerator.py index b7382b92..939a6ac9 100644 --- a/game/missiongenerator/tgogenerator.py +++ b/game/missiongenerator/tgogenerator.py @@ -9,15 +9,13 @@ from __future__ import annotations import logging import random -from collections import defaultdict from typing import Any, Dict, Iterator, List, Optional, TYPE_CHECKING, Type import dcs.vehicles -from dcs import Mission, Point, unitgroup +from dcs import Mission, Point from dcs.action import DoScript, SceneryDestructionZone from dcs.condition import MapObjectIsDead from dcs.country import Country -from dcs.point import StaticPoint from dcs.ships import ( CVN_71, CVN_72, @@ -41,8 +39,8 @@ from dcs.unit import Unit, InvisibleFARP from dcs.unitgroup import MovingGroup, ShipGroup, StaticGroup, VehicleGroup from dcs.unittype import ShipType, VehicleType from dcs.vehicles import vehicle_map -from game.missiongenerator.missiondata import CarrierInfo, MissionData +from game.missiongenerator.missiondata import CarrierInfo, MissionData from game.radio.radios import RadioFrequency, RadioRegistry from game.radio.tacan import TacanBand, TacanChannel, TacanRegistry, TacanUsage from game.runways import RunwayData @@ -53,7 +51,7 @@ from game.theater.theatergroundobject import ( LhaGroundObject, MissileSiteGroundObject, ) -from game.theater.theatergroup import SceneryUnit, TheaterGroup, IadsGroundGroup +from game.theater.theatergroup import SceneryUnit, IadsGroundGroup from game.unitmap import UnitMap from game.utils import Heading, feet, knots, mps diff --git a/game/plugins/manager.py b/game/plugins/manager.py index 5ffdf9de..2cea82bf 100644 --- a/game/plugins/manager.py +++ b/game/plugins/manager.py @@ -4,7 +4,6 @@ from pathlib import Path from typing import Dict, List from game.settings import Settings - from .luaplugin import LuaPlugin diff --git a/game/radio/radios.py b/game/radio/radios.py index 2d74ad05..2299d281 100644 --- a/game/radio/radios.py +++ b/game/radio/radios.py @@ -6,6 +6,7 @@ import logging import re from dataclasses import dataclass from typing import Dict, FrozenSet, Iterator, List, Set, Tuple + from dcs.task import Modulation diff --git a/game/scenery_group.py b/game/scenery_group.py index 8659f3ba..3a4f4291 100644 --- a/game/scenery_group.py +++ b/game/scenery_group.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import Iterable, List, TYPE_CHECKING from dcs.mapping import Polygon diff --git a/game/server/eventstream/models.py b/game/server/eventstream/models.py index fcedb6e7..fbb17ac3 100644 --- a/game/server/eventstream/models.py +++ b/game/server/eventstream/models.py @@ -12,10 +12,10 @@ from game.server.frontlines.models import FrontLineJs from game.server.iadsnetwork.models import IadsConnectionJs from game.server.leaflet import LeafletPoint from game.server.mapzones.models import ThreatZonesJs -from game.server.navmesh.models import NavMeshJs -from game.server.tgos.models import TgoJs from game.server.mapzones.models import UnculledZoneJs +from game.server.navmesh.models import NavMeshJs from game.server.supplyroutes.models import SupplyRouteJs +from game.server.tgos.models import TgoJs if TYPE_CHECKING: from game import Game diff --git a/game/server/game/models.py b/game/server/game/models.py index b5089d2e..610f2ae1 100644 --- a/game/server/game/models.py +++ b/game/server/game/models.py @@ -7,12 +7,12 @@ from pydantic import BaseModel from game.server.controlpoints.models import ControlPointJs from game.server.flights.models import FlightJs from game.server.frontlines.models import FrontLineJs +from game.server.iadsnetwork.models import IadsNetworkJs from game.server.leaflet import LeafletPoint from game.server.mapzones.models import ThreatZoneContainerJs, UnculledZoneJs from game.server.navmesh.models import NavMeshesJs from game.server.supplyroutes.models import SupplyRouteJs from game.server.tgos.models import TgoJs -from game.server.iadsnetwork.models import IadsConnectionJs, IadsNetworkJs if TYPE_CHECKING: from game import Game diff --git a/game/server/iadsnetwork/models.py b/game/server/iadsnetwork/models.py index a00321ff..6a4a4fea 100644 --- a/game/server/iadsnetwork/models.py +++ b/game/server/iadsnetwork/models.py @@ -1,11 +1,11 @@ from __future__ import annotations + from uuid import UUID from pydantic import BaseModel from game.server.leaflet import LeafletPoint from game.theater.iadsnetwork.iadsnetwork import IadsNetworkNode, IadsNetwork -from game.theater.theatergroundobject import TheaterGroundObject class IadsConnectionJs(BaseModel): diff --git a/game/server/iadsnetwork/routes.py b/game/server/iadsnetwork/routes.py index 81cd28b1..8bc35a02 100644 --- a/game/server/iadsnetwork/routes.py +++ b/game/server/iadsnetwork/routes.py @@ -1,4 +1,5 @@ from uuid import UUID + from fastapi import APIRouter, Depends from game import Game diff --git a/game/server/supplyroutes/models.py b/game/server/supplyroutes/models.py index 68a8da5e..cc1dffed 100644 --- a/game/server/supplyroutes/models.py +++ b/game/server/supplyroutes/models.py @@ -1,8 +1,6 @@ from __future__ import annotations -import uuid from typing import Any, TYPE_CHECKING -from uuid import UUID from dcs import Point from pydantic import BaseModel diff --git a/game/squadrons/airwing.py b/game/squadrons/airwing.py index c674b617..de035b36 100644 --- a/game/squadrons/airwing.py +++ b/game/squadrons/airwing.py @@ -4,9 +4,9 @@ import itertools from collections import defaultdict from typing import Sequence, Iterator, TYPE_CHECKING, Optional -from game.dcs.aircrafttype import AircraftType from game.ato.ai_flight_planner_db import aircraft_for_task from game.ato.closestairfields import ObjectiveDistanceCache +from game.dcs.aircrafttype import AircraftType from .squadrondefloader import SquadronDefLoader from ..campaignloader.squadrondefgenerator import SquadronDefGenerator from ..factions.faction import Faction diff --git a/game/theater/controlpoint.py b/game/theater/controlpoint.py index 583b164d..8a3bdcdd 100644 --- a/game/theater/controlpoint.py +++ b/game/theater/controlpoint.py @@ -63,7 +63,6 @@ from .frontline import FrontLine from .missiontarget import MissionTarget from .theatergroundobject import ( GenericCarrierGroundObject, - IadsGroundObject, TheaterGroundObject, VehicleGroupGroundObject, ) diff --git a/game/theater/iadsnetwork/iadsnetwork.py b/game/theater/iadsnetwork/iadsnetwork.py index e053f479..6b1fdadf 100644 --- a/game/theater/iadsnetwork/iadsnetwork.py +++ b/game/theater/iadsnetwork/iadsnetwork.py @@ -1,13 +1,14 @@ from __future__ import annotations -from collections import defaultdict -from dataclasses import dataclass, field import logging +import uuid +from collections import defaultdict +from dataclasses import dataclass, field from typing import TYPE_CHECKING, Iterator, Optional from uuid import UUID -import uuid -from game.theater.iadsnetwork.iadsrole import IadsRole + from game.dcs.groundunittype import GroundUnitType +from game.theater.iadsnetwork.iadsrole import IadsRole from game.theater.theatergroundobject import ( IadsBuildingGroundObject, IadsGroundObject, diff --git a/game/theater/iadsnetwork/iadsrole.py b/game/theater/iadsnetwork/iadsrole.py index 135d1208..d6fbd365 100644 --- a/game/theater/iadsnetwork/iadsrole.py +++ b/game/theater/iadsnetwork/iadsrole.py @@ -1,9 +1,8 @@ from __future__ import annotations -from dataclasses import dataclass, field from enum import Enum -from game.data.groups import GroupTask +from game.data.groups import GroupTask from game.utils import Distance diff --git a/game/theater/landmap.py b/game/theater/landmap.py index 8192b057..d3663e9a 100644 --- a/game/theater/landmap.py +++ b/game/theater/landmap.py @@ -1,9 +1,9 @@ -from dataclasses import dataclass -import pickle -from functools import cached_property -from typing import Optional, Tuple, Union import logging +import pickle +from dataclasses import dataclass +from functools import cached_property from pathlib import Path +from typing import Optional, Union from shapely import geometry from shapely.geometry import MultiPolygon, Polygon diff --git a/game/theater/missiontarget.py b/game/theater/missiontarget.py index eeeb5dc7..dbb7241b 100644 --- a/game/theater/missiontarget.py +++ b/game/theater/missiontarget.py @@ -1,10 +1,8 @@ from __future__ import annotations -from collections.abc import Sequence -from typing import Iterator, TYPE_CHECKING, Union +from typing import Iterator, TYPE_CHECKING from dcs.mapping import Point -from dcs.unit import Unit if TYPE_CHECKING: from game.ato.flighttype import FlightType diff --git a/game/theater/theatergroundobject.py b/game/theater/theatergroundobject.py index 6bfb7c2f..9a0a2013 100644 --- a/game/theater/theatergroundobject.py +++ b/game/theater/theatergroundobject.py @@ -6,7 +6,6 @@ from abc import ABC from typing import Any, Iterator, List, Optional, TYPE_CHECKING from dcs.mapping import Point - from shapely.geometry import Point as ShapelyPoint from game.sidc import ( diff --git a/game/unitmap.py b/game/unitmap.py index 8298c14b..066536ff 100644 --- a/game/unitmap.py +++ b/game/unitmap.py @@ -10,10 +10,10 @@ from dcs.triggers import TriggerZone from dcs.unit import Unit from dcs.unitgroup import FlyingGroup, VehicleGroup, ShipGroup +from game.ato.flight import Flight from game.dcs.groundunittype import GroundUnitType from game.squadrons import Pilot from game.theater import Airfield, ControlPoint, TheaterUnit -from game.ato.flight import Flight from game.theater.theatergroup import SceneryUnit if TYPE_CHECKING: diff --git a/game/weather.py b/game/weather.py index 47d83211..8ae4720f 100644 --- a/game/weather.py +++ b/game/weather.py @@ -9,7 +9,6 @@ from typing import Optional, TYPE_CHECKING from dcs.cloud_presets import Clouds as PydcsClouds from dcs.weather import CloudPreset, Weather as PydcsWeather, Wind -from game.theater.daytimemap import DaytimeMap from game.theater.seasonalconditions import determine_season from game.timeofday import TimeOfDay from game.utils import Distance, Heading, Pressure, inches_hg, interpolate, meters diff --git a/qt_ui/widgets/QBudgetBox.py b/qt_ui/widgets/QBudgetBox.py index 30713c92..cff1cbf5 100644 --- a/qt_ui/widgets/QBudgetBox.py +++ b/qt_ui/widgets/QBudgetBox.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QLabel, QHBoxLayout, QGroupBox, QPushButton +from PySide2.QtWidgets import QHBoxLayout, QGroupBox, QPushButton import qt_ui.uiconstants as CONST from game import Game diff --git a/qt_ui/widgets/QFactionsInfos.py b/qt_ui/widgets/QFactionsInfos.py index c0ca25cd..a0244227 100644 --- a/qt_ui/widgets/QFactionsInfos.py +++ b/qt_ui/widgets/QFactionsInfos.py @@ -1,4 +1,5 @@ from PySide2.QtWidgets import QLabel, QGroupBox, QGridLayout + from game import Game diff --git a/qt_ui/widgets/QTopPanel.py b/qt_ui/widgets/QTopPanel.py index c8166759..102ac14c 100644 --- a/qt_ui/widgets/QTopPanel.py +++ b/qt_ui/widgets/QTopPanel.py @@ -11,7 +11,6 @@ from PySide2.QtWidgets import ( import qt_ui.uiconstants as CONST from game import Game, persistency -from game.game import TurnState from game.ato.package import Package from game.ato.traveltime import TotEstimator from game.profiling import logged_duration diff --git a/qt_ui/widgets/combos/QAircraftTypeSelector.py b/qt_ui/widgets/combos/QAircraftTypeSelector.py index f64a55b0..7fe8f0c2 100644 --- a/qt_ui/widgets/combos/QAircraftTypeSelector.py +++ b/qt_ui/widgets/combos/QAircraftTypeSelector.py @@ -1,5 +1,6 @@ """Combo box for selecting aircraft types.""" from PySide2.QtWidgets import QComboBox + from game.dcs.aircrafttype import AircraftType diff --git a/qt_ui/widgets/combos/QFlightTypeComboBox.py b/qt_ui/widgets/combos/QFlightTypeComboBox.py index bb214ad3..235049f8 100644 --- a/qt_ui/widgets/combos/QFlightTypeComboBox.py +++ b/qt_ui/widgets/combos/QFlightTypeComboBox.py @@ -1,9 +1,9 @@ """Combo box for selecting a flight's task type.""" from PySide2.QtWidgets import QComboBox + from game.ato.flighttype import FlightType from game.settings.settings import Settings - from game.theater import ConflictTheater, MissionTarget diff --git a/qt_ui/widgets/views/QStrikeTargetInfoView.py b/qt_ui/widgets/views/QStrikeTargetInfoView.py index 26feac8e..4c21d01a 100644 --- a/qt_ui/widgets/views/QStrikeTargetInfoView.py +++ b/qt_ui/widgets/views/QStrikeTargetInfoView.py @@ -1,10 +1,6 @@ -import random - from PySide2.QtGui import QStandardItemModel, QStandardItem from PySide2.QtWidgets import ( QGroupBox, - QLabel, - QWidget, QVBoxLayout, QListView, QAbstractItemView, diff --git a/qt_ui/windows/AirWingConfigurationDialog.py b/qt_ui/windows/AirWingConfigurationDialog.py index 4b30e412..00c46693 100644 --- a/qt_ui/windows/AirWingConfigurationDialog.py +++ b/qt_ui/windows/AirWingConfigurationDialog.py @@ -29,6 +29,7 @@ from PySide2.QtWidgets import ( QToolButton, QMessageBox, ) + from game import Game from game.ato.flighttype import FlightType from game.coalition import Coalition diff --git a/qt_ui/windows/AirWingDialog.py b/qt_ui/windows/AirWingDialog.py index d6a4b930..e31130b4 100644 --- a/qt_ui/windows/AirWingDialog.py +++ b/qt_ui/windows/AirWingDialog.py @@ -17,9 +17,9 @@ from PySide2.QtWidgets import ( QHBoxLayout, ) +from game.ato.flight import Flight from game.squadrons import Squadron from game.theater import ConflictTheater -from game.ato.flight import Flight from qt_ui.delegates import TwoColumnRowDelegate from qt_ui.models import GameModel, AirWingModel, SquadronModel, AtoModel from qt_ui.windows.SquadronDialog import SquadronDialog diff --git a/qt_ui/windows/GameUpdateSignal.py b/qt_ui/windows/GameUpdateSignal.py index 00e96264..ba7309c2 100644 --- a/qt_ui/windows/GameUpdateSignal.py +++ b/qt_ui/windows/GameUpdateSignal.py @@ -5,8 +5,8 @@ from typing import Optional from PySide2.QtCore import QObject, Signal from game import Game -from game.game import TurnState from game.debriefing import Debriefing +from game.game import TurnState class GameUpdateSignal(QObject): diff --git a/qt_ui/windows/QDebriefingWindow.py b/qt_ui/windows/QDebriefingWindow.py index ab0e67f0..9e2b6711 100644 --- a/qt_ui/windows/QDebriefingWindow.py +++ b/qt_ui/windows/QDebriefingWindow.py @@ -12,10 +12,8 @@ from PySide2.QtWidgets import ( ) from game.debriefing import Debriefing -from game.game import TurnState from qt_ui.windows.GameUpdateSignal import GameUpdateSignal - T = TypeVar("T") diff --git a/qt_ui/windows/QUnitInfoWindow.py b/qt_ui/windows/QUnitInfoWindow.py index 577eef00..d59f3bed 100644 --- a/qt_ui/windows/QUnitInfoWindow.py +++ b/qt_ui/windows/QUnitInfoWindow.py @@ -11,11 +11,11 @@ from PySide2.QtWidgets import ( ) import game.ato.ai_flight_planner_db +from game.ato.flighttype import FlightType from game.dcs.aircrafttype import AircraftType from game.dcs.groundunittype import GroundUnitType from game.dcs.unittype import UnitType from game.game import Game -from game.ato.flighttype import FlightType from qt_ui.uiconstants import AIRCRAFT_BANNERS, VEHICLE_BANNERS diff --git a/qt_ui/windows/basemenu/QBaseMenu2.py b/qt_ui/windows/basemenu/QBaseMenu2.py index 5f56f3be..6932c6b8 100644 --- a/qt_ui/windows/basemenu/QBaseMenu2.py +++ b/qt_ui/windows/basemenu/QBaseMenu2.py @@ -9,12 +9,10 @@ from PySide2.QtWidgets import ( QVBoxLayout, QWidget, ) -from dcs.ships import Stennis, KUZNECOW from game import Game from game.ato.flighttype import FlightType from game.config import RUNWAY_REPAIR_COST -from game.game import TurnState from game.server import EventStream from game.sim import GameUpdateEvents from game.theater import ( diff --git a/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py b/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py index c82605b8..dc4ce0d5 100644 --- a/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py +++ b/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py @@ -11,12 +11,12 @@ from PySide2.QtWidgets import ( ) from game.dcs.aircrafttype import AircraftType +from game.purchaseadapter import AircraftPurchaseAdapter from game.squadrons import Squadron from game.theater import ControlPoint from qt_ui.models import GameModel from qt_ui.uiconstants import ICONS from qt_ui.windows.basemenu.UnitTransactionFrame import UnitTransactionFrame -from game.purchaseadapter import AircraftPurchaseAdapter class QAircraftRecruitmentMenu(UnitTransactionFrame[Squadron]): diff --git a/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py b/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py index 77e2af8f..6149ce8e 100644 --- a/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py +++ b/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py @@ -2,10 +2,10 @@ from PySide2.QtCore import Qt from PySide2.QtWidgets import QGridLayout, QScrollArea, QVBoxLayout, QWidget from game.dcs.groundunittype import GroundUnitType +from game.purchaseadapter import GroundUnitPurchaseAdapter from game.theater import ControlPoint from qt_ui.models import GameModel from qt_ui.windows.basemenu.UnitTransactionFrame import UnitTransactionFrame -from game.purchaseadapter import GroundUnitPurchaseAdapter class QArmorRecruitmentMenu(UnitTransactionFrame[GroundUnitType]): diff --git a/qt_ui/windows/groundobject/QBuildingInfo.py b/qt_ui/windows/groundobject/QBuildingInfo.py index aa4e67ba..8a762a31 100644 --- a/qt_ui/windows/groundobject/QBuildingInfo.py +++ b/qt_ui/windows/groundobject/QBuildingInfo.py @@ -2,9 +2,9 @@ import os from PySide2.QtGui import QPixmap from PySide2.QtWidgets import QGroupBox, QHBoxLayout, QLabel, QVBoxLayout -from game.theater import TheaterUnit from game.config import REWARDS +from game.theater import TheaterUnit class QBuildingInfo(QGroupBox): diff --git a/qt_ui/windows/infos/QInfoList.py b/qt_ui/windows/infos/QInfoList.py index 7614d21f..f6f02cfb 100644 --- a/qt_ui/windows/infos/QInfoList.py +++ b/qt_ui/windows/infos/QInfoList.py @@ -2,7 +2,7 @@ from PySide2.QtCore import QItemSelectionModel, QPoint from PySide2.QtGui import QStandardItemModel from PySide2.QtWidgets import QListView -from game import Game, game +from game import Game from qt_ui.windows.infos.QInfoItem import QInfoItem diff --git a/qt_ui/windows/infos/QInfoPanel.py b/qt_ui/windows/infos/QInfoPanel.py index 2bb021ab..1bfbc204 100644 --- a/qt_ui/windows/infos/QInfoPanel.py +++ b/qt_ui/windows/infos/QInfoPanel.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QFrame, QVBoxLayout, QLabel, QGroupBox +from PySide2.QtWidgets import QVBoxLayout, QGroupBox from game import Game from qt_ui.windows.infos.QInfoList import QInfoList diff --git a/qt_ui/windows/logs/QLogsWindow.py b/qt_ui/windows/logs/QLogsWindow.py index 47bc872e..bc15d6ad 100644 --- a/qt_ui/windows/logs/QLogsWindow.py +++ b/qt_ui/windows/logs/QLogsWindow.py @@ -2,13 +2,13 @@ import logging import typing from PySide2.QtCore import Signal +from PySide2.QtGui import QTextCursor, QIcon from PySide2.QtWidgets import ( QDialog, QPlainTextEdit, QVBoxLayout, QPushButton, ) -from PySide2.QtGui import QTextCursor, QIcon from qt_ui.logging_handler import HookableInMemoryHandler diff --git a/qt_ui/windows/mission/flight/QFlightCreator.py b/qt_ui/windows/mission/flight/QFlightCreator.py index 1ffa8f0e..d882a4fd 100644 --- a/qt_ui/windows/mission/flight/QFlightCreator.py +++ b/qt_ui/windows/mission/flight/QFlightCreator.py @@ -14,12 +14,12 @@ from PySide2.QtWidgets import ( from dcs.unittype import FlyingType from game import Game +from game.ato.flight import Flight +from game.ato.flightroster import FlightRoster +from game.ato.package import Package from game.ato.starttype import StartType from game.squadrons.squadron import Squadron from game.theater import ControlPoint, OffMapSpawn -from game.ato.package import Package -from game.ato.flightroster import FlightRoster -from game.ato.flight import Flight from qt_ui.uiconstants import EVENT_ICONS from qt_ui.widgets.QFlightSizeSpinner import QFlightSizeSpinner from qt_ui.widgets.QLabeledWidget import QLabeledWidget diff --git a/qt_ui/windows/mission/flight/SquadronSelector.py b/qt_ui/windows/mission/flight/SquadronSelector.py index 0813843c..459de9d7 100644 --- a/qt_ui/windows/mission/flight/SquadronSelector.py +++ b/qt_ui/windows/mission/flight/SquadronSelector.py @@ -3,9 +3,9 @@ from typing import Optional from PySide2.QtWidgets import QComboBox +from game.ato.flighttype import FlightType from game.dcs.aircrafttype import AircraftType from game.squadrons.airwing import AirWing -from game.ato.flighttype import FlightType class SquadronSelector(QComboBox): diff --git a/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py b/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py index a41edb92..0b70af76 100644 --- a/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py +++ b/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py @@ -7,8 +7,8 @@ from PySide2.QtWidgets import ( ) from game import Game -from game.data.weapons import Pylon from game.ato.flight import Flight +from game.data.weapons import Pylon from qt_ui.windows.mission.flight.payload.QPylonEditor import QPylonEditor diff --git a/qt_ui/windows/mission/flight/payload/QPylonEditor.py b/qt_ui/windows/mission/flight/payload/QPylonEditor.py index acb4151e..057e12bf 100644 --- a/qt_ui/windows/mission/flight/payload/QPylonEditor.py +++ b/qt_ui/windows/mission/flight/payload/QPylonEditor.py @@ -5,9 +5,9 @@ from typing import Optional from PySide2.QtWidgets import QComboBox from game import Game -from game.data.weapons import Pylon, Weapon from game.ato.flight import Flight from game.ato.loadouts import Loadout +from game.data.weapons import Pylon, Weapon class QPylonEditor(QComboBox): diff --git a/qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py b/qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py index 8ff93f73..fd403442 100644 --- a/qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py +++ b/qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py @@ -14,9 +14,9 @@ from PySide2.QtWidgets import ( ) from game import Game -from game.squadrons.pilot import Pilot -from game.ato.flightroster import FlightRoster from game.ato.flight import Flight +from game.ato.flightroster import FlightRoster +from game.squadrons.pilot import Pilot from qt_ui.models import PackageModel diff --git a/qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py b/qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py index d52d438e..0c9070a5 100644 --- a/qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py +++ b/qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py @@ -7,12 +7,12 @@ from qt_ui.models import PackageModel from qt_ui.windows.mission.flight.settings.FlightAirfieldDisplay import ( FlightAirfieldDisplay, ) +from qt_ui.windows.mission.flight.settings.QCustomName import QFlightCustomName from qt_ui.windows.mission.flight.settings.QFlightSlotEditor import QFlightSlotEditor from qt_ui.windows.mission.flight.settings.QFlightStartType import QFlightStartType from qt_ui.windows.mission.flight.settings.QFlightTypeTaskInfo import ( QFlightTypeTaskInfo, ) -from qt_ui.windows.mission.flight.settings.QCustomName import QFlightCustomName class QGeneralFlightSettingsTab(QFrame): diff --git a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointItem.py b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointItem.py index 545c3a5d..0f84f9dd 100644 --- a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointItem.py +++ b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointItem.py @@ -1,5 +1,3 @@ -from typing import List - from PySide2.QtGui import QStandardItem from game.ato.flightwaypoint import FlightWaypoint diff --git a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py index 5044315e..49a417ab 100644 --- a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py +++ b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py @@ -4,10 +4,10 @@ from PySide2.QtCore import QItemSelectionModel, QPoint from PySide2.QtGui import QStandardItem, QStandardItemModel from PySide2.QtWidgets import QHeaderView, QTableView -from game.ato.package import Package -from game.ato.flightwaypointtype import FlightWaypointType -from game.ato.flightwaypoint import FlightWaypoint from game.ato.flight import Flight +from game.ato.flightwaypoint import FlightWaypoint +from game.ato.flightwaypointtype import FlightWaypointType +from game.ato.package import Package from qt_ui.windows.mission.flight.waypoints.QFlightWaypointItem import QWaypointItem diff --git a/qt_ui/windows/notes/QNotesWindow.py b/qt_ui/windows/notes/QNotesWindow.py index cb1419b5..4726f5e9 100644 --- a/qt_ui/windows/notes/QNotesWindow.py +++ b/qt_ui/windows/notes/QNotesWindow.py @@ -1,3 +1,5 @@ +from PySide2.QtCore import QTimer +from PySide2.QtGui import QTextCursor from PySide2.QtWidgets import ( QDialog, QPlainTextEdit, @@ -6,14 +8,10 @@ from PySide2.QtWidgets import ( QPushButton, QLabel, ) -from PySide2.QtGui import QTextCursor -from PySide2.QtCore import QTimer import qt_ui.uiconstants as CONST from game.game import Game -from time import sleep - class QNotesWindow(QDialog): def __init__(self, game: Game): diff --git a/qt_ui/windows/preferences/QLiberationPreferencesWindow.py b/qt_ui/windows/preferences/QLiberationPreferencesWindow.py index e23a3c08..1a2d2aa8 100644 --- a/qt_ui/windows/preferences/QLiberationPreferencesWindow.py +++ b/qt_ui/windows/preferences/QLiberationPreferencesWindow.py @@ -1,4 +1,4 @@ -from PySide2.QtGui import QIcon, Qt +from PySide2.QtGui import QIcon from PySide2.QtWidgets import QDialog, QVBoxLayout, QPushButton, QHBoxLayout from qt_ui.windows.preferences.QLiberationPreferences import QLiberationPreferences diff --git a/qt_ui/windows/stats/QAircraftChart.py b/qt_ui/windows/stats/QAircraftChart.py index 6516ec58..439f775b 100644 --- a/qt_ui/windows/stats/QAircraftChart.py +++ b/qt_ui/windows/stats/QAircraftChart.py @@ -2,6 +2,7 @@ from PySide2.QtCharts import QtCharts from PySide2.QtCore import QPoint, Qt from PySide2.QtGui import QPainter from PySide2.QtWidgets import QFrame, QGridLayout + from game import Game diff --git a/qt_ui/windows/stats/QArmorChart.py b/qt_ui/windows/stats/QArmorChart.py index e952c717..4a140b32 100644 --- a/qt_ui/windows/stats/QArmorChart.py +++ b/qt_ui/windows/stats/QArmorChart.py @@ -2,6 +2,7 @@ from PySide2.QtCharts import QtCharts from PySide2.QtCore import QPoint, Qt from PySide2.QtGui import QPainter from PySide2.QtWidgets import QFrame, QGridLayout + from game import Game