diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index 31e4901f..1a2ad9a5 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -40,6 +40,7 @@ COLORS: Dict[str, QColor] = { "light_blue": QColor(105, 182, 240, 90), "blue": QColor(0, 132, 255), "dark_blue": QColor(45, 62, 80), + "sea_blue": QColor(52, 68, 85), "blue_transparent": QColor(0, 132, 255, 20), "purple": QColor(187, 137, 255), diff --git a/qt_ui/widgets/map/QLiberationMap.py b/qt_ui/widgets/map/QLiberationMap.py index 568d66ac..20f9e151 100644 --- a/qt_ui/widgets/map/QLiberationMap.py +++ b/qt_ui/widgets/map/QLiberationMap.py @@ -507,6 +507,11 @@ class QLiberationMap(QGraphicsView): # Polygon display mode if self.game.theater.landmap is not None: + for sea_zone in self.game.theater.landmap[2]: + print(sea_zone) + poly = QPolygonF([QPointF(*self._transform_point(Point(point[0], point[1]))) for point in sea_zone]) + scene.addPolygon(poly, CONST.COLORS["sea_blue"], CONST.COLORS["sea_blue"]) + for inclusion_zone in self.game.theater.landmap[0]: poly = QPolygonF([QPointF(*self._transform_point(Point(point[0], point[1]))) for point in inclusion_zone]) scene.addPolygon(poly, CONST.COLORS["grey"], CONST.COLORS["dark_grey"]) @@ -516,3 +521,5 @@ class QLiberationMap(QGraphicsView): scene.addPolygon(poly, CONST.COLORS["grey"], CONST.COLORS["dark_dark_grey"]) + + diff --git a/resources/caulandmap.p b/resources/caulandmap.p index 68f6806f..5736275a 100644 Binary files a/resources/caulandmap.p and b/resources/caulandmap.p differ diff --git a/resources/channellandmap.p b/resources/channellandmap.p index c0fe728e..649ad174 100644 Binary files a/resources/channellandmap.p and b/resources/channellandmap.p differ diff --git a/resources/gulflandmap.p b/resources/gulflandmap.p index e0447fbd..77b367f1 100644 Binary files a/resources/gulflandmap.p and b/resources/gulflandmap.p differ diff --git a/resources/nevlandmap.p b/resources/nevlandmap.p index 1a9d8cc4..1086ba36 100644 Binary files a/resources/nevlandmap.p and b/resources/nevlandmap.p differ diff --git a/resources/normandylandmap.p b/resources/normandylandmap.p index 0f41f8ea..e179bbf8 100644 Binary files a/resources/normandylandmap.p and b/resources/normandylandmap.p differ diff --git a/resources/syrialandmap.p b/resources/syrialandmap.p index d4169854..96b14c0e 100644 Binary files a/resources/syrialandmap.p and b/resources/syrialandmap.p differ diff --git a/resources/tools/cau_terrain.miz b/resources/tools/cau_terrain.miz index c885927d..e151b22d 100644 Binary files a/resources/tools/cau_terrain.miz and b/resources/tools/cau_terrain.miz differ diff --git a/resources/tools/channel_terrain.miz b/resources/tools/channel_terrain.miz index 53afc022..055cfcae 100644 Binary files a/resources/tools/channel_terrain.miz and b/resources/tools/channel_terrain.miz differ diff --git a/resources/tools/generate_landmap.py b/resources/tools/generate_landmap.py index 816747c5..1cdf2931 100644 --- a/resources/tools/generate_landmap.py +++ b/resources/tools/generate_landmap.py @@ -1,15 +1,15 @@ import pickle from dcs.mission import Mission -from dcs.planes import A_10C -for terrain in ["cau"]: +for terrain in ["cau", "nev", "syria", "channel", "normandy", "gulf"]: print("Terrain " + terrain) m = Mission() m.load_file("./{}_terrain.miz".format(terrain)) inclusion_zones = [] exclusion_zones = [] + seas_zones = [] for plane_group in m.country("USA").plane_group: zone = [(x.position.x, x.position.y) for x in plane_group.points] @@ -22,6 +22,10 @@ for terrain in ["cau"]: else: inclusion_zones.append(zone) + for ship_group in m.country("USA").ship_group: + zone = [(x.position.x, x.position.y) for x in ship_group.points] + seas_zones.append(zone) + with open("../{}landmap.p".format(terrain), "wb") as f: - print(len(inclusion_zones), len(exclusion_zones)) - pickle.dump((inclusion_zones, exclusion_zones), f) + print(len(inclusion_zones), len(exclusion_zones), len(seas_zones)) + pickle.dump((inclusion_zones, exclusion_zones, seas_zones), f) diff --git a/resources/tools/gulf_terrain.miz b/resources/tools/gulf_terrain.miz index 52ca6d05..6713c833 100644 Binary files a/resources/tools/gulf_terrain.miz and b/resources/tools/gulf_terrain.miz differ diff --git a/resources/tools/normandy_terrain.miz b/resources/tools/normandy_terrain.miz index cb42c13c..e848ee4b 100644 Binary files a/resources/tools/normandy_terrain.miz and b/resources/tools/normandy_terrain.miz differ diff --git a/resources/tools/syria_terrain.miz b/resources/tools/syria_terrain.miz index a1a9fae9..8b26b423 100644 Binary files a/resources/tools/syria_terrain.miz and b/resources/tools/syria_terrain.miz differ