Merge branch 'dev' into pr/204

2025-11-10 15:41:24 +00:00 · 2024-07-28 15:57:38 +02:00
parent 8dcf25d9ee e0d4a031bb
commit 65e529aa55
100 changed files with 1342 additions and 220 deletions
--- a/resources/campaigns/RetakeTheFalklands.miz
+++ b/resources/campaigns/RetakeTheFalklands.miz
--- a/resources/campaigns/RetakeTheFalklands.yaml
+++ b/resources/campaigns/RetakeTheFalklands.yaml
@@ -8,6 +8,8 @@ description: <p>Argentina and China have taken the Falklands by surprise. Curren
 miz: RetakeTheFalklands.miz
 performance: 2
 recommended_start_date: 2002-12-21
+settings:
+  squadron_start_full: true
 version: "10.7"
 squadrons:
 # Off-map spawn
@@ -22,6 +24,12 @@ squadrons:
      aircraft:
        - F-15E Strike Eagle (Suite 4+)
      size: 12
+     # Gamblers
+    - primary: DEAD
+      secondary: any
+      aircraft:
+        - 77th FS
+      size: 12
    - primary: Strike
      secondary: air-to-ground
      aircraft:
@@ -88,14 +96,6 @@ squadrons:
      size: 12
      aircraft:
        - J-15 Flanker X-2
- # Blue - San Julian
-  11:
-     # Gamblers
-    - primary: DEAD
-      secondary: any
-      aircraft:
-        - 77th FS
-      size: 9
 # RED - Punta Arenas
  9:
    - primary: CAS
--- a/resources/campaigns/scenic_merge.miz
+++ b/resources/campaigns/scenic_merge.miz
--- a/resources/campaigns/scenic_merge.yaml
+++ b/resources/campaigns/scenic_merge.yaml
@@ -16,14 +16,25 @@ recommended_player_income_multiplier: 1.5
 recommended_enemy_income_multiplier: 0.7
 settings:
  airbase_threat_range: 300
+  # Set mission duration to 45 minutes
+  desired_player_mission_duration: 45
+  #  Set max frontline width to 30 km
+  max_frontline_width: 30
+  squadron_start_full: true
 squadrons:
  #BLUFOR CVN
  Naval-3:
-    # Pukin' Dogs F-14
+    # The Swordsmen F-14
    - primary: BARCAP
      secondary: air-to-air
      aircraft:
-        - VF-143
+        - VF-32
+      size: 14
+    - primary: Strike
+      secondary: air-to-air
+      aircraft:
+        - VF-213
+        - F-14B Tomcat
      size: 14
    # Golden Dragons F/A-18
    - primary: SEAD
@@ -52,13 +63,18 @@ squadrons:
    - primary: BAI
      secondary: air-to-ground
      aircraft:
-        - VMA-223
-      size: 12
-    - primary: Transport
+        - AV-8B Harrier II Night Attack
+      size: 10
+    - primary: Air Assault
      secondary: air-to-ground
      aircraft:
-        - HMLA-169 (UH-1H)
-      size: 8
+        - UH-1H Iroquois
+      size: 4
+    - primary: BAI
+      secondary: air-to-ground
+      aircraft:
+        - AH-1W SuperCobra
+      size: 6
  # Al-Dhafra AFB
  4:        
    #USAF F-16C Gamblers
@@ -92,12 +108,6 @@ squadrons:
      #USAF F-15C 
  # Al-Minhab AFB
  12:
-    - primary: Transport
-      secondary: air-to-ground
-      aircraft:
-        - 101st Combat Aviation Brigade
-        #US Army UH-60
-      size: 6
    - primary: SEAD
      secondary: any
      aircraft:
@@ -115,8 +125,30 @@ squadrons:
      #USAF A-10CI
    - primary: Transport
      aircraft:
+        - C-130J-30 Super Hercules
        - C-130
      size: 8
+  # Khasab / 12
+  10:
+    - primary: Transport
+      secondary: air-to-ground
+      aircraft:
+        - 101st Combat Aviation Brigade
+        #US Army UH-60
+      size: 4
+    - primary: BAI
+      size: 4
+      secondary: air-to-ground
+      aircraft:
+      - A-10C Thunderbolt II (Suite 7)
+      #USAF A-10CI  
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Wolfpack, 1-82 ARB
+        #US Army Apache AH-64D
+      size: 4
+### OPFOR
  # Kish Intl
  24:
    - primary: AEW&C
@@ -156,7 +188,12 @@ squadrons:
      secondary: air-to-ground
      aircraft:
        - MiG-29A Fulcrum-A
-      size: 6
+      size: 12
+    - primary: BARCAP
+      secondary: air-to-ground
+      aircraft:
+        - Mirage-F1EQ
+      size: 12
    - primary: Strike
      secondary: air-to-ground
      aircraft:
--- a/resources/campaigns/syria_TheLongRoadToH3.miz
+++ b/resources/campaigns/syria_TheLongRoadToH3.miz
--- a/resources/campaigns/syria_TheLongRoadToH3.yaml
+++ b/resources/campaigns/syria_TheLongRoadToH3.yaml
@@ -3,7 +3,7 @@ name: Syria - The Long Road to H3
 theater: Syria
 authors: tmz42 (original campaign by Plob)
 description: 
-  <p>From Incirlik to H-3, repel the alliance between Iraq and Syria.</p>
+  <p>From Incirlik to H-3, repel the alliance between Syria and Iraq.</p>
  <p>This campaign is based on and meant as a lighter alternative to Syria - Full Map.</p>
 recommended_player_faction: NATO OIF
 recommended_enemy_faction:
@@ -25,7 +25,6 @@ recommended_enemy_faction:
    - SA 342L Gazelle
    - Su-22M4 Fitter-K
    - Su-24M Fencer-D
-    - Tu-22M3 Backfire-C
    - Su-25 Frogfoot
    - Mirage-F1EQ
    - H-6J Badger
@@ -42,10 +41,9 @@ recommended_enemy_faction:
    - MT-LB
    - T-55A
    - T-72B with Kontakt-1 ERA
-    - T-90A
    - ZSU-57-2 'Sparka'
+    - ZSU-23-4 Shilka
  artillery_units:
-    - BM-21 Grad
    - 2S1 Gvozdika
    - 2S9 Nona-S
  logistics_units:
@@ -65,19 +63,16 @@ recommended_enemy_faction:
    - SA-6
    - SA-11
    - SA-10/S-300PS
-    - SA-12/S-300V
    - Cold-War-Flak
    - Silkworm
    - KS-19/SON-9
  naval_units:
    - Corvette 1124.4 Grish
    - Corvette 1241.1 Molniya
-    - FAC La Combattante IIa
    - Frigate 1135M Rezky
+    - LS Ropucha
  air_defense_units:
    - SAM P19 "Flat Face" SR (SA-2/3)
-    - EWR 1L13
-    - EWR 55G6
    - SAM SA-8 Osa "Gecko" TEL
    - SA-9 Strela
    - SA-13 Gopher (9K35 Strela-10M3)
@@ -102,6 +97,7 @@ settings:
  desired_player_mission_duration: 45
  #  Set max frontline width to 30 km
  max_frontline_width: 30
+  squadron_start_full: true
 squadrons:
 ####################### BLUEFOR
  Blue CV:
--- a/resources/customized_payloads/AH-64D_BLK_II.lua
+++ b/resources/customized_payloads/AH-64D_BLK_II.lua
@@ -120,7 +120,7 @@ local unitPayloads = {
 			["name"] = "Retribution Escort",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["CLSID"] = "{M299_4xAGM_114L}",
 					["num"] = 3,
 				},
 				[2] = {
@@ -128,7 +128,7 @@ local unitPayloads = {
 					["num"] = 4,
 				},
 				[3] = {
-					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["CLSID"] = "{M299_4xAGM_114L}",
 					["num"] = 2,
 				},
 				[4] = {
--- a/resources/customized_payloads/OH-6A.lua
+++ b/resources/customized_payloads/OH-6A.lua
@@ -0,0 +1,153 @@
+local unitPayloads = {
+	["name"] = "OH-6A",
+	["payloads"] = {
+		[1] = {
+			["displayName"] = "Retribution BAI",
+			["name"] = "Retribution BAI",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{OH-6_M60_Door}",
+					["num"] = 11,
+				},
+				[2] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 6,
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{OH-6_M134_Minigun}",
+					["num"] = 8,
+				},
+				[5] = {
+					["CLSID"] = "{OH6_FRAG}",
+					["num"] = 5,
+				},
+				[6] = {
+					["CLSID"] = "{OH6_SMOKE_BLUE}",
+					["num"] = 4,
+				},
+				[7] = {
+					["CLSID"] = "{OH6_SMOKE_GREEN}",
+					["num"] = 3,
+				},
+				[8] = {
+					["CLSID"] = "{OH6_SMOKE_RED}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{OH6_SMOKE_YELLOW}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 17,
+				[2] = 35,
+			},
+		},
+		[2] = {
+			["displayName"] = "Retribution OCA/Aircraft",
+			["name"] = "Retribution OCA/Aircraft",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{OH6_XM158}",
+					["num"] = 10,
+				},
+				[2] = {
+					["CLSID"] = "{OH6_XM158}",
+					["num"] = 9,
+				},
+				[3] = {
+					["CLSID"] = "{OH6_FRAG}",
+					["num"] = 5,
+				},
+				[4] = {
+					["CLSID"] = "{OH6_SMOKE_BLUE}",
+					["num"] = 4,
+				},
+				[5] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 7,
+				},
+				[7] = {
+					["CLSID"] = "{OH6_SMOKE_GREEN}",
+					["num"] = 3,
+				},
+				[8] = {
+					["CLSID"] = "{OH6_SMOKE_RED}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{OH6_SMOKE_YELLOW}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 35,
+				[2] = 17,
+				[3] = 31,
+				[4] = 15,
+			},
+		},
+		[3] = {
+			["displayName"] = "Retribution CAS",
+			["name"] = "Retribution CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{OH-6 M60 Door}",
+					["num"] = 11,
+				},
+				[2] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 6,
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{OH-6 M134 Minigun}",
+					["num"] = 8,
+				},
+				[5] = {
+					["CLSID"] = "{OH6_FRAG}",
+					["num"] = 5,
+				},
+				[6] = {
+					["CLSID"] = "{OH6_SMOKE_BLUE}",
+					["num"] = 4,
+				},
+				[7] = {
+					["CLSID"] = "{OH6_SMOKE_GREEN}",
+					["num"] = 3,
+				},
+				[8] = {
+					["CLSID"] = "{OH6_SMOKE_RED}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{OH6_SMOKE_YELLOW}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 17,
+				[2] = 35,
+			},
+		},
+	},
+	["tasks"] = {
+		[1] = 35,
+		[2] = 17,
+		[3] = 31,
+		[4] = 15,
+	},
+	["unitType"] = "OH-6A",
+}
+return unitPayloads
--- a/resources/factions/USA
+++ b/resources/factions/USA
@@ -7,6 +7,7 @@
 	"aircrafts": [
 		"CH-47D",
 		"CH-53E",
+    	"OH-6A Cayuse",
 		"UH-1H Iroquois",
 		"AH-1W SuperCobra",
 		"OV-10A Bronco",
@@ -38,7 +39,8 @@
 	"frontline_units": [
 		"M113",
 		"M163 Vulcan Air Defense System",
-		"M60A3 \"Patton\""
+		"M60A3 \"Patton\"",
+		"M151A1C MUTT w/ 106mm Recoilless Rifle"
 	],
 	"artillery_units": [
 		"M109A6 Paladin"
@@ -48,7 +50,10 @@
 		"Infantry M4 Georgia"
 	],
 	"logistics_units": [
-		"Truck M818 6x6"
+		"Truck M818 6x6",
+		"VAP US M35 Truck",
+		"M151 1/4-ton 4x4 utility truck",
+		"M274 1/2-ton 4x4 utility truck"
 	],
 	"air_defense_units": [
 		"SAM Hawk SR (AN/MPQ-50)",
--- a/resources/factions/USA
+++ b/resources/factions/USA
@@ -7,6 +7,7 @@
 	"aircrafts": [
 		"CH-47D",
 		"CH-53E",
+    	"OH-6A Cayuse",
 		"UH-1H Iroquois",
 		"AH-1W SuperCobra",
 		"OV-10A Bronco",
@@ -36,7 +37,8 @@
 	"frontline_units": [
 		"M113",
 		"M163 Vulcan Air Defense System",
-		"M60A3 \"Patton\""
+		"M60A3 \"Patton\"",
+		"M151A1C MUTT w/ 106mm Recoilless Rifle"
 	],
 	"artillery_units": [
 		"M109A6 Paladin"
@@ -46,7 +48,10 @@
 		"Infantry M4 Georgia"
 	],
 	"logistics_units": [
-		"Truck M818 6x6"
+		"Truck M818 6x6",
+		"VAP US M35 Truck",
+		"M151 1/4-ton 4x4 utility truck",
+		"M274 1/2-ton 4x4 utility truck"
 	],
 	"air_defense_units": [
 		"SAM Hawk SR (AN/MPQ-50)",
--- a/resources/factions/bluefor_modern.json
+++ b/resources/factions/bluefor_modern.json
@@ -29,11 +29,14 @@
    "F-16D Fighting Falcon (Block 50+)",
    "F-16D Fighting Falcon (Block 50)",
    "F-22A Raptor",
+    "F-4E-45MC Phantom II",
    "F-5E Tiger II",
+    "F-5E Tiger II (FC)",
    "F/A-18C Hornet (Lot 20)",
    "F/A-18E Super Hornet",
    "F/A-18F Super Hornet",
    "EA-18G Growler",
+    "J-11A Flanker-L",
    "JF-17 Thunder",
    "Ka-50 Hokum",
    "Ka-50 Hokum III",
@@ -52,6 +55,7 @@
    "OH-58D(R) Kiowa Warrior",
    "SA 342L Gazelle",
    "SA 342M Gazelle",
+    "Su-24M Fencer-D",
    "Su-25T Frogfoot",
    "Su-27 Flanker-B",
    "Su-30MKA Flanker-H",
@@ -148,10 +152,14 @@
  "jtac_unit": "MQ-9 Reaper",
  "unrestricted_satnav": true,
  "liveries_overrides": {
-    "Ka-50 Hokum": ["georgia camo"],  
+    "J-11A Flanker-L": ["USN Aggressor VFC-13 'Ferris' (Fictional)"],
+    "JF-17 Thunder": ["'Splinter' Camo for Blue Side (Fictional)"],
+    "Ka-50 Hokum": ["georgia camo"],
+    "Ka-50 Hokum III": ["Ka-50_black_neutral"],
    "Mi-8MTV2 Hip": ["Ukraine"],
    "Mi-24P Hind-F": ["Ukrainian Army Aviation"],
    "MiG-29S Fulcrum-C": ["Air Force Ukraine Standard"],
+    "Su-24M Fencer-D": ["Ukrainian Air Force Standard"],
    "Su-25T Frogfoot": ["af standard 101"],
    "Su-27 Flanker-B": ["Air Force Ukraine Standard"]
  }
--- a/resources/factions/usa_1965.json
+++ b/resources/factions/usa_1965.json
@@ -23,6 +23,7 @@
    "F-105G Thunderchief",
    "F-106A Delta Dart",
    "F-106B Delta Dart",
+    "OH-6A Cayuse",
    "UH-1H Iroquois"
  ],
  "awacs": [
--- a/resources/factions/usa_1970.json
+++ b/resources/factions/usa_1970.json
@@ -20,6 +20,7 @@
    "C-47 Skytrain",
    "C-130",
    "C-130J-30 Super Hercules",
+    "OH-6A Cayuse",
    "UH-1H Iroquois",
    "AH-1W SuperCobra",
    "OH-58D(R) Kiowa Warrior",
--- a/resources/factions/usa_1975.json
+++ b/resources/factions/usa_1975.json
@@ -27,6 +27,7 @@
    "F-106B Delta Dart",
    "S-3B Viking",
 	"OV-10A Bronco",
+    "OH-6A Cayuse",
    "UH-1H Iroquois"
  ],
  "awacs": [
--- a/resources/factions/vietcong_1970.json
+++ b/resources/factions/vietcong_1970.json
@@ -0,0 +1,54 @@
+{
+  "country": "Vietnam",
+  "name": "Viet Cong 1970",
+  "authors": "Ghosti",
+  "description": "<p>National Liberation Front of South Vietnam during the Vietnam War from 1965 to 1975. Includes air units of the PAVN/VPAF. Requires the OH-6 Vietnam Asset Pack.</p>",
+  "locales": [
+    "vi_Vn"
+  ],
+  "aircrafts": [
+    "Mi-8MTV2 Hip",
+    "MiG-19P Farmer-B",
+    "MiG-21bis Fishbed-N"
+  ],
+  "awacs": [],
+  "tankers": [],
+  "frontline_units": [
+    "PT-76",
+    "VAP VC Zil 130 Armed",
+    "VAP VC Bicycle AK",
+    "VAP VC MG Nest",
+    "VAP VC Bunker"
+  ],
+  "artillery_units": [
+    "VAP VC Type63 107mm MLRS"
+  ],
+  "logistics_units": [
+    "VAP VC Zis 150",
+    "VAP VC Bicycle"
+  ],
+  "infantry_units": [
+    "Infantry AK-74 Rus",
+    "VAP VC Bicycle Mortar"
+  ],
+  "missiles": [],
+  "preset_groups": [
+    "KS-19/SON-9"
+  ],
+  "naval_units": [
+    "Boat Armed Hi-speed",
+    "Boat Schnellboot type S130"
+  ],
+  "air_defense_units": [
+    "VAP VC Zis 150 AAA",
+    "S-60 57mm",
+    "ZSU-57-2 'Sparka'",
+    "AAA ZU-23 Emplacement",
+    "ZU-23 on Ural-375",
+    "ZSU-23-4 Shilka"
+  ],
+  "requirements": {
+    "OH-6 Vietnam Asset Pack": "https://github.com/tobi-be/DCS-OH-6A"
+  },
+  "doctrine": "coldwar"
+}
--- a/resources/squadrons/hornet/VMFA-122.yaml
+++ b/resources/squadrons/hornet/VMFA-122.yaml
@@ -6,6 +6,9 @@ country: USA
 role: Strike Fighter
 aircraft: F/A-18C Hornet (Lot 20)
 livery: VMFA-122 high visibility
+bases:
+  shore: true
+  carrier: true
 mission_types:
  - Anti-ship
  - BAI
--- a/resources/squadrons/hornet/VMFA-251.yaml
+++ b/resources/squadrons/hornet/VMFA-251.yaml
@@ -6,6 +6,9 @@ country: USA
 role: Strike Fighter
 aircraft: F/A-18C Hornet (Lot 20)
 livery: VMFA-251 high visibility
+bases:
+  shore: true
+  carrier: true
 mission_types:
  - Anti-ship
  - BAI
--- a/resources/ui/units/aircrafts/banners/OH-6A.jpg
+++ b/resources/ui/units/aircrafts/banners/OH-6A.jpg
--- a/resources/ui/units/aircrafts/icons/OH-6A_24.jpg
+++ b/resources/ui/units/aircrafts/icons/OH-6A_24.jpg
--- a/resources/ui/units/vehicles/icons/PT_76_24.jpg
+++ b/resources/ui/units/vehicles/icons/PT_76_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_m35_truck_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_m35_truck_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_mule_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_mule_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_mutt_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_mutt_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_mutt_gun_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_mutt_gun_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_type63_mlrs_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_type63_mlrs_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_vc_bicycle_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_vc_bicycle_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_vc_bicycle_ak_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_vc_bicycle_ak_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_vc_bicycle_mortar_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_vc_bicycle_mortar_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_vc_bunker_single_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_vc_bunker_single_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_vc_mg_nest_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_vc_mg_nest_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_vc_zil_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_vc_zil_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_vc_zis_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_vc_zis_24.jpg
--- a/resources/ui/units/vehicles/icons/vap_zis_150_aa_24.jpg
+++ b/resources/ui/units/vehicles/icons/vap_zis_150_aa_24.jpg
--- a/resources/units/aircraft/A-10A.yaml
+++ b/resources/units/aircraft/A-10A.yaml
@@ -16,6 +16,9 @@ price: 12
 role: Close Air Support/Attack
 variants:
  A-10A Thunderbolt II: {}
+altitudes:
+  cruise: 15000
+  combat: 10000
 tasks:
  BAI: 680
  CAS: 680
--- a/resources/units/aircraft/A-10C.yaml
+++ b/resources/units/aircraft/A-10C.yaml
@@ -14,6 +14,9 @@ price: 18
 role: Close Air Support/Attack
 variants:
  A-10C Thunderbolt II (Suite 3): {}
+altitudes:
+  cruise: 15000
+  combat: 10000
 radios:
  intra_flight: AN/ARC-186(V) AM
  inter_flight: AN/ARC-164
--- a/resources/units/aircraft/A-10C_2.yaml
+++ b/resources/units/aircraft/A-10C_2.yaml
@@ -14,6 +14,9 @@ price: 20
 role: Close Air Support/Attack
 variants:
  A-10C Thunderbolt II (Suite 7): {}
+altitudes:
+  cruise: 15000
+  combat: 10000
 radios:
  # DCS will clobber channel 1 of the AN/ARC-164 with the flight's assigned
  # frequency, so we may as well use that one for intra-flight.
--- a/resources/units/aircraft/OH-6A.yaml
+++ b/resources/units/aircraft/OH-6A.yaml
@@ -0,0 +1,20 @@
+class: Helicopter
+carrier_capable: false
+description:
+  The Hughes OH-6 Cayuse is a single-engine light helicopter designed and
+  produced by the American aerospace company Hughes Helicopters.
+introduced: 1966
+lha_capable: false
+can_carry_crates: false
+manufacturer: Hughes Helicopters
+origin: USA
+price: 3
+role: Light Observation/Light Attack
+variants:
+  OH-6A Cayuse: {}
+tasks:
+  BAI: 0
+  CAS: 0
+  OCA/Aircraft: 0
+  Air Assault: 50
+  Transport: 50
--- a/resources/units/ground_units/M1A2C_SEP_V3.yaml
+++ b/resources/units/ground_units/M1A2C_SEP_V3.yaml
@@ -1,6 +1,6 @@
 class: Tank
-description: 
-introduced: 1992
+description: Abrams M1A2 SEPv3 is a modernised configuration of the Abrams main battle tank (MBT) in service with the US Army.The new version offers enhanced protection and survivability, as well as higher lethality than its predecessors. The tank also features various advancements in technology, including improved armour, communications, reliability, sustainment, and fuel efficiency.
+introduced: 2017
 manufacturer: General Dynamics Land Systems
 origin: USA
 price: 25
--- a/resources/units/ground_units/MaxxPro_MRAP.yaml
+++ b/resources/units/ground_units/MaxxPro_MRAP.yaml
@@ -1,6 +1,6 @@
 class: APC
-description: 2007
-introduced: 
+description: The International M1224 MaxxPro MRAP (Mine-Resistant Ambush Protected) is an armored fighting vehicle designed by American company Navistar International's subsidiary Navistar Defense along with the Israeli Plasan Sasa, who designed and manufactures the vehicle's armor. The vehicle was designed to take part in the US military's Mine Resistant Ambush Protected vehicle program, led by the US Marine Corps, as well as a similar US Army-led Medium Mine Protected Vehicle program.
+introduced: 2007
 manufacturer: Navistar/Plasan
 origin: USA
 price: 8
--- a/resources/units/ground_units/SHERIDAN.yaml
+++ b/resources/units/ground_units/SHERIDAN.yaml
@@ -0,0 +1,14 @@
+class: ATGM
+description: The M551 Sheridan AR/AAV (Armored Reconnaissance/Airborne Assault Vehicle)
+  is a light tank developed by the United States and named after General Philip Sheridan,
+  of American Civil War fame. It was designed to be landed by parachute and to swim across
+  rivers. It is armed with the technically advanced M81/M81 Modified/M81E1 152 mm
+  gun/launcher, which fires both conventional ammunition and the MGM-51 Shillelagh guided
+  anti-tank missile.
+introduced: 1966
+manufacturer: General Motors, Cadillac Motor Company
+origin: USA
+price: 16
+role: Light Tank
+variants:
+  M551 "Sheridan": {}
--- a/resources/units/ground_units/T62.yaml
+++ b/resources/units/ground_units/T62.yaml
@@ -0,0 +1,14 @@
+class: Tank
+description: The T-62 is a Soviet main battle tank that was first introduced in 1961.
+  As a further development of the T-55 series, the T-62 retained many similar design
+  elements of its predecessor including low profile and thick turret armour. In
+  contrast with previous tanks, which were armed with rifled tank guns, the T-62 was
+  the first production tank armed with a smoothbore tank gun that could fire APFSDS
+  rounds at higher velocities. 
+introduced: 1961
+manufacturer: UralVagonZavod
+origin: USSR/Russia
+price: 19
+role: Main Battle Tank
+variants:
+  T-62: {}
--- a/resources/units/ground_units/T64BV.yaml
+++ b/resources/units/ground_units/T64BV.yaml
@@ -0,0 +1,17 @@
+class: Tank
+description: The T-64 is a Soviet second-generation main battle tank, designed by
+  Kharkiv Morozov Machine Building Design Bureau in Ukraine, introduced in the early
+  1960s. It was a more advanced counterpart to the T-62; the T-64 served in tank
+  divisions, while the T-62 supported infantry in motorized rifle divisions. It
+  introduced a number of advanced features including composite armour, a compact
+  engine and transmission, and a smoothbore 125-mm gun equipped with an autoloader
+  to allow the crew to be reduced to three so the tank could be smaller and lighter.
+  In spite of being armed and armoured like a heavy tank, the T-64 weighed only 38
+  tonnes (42 short tons; 37 long tons).
+introduced: 1966
+manufacturer: Kharkiv
+origin: USSR/Russia
+price: 19
+role: Main Battle Tank
+variants:
+  T-64BV: {}
--- a/resources/units/ground_units/vap_m35_truck.yaml
+++ b/resources/units/ground_units/vap_m35_truck.yaml
@@ -0,0 +1,4 @@
+class: Logistics
+price: 3
+variants:
+  VAP US M35 Truck: null
--- a/resources/units/ground_units/vap_mule.yaml
+++ b/resources/units/ground_units/vap_mule.yaml
@@ -0,0 +1,5 @@
+class: Logistics
+price: 3
+variants:
+  VAP US Mule: {}
+  M274 1/2-ton 4x4 utility truck: {}
--- a/resources/units/ground_units/vap_mutt.yaml
+++ b/resources/units/ground_units/vap_mutt.yaml
@@ -0,0 +1,5 @@
+class: Logistics
+price: 3
+variants:
+  VAP US MUTT: {}
+  M151 1/4-ton 4x4 utility truck: {}
--- a/resources/units/ground_units/vap_mutt_gun.yaml
+++ b/resources/units/ground_units/vap_mutt_gun.yaml
@@ -0,0 +1,6 @@
+class: ATGM
+price: 10
+role: Self-Propelled Recoilless Rifle
+variants:
+  VAP US MUTT Gun: {}
+  M151A1C MUTT w/ 106mm Recoilless Rifle: {}
--- a/resources/units/ground_units/vap_type63_mlrs.yaml
+++ b/resources/units/ground_units/vap_type63_mlrs.yaml
@@ -0,0 +1,5 @@
+class: Artillery
+price: 10
+role: Multiple-Launch Rocket System
+variants:
+  VAP VC Type63 107mm MLRS: {}
--- a/resources/units/ground_units/vap_vc_bicycle.yaml
+++ b/resources/units/ground_units/vap_vc_bicycle.yaml
@@ -0,0 +1,4 @@
+class: Logistics
+price: 2
+variants:
+  VAP VC Bicycle: null
--- a/resources/units/ground_units/vap_vc_bicycle_ak.yaml
+++ b/resources/units/ground_units/vap_vc_bicycle_ak.yaml
@@ -0,0 +1,5 @@
+class: Recon
+price: 2
+role: Recon
+variants:
+  VAP VC Bicycle AK: {}
--- a/resources/units/ground_units/vap_vc_bicycle_mortar.yaml
+++ b/resources/units/ground_units/vap_vc_bicycle_mortar.yaml
@@ -0,0 +1,5 @@
+class: Infantry
+price: 0
+spawn_weight: 1
+variants:
+  VAP VC Bicycle Mortar: null
--- a/resources/units/ground_units/vap_vc_bunker_single.yaml
+++ b/resources/units/ground_units/vap_vc_bunker_single.yaml
@@ -0,0 +1,4 @@
+class: IFV
+price: 4
+variants:
+  VAP VC Bunker: null
--- a/resources/units/ground_units/vap_vc_mg_nest.yaml
+++ b/resources/units/ground_units/vap_vc_mg_nest.yaml
@@ -0,0 +1,4 @@
+class: APC
+price: 3
+variants:
+  VAP VC MG Nest: null
--- a/resources/units/ground_units/vap_vc_zil.yaml
+++ b/resources/units/ground_units/vap_vc_zil.yaml
@@ -0,0 +1,6 @@
+class: ATGM
+description:
+price: 7
+role: Armed Truck
+variants:
+  VAP VC Zil 130 Armed: {}
--- a/resources/units/ground_units/vap_vc_zis.yaml
+++ b/resources/units/ground_units/vap_vc_zis.yaml
@@ -0,0 +1,4 @@
+class: Logistics
+price: 3
+variants:
+  VAP VC Zis 150: null
--- a/resources/units/ground_units/vap_zis_150_aa.yaml
+++ b/resources/units/ground_units/vap_zis_150_aa.yaml
@@ -0,0 +1,6 @@
+class: AAA
+description:
+price: 7
+role: Self-Propelled Anti-Aircraft Gun
+variants:
+  VAP VC Zis 150 AAA: {}
--- a/resources/units/ships/vap_us_seafloat.yaml
+++ b/resources/units/ships/vap_us_seafloat.yaml
@@ -0,0 +1,4 @@
+class: Boat
+price: 0
+variants:
+  VAP - US Sea Float Barge: null