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

Fix JTAC names

Browse Source 
- Add additional naming method to naming.py
- JTACs now use the ALPHA_MILITARY. So first JTAC is called JTAC Alpha, 2nd JTAC is called JTAC Bravo and so on

fixes #2120
This commit is contained in:
RndName 2022-03-28 13:49:43 +02:00
parent 088073b257
commit 6de50d1515
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
game/missiongenerator/flotgenerator.py
View File

@ -141,10 +141,8 @@ class FlotGenerator:
# Add JTAC # Add JTAC
if self.game.blue.faction.has_jtac: if self.game.blue.faction.has_jtac:
n = "JTAC" + str(self.conflict.blue_cp.id) + str(self.conflict.red_cp.id)
code: int code: int
freq = self.radio_registry.alloc_uhf() freq = self.radio_registry.alloc_uhf()
# If the option fc3LaserCode is enabled, force all JTAC # If the option fc3LaserCode is enabled, force all JTAC
# laser codes to 1113 to allow lasing for Su-25 Frogfoots and A-10A Warthogs. # laser codes to 1113 to allow lasing for Su-25 Frogfoots and A-10A Warthogs.
# Otherwise use 1688 for the first JTAC, 1687 for the second etc. # Otherwise use 1688 for the first JTAC, 1687 for the second etc.
@ -159,7 +157,7 @@ class FlotGenerator:
jtac = self.mission.flight_group( jtac = self.mission.flight_group(
country=self.mission.country(self.game.blue.country_name), country=self.mission.country(self.game.blue.country_name),
name=n, name=namegen.next_jtac_name(),
aircraft_type=utype.dcs_unit_type, aircraft_type=utype.dcs_unit_type,
position=position[0], position=position[0],
airport=None, airport=None,
@ -181,8 +179,8 @@ class FlotGenerator:
callsign = callsign_for_support_unit(jtac) callsign = callsign_for_support_unit(jtac)
self.air_support.jtacs.append( self.air_support.jtacs.append(
JtacInfo( JtacInfo(
str(jtac.name), jtac.name,
n, jtac.name,
callsign, callsign,
frontline, frontline,
str(code), str(code),

13
game/naming.py
View File

@ -452,6 +452,7 @@ class NameGenerator:
aircraft_number = 0 aircraft_number = 0
convoy_number = 0 convoy_number = 0
cargo_ship_number = 0 cargo_ship_number = 0
jtac_number = 0
animals: list[str] = list(ANIMALS) animals: list[str] = list(ANIMALS)
existing_alphas: List[str] = [] existing_alphas: List[str] = []
@ -462,6 +463,7 @@ class NameGenerator:
cls.infantry_number = 0 cls.infantry_number = 0
cls.convoy_number = 0 cls.convoy_number = 0
cls.cargo_ship_number = 0 cls.cargo_ship_number = 0
cls.jtac_number = 0
cls.animals = list(ANIMALS) cls.animals = list(ANIMALS)
cls.existing_alphas = [] cls.existing_alphas = []
@ -472,6 +474,7 @@ class NameGenerator:
cls.aircraft_number = 0 cls.aircraft_number = 0
cls.convoy_number = 0 cls.convoy_number = 0
cls.cargo_ship_number = 0 cls.cargo_ship_number = 0
cls.jtac_number = 0
@classmethod @classmethod
def next_aircraft_name(cls, country: Country, flight: Flight) -> str: def next_aircraft_name(cls, country: Country, flight: Flight) -> str:
@ -523,6 +526,16 @@ class NameGenerator:
cls.cargo_ship_number += 1 cls.cargo_ship_number += 1
return f"Cargo Ship {cls.cargo_ship_number:03}" return f"Cargo Ship {cls.cargo_ship_number:03}"
@classmethod
def next_jtac_name(cls) -> str:
name = (
ALPHA_MILITARY[cls.jtac_number]
if cls.jtac_number < len(ALPHA_MILITARY)
else str(cls.jtac_number + 1)
)
cls.jtac_number += 1
return f"JTAC {name}"
@classmethod @classmethod
def random_objective_name(cls) -> str: def random_objective_name(cls) -> str:
if cls.animals: if cls.animals: