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

Add special fuel case for C101 #492

Browse Source
This commit is contained in:
walterroach 2020-12-08 18:25:58 -06:00
parent 473cda971a
commit 6296896471
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gen/aircraft.py
View File

@ -20,12 +20,15 @@ from dcs.planes import (
B_17G, B_17G,
B_52H, B_52H,
Bf_109K_4, Bf_109K_4,
C_101EB,
C_101CC,
FW_190A8, FW_190A8,
FW_190D9, FW_190D9,
F_14B, F_14B,
I_16, I_16,
JF_17, JF_17,
Ju_88A4, Ju_88A4,
PlaneType,
P_47D_30, P_47D_30,
P_47D_30bl1, P_47D_30bl1,
P_47D_40, P_47D_40,
@ -791,14 +794,9 @@ class AircraftConflictGenerator:
joker_fuel=flight.flight_plan.joker_fuel joker_fuel=flight.flight_plan.joker_fuel
)) ))
# Special case so Su 33 carrier take off # Special case so Su 33 and C101 can take off
if unit_type is Su_33: if unit_type in [Su_33, C_101EB, C_101CC]:
if flight.flight_type is not CAP: self.set_reduced_fuel(flight, group, unit_type)
for unit in group.units:
unit.fuel = Su_33.fuel_max / 2.2
else:
for unit in group.units:
unit.fuel = Su_33.fuel_max * 0.8
def _generate_at_airport(self, name: str, side: Country, def _generate_at_airport(self, name: str, side: Country,
unit_type: Type[FlyingType], count: int, unit_type: Type[FlyingType], count: int,
@ -1078,6 +1076,20 @@ class AircraftConflictGenerator:
return group return group
@staticmethod
def set_reduced_fuel(flight: Flight, group: FlyingGroup, unit_type: Type[PlaneType]) -> None:
if unit_type is Su_33:
for unit in group.units:
if flight.flight_type is not CAP:
unit.fuel = Su_33.fuel_max / 2.2
else:
unit.fuel = Su_33.fuel_max * 0.8
elif unit_type in [C_101EB, C_101CC]:
for unit in group.units:
unit.fuel = unit_type.fuel_max * 0.5
else:
raise RuntimeError(f"No reduced fuel case for type {unit_type}")
@staticmethod @staticmethod
def configure_behavior( def configure_behavior(
group: FlyingGroup, group: FlyingGroup,
@ -1275,10 +1287,10 @@ class AircraftConflictGenerator:
if point.only_for_player and not flight.client_count: if point.only_for_player and not flight.client_count:
continue continue
filtered_points.append(point) filtered_points.append(point)
# Only add 1 target waypoint for Viggens. This only affects player flights, # Only add 1 target waypoint for Viggens. This only affects player flights,
# the Viggen can't have more than 9 waypoints which leaves us with two target point # the Viggen can't have more than 9 waypoints which leaves us with two target point
# under the current flight plans. # under the current flight plans.
# TODO: Make this smarter, it currently selects a random unit in the group for target, # TODO: Make this smarter, it currently selects a random unit in the group for target,
# this could be updated to make it pick the "best" two targets in the group. # this could be updated to make it pick the "best" two targets in the group.
if flight.unit_type is AJS37 and flight.client_count: if flight.unit_type is AJS37 and flight.client_count:
viggen_target_points = [ viggen_target_points = [
@ -1291,7 +1303,7 @@ class AircraftConflictGenerator:
point.waypoint_type not in TARGET_WAYPOINTS or idx == keep_target[0] point.waypoint_type not in TARGET_WAYPOINTS or idx == keep_target[0]
) )
] ]
for idx, point in enumerate(filtered_points): for idx, point in enumerate(filtered_points):
PydcsWaypointBuilder.for_waypoint( PydcsWaypointBuilder.for_waypoint(
point, group, package, flight, self.m point, group, package, flight, self.m
@ -1415,7 +1427,7 @@ class PydcsWaypointBuilder:
If the flight is a player controlled Viggen flight, no TOT should be set on any waypoint except actual target waypoints. If the flight is a player controlled Viggen flight, no TOT should be set on any waypoint except actual target waypoints.
""" """
if ( if (
(self.flight.client_count > 0 and self.flight.unit_type == AJS37) and (self.flight.client_count > 0 and self.flight.unit_type == AJS37) and
(self.waypoint.waypoint_type not in TARGET_WAYPOINTS) (self.waypoint.waypoint_type not in TARGET_WAYPOINTS)
): ):
return True return True

7
gen/triggergen.py
View File

@ -132,7 +132,7 @@ class TriggersGenerator:
self.mission.triggerrules.triggers.append(mark_trigger) self.mission.triggerrules.triggers.append(mark_trigger)
def _generate_capture_triggers(self, player_coalition: str, enemy_coalition: str) -> None: def _generate_capture_triggers(self, player_coalition: str, enemy_coalition: str) -> None:
"""Creates a pair of triggers for each control point of `cls.capture_zone_types`. """Creates a pair of triggers for each control point of `cls.capture_zone_types`.
One for the initial capture of a control point, and one if it is recaptured. One for the initial capture of a control point, and one if it is recaptured.
Directly appends to the global `base_capture_events` var declared by `dcs_libaration.lua` Directly appends to the global `base_capture_events` var declared by `dcs_libaration.lua`
""" """
@ -193,12 +193,9 @@ class TriggersGenerator:
self._set_allegiances(player_coalition, enemy_coalition) self._set_allegiances(player_coalition, enemy_coalition)
self._gen_markers() self._gen_markers()
self._generate_capture_triggers(player_coalition, enemy_coalition) self._generate_capture_triggers(player_coalition, enemy_coalition)
print("Test")
@classmethod @classmethod
def get_capture_zone_flag(cls): def get_capture_zone_flag(cls):
flag = cls.capture_zone_flag flag = cls.capture_zone_flag
cls.capture_zone_flag += 1 cls.capture_zone_flag += 1
return flag return flag