Generate WW2 Ship groups, added B17 to allies. Implemented modifiable doctrine to setup flight generator.

game/data/doctrine.py

@@ -0,0 +1,113 @@
+from game.utils import nm_to_meter, feet_to_meter
+
+MAX_NUMBER_OF_INTERCEPTION_GROUP = 3
+MISSION_DURATION = 120 # in minutes
+CAP_EVERY_X_MINUTES = 20
+CAS_EVERY_X_MINUTES = 30
+SEAD_EVERY_X_MINUTES = 40
+STRIKE_EVERY_X_MINUTES = 40
+
+INGRESS_EGRESS_DISTANCE = nm_to_meter(45)
+INGRESS_ALT = feet_to_meter(20000)
+EGRESS_ALT = feet_to_meter(20000)
+PATROL_ALT_RANGE = (feet_to_meter(15000), feet_to_meter(33000))
+NAV_ALT = 9144
+PATTERN_ALTITUDE = feet_to_meter(5000)
+
+CAP_DEFAULT_ENGAGE_DISTANCE = nm_to_meter(40)
+
+
+
+MODERN_DOCTRINE = {
+
+    "GENERATORS":{
+        "CAS": True,
+        "CAP": True,
+        "SEAD": True,
+        "STRIKE": True,
+        "ANTISHIP": True,
+    },
+
+    "STRIKE_MAX_RANGE": 1500000,
+    "SEAD_MAX_RANGE": 1500000,
+
+    "CAP_EVERY_X_MINUTES": 20,
+    "CAS_EVERY_X_MINUTES": 30,
+    "SEAD_EVERY_X_MINUTES": 40,
+    "STRIKE_EVERY_X_MINUTES": 40,
+
+    "INGRESS_EGRESS_DISTANCE": nm_to_meter(45),
+    "INGRESS_ALT": feet_to_meter(20000),
+    "EGRESS_ALT": feet_to_meter(20000),
+    "PATROL_ALT_RANGE": (feet_to_meter(15000), feet_to_meter(33000)),
+    "PATTERN_ALTITUDE": feet_to_meter(5000),
+
+    "CAP_PATTERN_LENGTH": (nm_to_meter(15), nm_to_meter(40)),
+    "FRONTLINE_CAP_DISTANCE_FROM_FRONTLINE": (nm_to_meter(6), nm_to_meter(15)),
+    "CAP_DISTANCE_FROM_CP": (nm_to_meter(10), nm_to_meter(40)),
+
+    "MAX_NUMBER_OF_INTERCEPTION_GROUP": 3,
+}
+
+COLDWAR_DOCTRINE = {
+
+    "GENERATORS": {
+        "CAS": True,
+        "CAP": True,
+        "SEAD": True,
+        "STRIKE": True,
+        "ANTISHIP": True,
+    },
+
+    "STRIKE_MAX_RANGE": 1500000,
+    "SEAD_MAX_RANGE": 1500000,
+
+    "CAP_EVERY_X_MINUTES": 20,
+    "CAS_EVERY_X_MINUTES": 30,
+    "SEAD_EVERY_X_MINUTES": 40,
+    "STRIKE_EVERY_X_MINUTES": 40,
+
+    "INGRESS_EGRESS_DISTANCE": nm_to_meter(30),
+    "INGRESS_ALT": feet_to_meter(18000),
+    "EGRESS_ALT": feet_to_meter(18000),
+    "PATROL_ALT_RANGE": (feet_to_meter(10000), feet_to_meter(24000)),
+    "PATTERN_ALTITUDE": feet_to_meter(5000),
+
+    "CAP_PATTERN_LENGTH": (nm_to_meter(12), nm_to_meter(24)),
+    "FRONTLINE_CAP_DISTANCE_FROM_FRONTLINE": (nm_to_meter(2), nm_to_meter(8)),
+    "CAP_DISTANCE_FROM_CP": (nm_to_meter(8), nm_to_meter(25)),
+
+    "MAX_NUMBER_OF_INTERCEPTION_GROUP": 3,
+}
+
+WWII_DOCTRINE = {
+
+    "GENERATORS": {
+        "CAS": True,
+        "CAP": True,
+        "SEAD": False,
+        "STRIKE": True,
+        "ANTISHIP": True,
+    },
+
+    "STRIKE_MAX_RANGE": 1500000,
+    "SEAD_MAX_RANGE": 1500000,
+
+    "CAP_EVERY_X_MINUTES": 20,
+    "CAS_EVERY_X_MINUTES": 30,
+    "SEAD_EVERY_X_MINUTES": 40,
+    "STRIKE_EVERY_X_MINUTES": 40,
+
+    "INGRESS_EGRESS_DISTANCE": nm_to_meter(7),
+    "INGRESS_ALT": feet_to_meter(8000),
+    "EGRESS_ALT": feet_to_meter(8000),
+    "PATROL_ALT_RANGE": (feet_to_meter(4000), feet_to_meter(15000)),
+    "PATTERN_ALTITUDE": feet_to_meter(5000),
+
+    "CAP_PATTERN_LENGTH": (nm_to_meter(8), nm_to_meter(18)),
+    "FRONTLINE_CAP_DISTANCE_FROM_FRONTLINE": (nm_to_meter(1), nm_to_meter(6)),
+    "CAP_DISTANCE_FROM_CP": (nm_to_meter(5), nm_to_meter(15)),
+
+    "MAX_NUMBER_OF_INTERCEPTION_GROUP": 3,
+
+}

game/db.py

@@ -162,6 +162,7 @@ PRICES = {
     P_51D_30_NA: 6,
     P_51D: 6,
     P_47D_30: 6,
+    B_17G: 18,
 
     # armor
     Armor.APC_MTLB: 4,
@@ -260,7 +261,6 @@ PRICES = {
     Artillery.M12_GMC: 2,
     Artillery.Sturmpanzer_IV_Brummbär: 2,
 
-
     # ship
     CV_1143_5_Admiral_Kuznetsov: 100,
     CVN_74_John_C__Stennis: 100,
@@ -350,6 +350,7 @@ UNIT_BY_TASK = {
         A_20G,
         P_47D_30,
         Ju_88A4,
+        B_17G
     ],
     Transport: [
         IL_76MD,
@@ -739,6 +740,8 @@ PLANE_PAYLOAD_OVERRIDES = {
     L_39C:COMMON_OVERRIDE,
     Su_17M4: COMMON_OVERRIDE,
     F_4E: COMMON_OVERRIDE,
+    P_47D_30:COMMON_OVERRIDE,
+    B_17G: COMMON_OVERRIDE,
 
     AH_64D:{
         CAS: "AGM-114K*16"
@@ -1053,4 +1056,5 @@ class DefaultLiveries:
 OH_58D.Liveries = DefaultLiveries
 F_16C_50.Liveries = DefaultLiveries
 P_51D_30_NA.Liveries = DefaultLiveries
-Ju_88A4.Liveries = DefaultLiveries
+Ju_88A4.Liveries = DefaultLiveries
+B_17G.Liveries = DefaultLiveries

game/factions/germany_1944.py

@@ -1,7 +1,9 @@
 from dcs.planes import *
+from dcs.ships import Uboat_VIIC_U_flak, Schnellboot_type_S130
 from dcs.vehicles import *
 
 from game.data.building_data import WW2_GERMANY_BUILDINGS
+from game.data.doctrine import WWII_DOCTRINE
 
 Germany_1944 = {
     "country": "Third Reich",
@@ -32,11 +34,10 @@ Germany_1944 = {
         Infantry.Infantry_Mauser_98,
         AirDefence.AAA_8_8cm_Flak_36,
     ],
-    "shorad":[
+    "shorad": [
         AirDefence.AAA_8_8cm_Flak_36,
     ],
     "objects": WW2_GERMANY_BUILDINGS,
-    "doctrine": {
-        # TODO
-    }
+    "doctrine": WWII_DOCTRINE,
+    "boat": [Uboat_VIIC_U_flak, Schnellboot_type_S130]
 }

game/factions/germany_1944_easy.py

@@ -1,7 +1,9 @@
 from dcs.planes import *
 from dcs.vehicles import *
+from dcs.ships import *
 
 from game.data.building_data import WW2_GERMANY_BUILDINGS
+from game.data.doctrine import WWII_DOCTRINE
 
 Germany_1944_Easy = {
     "country": "Third Reich",
@@ -29,7 +31,6 @@ Germany_1944_Easy = {
         AirDefence.AAA_8_8cm_Flak_36,
     ],
     "objects": WW2_GERMANY_BUILDINGS,
-    "doctrine": {
-        # TODO
-    }
+    "doctrine": WWII_DOCTRINE,
+    "boat": [Uboat_VIIC_U_flak, Schnellboot_type_S130]
 }

game/factions/usa_1944.py

@@ -3,6 +3,7 @@ from dcs.ships import *
 from dcs.vehicles import *
 
 from game.data.building_data import WW2_ALLIES_BUILDINGS
+from game.data.doctrine import WWII_DOCTRINE
 
 USA_1944 = {
     "country": "USA",
@@ -14,6 +15,7 @@ USA_1944 = {
         SpitfireLFMkIX,
         SpitfireLFMkIXCW,
         A_20G,
+        B_17G,
 
         Armor.MT_M4_Sherman,
         Armor.MT_M4A4_Sherman_Firefly,
@@ -38,5 +40,8 @@ USA_1944 = {
         AirDefence.AAA_Bofors_40mm,
     ], "shorad":[
         AirDefence.AAA_Bofors_40mm,
-    ], "objects": WW2_ALLIES_BUILDINGS
+    ],
+    "objects": WW2_ALLIES_BUILDINGS,
+    "doctrine": WWII_DOCTRINE,
+    "boat": [LS_Samuel_Chase]
 }

game/game.py

@@ -73,6 +73,15 @@ class Game:
         self.informations = []
         self.informations.append(Information("Game Start", "-" * 40, 0))
 
+
+    @property
+    def player_faction(self):
+        return db.FACTIONS[self.player_name]
+
+    @property
+    def enemy_faction(self):
+        return db.FACTIONS[self.enemy_name]
+
     def _roll(self, prob, mult):
         if self.settings.version == "dev":
             # always generate all events for dev

game/utils.py

@@ -0,0 +1,14 @@
+def meter_to_feet(value_in_meter):
+    return int(3.28084 * value_in_meter)
+
+
+def feet_to_meter(value_in_feet):
+    return int(float(value_in_feet)/3.048)
+
+
+def meter_to_nm(value_in_meter):
+    return int(float(value_in_meter)*0.000539957)
+
+
+def nm_to_meter(value_in_nm):
+    return int(float(value_in_nm)*1852)