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

Tweaking helicopter stuff

Browse Source
This commit is contained in:
Raffson 2023-08-19 21:10:26 +02:00
parent 8a6b7b172c
commit 9b9905c5a3
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/ato/flightplans/airassault.py
View File

@ -92,7 +92,7 @@ class AirAssaultFlightPlan(FormationAttackFlightPlan, UiZoneDisplay):
def ui_zone(self) -> UiZone: def ui_zone(self) -> UiZone:
return UiZone( return UiZone(
[self.layout.target.position], [self.layout.targets[0].position],
self.ctld_target_zone_radius, self.ctld_target_zone_radius,
) )

1
game/ato/flightplans/escort.py
View File

@ -45,6 +45,7 @@ class Builder(FormationAttackBuilder[EscortFlightPlan, FormationAttackLayout]):
) )
ingress.only_for_player = True ingress.only_for_player = True
target.only_for_player = True target.only_for_player = True
hold = None
if not self.primary_flight_is_air_assault: if not self.primary_flight_is_air_assault:
hold = builder.hold(self._hold_point()) hold = builder.hold(self._hold_point())
elif self.package.primary_flight is not None: elif self.package.primary_flight is not None:

4
game/missiongenerator/aircraft/waypoints/joinpoint.py
View File

@ -35,7 +35,7 @@ class JoinPointBuilder(PydcsWaypointBuilder):
targets = [ targets = [
Targets.All.Air.Helicopters.id, Targets.All.Air.Helicopters.id,
Targets.All.GroundUnits.AirDefence.id, Targets.All.GroundUnits.AirDefence.id,
Targets.All.GroundUnits.GroundVehicles.UnarmedVehicles.id, Targets.All.GroundUnits.Infantry.id,
Targets.All.GroundUnits.GroundVehicles.ArmoredVehicles.id, Targets.All.GroundUnits.GroundVehicles.ArmoredVehicles.id,
Targets.All.Naval.Ships.ArmedShips.LightArmedShips.id, Targets.All.Naval.Ships.ArmedShips.LightArmedShips.id,
] ]
@ -84,7 +84,7 @@ class JoinPointBuilder(PydcsWaypointBuilder):
max_dist: float = 30.0, max_dist: float = 30.0,
vertical_spacing: float = 2000.0, vertical_spacing: float = 2000.0,
) -> None: ) -> None:
waypoint.tasks.append(OptROE(value=OptROE.Values.OpenFireWeaponFree)) waypoint.tasks.append(OptROE(value=OptROE.Values.OpenFire))
rx = (random.random() + 0.1) * 333 rx = (random.random() + 0.1) * 333
ry = feet(vertical_spacing).meters ry = feet(vertical_spacing).meters

3
game/missiongenerator/aircraft/waypoints/pydcswaypointbuilder.py
View File

@ -79,7 +79,8 @@ class PydcsWaypointBuilder:
if ( if (
self.flight.client_count > 0 self.flight.client_count > 0
and self.flight.unit_type.dcs_unit_type == AJS37 and self.flight.unit_type.dcs_unit_type == AJS37
) and (self.waypoint.waypoint_type not in TARGET_WAYPOINTS): and self.waypoint.waypoint_type not in TARGET_WAYPOINTS
):
return True return True
else: else:
return False return False

7
game/missiongenerator/aircraft/waypoints/splitpoint.py
View File

@ -19,9 +19,10 @@ class SplitPointBuilder(PydcsWaypointBuilder):
waypoint.tasks.append(OptFormation.rotary_wedge()) waypoint.tasks.append(OptFormation.rotary_wedge())
else: else:
waypoint.tasks.append(OptFormation.finger_four_close()) waypoint.tasks.append(OptFormation.finger_four_close())
waypoint.speed_locked = True if not self.flight.is_helo:
waypoint.speed = self.flight.coalition.doctrine.rtb_speed.meters_per_second waypoint.speed_locked = True
waypoint.ETA_locked = False waypoint.speed = self.flight.coalition.doctrine.rtb_speed.meters_per_second
waypoint.ETA_locked = False
if self.flight is self.package.primary_flight: if self.flight is self.package.primary_flight:
script = RunScript( script = RunScript(
f'trigger.action.setUserFlag("split-{id(self.package)}", true)' f'trigger.action.setUserFlag("split-{id(self.package)}", true)'