weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't show red support units on blue kneeboards.

Browse Source 
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1080
This commit is contained in:
Dan Albert 2021-05-20 17:24:02 -07:00
parent e12e2c4b0b
commit e795e96bfb
4 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
game/operation/operation.py
View File

@ -171,12 +171,15 @@ class Operation:
gen.add_dynamic_runway(dynamic_runway) gen.add_dynamic_runway(dynamic_runway)
for tanker in airsupportgen.air_support.tankers: for tanker in airsupportgen.air_support.tankers:
if tanker.blue:
gen.add_tanker(tanker) gen.add_tanker(tanker)
for aewc in airsupportgen.air_support.awacs: for aewc in airsupportgen.air_support.awacs:
if aewc.blue:
gen.add_awacs(aewc) gen.add_awacs(aewc)
for jtac in jtacs: for jtac in jtacs:
if jtac.blue:
gen.add_jtac(jtac) gen.add_jtac(jtac)
for flight in airgen.flights: for flight in airgen.flights:
@ -453,7 +456,7 @@ class Operation:
for tanker in airsupportgen.air_support.tankers: for tanker in airsupportgen.air_support.tankers:
luaData["Tankers"][tanker.callsign] = { luaData["Tankers"][tanker.callsign] = {
"dcsGroupName": tanker.dcsGroupName, "dcsGroupName": tanker.group_name,
"callsign": tanker.callsign, "callsign": tanker.callsign,
"variant": tanker.variant, "variant": tanker.variant,
"radio": tanker.freq.mhz, "radio": tanker.freq.mhz,
@ -463,14 +466,14 @@ class Operation:
if airsupportgen.air_support.awacs: if airsupportgen.air_support.awacs:
for awacs in airsupportgen.air_support.awacs: for awacs in airsupportgen.air_support.awacs:
luaData["AWACs"][awacs.callsign] = { luaData["AWACs"][awacs.callsign] = {
"dcsGroupName": awacs.dcsGroupName, "dcsGroupName": awacs.group_name,
"callsign": awacs.callsign, "callsign": awacs.callsign,
"radio": awacs.freq.mhz, "radio": awacs.freq.mhz,
} }
for jtac in jtacs: for jtac in jtacs:
luaData["JTACs"][jtac.callsign] = { luaData["JTACs"][jtac.callsign] = {
"dcsGroupName": jtac.dcsGroupName, "dcsGroupName": jtac.group_name,
"callsign": jtac.callsign, "callsign": jtac.callsign,
"zone": jtac.region, "zone": jtac.region,
"dcsUnit": jtac.unit_name, "dcsUnit": jtac.unit_name,

3
gen/aircraft.py
View File

@ -815,12 +815,13 @@ class AircraftConflictGenerator:
self.air_support.awacs.append( self.air_support.awacs.append(
AwacsInfo( AwacsInfo(
dcsGroupName=str(group.name), group_name=str(group.name),
callsign=callsign, callsign=callsign,
freq=channel, freq=channel,
depature_location=flight.departure.name, depature_location=flight.departure.name,
end_time=flight.flight_plan.mission_departure_time, end_time=flight.flight_plan.mission_departure_time,
start_time=flight.flight_plan.mission_start_time, start_time=flight.flight_plan.mission_start_time,
blue=flight.departure.captured,
) )
) )

18
gen/airsupportgen.py
View File

@ -35,23 +35,25 @@ AWACS_ALT = 13000
class AwacsInfo: class AwacsInfo:
"""AWACS information for the kneeboard.""" """AWACS information for the kneeboard."""
dcsGroupName: str group_name: str
callsign: str callsign: str
freq: RadioFrequency freq: RadioFrequency
depature_location: Optional[str] depature_location: Optional[str]
start_time: Optional[timedelta] start_time: Optional[timedelta]
end_time: Optional[timedelta] end_time: Optional[timedelta]
blue: bool
@dataclass @dataclass
class TankerInfo: class TankerInfo:
"""Tanker information for the kneeboard.""" """Tanker information for the kneeboard."""
dcsGroupName: str group_name: str
callsign: str callsign: str
variant: str variant: str
freq: RadioFrequency freq: RadioFrequency
tacan: TacanChannel tacan: TacanChannel
blue: bool
@dataclass @dataclass
@ -165,7 +167,14 @@ class AirSupportConflictGenerator:
tanker_group.points[0].tasks.append(SetImmortalCommand(True)) tanker_group.points[0].tasks.append(SetImmortalCommand(True))
self.air_support.tankers.append( self.air_support.tankers.append(
TankerInfo(str(tanker_group.name), callsign, variant, freq, tacan) TankerInfo(
str(tanker_group.name),
callsign,
variant,
freq,
tacan,
blue=True,
)
) )
if not self.game.settings.disable_legacy_aewc: if not self.game.settings.disable_legacy_aewc:
@ -196,12 +205,13 @@ class AirSupportConflictGenerator:
self.air_support.awacs.append( self.air_support.awacs.append(
AwacsInfo( AwacsInfo(
dcsGroupName=str(awacs_flight.name), group_name=str(awacs_flight.name),
callsign=callsign_for_support_unit(awacs_flight), callsign=callsign_for_support_unit(awacs_flight),
freq=freq, freq=freq,
depature_location=None, depature_location=None,
start_time=None, start_time=None,
end_time=None, end_time=None,
blue=True,
) )
) )
else: else:

12
gen/armor.py
View File

@ -68,11 +68,12 @@ INFANTRY_GROUP_SIZE = 5
class JtacInfo: class JtacInfo:
"""JTAC information.""" """JTAC information."""
dcsGroupName: str group_name: str
unit_name: str unit_name: str
callsign: str callsign: str
region: str region: str
code: str code: str
blue: bool
# TODO: Radio info? Type? # TODO: Radio info? Type?
@ -196,7 +197,14 @@ class GroundConflictGenerator:
# Note: Will need to change if we ever add ground based JTAC. # Note: Will need to change if we ever add ground based JTAC.
callsign = callsign_for_support_unit(jtac) callsign = callsign_for_support_unit(jtac)
self.jtacs.append( self.jtacs.append(
JtacInfo(str(jtac.name), n, callsign, frontline, str(code)) JtacInfo(
str(jtac.name),
n,
callsign,
frontline,
str(code),
blue=True,
)
) )
def gen_infantry_group_for_group( def gen_infantry_group_for_group(