diff --git a/game/theater/controlpoint.py b/game/theater/controlpoint.py index c23f158b..a80dadef 100644 --- a/game/theater/controlpoint.py +++ b/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 diff --git a/resources/factions/uk_1990.json b/resources/factions/uk_1990.json index 2e12cd7d..994ef623 100644 --- a/resources/factions/uk_1990.json +++ b/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", diff --git a/resources/layouts/naval/Carrier_Group_Frigates.miz b/resources/layouts/naval/Carrier_Group_Frigates.miz new file mode 100644 index 00000000..85a78ca5 Binary files /dev/null and b/resources/layouts/naval/Carrier_Group_Frigates.miz differ diff --git a/resources/layouts/naval/Carrier_Group_Frigates.yaml b/resources/layouts/naval/Carrier_Group_Frigates.yaml new file mode 100644 index 00000000..f76ef316 --- /dev/null +++ b/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 diff --git a/resources/layouts/naval/LHA_Group_Frigates.miz b/resources/layouts/naval/LHA_Group_Frigates.miz new file mode 100644 index 00000000..806ed908 Binary files /dev/null and b/resources/layouts/naval/LHA_Group_Frigates.miz differ diff --git a/resources/layouts/naval/LHA_Group_Frigates.yaml b/resources/layouts/naval/LHA_Group_Frigates.yaml new file mode 100644 index 00000000..050883ab --- /dev/null +++ b/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 diff --git a/resources/units/ships/CastleClass_01.yaml b/resources/units/ships/CastleClass_01.yaml new file mode 100644 index 00000000..b30fae6b --- /dev/null +++ b/resources/units/ships/CastleClass_01.yaml @@ -0,0 +1,5 @@ +class: Destroyer +price: 0 +variants: + P258 Leeds Castle: null + P265 Dumbarton Castle: null \ No newline at end of file diff --git a/resources/units/ships/Hms_invincible.yaml b/resources/units/ships/Hms_invincible.yaml new file mode 100644 index 00000000..8e63937e --- /dev/null +++ b/resources/units/ships/Hms_invincible.yaml @@ -0,0 +1,4 @@ +class: HelicopterCarrier +price: 0 +variants: + R05 Invincible: null \ No newline at end of file diff --git a/resources/units/ships/leander-gun-achilles.yaml b/resources/units/ships/leander-gun-achilles.yaml new file mode 100644 index 00000000..ac0d9015 --- /dev/null +++ b/resources/units/ships/leander-gun-achilles.yaml @@ -0,0 +1,4 @@ +class: Cruiser +price: 0 +variants: + F12 Achilles: null \ No newline at end of file diff --git a/resources/units/ships/leander-gun-andromeda.yaml b/resources/units/ships/leander-gun-andromeda.yaml new file mode 100644 index 00000000..ae20165e --- /dev/null +++ b/resources/units/ships/leander-gun-andromeda.yaml @@ -0,0 +1,4 @@ +class: Cruiser +price: 0 +variants: + F57 Andromeda: null \ No newline at end of file diff --git a/resources/units/ships/leander-gun-ariadne.yaml b/resources/units/ships/leander-gun-ariadne.yaml new file mode 100644 index 00000000..c8449d7d --- /dev/null +++ b/resources/units/ships/leander-gun-ariadne.yaml @@ -0,0 +1,4 @@ +class: Cruiser +price: 0 +variants: + F72 Ariadne: null \ No newline at end of file diff --git a/resources/units/ships/leander-gun-condell.yaml b/resources/units/ships/leander-gun-condell.yaml new file mode 100644 index 00000000..6a764bb3 --- /dev/null +++ b/resources/units/ships/leander-gun-condell.yaml @@ -0,0 +1,5 @@ +class: Cruiser +price: 0 +variants: + F233 Marlborough: null + FF06 Almirante Condell: null \ No newline at end of file diff --git a/resources/units/ships/leander-gun-lynch.yaml b/resources/units/ships/leander-gun-lynch.yaml new file mode 100644 index 00000000..74fcf468 --- /dev/null +++ b/resources/units/ships/leander-gun-lynch.yaml @@ -0,0 +1,5 @@ +class: Cruiser +price: 0 +variants: + F80 Grafton: null + FF07 Almirante Lynch: null \ No newline at end of file