diff --git a/game/db.py b/game/db.py index 0ff1e24d..ddf06062 100644 --- a/game/db.py +++ b/game/db.py @@ -157,7 +157,7 @@ PRICES = { # armor Armor.APC_MTLB: 4, - Armor.ARV_MTLB_U_BOMAN: 5, + Armor.FDDM_Grad: 5, Armor.ARV_BRDM_2: 6, Armor.ARV_BTR_RD: 8, Armor.APC_BTR_80: 8, @@ -239,8 +239,8 @@ PRICES = { Armor.M30_Cargo_Carrier:2, Armor.APC_M2A1:2, AirDefence.AAA_Bofors_40mm:4, - AirDefence.AAA_Flak_36:6, - AirDefence.AAA_Flak_18:4, + AirDefence.AAA_8_8cm_Flak_36:6, + AirDefence.AAA_8_8cm_Flak_18:4, Artillery.M12_GMC:2, Artillery.Sturmpanzer_IV_Brummbär:2, @@ -351,11 +351,11 @@ UNIT_BY_TASK = { Armor.APC_MTLB, Armor.APC_MTLB, Armor.APC_MTLB, - Armor.ARV_MTLB_U_BOMAN, - Armor.ARV_MTLB_U_BOMAN, - Armor.ARV_MTLB_U_BOMAN, - Armor.ARV_MTLB_U_BOMAN, - Armor.ARV_MTLB_U_BOMAN, + Armor.FDDM_Grad, + Armor.FDDM_Grad, + Armor.FDDM_Grad, + Armor.FDDM_Grad, + Armor.FDDM_Grad, Armor.ARV_BRDM_2, Armor.ARV_BRDM_2, Armor.ARV_BRDM_2, @@ -534,6 +534,7 @@ SAM_CONVERT = { } } + """ Units that will always be spawned in the air """ @@ -797,6 +798,21 @@ TaskForceDict = typing.Dict[typing.Type[Task], AssignedUnitsDict] StartingPosition = typing.Optional[typing.Union[ShipGroup, StaticGroup, Airport, Point]] +def upgrade_to_supercarrier(unit, name: str): + if unit == CVN_74_John_C__Stennis: + if name == "CVN-71 Theodore Roosevelt": + return CVN_71_Theodore_Roosevelt + elif name == "CVN-72 Abraham Lincoln": + return CVN_72_Abraham_Lincoln + elif name == "CVN-73 George Washington": + return CVN_73_George_Washington + else: + return CVN_71_Theodore_Roosevelt + elif unit == CV_1143_5_Admiral_Kuznetsov: + return CV_1143_5_Admiral_Kuznetsov_2017 + else: + return unit + def unit_task(unit: UnitType) -> Task: for task, units in UNIT_BY_TASK.items(): if unit in units: diff --git a/game/factions/germany_1944.py b/game/factions/germany_1944.py index 5fbfc66c..559d3032 100644 --- a/game/factions/germany_1944.py +++ b/game/factions/germany_1944.py @@ -23,6 +23,6 @@ Germany_1944 = { Infantry.Infantry_Mauser_98, - AirDefence.AAA_Flak_36, + AirDefence.AAA_8_8cm_Flak_36, ] } \ No newline at end of file diff --git a/game/factions/libya_2011.py b/game/factions/libya_2011.py index eca6247b..2e3ba882 100644 --- a/game/factions/libya_2011.py +++ b/game/factions/libya_2011.py @@ -28,7 +28,7 @@ Lybia_2011 = { AirDefence.HQ_7_Self_Propelled_LN, Armor.IFV_BMP_1, - Armor.ARV_MTLB_U_BOMAN, + Armor.FDDM_Grad, Armor.ARV_BRDM_2, Armor.MBT_T_55, Armor.MBT_T_72B, diff --git a/game/factions/russia_1955.py b/game/factions/russia_1955.py index efdd464d..dcaeec68 100644 --- a/game/factions/russia_1955.py +++ b/game/factions/russia_1955.py @@ -17,7 +17,7 @@ Russia_1955 = { AirDefence.AAA_ZU_23_Closed, AirDefence.AAA_ZU_23_on_Ural_375, Armor.ARV_BRDM_2, - Armor.ARV_MTLB_U_BOMAN, + Armor.FDDM_Grad, Armor.APC_MTLB, Armor.MBT_T_55, Artillery.MLRS_BM_21_Grad, diff --git a/game/factions/usa_1990.py b/game/factions/usa_1990.py index e8d3eb89..d662e088 100644 --- a/game/factions/usa_1990.py +++ b/game/factions/usa_1990.py @@ -46,6 +46,7 @@ USA_1990 = { LHA_1_Tarawa, ], "destroyer": [ Oliver_Hazzard_Perry_class, + USS_Arleigh_Burke_IIa, ], "cruiser": [ Ticonderoga_class, ], "carrier_names": [ diff --git a/game/factions/usa_2005.py b/game/factions/usa_2005.py index f7ae445d..761953d6 100644 --- a/game/factions/usa_2005.py +++ b/game/factions/usa_2005.py @@ -53,11 +53,13 @@ USA_2005 = { LHA_1_Tarawa, ], "destroyer": [ Oliver_Hazzard_Perry_class, + USS_Arleigh_Burke_IIa, ], "cruiser": [ Ticonderoga_class, ], "carrier_names": [ + "CVN-71 Theodore Roosevelt", "CVN-72 Abraham Lincoln", - "CVN-73 Georges Washington", + "CVN-73 George Washington", "CVN-74 John C. Stennis", ], "lhanames": [ "LHA-1 Tarawa", diff --git a/gen/ground_forces/ai_ground_planner.py b/gen/ground_forces/ai_ground_planner.py index cb6d772a..26aaa839 100644 --- a/gen/ground_forces/ai_ground_planner.py +++ b/gen/ground_forces/ai_ground_planner.py @@ -63,7 +63,7 @@ TYPE_APC = [ Armor.TPz_Fuchs, Armor.ARV_BRDM_2, Armor.ARV_BTR_RD, - Armor.ARV_MTLB_U_BOMAN, + Armor.FDDM_Grad, Armor.M30_Cargo_Carrier, Armor.APC_M2A1, ] diff --git a/gen/groundobjectsgen.py b/gen/groundobjectsgen.py index 33a2075b..a5f6681e 100644 --- a/gen/groundobjectsgen.py +++ b/gen/groundobjectsgen.py @@ -82,9 +82,12 @@ class GroundObjectsGenerator: if len(g.units) > 0: utype = unit_type_from_name(g.units[0].type) - sg = self.m.ship_group(side, g.name, utype, position=g.position, heading=g.units[0].heading) + if ground_object.dcs_identifier == "CARRIER" and self.game.settings.supercarrier == True: + utype = db.upgrade_to_supercarrier(utype, cp.name) + sg = self.m.ship_group(side, g.name, utype, position=g.position, heading=g.units[0].heading) sg.units[0].name = self.m.string(g.units[0].name) + for i, u in enumerate(g.units): if i > 0: ship = Ship(self.m.next_unit_id(), self.m.string(u.name), unit_type_from_name(u.type)) diff --git a/gen/sam/aaa_flak.py b/gen/sam/aaa_flak.py index c9afc918..12660d1e 100644 --- a/gen/sam/aaa_flak.py +++ b/gen/sam/aaa_flak.py @@ -4,7 +4,7 @@ from dcs.vehicles import AirDefence, Unarmed from gen.sam.group_generator import GroupGenerator -GFLAK = [AirDefence.AAA_Flak_Vierling_38, AirDefence.AAA_Flak_Vierling_38, AirDefence.AAA_Flak_18, AirDefence.AAA_Flak_36, AirDefence.AAA_Flak_37, AirDefence.AAA_Flak_38] +GFLAK = [AirDefence.AAA_Flak_Vierling_38, AirDefence.AAA_8_8cm_Flak_18, AirDefence.AAA_8_8cm_Flak_36, AirDefence.AAA_8_8cm_Flak_37, AirDefence.AAA_8_8cm_Flak_41, AirDefence.AAA_Flak_38] class FlakGenerator(GroupGenerator): """ diff --git a/gen/sam/sam_group_generator.py b/gen/sam/sam_group_generator.py index 712b3d33..c1c4c95d 100644 --- a/gen/sam/sam_group_generator.py +++ b/gen/sam/sam_group_generator.py @@ -50,7 +50,7 @@ SAM_MAP = { AirDefence.SAM_Patriot_EPP_III: PatriotGenerator, AirDefence.SAM_Chaparral_M48: ChaparralGenerator, AirDefence.AAA_Bofors_40mm: BoforsGenerator, - AirDefence.AAA_Flak_36: FlakGenerator, + AirDefence.AAA_8_8cm_Flak_36: FlakGenerator, AirDefence.SAM_SA_2_LN_SM_90: SA2Generator, AirDefence.SAM_SA_3_S_125_LN_5P73: SA3Generator, AirDefence.SAM_SA_6_Kub_LN_2P25: SA6Generator,