diff --git a/game/theater/controlpoint.py b/game/theater/controlpoint.py index d4f089a1..ff371923 100644 --- a/game/theater/controlpoint.py +++ b/game/theater/controlpoint.py @@ -40,6 +40,7 @@ from dcs.ships import ( Stennis, Type_071, hms_invincible, + Essex, ) from dcs.terrain.terrain import Airport, ParkingSlot from dcs.unitgroup import ShipGroup, StaticGroup @@ -1428,6 +1429,7 @@ class NavalControlPoint( CVN_72, CVN_73, CVN_75, + Essex, ]: return True return False diff --git a/game/theater/start_generator.py b/game/theater/start_generator.py index 2894e0cb..73182062 100644 --- a/game/theater/start_generator.py +++ b/game/theater/start_generator.py @@ -297,7 +297,9 @@ class GenericCarrierGroundObjectGenerator(ControlPointGroundObjectGenerator): if go.category in ["CARRIER", "LHA"] ][0] groups = [ - g for g in carrier_go.groups if "Carrier" in g.name or "LHA" in g.name + g + for g in carrier_go.groups + if "carrier" in g.name.lower() or "lha" in g.name.lower() ] return groups[0].units[0] diff --git a/resources/factions/allies_1944.json b/resources/factions/allies_1944.json index 140d57a7..700c20e8 100644 --- a/resources/factions/allies_1944.json +++ b/resources/factions/allies_1944.json @@ -49,7 +49,8 @@ ], "preset_groups": [ "Ally Flak", - "WW2LST" + "WW2LST", + "WW2Essex" ], "naval_units": [ "USS Bennington (CV-20)" @@ -58,7 +59,9 @@ "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, "carrier_names": [], - "helicopter_carrier_names": [], + "helicopter_carrier_names": [ + "USS Essex (CV-9)" + ], "has_jtac": false, "doctrine": "ww2", "building_set": "ww2ally", diff --git a/resources/groups/WW2Essex.yaml b/resources/groups/WW2Essex.yaml new file mode 100644 index 00000000..c0b5a064 --- /dev/null +++ b/resources/groups/WW2Essex.yaml @@ -0,0 +1,7 @@ +name: WW2Essex +tasks: + - HelicopterCarrier +units: + - USS Bennington (CV-20) +layouts: + - WW2 Essex Carrier \ No newline at end of file diff --git a/resources/layouts/naval/WW2-Essex_Carrier.miz b/resources/layouts/naval/WW2-Essex_Carrier.miz new file mode 100644 index 00000000..a1dcb96e Binary files /dev/null and b/resources/layouts/naval/WW2-Essex_Carrier.miz differ diff --git a/resources/layouts/naval/WW2-Essex_Carrier.yaml b/resources/layouts/naval/WW2-Essex_Carrier.yaml new file mode 100644 index 00000000..3a58d3d5 --- /dev/null +++ b/resources/layouts/naval/WW2-Essex_Carrier.yaml @@ -0,0 +1,10 @@ +name: WW2 Essex Carrier +tasks: + - HelicopterCarrier +groups: + - Carrier: # the word "Carrier" or "LHA" needs to be present in the group-name + - name: WW2 Carrier Group 0 + unit_count: + - 1 + unit_types: + - Essex