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

Updated pydcs version.

Browse Source
This commit is contained in:
SnappyComebacks 2021-05-07 19:37:27 -06:00 committed by Dan Albert
parent 2ca875192a
commit 426f06045e
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gen/aircraft.py
View File

@ -1615,7 +1615,7 @@ class PydcsWaypointBuilder:
waypoint = self.group.add_waypoint( waypoint = self.group.add_waypoint(
Point(self.waypoint.x, self.waypoint.y), Point(self.waypoint.x, self.waypoint.y),
self.waypoint.alt.meters, self.waypoint.alt.meters,
name=self.mission.string(self.waypoint.name), name=self.waypoint.name,
) )
if self.waypoint.flyover: if self.waypoint.flyover:

18
gen/groundobjectsgen.py
View File

@ -93,13 +93,11 @@ class GenericGroundObjectGenerator:
position=group.position, position=group.position,
heading=group.units[0].heading, heading=group.units[0].heading,
) )
vg.units[0].name = self.m.string(group.units[0].name) vg.units[0].name = group.units[0].name
vg.units[0].player_can_drive = True vg.units[0].player_can_drive = True
for i, u in enumerate(group.units): for i, u in enumerate(group.units):
if i > 0: if i > 0:
vehicle = Vehicle( vehicle = Vehicle(self.m.next_unit_id(), u.name, u.type)
self.m.next_unit_id(), self.m.string(u.name), u.type
)
vehicle.position.x = u.position.x vehicle.position.x = u.position.x
vehicle.position.y = u.position.y vehicle.position.y = u.position.y
vehicle.heading = u.heading vehicle.heading = u.heading
@ -330,13 +328,13 @@ class GenericCarrierGenerator(GenericGroundObjectGenerator):
heading=group.units[0].heading, heading=group.units[0].heading,
) )
ship_group.set_frequency(atc_channel.hertz) ship_group.set_frequency(atc_channel.hertz)
ship_group.units[0].name = self.m.string(group.units[0].name) ship_group.units[0].name = group.units[0].name
return ship_group return ship_group
def create_ship(self, unit: Unit, atc_channel: RadioFrequency) -> Ship: def create_ship(self, unit: Unit, atc_channel: RadioFrequency) -> Ship:
ship = Ship( ship = Ship(
self.m.next_unit_id(), self.m.next_unit_id(),
self.m.string(unit.name), unit.name,
unit_type_from_name(unit.type), unit_type_from_name(unit.type),
) )
ship.position.x = unit.position.x ship.position.x = unit.position.x
@ -481,11 +479,11 @@ class ShipObjectGenerator(GenericGroundObjectGenerator):
position=group_def.position, position=group_def.position,
heading=group_def.units[0].heading, heading=group_def.units[0].heading,
) )
group.units[0].name = self.m.string(group_def.units[0].name) group.units[0].name = group_def.units[0].name
# TODO: Skipping the first unit looks like copy pasta from the carrier. # TODO: Skipping the first unit looks like copy pasta from the carrier.
for unit in group_def.units[1:]: for unit in group_def.units[1:]:
unit_type = unit_type_from_name(unit.type) unit_type = unit_type_from_name(unit.type)
ship = Ship(self.m.next_unit_id(), self.m.string(unit.name), unit_type) ship = Ship(self.m.next_unit_id(), unit.name, unit_type)
ship.position.x = unit.position.x ship.position.x = unit.position.x
ship.position.y = unit.position.y ship.position.y = unit.position.y
ship.heading = unit.heading ship.heading = unit.heading
@ -524,11 +522,11 @@ class HelipadGenerator:
for i, helipad in enumerate(self.cp.helipads): for i, helipad in enumerate(self.cp.helipads):
name = self.cp.name + "_helipad_" + str(i) name = self.cp.name + "_helipad_" + str(i)
logging.info("Generating helipad : " + name) logging.info("Generating helipad : " + name)
pad = SingleHeliPad(name=self.m.string(name + "_unit")) pad = SingleHeliPad(name=(name + "_unit"))
pad.position = Point(helipad.x, helipad.y) pad.position = Point(helipad.x, helipad.y)
pad.heading = helipad.heading pad.heading = helipad.heading
# pad.heliport_frequency = self.radio_registry.alloc_uhf() TODO : alloc radio & callsign # pad.heliport_frequency = self.radio_registry.alloc_uhf() TODO : alloc radio & callsign
sg = unitgroup.StaticGroup(self.m.next_group_id(), self.m.string(name)) sg = unitgroup.StaticGroup(self.m.next_group_id(), name)
sg.add_unit(pad) sg.add_unit(pad)
sp = StaticPoint() sp = StaticPoint()
sp.position = pad.position sp.position = pad.position

2
pydcs

@ -1 +1 @@
Subproject commit 84247a9fa108174b4f9696136a413d53cee23533 Subproject commit ea94bca55c83520038edc7c7fa43648376ec72a4