diff --git a/game/radio/channels.py b/game/radio/channels.py index d7039e02..f264de71 100644 --- a/game/radio/channels.py +++ b/game/radio/channels.py @@ -116,6 +116,8 @@ class CommonRadioChannelAllocator(RadioChannelAllocator): radio_id = self.intra_flight_radio_index elif self.inter_flight_radio_index and radio == "inter_flight": radio_id = self.inter_flight_radio_index + elif type(radio) == int: + radio_id = radio for channel, freq in enumerate(presets[radio], start=1): flight.assign_channel(radio_id, channel, freq) diff --git a/game/squadrons/squadron.py b/game/squadrons/squadron.py index b8987493..a74ee8ef 100644 --- a/game/squadrons/squadron.py +++ b/game/squadrons/squadron.py @@ -4,7 +4,7 @@ import logging import random from collections.abc import Iterable from dataclasses import dataclass, field -from typing import Optional, Sequence, TYPE_CHECKING, Any +from typing import Optional, Sequence, TYPE_CHECKING, Any, Union from uuid import uuid4, UUID from dcs.country import Country @@ -40,7 +40,7 @@ class Squadron: livery: Optional[str] primary_task: FlightType auto_assignable_mission_types: set[FlightType] - radio_presets: dict[str, list[RadioFrequency]] + radio_presets: dict[Union[str, int], list[RadioFrequency]] operating_bases: OperatingBases female_pilot_percentage: int diff --git a/game/squadrons/squadrondef.py b/game/squadrons/squadrondef.py index d6bc6610..9f213c6a 100644 --- a/game/squadrons/squadrondef.py +++ b/game/squadrons/squadrondef.py @@ -2,7 +2,7 @@ from __future__ import annotations from dataclasses import dataclass from pathlib import Path -from typing import Optional, TYPE_CHECKING +from typing import Optional, TYPE_CHECKING, Union import yaml from dcs.country import Country @@ -28,7 +28,7 @@ class SquadronDef: aircraft: AircraftType livery: Optional[str] auto_assignable_mission_types: set[FlightType] - radio_presets: dict[str, list[RadioFrequency]] + radio_presets: dict[Union[str, int], list[RadioFrequency]] operating_bases: OperatingBases female_pilot_percentage: int pilot_pool: list[Pilot]