Merge remote-tracking branch 'remotes/dcs-retribution/dcs-retribution/dev' into pretense-generator

2025-11-10 15:41:24 +00:00 · 2024-06-22 09:57:18 +03:00
parent 7f7821f878 af83088dfd
commit b27141cb1e
44 changed files with 324 additions and 129 deletions
--- a/resources/campaigns/grabthars_hammer.miz
+++ b/resources/campaigns/grabthars_hammer.miz
--- a/resources/campaigns/grabthars_hammer.yaml
+++ b/resources/campaigns/grabthars_hammer.yaml
@@ -43,11 +43,6 @@ squadrons:
      aircraft:
        - AH-64D Apache Longbow
      size: 4
-    - primary: CAS
-      secondary: any
-      aircraft:
-        - OH-58D(R) Kiowa Warrior
-      size: 4
    - primary: Refueling
      aircraft:
        - KC-135 Stratotanker
@@ -101,7 +96,12 @@ squadrons:
      secondary: air-to-ground
      aircraft:
        - AV-8B Harrier II Night Attack
-      size: 18
+      size: 10
+    - primary: CAS
+      secondary: any
+      aircraft:
+        - OH-58D(R) Kiowa Warrior
+      size: 8      
    - primary: Air Assault
      secondary: any
      aircraft:
--- a/resources/campaigns/operation_gazelle.miz
+++ b/resources/campaigns/operation_gazelle.miz
--- a/resources/campaigns/operation_gazelle.yaml
+++ b/resources/campaigns/operation_gazelle.yaml
@@ -32,7 +32,7 @@ squadrons:
      aircraft:
        - C-130J-30 Super Hercules
        - C-130
-      size: 8
+      size: 4
  # Tel Nof
  23:
    - primary: SEAD
@@ -53,20 +53,20 @@ squadrons:
      secondary: any
      aircraft:
        - UH-1H Iroquois
-      size: 8
+      size: 4
  # Hatzor
  20:
    - primary: BAI
      secondary: any
      aircraft:
        - A-4E Skyhawk
-        - F-4E Phantom II
+        - F-4E-45MC Phantom II
      size: 20
    - primary: Strike
      secondary: any
      aircraft:
        - A-4E Skyhawk
-        - F-4E Phantom II
+        - F-4E-45MC Phantom II
      size: 20
  # El Arish
  29:
@@ -83,7 +83,7 @@ squadrons:
      secondary: any
      aircraft:
        - MiG-15bis Fagot
-      size: 8
+      size: 16
    - primary: Air Assault
      secondary: any
      aircraft:
@@ -91,50 +91,31 @@ squadrons:
      size: 4
  # Al Mansurah
  14:
-    - primary: Escort
-      secondary:
-        - BAI
-        - BARCAP
-        - Escort
-        - Fighter sweep
-        - Intercept
-        - TARCAP
+    - primary: BARCAP
+      secondary: any
      aircraft:
        - MiG-21bis Fishbed-N
-      size: 20    
+      size: 16
    - primary: BAI
      secondary: any
      aircraft:
        - MiG-19P Farmer-B
-      size: 20
+      size: 16
+  # Cairo West
+  18:
+    - primary: Strike
+      secondary: any
+      aircraft:
+        - Tu-16 Badger
+      size: 14
+    - primary: Escort
+      secondary: air-to-air
+      aircraft:
+        - MiG-21bis Fishbed-N
+      size: 16
+  # FARP
+  Port Tewfik Staging Area:
    - primary: Transport
-      secondary: any
-      aircraft:
-        - Mi-8MTV2 Hip
-      size: 4
-  # Cairo West
-  18:
-    - primary: Strike
-      secondary:
-        - DEAD
-        - OCA/Runway
-      aircraft:
-        - Tu-16 Badger
-      size: 15
-    - primary: BARCAP
-      secondary:
-        - BAI
-        - BARCAP
-        - Escort
-        - Fighter sweep
-        - Intercept
-        - TARCAP
-      aircraft:
-        - MiG-21bis Fishbed-N
-      size: 20
-  # FARP
-  Port Tewfik Staging Area:
-    - primary: Air Assault
      secondary: any
      aircraft:
        - Mi-8MTV2 Hip
--- a/resources/campaigns/operation_peace_spring.miz
+++ b/resources/campaigns/operation_peace_spring.miz
--- a/resources/campaigns/operation_peace_spring.yaml
+++ b/resources/campaigns/operation_peace_spring.yaml
@@ -36,6 +36,11 @@ squadrons:
      aircraft:
        - S-3B Tanker
      size: 4
+    - primary: Air Assault
+      secondary: any
+      aircraft:
+        - UH-60A
+      size: 4      
  # Akrotiri
  44:
    - primary: Strike
@@ -85,11 +90,6 @@ squadrons:
      aircraft:
        - OH-58D(R) Kiowa Warrior
      size: 4
-    - primary: Air Assault
-      secondary: any
-      aircraft:
-        - UH-60A
-      size: 4
  # Damascus
  7:
    - primary: Strike
--- a/resources/customized_payloads/EA_6B.lua
+++ b/resources/customized_payloads/EA_6B.lua
@@ -0,0 +1,36 @@
+local unitPayloads = {
+	["name"] = "EA_6B",
+	["payloads"] = {
+		[1] = {
+			["displayName"] = "Liberation SEAD",
+			["name"] = "Liberation SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{0395076D-2F77-4420-9D33-087A4398130B}",
+					["num"] = 2,
+				},
+				[3] = {
+					["CLSID"] = "{EA6B_ANALQ992}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{0395076D-2F77-4420-9D33-087A4398130B}",
+					["num"] = 4,
+				},
+				[5] = {
+					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+	},
+	["unitType"] = "EA_6B",
+}
+return unitPayloads
--- a/resources/factions/usa_1975.json
+++ b/resources/factions/usa_1975.json
@@ -13,6 +13,7 @@
    "CH-53E",
    "A-4E Skyhawk",
    "A-7E Corsair II",
+    "EA-6B Prowler",
    "F-14A Tomcat (AI)",
    "F-14A Tomcat (Block 135-GR Late)",
    "F-4B Phantom II",
--- a/resources/factions/usa_1990.json
+++ b/resources/factions/usa_1990.json
@@ -16,6 +16,7 @@
    "C-130J-30 Super Hercules",
    "CH-47D",
    "CH-53E",
+    "EA-6B Prowler",
    "F-117A Nighthawk",
    "F-14A Tomcat (AI)",
    "F-14A Tomcat (Block 135-GR Late)",
--- a/resources/factions/usa_2005.json
+++ b/resources/factions/usa_2005.json
@@ -26,21 +26,22 @@
    "F-15E Strike Eagle (AI)",
    "F-15E Strike Eagle (Suite 4+)",
    "F-16CM Fighting Falcon (Block 50)",
-	"F-16D Fighting Falcon (Block 52+)",
-	"F-16D Fighting Falcon (Block 52)",
-	"F-16D Fighting Falcon (Block 50+)",
-	"F-16D Fighting Falcon (Block 50)",
+	  "F-16D Fighting Falcon (Block 52+)",
+	  "F-16D Fighting Falcon (Block 52)",
+	  "F-16D Fighting Falcon (Block 50+)",
+	  "F-16D Fighting Falcon (Block 50)",
    "F-22A Raptor",
    "F/A-18C Hornet (Lot 20)",
-	"F/A-18E Super Hornet",
-	"F/A-18F Super Hornet",
-	"EA-18G Growler",
+	  "F/A-18E Super Hornet",
+	  "F/A-18F Super Hornet",
+    "EA-6B Prowler",
+	  "EA-18G Growler",
    "OH-58D(R) Kiowa Warrior",
    "S-3B Viking",
    "SH-60B Seahawk",
    "UH-1H Iroquois",
-	"UH-60A",
-	"UH-60L"
+	  "UH-60A",
+	  "UH-60L"
  ],
  "awacs": [
    "E-2C Hawkeye",
--- a/resources/factions/usn_1985.json
+++ b/resources/factions/usn_1985.json
@@ -10,6 +10,7 @@
    "AH-1W SuperCobra",
    "A-4E Skyhawk",
    "A-6A Intruder",
+    "EA-6B Prowler",
    "A-7E Corsair II",
    "F-14A Tomcat (AI)",
    "F-14A Tomcat (Block 135-GR Late)",
--- a/resources/factions/usn_2005.json
+++ b/resources/factions/usn_2005.json
@@ -8,6 +8,7 @@
  ],
  "aircrafts": [
    "F-14B Tomcat",
+    "EA-6B Prowler",
    "F/A-18C Hornet (Lot 20)",
 	"F/A-18E Super Hornet",
 	"F/A-18F Super Hornet",
--- a/resources/factions/usn_2009.json
+++ b/resources/factions/usn_2009.json
@@ -11,7 +11,8 @@
    "F/A-18C Hornet (Lot 20)",
 	"F/A-18E Super Hornet",
 	"F/A-18F Super Hornet",
-  "EA-18G Growler",
+    "EA-18G Growler",
+    "EA-6B Prowler",
    "AV-8B Harrier II Night Attack",
    "AH-1W SuperCobra",
    "S-3B Viking",
--- a/resources/squadrons/OH58D/AUS
+++ b/resources/squadrons/OH58D/AUS
@@ -3,8 +3,7 @@ name: Australian Army
 country: Australia
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - AUS Army Fictional
+livery: AUS Army Fictional
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/DE
+++ b/resources/squadrons/OH58D/DE
@@ -3,8 +3,7 @@ name: German Army
 country: Germany
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - DE Army Fictional
+livery: DE Army Fictional
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/ES
+++ b/resources/squadrons/OH58D/ES
@@ -3,8 +3,7 @@ name: Spanish Army
 country: Spain
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - ES Army Fictional
+livery: ES Army Fictional
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/FR
+++ b/resources/squadrons/OH58D/FR
@@ -3,8 +3,7 @@ name: French Army
 country: France
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - FR Army Fictional
+livery: FR Army Fictional
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/GR
+++ b/resources/squadrons/OH58D/GR
@@ -3,8 +3,7 @@ name: Greek Army
 country: Greece
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - GR Army Fictional
+livery: GR Army Fictional
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/ISR
+++ b/resources/squadrons/OH58D/ISR
@@ -3,8 +3,7 @@ name: Israeli Army
 country: Israel
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - ISR Army Fictional
+livery: ISR Army Fictional
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/JPN
+++ b/resources/squadrons/OH58D/JPN
@@ -3,8 +3,7 @@ name: Japanese Army
 country: Japan
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - JPN Army Fictional
+livery: JPN Army Fictional
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/NL
+++ b/resources/squadrons/OH58D/NL
@@ -3,8 +3,7 @@ name: Dutch Army
 country: The Netherlands
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - NL Army Fictional
+livery: NL Army Fictional
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/PL
+++ b/resources/squadrons/OH58D/PL
@@ -3,8 +3,7 @@ name: Polish Army
 country: Poland
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - PL Army Fictional
+livery: PL Army Fictional
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/RU
+++ b/resources/squadrons/OH58D/RU
@@ -3,8 +3,7 @@ name: Russian Army
 country: Russia
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - RU Army Fictional
+livery: RU Army Fictional
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/TUN
+++ b/resources/squadrons/OH58D/TUN
@@ -3,8 +3,7 @@ name: Tunisian Army
 country: Tunisia
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - TUN Army
+livery: TUN Army
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/TWN
+++ b/resources/squadrons/OH58D/TWN
@@ -3,8 +3,7 @@ name: Taiwanese Army
 country: Combined Joint Task Forces Blue
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - TWN Army Fictional
+livery: TWN Army Fictional
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/UK
+++ b/resources/squadrons/OH58D/UK
@@ -3,8 +3,7 @@ name: British Army Air Corps Desert
 country: UK
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - UK Army Fictional Desert
+livery: UK Army Fictional Desert
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/UK
+++ b/resources/squadrons/OH58D/UK
@@ -3,8 +3,7 @@ name: British Army Air Corps
 country: UK
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - UK Army Fictional
+livery: UK Army Fictional
 mission_types:
  - BAI
  - CAS
--- a/resources/squadrons/OH58D/US
+++ b/resources/squadrons/OH58D/US
@@ -5,8 +5,7 @@ female_pilot_percentage: 10
 country: USA
 role: Light Attack and Scout Helicopter
 aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - US 3-17 B 937 Iraq
+livery: US 3-17 B 937 Iraq
 mission_types:
  - BAI
  - CAS
--- a/resources/ui/units/aircrafts/banners/EA_6B.jpg
+++ b/resources/ui/units/aircrafts/banners/EA_6B.jpg
--- a/resources/ui/units/aircrafts/icons/EA_6B_24.jpg
+++ b/resources/ui/units/aircrafts/icons/EA_6B_24.jpg
--- a/resources/units/aircraft/EA_6B.yaml
+++ b/resources/units/aircraft/EA_6B.yaml
@@ -0,0 +1,17 @@
+carrier_capable: true
+description:
+  "The Northrop Grumman EA-6B Prowler is a twin-engine, four-seat, mid-wing electronic-warfare \
+  \ aircraft derived from the A-6 Intruder airframe. The EA-6A was the initial electronic warfare \
+  \ version of the A-6 used by the United States Marine Corps and United States Navy. \
+  \ It was capable of carrying and firing anti-radiation missiles (ARMs), such as the AGM-88 HARM."
+introduced: 1971
+manufacturer: Northrop Grumman
+origin: USA
+price: 11
+role: Carrier-based Electronic-warfare Aircraft
+gunfighter: false
+variants:
+  EA-6B Prowler: {}
+tasks:
+  SEAD: 460
+  SEAD Escort: 460