From 58ede1b8889188f095faaf7eeee543a45fbb3145 Mon Sep 17 00:00:00 2001
From: Nosajthedevil <78634843+Nosajthedevil@users.noreply.github.com>
Date: Tue, 1 Aug 2023 20:26:08 -0500
Subject: [PATCH] Add support for ARA Veinticinco de Mayo.

Includes an Argentina 1982 faction for testing purposes, although it's
sparse because of a lack of assets in DCS.

Note that the carrier is mispelled as the Vienticinco in the game.

Includes prerequisite pydcs update.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/3123.
---
 game/theater/controlpoint.py           |  2 ++
 requirements.txt                       |  2 +-
 resources/factions/argentina_1982.yaml | 40 ++++++++++++++++++++++++++
 resources/units/ships/ara_vdm.yaml     |  6 ++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 resources/factions/argentina_1982.yaml
 create mode 100644 resources/units/ships/ara_vdm.yaml

diff --git a/game/theater/controlpoint.py b/game/theater/controlpoint.py
index 0585fff6..a94ccda1 100644
--- a/game/theater/controlpoint.py
+++ b/game/theater/controlpoint.py
@@ -27,6 +27,7 @@ from uuid import UUID
 
 from dcs.mapping import Point
 from dcs.ships import (
+    Ara_vdm,
     CVN_71,
     CVN_72,
     CVN_73,
@@ -1246,6 +1247,7 @@ class NavalControlPoint(ControlPoint, ABC):
         for group in self.find_main_tgo().groups:
             for u in group.units:
                 if u.alive and u.type in [
+                    Ara_vdm,
                     Forrestal,
                     Hms_invincible,
                     KUZNECOW,
diff --git a/requirements.txt b/requirements.txt
index 8506cd1a..9e3ee918 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,7 +33,7 @@ platformdirs==2.6.2
 pluggy==1.0.0
 pre-commit==2.21.0
 pydantic==1.10.7
-git+https://github.com/pydcs/dcs@fe541426f36889d7e0275b71656f5c2db2c617ce#egg=pydcs
+git+https://github.com/pydcs/dcs@074064171cff71ea0bfb7b62fc27f89f0e6aee77#egg=pydcs
 pyinstaller==5.13.0
 pyinstaller-hooks-contrib==2023.6
 pyproj==3.4.1
diff --git a/resources/factions/argentina_1982.yaml b/resources/factions/argentina_1982.yaml
new file mode 100644
index 00000000..63211da7
--- /dev/null
+++ b/resources/factions/argentina_1982.yaml
@@ -0,0 +1,40 @@
+---
+country: Argentina
+name: Argentina 1982
+authors: Nosaj
+description: <p>Starter Argentina faction during falklands war for testing the ARA Veinticinco de Mayo. Using the Castle Class as a stand-in for the rest of the Argentine Navy. </p>
+locales:
+  - es_ES
+aircrafts:
+  - A-4E Skyhawk
+  - C-130
+  - C-130J-30 Super Hercules
+  - CH-47D
+  - MB-339A
+  - UH-1H Iroquois
+awacs: []
+tankers:
+  - KC-130
+frontline_units:
+  - AAVP-7A1 'Amtrac'
+  - Scout LC with DSHK 12.7mm
+  - Scout LC with KORD 12.7mm
+artillery_units:
+  - MLRS LC with B8M1 80mm
+logistics_units:
+  - Truck M818 6x6
+infantry_units:
+  - Infantry M249
+  - Infantry M4
+  - Mortar 2B11 120mm
+preset_groups:
+  - Roland
+naval_units:
+  - ARA Veinticinco de Mayo
+  - Castle Class
+missiles: []
+air_defense_units:
+  - Bofors 40 mm Gun
+requirements: {}
+carrier_names:
+  - ARA Veinticinco de Mayo
diff --git a/resources/units/ships/ara_vdm.yaml b/resources/units/ships/ara_vdm.yaml
new file mode 100644
index 00000000..cf619709
--- /dev/null
+++ b/resources/units/ships/ara_vdm.yaml
@@ -0,0 +1,6 @@
+class: AircraftCarrier
+price: 0
+variants:
+  ARA Vienticinco de Mayo: {}
+  ARA Veinticinco de Mayo: {}
+  HMAS Melbourne: {}