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 diversified frontline distance

Browse Source
This commit is contained in:
walterroach 2020-12-13 12:21:09 -06:00
parent 25b72e1af4
commit d9ea33cbb9
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gen/armor.py
View File

@ -597,29 +597,36 @@ class GroundConflictGenerator:
return potential_target.points[0].position return potential_target.points[0].position
return None return None
def get_artilery_group_distance_from_frontline(self, group): @staticmethod
def get_artilery_group_distance_from_frontline(group: CombatGroup) -> int:
""" """
For artilery group, decide the distance from frontline with the range of the unit For artilery group, decide the distance from frontline with the range of the unit
""" """
rg = group.units[0].threat_range - 7500 rg = group.units[0].threat_range - 7500
if rg > DISTANCE_FROM_FRONTLINE[CombatGroupRole.ARTILLERY][1]: if rg > DISTANCE_FROM_FRONTLINE[CombatGroupRole.ARTILLERY][1]:
rg = DISTANCE_FROM_FRONTLINE[CombatGroupRole.ARTILLERY] rg = random.randint(
if rg < DISTANCE_FROM_FRONTLINE[CombatGroupRole.ARTILLERY][1]: DISTANCE_FROM_FRONTLINE[CombatGroupRole.ARTILLERY][0],
rg = DISTANCE_FROM_FRONTLINE[CombatGroupRole.TANK] DISTANCE_FROM_FRONTLINE[CombatGroupRole.ARTILLERY][1]
)
elif rg < DISTANCE_FROM_FRONTLINE[CombatGroupRole.ARTILLERY][1]:
rg = random.randint(
DISTANCE_FROM_FRONTLINE[CombatGroupRole.TANK][0],
DISTANCE_FROM_FRONTLINE[CombatGroupRole.TANK][1]
)
return rg return rg
def get_valid_position_for_group( def get_valid_position_for_group(
self, self,
conflict_position: Point, conflict_position: Point,
combat_width: int, combat_width: int,
distance_from_frontline: Tuple[int, int], distance_from_frontline: int,
heading: int, heading: int,
spawn_heading: int spawn_heading: int
): ):
shifted = conflict_position.point_from_heading(heading, random.randint(0, combat_width)) shifted = conflict_position.point_from_heading(heading, random.randint(0, combat_width))
desired_point = shifted.point_from_heading( desired_point = shifted.point_from_heading(
spawn_heading, spawn_heading,
random.randint(distance_from_frontline[0], distance_from_frontline[1]) distance_from_frontline
) )
return Conflict.find_ground_position(desired_point, combat_width, heading, self.conflict.theater) return Conflict.find_ground_position(desired_point, combat_width, heading, self.conflict.theater)
@ -639,7 +646,10 @@ class GroundConflictGenerator:
if group.role == CombatGroupRole.ARTILLERY: if group.role == CombatGroupRole.ARTILLERY:
distance_from_frontline = self.get_artilery_group_distance_from_frontline(group) distance_from_frontline = self.get_artilery_group_distance_from_frontline(group)
else: else:
distance_from_frontline = DISTANCE_FROM_FRONTLINE[group.role] distance_from_frontline = random.randint(
DISTANCE_FROM_FRONTLINE[group.role][0],
DISTANCE_FROM_FRONTLINE[group.role][1]
)
final_position = self.get_valid_position_for_group( final_position = self.get_valid_position_for_group(
position, position,
@ -655,7 +665,7 @@ class GroundConflictGenerator:
group.units[0], group.units[0],
len(group.units), len(group.units),
final_position, final_position,
random.randint(distance_from_frontline[0], distance_from_frontline[1]), distance_from_frontline,
heading=opposite_heading(spawn_heading), heading=opposite_heading(spawn_heading),
) )
if is_player: if is_player: