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

Revert "Remove front line minimum distance."

Browse Source 
This bug still isn't well understood and this made things worse.
Reverting until we understand the cause.

This reverts commit c844c364fa8a544b8f542a63c90da7162539640f.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1912
This commit is contained in:
Dan Albert 2022-01-24 16:59:36 -08:00
parent b3a3eb414a
commit f95795d547
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
game/theater/frontline.py
View File

@ -13,6 +13,9 @@ if TYPE_CHECKING:
from game.ato import FlightType from game.ato import FlightType
FRONTLINE_MIN_CP_DISTANCE = 5000
@dataclass @dataclass
class FrontLineSegment: class FrontLineSegment:
""" """
@ -170,8 +173,23 @@ class FrontLine(MissionTarget):
""" """
total_strength = self.blue_cp.base.strength + self.red_cp.base.strength total_strength = self.blue_cp.base.strength + self.red_cp.base.strength
if self.blue_cp.base.strength == 0: if self.blue_cp.base.strength == 0:
return 0 return self._adjust_for_min_dist(0)
if self.red_cp.base.strength == 0: if self.red_cp.base.strength == 0:
return self.attack_distance return self._adjust_for_min_dist(self.attack_distance)
strength_pct = self.blue_cp.base.strength / total_strength strength_pct = self.blue_cp.base.strength / total_strength
return strength_pct * self.attack_distance return self._adjust_for_min_dist(strength_pct * self.attack_distance)
def _adjust_for_min_dist(self, distance: float) -> float:
"""
Ensures the frontline conflict is never located within the minimum distance
constant of either end control point.
"""
if (distance > self.attack_distance / 2) and (
distance + FRONTLINE_MIN_CP_DISTANCE > self.attack_distance
):
distance = self.attack_distance - FRONTLINE_MIN_CP_DISTANCE
elif (distance < self.attack_distance / 2) and (
distance < FRONTLINE_MIN_CP_DISTANCE
):
distance = FRONTLINE_MIN_CP_DISTANCE
return distance