Add some South Atlantic naval assets (#23)

- Unit yamls for several ships and added some new ones to uk_1990.json
- 2 new layouts: Aircraft Carrier / LHA with Frigate escorts
- Add "HMS Invincible" as Control Point

game/theater/controlpoint.py

@@ -37,6 +37,7 @@ from dcs.ships import (
     LHA_Tarawa,
     Stennis,
     Type_071,
+    Hms_invincible,
 )
 from dcs.terrain.terrain import Airport, ParkingSlot
 from dcs.unitgroup import ShipGroup, StaticGroup
@@ -1203,6 +1204,7 @@ class NavalControlPoint(ControlPoint, ABC):
                     LHA_Tarawa,
                     KUZNECOW,
                     Type_071,
+                    Hms_invincible,
                 ]:
                     return True
         return False

resources/factions/uk_1990.json

@@ -48,6 +48,10 @@
     "Rapier"
   ],
   "naval_units": [
+    "P265 Dumbarton Castle",
+    "F72 Ariadne",
+    "F57 Andromeda",
+    "F12 Achilles",
     "FFG Oliver Hazard Perry",
     "DDG Arleigh Burke IIa",
     "CG Ticonderoga",

resources/layouts/naval/Carrier_Group_Frigates.yaml

@@ -0,0 +1,17 @@
+name: Carrier Group with Frigate escort
+generic: true
+tasks:
+  - AircraftCarrier
+groups:
+  - Carrier:
+    - name: Carrier Group 0
+      unit_count:
+        - 1
+      unit_classes:
+        - AircraftCarrier
+  - Escort:
+    - name: Carrier Group 1
+      unit_count:
+        - 4
+      unit_classes:
+        - Frigate

resources/layouts/naval/LHA_Group_Frigates.yaml

@@ -0,0 +1,17 @@
+name: LHA Group with Frigate escort
+generic: true
+tasks:
+  - HelicopterCarrier
+groups:
+  - LHA:
+    - name: LHA Group 0
+      unit_count:
+        - 1
+      unit_classes:
+        - HelicopterCarrier
+  - Escort:
+    - name: LHA Group 1
+      unit_count:
+        - 2
+      unit_classes:
+        - Frigate

resources/units/ships/CastleClass_01.yaml

@@ -0,0 +1,5 @@
+class: Destroyer
+price: 0
+variants:
+  P258 Leeds Castle: null
+  P265 Dumbarton Castle: null

resources/units/ships/Hms_invincible.yaml

@@ -0,0 +1,4 @@
+class: HelicopterCarrier
+price: 0
+variants:
+  R05 Invincible: null

resources/units/ships/leander-gun-achilles.yaml

@@ -0,0 +1,4 @@
+class: Cruiser
+price: 0
+variants:
+  F12 Achilles: null

resources/units/ships/leander-gun-andromeda.yaml

@@ -0,0 +1,4 @@
+class: Cruiser
+price: 0
+variants:
+  F57 Andromeda: null

resources/units/ships/leander-gun-ariadne.yaml

@@ -0,0 +1,4 @@
+class: Cruiser
+price: 0
+variants:
+  F72 Ariadne: null

resources/units/ships/leander-gun-condell.yaml

@@ -0,0 +1,5 @@
+class: Cruiser
+price: 0
+variants:
+  F233 Marlborough: null
+  FF06 Almirante Condell: null

resources/units/ships/leander-gun-lynch.yaml

@@ -0,0 +1,5 @@
+class: Cruiser
+price: 0
+variants:
+  F80 Grafton: null
+  FF07 Almirante Lynch: null