Added new campaign generation settings. Added Helicopter Carrier to China faction.

game/db.py

@@ -18,7 +18,7 @@ from game.factions.bluefor_coldwar import BLUEFOR_COLDWAR
 from game.factions.bluefor_coldwar_a4 import BLUEFOR_COLDWAR_A4
 from game.factions.bluefor_coldwar_mods import BLUEFOR_COLDWAR_MODS
 from game.factions.canada_2005 import Canada_2005
-from game.factions.china_2000 import China_2000
+from game.factions.china_2010 import China_2010
 from game.factions.france_1995 import France_1995
 from game.factions.france_2005 import France_2005
 from game.factions.france_modded import France_2005_Modded
@@ -759,7 +759,7 @@ FACTIONS = {
 
     "Israel 2000": Israel_2000,
 
-    "China 2000": China_2000,
+    "China 2010": China_2010,
 
     "Sweden 1990": Sweden_1990,
 

game/factions/china_2010.py

@@ -3,7 +3,7 @@ from dcs.planes import *
 from dcs.ships import *
 from dcs.vehicles import *
 
-China_2000 = {
+China_2010 = {
     "country": "China",
     "side": "red",
     "units": [
@@ -58,10 +58,20 @@ China_2000 = {
         Type_052C_Destroyer
     ], "cruiser": [
         Type_054A_Frigate,
+    ], "helicopter_carrier": [
+        Type_071_Amphibious_Transport_Dock,
+    ], "lhanames": [
+        "Kunlun Shan",
+        "Jinggang Shan",
+        "Changbai Shan",
+        "Yimeng Shan",
+        "Longhu Shan",
+        "Wuzhi Shan",
+        "Wudang Shan"
     ], "carrier_names": [
         "001 Liaoning",
         "002 Shandong",
     ], "boat":[
-        "ChineseNavyGroupGenerator", "Type54GroupGenerator"
+        "Type54GroupGenerator"
     ]
 }

game/game.py

@@ -56,8 +56,8 @@ class Game:
     current_unit_id = 0
     current_group_id = 0
 
-    def __init__(self, player_name: str, enemy_name: str, theater: ConflictTheater, start_date: datetime):
-        self.settings = Settings()
+    def __init__(self, player_name: str, enemy_name: str, theater: ConflictTheater, start_date: datetime, settings):
+        self.settings = settings
         self.events = []
         self.theater = theater
         self.player_name = player_name

game/settings.py

@@ -1,33 +1,41 @@
 
 class Settings:
 
-    # Difficulty settings
-    player_skill = "Good"
-    enemy_skill = "Average"
-    enemy_vehicle_skill = "Average"
-    map_coalition_visibility = "All Units"
-    labels = "Full"
-    only_player_takeoff = True  # Legacy parameter do not use
-    night_disabled = False
-    external_views_allowed = True
-    supercarrier = False
-    multiplier = 1
-    generate_marks = True
-    sams = True # Legacy parameter do not use
-    cold_start = False # Legacy parameter do not use
-    version = None
+    def __init__(self):
+        # Generator settings
+        self.inverted = False
+        self.do_not_generate_carrier = False # TODO : implement
+        self.do_not_generate_lha = False     # TODO : implement
+        self.do_not_generate_player_navy = True          # TODO : implement
+        self.do_not_generate_enemy_navy = True           # TODO : implement
 
-    # Performance oriented
-    perf_red_alert_state = True
-    perf_smoke_gen = True
-    perf_artillery = True
-    perf_moving_units = True
-    perf_infantry = True
-    perf_ai_parking_start = True
-    perf_destroyed_units = True
+        # Difficulty settings
+        self.player_skill = "Good"
+        self.enemy_skill = "Average"
+        self.enemy_vehicle_skill = "Average"
+        self.map_coalition_visibility = "All Units"
+        self.labels = "Full"
+        self.only_player_takeoff = True  # Legacy parameter do not use
+        self.night_disabled = False
+        self.external_views_allowed = True
+        self.supercarrier = False
+        self.multiplier = 1
+        self.generate_marks = True
+        self.sams = True # Legacy parameter do not use
+        self.cold_start = False # Legacy parameter do not use
+        self.version = None
 
-    # Performance culling
-    perf_culling = False
-    perf_culling_distance = 100
+        # Performance oriented
+        self.perf_red_alert_state = True
+        self.perf_smoke_gen = True
+        self.perf_artillery = True
+        self.perf_moving_units = True
+        self.perf_infantry = True
+        self.perf_ai_parking_start = True
+        self.perf_destroyed_units = True
+
+        # Performance culling
+        self.perf_culling = False
+        self.perf_culling_distance = 100