weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Interpret integer radio_preset keys as radio_id

Browse Source 
Allows for configuration of radios 3, 4, 5,...
This commit is contained in:
Raffson 2023-09-30 20:17:09 +02:00
parent 3024bd6479
commit 8e821c50e5
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/radio/channels.py
View File

@ -116,6 +116,8 @@ class CommonRadioChannelAllocator(RadioChannelAllocator):
radio_id = self.intra_flight_radio_index radio_id = self.intra_flight_radio_index
elif self.inter_flight_radio_index and radio == "inter_flight": elif self.inter_flight_radio_index and radio == "inter_flight":
radio_id = self.inter_flight_radio_index radio_id = self.inter_flight_radio_index
elif type(radio) == int:
radio_id = radio
for channel, freq in enumerate(presets[radio], start=1): for channel, freq in enumerate(presets[radio], start=1):
flight.assign_channel(radio_id, channel, freq) flight.assign_channel(radio_id, channel, freq)

4
game/squadrons/squadron.py
View File

@ -4,7 +4,7 @@ import logging
import random import random
from collections.abc import Iterable from collections.abc import Iterable
from dataclasses import dataclass, field 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 uuid import uuid4, UUID
from dcs.country import Country from dcs.country import Country
@ -40,7 +40,7 @@ class Squadron:
livery: Optional[str] livery: Optional[str]
primary_task: FlightType primary_task: FlightType
auto_assignable_mission_types: set[FlightType] auto_assignable_mission_types: set[FlightType]
radio_presets: dict[str, list[RadioFrequency]] radio_presets: dict[Union[str, int], list[RadioFrequency]]
operating_bases: OperatingBases operating_bases: OperatingBases
female_pilot_percentage: int female_pilot_percentage: int

4
game/squadrons/squadrondef.py
View File

@ -2,7 +2,7 @@ from __future__ import annotations
from dataclasses import dataclass from dataclasses import dataclass
from pathlib import Path from pathlib import Path
from typing import Optional, TYPE_CHECKING from typing import Optional, TYPE_CHECKING, Union
import yaml import yaml
from dcs.country import Country from dcs.country import Country
@ -28,7 +28,7 @@ class SquadronDef:
aircraft: AircraftType aircraft: AircraftType
livery: Optional[str] livery: Optional[str]
auto_assignable_mission_types: set[FlightType] auto_assignable_mission_types: set[FlightType]
radio_presets: dict[str, list[RadioFrequency]] radio_presets: dict[Union[str, int], list[RadioFrequency]]
operating_bases: OperatingBases operating_bases: OperatingBases
female_pilot_percentage: int female_pilot_percentage: int
pilot_pool: list[Pilot] pilot_pool: list[Pilot]