Vietnam War Vessels Mod v0.9.0 integration (#435)

* vietnamwarvessels first batch

* Ship YAMLs

* aircraft yamls initial version, need more work

* initial helicopter yamls

* update aircraft yamls

* Added DDs Fletcher and Sullivans

* ship icons

* aircraft banners and icons

* no huts

* update py files to VWV v0.9.0

* update aircraft yamls, add vigilante

* added 2 ships for VWV v0.9.0

* mig-21mf yaml

* icons and banners additional units v0.9.0

* added VWV units to USA_1970 and Vietnam_1970 JSONs

* Revert "added VWV units to USA_1970 and Vietnam_1970 JSONs"

This reverts commit ed0b28dc36.

* A-1H yaml update

* mig-17 yaml update

* update helicopter yamls

* extension init

* weapon injections

* icon filenames _24 added

* removed tasks 0 from yamls

* hh2d yaml fix

* added VWV v0.9.0 to factions USA and Vietnam

* added max_range to aircraft yamls

* housekeeping

* Flyable to False - not available in mod version

* minor edits

* ignore test campaign

* deleted tasks

* weapon luas blue air

* added task numbers from task.py

* weapon luas red air

* task id numbers in comment

* switched weapon lua from aim-9J to aim-9D

* removed test campaigns

* update payload luas with payload names from flighttype.py

* Changed AIM-9D to 9B, 9D does not work

* removed air assault task for HH-2D

* Cva_31 added to runway_is_operational()

* CVA-31 added to naval_units in faction jsons

* add strike and cas tasks to ra-5c

* correct typo

* Added Armed Recon as task and payload to most a/c

* ignore pre-commit-config.yaml

* pre-commit-config

* black reformat controlpoint.py

* Added tasks to Vigilante (next to Recon) containing attack subtasks, which allow it to be scheduled for missions

* added ships to UNITS_WITH_RADAR

* remove pre-commit-config from gitignore

* added red aircraft to nva_1970 faction

* fixed black's complaint (two empty lines, should be one)

game/data/radar_db.py

@@ -24,8 +24,10 @@ from dcs.ships import (
 from dcs.vehicles import AirDefence
 
 from pydcs_extensions import highdigitsams as hds
+from pydcs_extensions import vietnamwarvessels as vwv
 from pydcs_extensions import chinesemilitaryassetspack as cmap
 
+
 TELARS = {
     AirDefence.x_2S6_Tunguska,
     AirDefence.SA_11_Buk_LN_9A310M1,
@@ -146,6 +148,12 @@ UNITS_WITH_RADAR = {
     Type_054A,
     USS_Arleigh_Burke_IIa,
     VINSON,
+    vwv.Cva_31,
+    vwv.USS_Fletcher,
+    vwv.USS_Laffey,
+    vwv.USS_Maddox,
+    vwv.USS_Sumner,
+    vwv.USS_The_Sullivans,
     cmap.CH_Type022,
     cmap.Type052D,
     cmap.CH_Type054B,

game/factions/faction.py

@@ -653,6 +653,24 @@ class Faction:
             self.remove_vehicle("TR_TT")
             self.remove_vehicle("Gozanti")
             self.remove_ship("Destroyer_carrier")
+        # vietnamwarvessels
+        if not mod_settings.vietnamwarvessels:
+            self.remove_ship("PBR_MKII")
+            self.remove_ship("USS Sumner")
+            self.remove_ship("cva-31")
+            self.remove_ship("USS Fletcher")
+            self.remove_ship("USS Laffey")
+            self.remove_ship("USS Maddox")
+            self.remove_ship("USS The Sullivans")
+            self.remove_ship("P4")
+            self.remove_aircraft("vwv_a1_skyraider")
+            self.remove_aircraft("vwv_ra-5")
+            self.remove_aircraft("vwv_crusader")
+            self.remove_aircraft("vwv_mig17f")
+            self.remove_aircraft("vwv_mig21mf")
+            self.remove_aircraft("vwv_o-1")
+            self.remove_aircraft("vwv_sh2f")
+            self.remove_aircraft("vwv_hh2d")
         # Chinese Military Assets Pack
         if not mod_settings.chinesemilitaryassetspack:
             self.remove_vehicle("CH_PCL181_155")

game/theater/controlpoint.py

@@ -41,6 +41,8 @@ from dcs.ships import (
     Type_071,
     hms_invincible,
 )
+from pydcs_extensions.vietnamwarvessels import Cva_31
+
 from dcs.terrain.terrain import Airport, ParkingSlot
 from dcs.unitgroup import ShipGroup, StaticGroup
 from dcs.unittype import ShipType
@@ -1419,6 +1421,7 @@ class NavalControlPoint(
                     L52,
                     L61,
                     CV_1143_5,
+                    Cva_31,  # Vietnam War Vessels Mod
                     CVN_71,
                     CVN_72,
                     CVN_73,

game/theater/start_generator.py

@@ -100,6 +100,7 @@ class ModSettings:
     swedishmilitaryassetspack: bool = False
     coldwarassets: bool = False
     SWPack: bool = False
+    vietnamwarvessels: bool = False
     chinesemilitaryassetspack: bool = False