From aefc8685a1848dd554f231e0205970e5ee9e10a4 Mon Sep 17 00:00:00 2001
From: Khopa <clemguip@gmail.com>
Date: Sat, 7 Nov 2020 17:40:26 +0100
Subject: [PATCH] Added new FLAK units to WW2 allies factions

---
 game/db.py                          |  8 ++++++-
 gen/sam/aaa_ww2_ally_flak.py        | 34 +++++++++++++++++++++++++++++
 gen/sam/sam_group_generator.py      |  4 +++-
 resources/factions/allies_1944.json |  1 +
 resources/factions/uk_1944.json     |  1 +
 resources/factions/usa_1944.json    |  1 +
 6 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 gen/sam/aaa_ww2_ally_flak.py

diff --git a/game/db.py b/game/db.py
index 9bff2dcb..a1794764 100644
--- a/game/db.py
+++ b/game/db.py
@@ -422,6 +422,9 @@ PRICES = {
     Armor.StuG_III_Ausf__G: 12,
     Artillery.M12_GMC: 10,
     Artillery.Sturmpanzer_IV_Brummbär: 10,
+    Armor.Daimler_Armoured_Car: 8,
+    Armor.LT_Mk_VII_Tetrarch: 8,
+    Armor.M4_Tractor: 2,
 
     # ship
     CV_1143_5_Admiral_Kuznetsov: 100,
@@ -500,13 +503,16 @@ PRICES = {
     AirDefence.AAA_Flak_38: 6,
     AirDefence.AAA_8_8cm_Flak_36: 8,
     AirDefence.AAA_8_8cm_Flak_37: 9,
-    AirDefence.AAA_Flak_Vierling_38:6,
+    AirDefence.AAA_Flak_Vierling_38: 5,
     AirDefence.AAA_Kdo_G_40: 8,
     AirDefence.Flak_Searchlight_37: 4,
     AirDefence.Maschinensatz_33: 10,
     AirDefence.AAA_8_8cm_Flak_41: 10,
     AirDefence.EWR_FuMG_401_Freya_LZ: 25,
     AirDefence.AAA_Bofors_40mm: 8,
+    AirDefence.AAA_M1_37mm: 7,
+    AirDefence.AAA_M45_Quadmount: 4,
+    AirDefence.AA_gun_QF_3_7: 10,
 
     # FRENCH PACK MOD
     frenchpack.AMX_10RCR: 10,
diff --git a/gen/sam/aaa_ww2_ally_flak.py b/gen/sam/aaa_ww2_ally_flak.py
new file mode 100644
index 00000000..7c449dba
--- /dev/null
+++ b/gen/sam/aaa_ww2_ally_flak.py
@@ -0,0 +1,34 @@
+import random
+
+from dcs.vehicles import AirDefence, Unarmed, Armor
+
+from gen.sam.group_generator import GroupGenerator
+
+
+class AllyWW2FlakGenerator(GroupGenerator):
+    """
+    This generate an ally flak artillery group
+    """
+
+    name = "WW2 Ally Flak Site"
+    price = 140
+
+    def generate(self):
+
+        positions = self.get_circular_position(4, launcher_distance=50, 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)
+        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)
+        for i, position in enumerate(positions):
+            self.add_unit(AirDefence.AAA_M45_Quadmount, "AA#" + str(12 + i), position[0], position[1], position[2])
+
+        # Add a commander truck
+        self.add_unit(Unarmed.Willys_MB, "CMD#1", self.position.x, self.position.y - 20, random.randint(0, 360))
+        self.add_unit(Armor.M30_Cargo_Carrier, "LOG#1", self.position.x, self.position.y + 20, random.randint(0, 360))
+        self.add_unit(Armor.M4_Tractor, "LOG#2", self.position.x + 20, self.position.y, random.randint(0, 360))
+        self.add_unit(Unarmed.Bedford_MWD, "LOG#3", self.position.x - 20, self.position.y, random.randint(0, 360))
diff --git a/gen/sam/sam_group_generator.py b/gen/sam/sam_group_generator.py
index d49bc85d..5bafd6f5 100644
--- a/gen/sam/sam_group_generator.py
+++ b/gen/sam/sam_group_generator.py
@@ -8,6 +8,7 @@ from game import Game, db
 from gen.sam.aaa_bofors import BoforsGenerator
 from gen.sam.aaa_flak import FlakGenerator
 from gen.sam.aaa_flak18 import Flak18Generator
+from gen.sam.aaa_ww2_ally_flak import AllyWW2FlakGenerator
 from gen.sam.aaa_zu23_insurgent import ZU23InsurgentGenerator
 from gen.sam.cold_war_flak import EarlyColdWarFlakGenerator, ColdWarFlakGenerator
 from gen.sam.group_generator import GroupGenerator
@@ -69,7 +70,8 @@ SAM_MAP = {
     "Flak18Generator": Flak18Generator,
     "ColdWarFlakGenerator": ColdWarFlakGenerator,
     "EarlyColdWarFlakGenerator": EarlyColdWarFlakGenerator,
-    "FreyaGenerator": FreyaGenerator
+    "FreyaGenerator": FreyaGenerator,
+    "AllyWW2FlakGenerator": AllyWW2FlakGenerator
 }
 
 SAM_PRICES = {
diff --git a/resources/factions/allies_1944.json b/resources/factions/allies_1944.json
index 622b0447..0f07247a 100644
--- a/resources/factions/allies_1944.json
+++ b/resources/factions/allies_1944.json
@@ -40,6 +40,7 @@
     "BoforsGenerator"
   ],
   "sams": [
+    "AllyWW2FlakGenerator",
     "BoforsGenerator"
   ],
   "aircraft_carrier": [
diff --git a/resources/factions/uk_1944.json b/resources/factions/uk_1944.json
index b30c7f34..29c8ddd7 100644
--- a/resources/factions/uk_1944.json
+++ b/resources/factions/uk_1944.json
@@ -35,6 +35,7 @@
     "BoforsGenerator"
   ],
   "sams": [
+    "AllyWW2FlakGenerator",
     "BoforsGenerator"
   ],
   "aircraft_carrier": [
diff --git a/resources/factions/usa_1944.json b/resources/factions/usa_1944.json
index ce7084a3..ac6e2052 100644
--- a/resources/factions/usa_1944.json
+++ b/resources/factions/usa_1944.json
@@ -34,6 +34,7 @@
     "BoforsGenerator"
   ],
   "sams": [
+    "AllyWW2FlakGenerator",
     "BoforsGenerator"
   ],
   "aircraft_carrier": [