diff --git a/resources/nevada.gif b/resources/nevada.gif index c73532c5..d57b199e 100644 Binary files a/resources/nevada.gif and b/resources/nevada.gif differ diff --git a/resources/persiangulf.gif b/resources/persiangulf.gif index af08e704..88f74c1a 100644 Binary files a/resources/persiangulf.gif and b/resources/persiangulf.gif differ diff --git a/resources/ui/cleared.png b/resources/ui/cleared.png new file mode 100644 index 00000000..2912f6de Binary files /dev/null and b/resources/ui/cleared.png differ diff --git a/resources/ui/sam.png b/resources/ui/sam.png new file mode 100644 index 00000000..26ea05c7 Binary files /dev/null and b/resources/ui/sam.png differ diff --git a/resources/ui/target.png b/resources/ui/target.png new file mode 100644 index 00000000..c93255c1 Binary files /dev/null and b/resources/ui/target.png differ diff --git a/theater/nevada.py b/theater/nevada.py index 66b8b350..c55b127d 100644 --- a/theater/nevada.py +++ b/theater/nevada.py @@ -9,8 +9,8 @@ from .base import * class NevadaTheater(ConflictTheater): terrain = dcs.terrain.Nevada() overview_image = "nevada.gif" - reference_points = {(nevada.Mina_Airport_3Q0.position.x, nevada.Mina_Airport_3Q0.position.y): (45, -360), - (nevada.Laughlin_Airport.position.x, nevada.Laughlin_Airport.position.y): (440, 80), } + reference_points = {(nevada.Mina_Airport_3Q0.position.x, nevada.Mina_Airport_3Q0.position.y): (45*2, -360*2), + (nevada.Laughlin_Airport.position.x, nevada.Laughlin_Airport.position.y): (440*2, 80*2), } landmap = load_landmap("resources\\nev_landmap.p") daytime_map = { "dawn": (4, 6), diff --git a/theater/persiangulf.py b/theater/persiangulf.py index ec55045f..6f4b0397 100644 --- a/theater/persiangulf.py +++ b/theater/persiangulf.py @@ -9,8 +9,8 @@ from .landmap import load_landmap class PersianGulfTheater(ConflictTheater): terrain = dcs.terrain.PersianGulf() overview_image = "persiangulf.gif" - reference_points = {(persiangulf.Sir_Abu_Nuayr.position.x, persiangulf.Sir_Abu_Nuayr.position.y): (321, 145), - (persiangulf.Sirri_Island.position.x, persiangulf.Sirri_Island.position.y): (347, 82), } + reference_points = {(persiangulf.Sir_Abu_Nuayr.position.x, persiangulf.Sir_Abu_Nuayr.position.y): (321*4, 145*4), + (persiangulf.Sirri_Island.position.x, persiangulf.Sirri_Island.position.y): (347*4, 82*4), } landmap = load_landmap("resources\\gulflandmap.p") daytime_map = { "dawn": (6, 8), diff --git a/ui/overviewcanvas.py b/ui/overviewcanvas.py index 8951aeb1..b18b6435 100644 --- a/ui/overviewcanvas.py +++ b/ui/overviewcanvas.py @@ -199,7 +199,8 @@ class OverviewCanvas: self.surface.blit(self.map, (0, 0)) - pygame.draw.rect(surface, (255, 0, 255), (mouse_pos[0], mouse_pos[1], 5, 5), 2) + # Debug + # pygame.draw.rect(surface, (255, 0, 255), (mouse_pos[0], mouse_pos[1], 5, 5), 2) for cp in self.game.theater.controlpoints: @@ -248,7 +249,7 @@ class OverviewCanvas: end_coords = self.transform_point(frontline_pos.point_from_heading(heading, distance), treshold=60) - pygame.draw.line(surface, color, start_coords, end_coords, 1) + pygame.draw.line(surface, color, start_coords, end_coords, 4) if self.display_bases.get(): for cp in self.game.theater.controlpoints: