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

resources/campaigns/mozdok_to_maykop.yaml

@@ -3,7 +3,7 @@ theater: Caucasus
 authors: Khopa
 recommended_player_faction: Russia 2010
 recommended_enemy_faction: USA 1990
-description: <p>A small theater in Russia, progress from Mozdok to Maykop.</p><p>This scenario is pretty simple, and is ideal if you want to run a short campaign to try liberation. If your PC is not powerful, this is also the less performance heavy scenario.</p>
+description: <p>A small theater in Russia, progress from Mozdok to Maykop.</p><p>This scenario is pretty simple, and is ideal if you want to run a short campaign to try Retribution. If your PC is not powerful, this is also the less performance heavy scenario.</p>
 miz: mozdok_to_maykop.miz
 performance: 0
 version: 9.0

resources/customized_payloads/UH-60L.lua

@@ -1,50 +1,95 @@
-local unitPayloads =
-{
+local unitPayloads = {
 	["name"] = "UH-60L",
-	["payloads"] =
-	{
-		[1] =
-		{
-			["name"] = "Retribution Ferry",
-			["pylons"] =
-			{
+	["payloads"] = {
+		[1] = {
+			["name"] = "Liberation Air Assault",
+			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{UH60_FUEL_TANK_230}",
+					["CLSID"] = "<CLEAN>",
 					["num"] = 7,
 				},
 				[2] = {
-					["CLSID"] = "{UH60_FUEL_TANK_230}",
+					["CLSID"] = "<CLEAN>",
 					["num"] = 1,
 				},
 				[3] = {
-					["CLSID"] = "{UH60_FUEL_TANK_230}",
+					["CLSID"] = "<CLEAN>",
 					["num"] = 2,
 				},
 				[4] = {
-					["CLSID"] = "{UH60_FUEL_TANK_230}",
+					["CLSID"] = "<CLEAN>",
 					["num"] = 6,
 				},
 				[5] = {
-					["CLSID"] = "{UH60_SEAT_GUNNER_L}",
-					["num"] = 3,
-				},
-				[6] = {
 					["CLSID"] = "{UH60_SEAT_CARGO_ALL}",
 					["num"] = 4,
 				},
-				[7] = {
-					["CLSID"] = "{UH60_SEAT_GUNNER_R}",
-					["num"] = 5,
+			},
+			["tasks"] = {
+				[1] = 35,
+			},
+		},
+		[2] = {
+			["displayName"] = "Liberation Ferry",
+			["name"] = "Liberation Ferry",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{UH60_SEAT_CARGO_ALL}",
+					["num"] = 4,
+				},
+				[4] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
 				},
 			},
-			["tasks"] =
-			{
+			["tasks"] = {
+				[1] = 35,
+			},
+		},
+		[3] = {
+			["displayName"] = "Liberation Transport",
+			["name"] = "Liberation Transport",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+				},
+				[4] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{UH60_SEAT_CARGO_ALL}",
+					["num"] = 4,
+				},
+			},
+			["tasks"] = {
 				[1] = 35,
-				[2] = 17,
 			},
 		},
 	},
-	["tasks"] = {},
+	["tasks"] = {
+	},
 	["unitType"] = "UH-60L",
 }
 return unitPayloads

resources/factions/blufor_late_coldwar.json

@@ -12,8 +12,11 @@
     "AJS-37 Viggen",
     "AV-8B Harrier II Night Attack",
     "B-52H Stratofortress",
+    "C-101CC Aviojet",
     "C-130",
     "C-130J-30 Super Hercules",
+    "CH-47D",
+    "CH-53E",
     "F-14A Tomcat (Block 135-GR Late)",
     "F-14B Tomcat",
     "F-15C Eagle",
@@ -22,6 +25,7 @@
     "F/A-18C Hornet (Lot 20)",
     "F-4E Phantom II",
     "F-5E Tiger II",
+    "Mi-8MTV2 Hip",
     "MiG-21bis Fishbed-N",
     "Mirage-F1B",
     "Mirage-F1BE",
@@ -31,7 +35,9 @@
     "S-3B Viking",
     "SA 342L Gazelle",
     "SA 342M Gazelle",
-    "UH-1H Iroquois"
+    "UH-1H Iroquois",
+    "UH-60A",
+    "UH-60L"
   ],
   "awacs": [
     "E-2C Hawkeye",

resources/factions/russia_1980.json

@@ -2,23 +2,27 @@
   "country": "Russia",
   "name": "Russia 1980",
   "authors": "Starfire",
-  "description": "<p>Soviet army in the 1980s.</p>",
+  "description": "<p>Soviet military in the 1980s.</p>",
   "locales": [
     "ru_RU"
   ],
   "aircrafts": [
+    "IL-76MD",
     "Mi-24V Hind-E",
     "Mi-24P Hind-F",
     "Mi-8MTV2 Hip",
     "MiG-21bis Fishbed-N",
     "MiG-23MLD Flogger-K",
     "MiG-25PD Foxbat-E",
+    "MiG-27K Flogger-J2",
     "MiG-29A Fulcrum-A",
+    "MiG-31 Foxhound",
     "Su-17M4 Fitter-K",
     "Su-24M Fencer-D",
     "Su-25 Frogfoot",
+    "Su-27 Flanker-B",
     "Tu-142 Bear-F",
-	"Tu-22M3 Backfire-C",
+    "Tu-22M3 Backfire-C",
     "Tu-95MS Bear-H"
   ],
   "awacs": [
@@ -60,7 +64,9 @@
     "KS-19/SON-9"
   ],
   "naval_units": [
-    "Corvette 1241.1 Molniya"
+    "Corvette 1241.1 Molniya",
+    "Corvette 1124.4 Grish",
+    "SSK 877V Kilo"
   ],
   "air_defense_units": [
     "SAM P19 \"Flat Face\" SR (SA-2/3)",
@@ -81,4 +87,4 @@
   "carrier_names": [],
   "has_jtac": false,
   "doctrine": "coldwar"
-}
+}

resources/plugins/ctld/plugin.json

@@ -3,7 +3,7 @@
     "defaultValue": true,
     "specificOptions": [
         {
-            "nameInUI": "Tailor CTLD for the Liberation specific missions",
+            "nameInUI": "Tailor CTLD for the Retribution specific missions",
             "mnemonic": "tailorctld",
             "defaultValue": true
         },

resources/theaters/falklands/info.yaml

@@ -17,7 +17,7 @@ climate:
   day_night_temperature_difference: 11.0
   seasons:
     # "winter" and "summer" are actually interpreted as northern hemisphere
-    # seasons in liberation, so these seasons are all inverted.
+    # seasons in Retribution, so these seasons are all inverted.
     winter:
       average_pressure: 29.63
       average_temperature: 21.0