diff --git a/game/db.py b/game/db.py index fc80fecb..21b09b5a 100644 --- a/game/db.py +++ b/game/db.py @@ -287,6 +287,7 @@ UNIT_BY_COUNTRY = { ], "USA": [ + F_5E_3, F_15C, FA_18C_hornet, AJS37, diff --git a/gen/airsupportgen.py b/gen/airsupportgen.py index 53dc01e0..6e4650d3 100644 --- a/gen/airsupportgen.py +++ b/gen/airsupportgen.py @@ -33,7 +33,7 @@ class AirSupportConflictGenerator: plane_type=tanker_unit, position=tanker_position, altitude=TANKER_ALT, - frequency=140, + frequency=240, start_type=StartType.Warm, tacanchannel="99X", ) @@ -49,6 +49,6 @@ class AirSupportConflictGenerator: altitude=AWACS_ALT, airport=None, position=self.conflict.position.random_point_within(AWACS_DISTANCE, AWACS_DISTANCE), - frequency=180, + frequency=244, start_type=StartType.Warm, ) diff --git a/gen/triggergen.py b/gen/triggergen.py index 859d0a6e..f199f841 100644 --- a/gen/triggergen.py +++ b/gen/triggergen.py @@ -149,10 +149,10 @@ class TriggersGenerator: description = "" description += "FREQUENCIES:" description += "\nFlight: 251 MHz AM" - description += "\nTanker: 10X/140 MHz" + description += "\nTanker: 10X/240 MHz" if awacs_enabled: - description += "\nAWACS: 180 MHz" + description += "\nAWACS: 244 MHz" if self.conflict.from_cp.is_global or self.conflict.to_cp.is_global: description += "\nCarrier: 20X/ICLS CHAN1" diff --git a/resources/gulflandmap.p b/resources/gulflandmap.p index 59f83a97..d64c975a 100644 Binary files a/resources/gulflandmap.p and b/resources/gulflandmap.p differ diff --git a/resources/tools/generate_landmap.py b/resources/tools/generate_landmap.py index 500df0dd..a758e0ee 100644 --- a/resources/tools/generate_landmap.py +++ b/resources/tools/generate_landmap.py @@ -4,11 +4,11 @@ from dcs.mission import Mission from dcs.terrain import PersianGulf m = Mission() -m.load_file("tools/cau_terrain.miz") +m.load_file("./gulf_terrain.miz") landmap = [] for plane_group in m.country("USA").plane_group: landmap.append([(x.position.x, x.position.y) for x in plane_group.points]) -with open("./caulandmap.p", "wb") as f: +with open("../gulflandmap.p", "wb") as f: pickle.dump(landmap, f) diff --git a/resources/tools/gulf_terrain.miz b/resources/tools/gulf_terrain.miz index ff0179df..a2ee9de2 100644 Binary files a/resources/tools/gulf_terrain.miz and b/resources/tools/gulf_terrain.miz differ diff --git a/ui/overviewcanvas.py b/ui/overviewcanvas.py index a235d8f1..d3ca3ac7 100644 --- a/ui/overviewcanvas.py +++ b/ui/overviewcanvas.py @@ -21,7 +21,7 @@ class OverviewCanvas: self.canvas = Canvas(frame, width=self.image.width(), height=self.image.height()) self.canvas.grid(column=0, row=0, sticky=NSEW) - def transform_point(self, p: Point) -> (int, int): + def transform_point(self, p: Point, treshold=30) -> (int, int): point_a = list(self.game.theater.reference_points.keys())[0] point_a_img = self.game.theater.reference_points[point_a] @@ -44,7 +44,6 @@ class OverviewCanvas: X = point_b_img[1] + X_offset * X_scale Y = point_a_img[0] - Y_offset * Y_scale - treshold = 30 return X > treshold and X or treshold, Y > treshold and Y or treshold def create_cp_title(self, coords, cp: ControlPoint): @@ -81,7 +80,9 @@ class OverviewCanvas: if cp.captured and not connected_cp.captured and Conflict.has_frontline_between(cp, connected_cp): frontline_pos, heading, distance = Conflict.frontline_vector(cp, connected_cp, self.game.theater) - start_coords, end_coords = self.transform_point(frontline_pos), self.transform_point(frontline_pos.point_from_heading(heading, distance)) + start_coords = self.transform_point(frontline_pos, treshold=10) + end_coords = self.transform_point(frontline_pos.point_from_heading(heading, distance), treshold=60) + self.canvas.create_line((*start_coords, *end_coords), width=2, fill=color) for cp in self.game.theater.controlpoints: