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

Handle threat/detection per group.

Browse Source 
Some SAMs have multiple groups (such as an SA-10 group with its
accompanying SA-15 and SA-19 groups). This shows each group's threat and
detection separately on the map, and also makes it so that an SA-10 with
dead radars will no longer contribute to the threat zone just because
the shilka next to it still has a functioning radar.

https://github.com/Khopa/dcs_liberation/issues/647
Fixes https://github.com/Khopa/dcs_liberation/issues/672
This commit is contained in:
Dan Albert
2020-12-26 15:52:36 -08:00
parent d946a9e526
commit a6dc3d2aff
4 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
qt_ui/widgets/map/QLiberationMap.py
View File

@@ -28,6 +28,7 @@ from PySide2.QtWidgets import (
from dcs import Point
from dcs.planes import F_16C_50
from dcs.mapping import point_from_heading
from dcs.unitgroup import Group
from shapely.geometry import (
LineString,
MultiPolygon,
@@ -36,7 +37,7 @@ from shapely.geometry import (
)
import qt_ui.uiconstants as CONST
from game import Game, db
from game import Game
from game.navmesh import NavMesh
from game.theater import ControlPoint, Enum
from game.theater.conflicttheater import FrontLine, ReferencePoint
@@ -446,10 +447,10 @@ class QLiberationMap(QGraphicsView):
return ((DisplayOptions.sam_ranges and cp.captured) or
(DisplayOptions.enemy_sam_ranges and not cp.captured))
def draw_threat_range(self, scene: QGraphicsScene, ground_object: TheaterGroundObject, cp: ControlPoint) -> None:
def draw_threat_range(self, scene: QGraphicsScene, group: Group, ground_object: TheaterGroundObject, cp: ControlPoint) -> None:
go_pos = self._transform_point(ground_object.position)
detection_range = ground_object.detection_range
threat_range = ground_object.threat_range
detection_range = ground_object.detection_range(group)
threat_range = ground_object.threat_range(group)
if threat_range:
threat_pos = self._transform_point(
ground_object.position + Point(threat_range.meters,
@@ -482,7 +483,8 @@ class QLiberationMap(QGraphicsView):
should_display = self.should_display_ground_objects_at(cp)
if ground_object.might_have_aa and should_display:
self.draw_threat_range(scene, ground_object, cp)
for group in ground_object.groups:
self.draw_threat_range(scene, group, ground_object, cp)
added_objects.append(ground_object.obj_name)
def reload_scene(self):