From de0a3f929c011ce35d035101e405e76a6d50377f Mon Sep 17 00:00:00 2001 From: Khopa Date: Tue, 1 Dec 2020 13:49:09 +0100 Subject: [PATCH] Made WW2 Flak sites more compact, so it's easier to fit them in fields on the Normandy map. --- gen/sam/aaa_flak.py | 8 ++++---- gen/sam/aaa_ww2_ally_flak.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gen/sam/aaa_flak.py b/gen/sam/aaa_flak.py index 352e5431..4df555c0 100644 --- a/gen/sam/aaa_flak.py +++ b/gen/sam/aaa_flak.py @@ -29,7 +29,7 @@ class FlakGenerator(AirDefenseGroupGenerator): grid_x = random.randint(2, 3) grid_y = random.randint(2, 3) - spacing = random.randint(30, 60) + spacing = random.randint(20, 35) index = 0 mixed = random.choice([True, False]) @@ -46,7 +46,7 @@ class FlakGenerator(AirDefenseGroupGenerator): unit_type = random.choice(GFLAK) # Search lights - search_pos = self.get_circular_position(random.randint(2,3), 90) + search_pos = self.get_circular_position(random.randint(2,3), 80) for index, pos in enumerate(search_pos): self.add_unit(AirDefence.Flak_Searchlight_37, "SearchLight#" + str(index), pos[0], pos[1], self.heading) @@ -63,8 +63,8 @@ class FlakGenerator(AirDefenseGroupGenerator): for i in range(int(max(1,grid_x/2))): for j in range(int(max(1,grid_x/2))): self.add_unit(Unarmed.Blitz_3_6_6700A, "AAA#" + str(index), - self.position.x + 200 + 15*i + random.randint(1,5), - self.position.y + 15*j + random.randint(1,5), 90) + self.position.x + 125 + 15*i + random.randint(1,5), + self.position.y + 15*j + random.randint(1,5), 75) @classmethod def range(cls) -> AirDefenseRange: diff --git a/gen/sam/aaa_ww2_ally_flak.py b/gen/sam/aaa_ww2_ally_flak.py index b6a89192..6c2fed26 100644 --- a/gen/sam/aaa_ww2_ally_flak.py +++ b/gen/sam/aaa_ww2_ally_flak.py @@ -18,15 +18,15 @@ class AllyWW2FlakGenerator(AirDefenseGroupGenerator): def generate(self): - positions = self.get_circular_position(4, launcher_distance=50, coverage=360) + positions = self.get_circular_position(4, launcher_distance=30, coverage=360) for i, position in enumerate(positions): self.add_unit(AirDefence.AA_gun_QF_3_7, "AA#" + str(i), position[0], position[1], position[2]) - positions = self.get_circular_position(8, launcher_distance=100, coverage=360) + positions = self.get_circular_position(8, launcher_distance=60, coverage=360) for i, position in enumerate(positions): self.add_unit(AirDefence.AAA_M1_37mm, "AA#" + str(4 + i), position[0], position[1], position[2]) - positions = self.get_circular_position(8, launcher_distance=150, coverage=360) + positions = self.get_circular_position(8, launcher_distance=90, coverage=360) for i, position in enumerate(positions): self.add_unit(AirDefence.AAA_M45_Quadmount, "AA#" + str(12 + i), position[0], position[1], position[2])