Merge branch 'develop' into helipads

# Conflicts:
#	game/game.py
#	game/operation/operation.py
#	game/theater/controlpoint.py
#	gen/aircraft.py
#	resources/campaigns/golan_heights_lite.miz

resources/campaigns/First_Lebanon_War.json

@@ -0,0 +1,11 @@
+{
+  "name": "Syria - First Lebanon War",
+  "theater": "Syria",
+  "authors": "Mustang25",
+  "recommended_player_faction": "Israel 1982",
+  "recommended_enemy_faction": "Syria 1982",
+  "description": "<p> 1100HRS, 06 June 1982: H-hour for Operation Peace for Galilee. </p><p>Objective: Push North towards Beirut and into the Bekaa Valley, eliminating or displacing any PLO and Syrian resistance. Airbases and their surrounding infrastructure in Syria are not the main objective but are still viable strategic targets.</p> <p>Background: Years of PLO encroachment into the UN neutral zone and their resulting terror attacks against Israelis have pushed tension along the border to a breaking point. On June 3, the attempted assassination of Israeli Ambassador, Shlomo Argov by gunmen with ties to the PLO have finally pushed the Israelis to action.</p><p>Recommended Starting Budget:</p><p>$1500m for recommended factions, $$2000m for modern scenarios</p><p>Income Multiplier:</p><p>Blue: 1.0x</p><p>Red: 0.7x-1.0x</p>",
+  "miz": "First_Lebanon_War_v3.0.2.miz",
+  "version": "6.0",
+  "performance": 2
+  }

resources/campaigns/around_the_mountain.json

@@ -1,11 +0,0 @@
-{
-  "name": "Caucasus - Around The Mountain",
-  "theater": "Caucasus",
-  "authors": "Dillie",
-  "recommended_player_faction": "Russia 2010",
-  "recommended_enemy_faction": "USA 1990",
-  "description": "<p>Scenario from Russia to Georgia in two Frontlines.</p>",
-  "version": "6.0",
-  "miz": "around_the_mountain.miz",
-  "performance": 2
-}

resources/campaigns/inherent_resolve.json

@@ -5,7 +5,7 @@
   "recommended_player_faction": "USA 2005",
   "recommended_enemy_faction": "Insurgents (Hard)",
   "description": "<p>In this scenario, you start from Jordan, and have to fight your way through eastern Syria.</p>",
-  "version": "6.0",
+  "version": "6.1",
   "miz": "inherent_resolve.miz",
   "performance": 2
 }

resources/campaigns/operation_allied_sword.json

@@ -2,8 +2,6 @@
     "name": "Syria - Operation Allied Sword",
     "theater": "Syria",
     "authors": "Fuzzle",
-    "recommended_player_faction": "Israel-USN 2005 (Allied Sword)",
-    "recommended_enemy_faction": "Syria-Lebanon 2005 (Allied Sword)",
     "description": "<p>In this fictional scenario, a US/Israeli coalition must push north from the Israeli border, through Syria and Lebanon to Aleppo.</p><p><strong>Backstory:</strong> A Syrian-Lebanese joint force (with Russian materiel support) has attacked Israel, attmepting to cross the northern border. With the arrival of a US carrier group, Israel prepares its counterattack. The US Navy will handle the Beirut region's coastal arena, while the IAF will push through Damascus and the inland mountain ranges.</p>",
     "version": "6.0",
     "miz": "operation_allied_sword.miz",

resources/customized_payloads/F-16C_50.lua

@@ -131,40 +131,40 @@ local unitPayloads = {
 			},
 		},
 		[4] = {
-			["name"] = "STRIKE",
+			["name"] = "Liberation Strike",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}",
-					["num"] = 7,
-				},
-				[2] = {
-					["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}",
-					["num"] = 4,
-				},
-				[3] = {
-					["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}",
-					["num"] = 6,
-				},
-				[4] = {
-					["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}",
-					["num"] = 3,
-				},
-				[5] = {
-					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
-					["num"] = 2,
-				},
-				[6] = {
-					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
-					["num"] = 8,
-				},
-				[7] = {
 					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
 					["num"] = 9,
 				},
-				[8] = {
+				[2] = {
 					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
 					["num"] = 1,
 				},
+				[3] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 2,
+				},
+				[4] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 8,
+				},
+				[5] = {
+					["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}",
+					["num"] = 4,
+				},
+				[7] = {
+					["CLSID"] = "{GBU-31}",
+					["num"] = 3,
+				},
+				[8] = {
+					["CLSID"] = "{GBU-31}",
+					["num"] = 7,
+				},
 				[9] = {
 					["CLSID"] = "<CLEAN>",
 					["num"] = 5,
@@ -175,6 +175,7 @@ local unitPayloads = {
 				},
 			},
 			["tasks"] = {
+				[1] = 33,
 			},
 		},
 		[5] = {

resources/customized_payloads/Mi-24P.lua

@@ -0,0 +1,217 @@
+local unitPayloads = {
+	["name"] = "Mi-24P",
+	["payloads"] = {
+		[1] = {
+			["displayName"] = "Liberation CAS",
+			["name"] = "Liberation CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 6,
+				},
+				[2] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}",
+					["num"] = 4,
+				},
+				[4] = {
+					["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}",
+					["num"] = 3,
+				},
+				[5] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 5,
+				},
+				[6] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 31,
+				[2] = 18,
+				[3] = 32,
+			},
+		},
+		[2] = {
+			["displayName"] = "Liberation BAI",
+			["name"] = "Liberation BAI",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 6,
+				},
+				[2] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}",
+					["num"] = 4,
+				},
+				[4] = {
+					["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}",
+					["num"] = 3,
+				},
+				[5] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 5,
+				},
+				[6] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 31,
+				[2] = 18,
+				[3] = 32,
+			},
+		},
+		[3] = {
+			["displayName"] = "Liberation Strike",
+			["name"] = "Liberation Strike",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}",
+					["num"] = 4,
+				},
+				[2] = {
+					["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}",
+					["num"] = 3,
+				},
+				[3] = {
+					["CLSID"] = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}",
+					["num"] = 2,
+				},
+				[4] = {
+					["CLSID"] = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}",
+					["num"] = 5,
+				},
+				[5] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 1,
+				},
+				[6] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 6,
+				},
+			},
+			["tasks"] = {
+				[1] = 31,
+			},
+		},
+		[4] = {
+			["displayName"] = "Liberation Antiship",
+			["name"] = "Liberation Antiship",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 6,
+				},
+				[2] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}",
+					["num"] = 4,
+				},
+				[4] = {
+					["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}",
+					["num"] = 3,
+				},
+				[5] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 5,
+				},
+				[6] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 31,
+				[2] = 18,
+				[3] = 32,
+			},
+		},
+		[5] = {
+			["displayName"] = "Liberation SEAD",
+			["name"] = "Liberation SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 6,
+				},
+				[2] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}",
+					["num"] = 4,
+				},
+				[4] = {
+					["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}",
+					["num"] = 3,
+				},
+				[5] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 5,
+				},
+				[6] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 31,
+				[2] = 18,
+				[3] = 32,
+			},
+		},
+		[6] = {
+			["displayName"] = "Liberation DEAD",
+			["name"] = "Liberation DEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 6,
+				},
+				[2] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}",
+					["num"] = 4,
+				},
+				[4] = {
+					["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}",
+					["num"] = 3,
+				},
+				[5] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 5,
+				},
+				[6] = {
+					["CLSID"] = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 31,
+				[2] = 18,
+				[3] = 32,
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "Mi-24P",
+}
+return unitPayloads

resources/dcs/beacons/syria.json

@@ -139,6 +139,20 @@
   "hertz": 117700000,
   "channel": null
  },
+ {
+  "name": "MUT",
+  "callsign": "MUT",
+  "beacon_type": 4,
+  "hertz": 112300000,
+  "channel": null
+ },
+ {
+  "name": "DHEKELIA",
+  "callsign": "DKA",
+  "beacon_type": 10,
+  "hertz": 343000,
+  "channel": null
+ },
  {
   "name": "",
   "callsign": "IADA",
@@ -157,7 +171,7 @@
   "name": "ADANA",
   "callsign": "ADN",
   "beacon_type": 11,
-  "hertz": 395000000,
+  "hertz": 395000,
   "channel": null
  },
  {
@@ -167,6 +181,41 @@
   "hertz": 112700000,
   "channel": null
  },
+ {
+  "name": "",
+  "callsign": "IAK",
+  "beacon_type": 14,
+  "hertz": 109700000,
+  "channel": null
+ },
+ {
+  "name": "",
+  "callsign": "IAK",
+  "beacon_type": 15,
+  "hertz": 109700000,
+  "channel": null
+ },
+ {
+  "name": "Akrotiri",
+  "callsign": "AKR",
+  "beacon_type": 6,
+  "hertz": 116000000,
+  "channel": 107
+ },
+ {
+  "name": "Akrotiri",
+  "callsign": "AKR",
+  "beacon_type": 3,
+  "hertz": 116000000,
+  "channel": 107
+ },
+ {
+  "name": "AKROTIRI",
+  "callsign": "AK",
+  "beacon_type": 10,
+  "hertz": 365000,
+  "channel": null
+ },
  {
   "name": "KALDE",
   "callsign": "KAD",
@@ -220,7 +269,7 @@
   "name": "BEIRUT",
   "callsign": "BOD",
   "beacon_type": 11,
-  "hertz": 351000000,
+  "hertz": 351000,
   "channel": null
  },
  {
@@ -255,14 +304,14 @@
   "name": "DAMASCUS",
   "callsign": "DAL",
   "beacon_type": 11,
-  "hertz": 342000000,
+  "hertz": 342000,
   "channel": null
  },
  {
   "name": "ABYAD",
   "callsign": "ABD",
   "beacon_type": 10,
-  "hertz": 264000,
+  "hertz": 264,
   "channel": null
  },
  {
@@ -272,6 +321,69 @@
   "hertz": 111100000,
   "channel": null
  },
+ {
+  "name": "ERCAN",
+  "callsign": "ECN",
+  "beacon_type": 4,
+  "hertz": 117000000,
+  "channel": null
+ },
+ {
+  "name": "",
+  "callsign": "IGNP",
+  "beacon_type": 14,
+  "hertz": 109100000,
+  "channel": null
+ },
+ {
+  "name": "",
+  "callsign": "IGNP",
+  "beacon_type": 15,
+  "hertz": 109100000,
+  "channel": null
+ },
+ {
+  "name": "",
+  "callsign": "IGZP",
+  "beacon_type": 14,
+  "hertz": 108500000,
+  "channel": null
+ },
+ {
+  "name": "",
+  "callsign": "IGZP",
+  "beacon_type": 15,
+  "hertz": 108500000,
+  "channel": null
+ },
+ {
+  "name": "ALANYA/GAZIPASA",
+  "callsign": "GZP",
+  "beacon_type": 4,
+  "hertz": 114200000,
+  "channel": null
+ },
+ {
+  "name": "GAZIPASA/ALANYA",
+  "callsign": "GZP",
+  "beacon_type": 10,
+  "hertz": 316000,
+  "channel": null
+ },
+ {
+  "name": "FAMAGUSTA_GECITKALE",
+  "callsign": "GKE",
+  "beacon_type": 4,
+  "hertz": 114300000,
+  "channel": null
+ },
+ {
+  "name": "GECITKALE",
+  "callsign": "GKE",
+  "beacon_type": 10,
+  "hertz": 435000,
+  "channel": null
+ },
  {
   "name": "HATAY",
   "callsign": "HTY",
@@ -317,8 +429,8 @@
  {
   "name": "INCIRLIC",
   "callsign": "DAN",
-  "beacon_type": 6,
-  "hertz": 108400000,
+  "beacon_type": 5,
+  "hertz": null,
   "channel": 21
  },
  {
@@ -349,6 +461,34 @@
   "hertz": 111700000,
   "channel": null
  },
+ {
+  "name": "",
+  "callsign": "ILC",
+  "beacon_type": 14,
+  "hertz": 110300000,
+  "channel": null
+ },
+ {
+  "name": "Larnaca",
+  "callsign": "LCA",
+  "beacon_type": 4,
+  "hertz": 112800000,
+  "channel": null
+ },
+ {
+  "name": "",
+  "callsign": "ILC",
+  "beacon_type": 15,
+  "hertz": 110300000,
+  "channel": null
+ },
+ {
+  "name": "Larnaca",
+  "callsign": "LCA",
+  "beacon_type": 9,
+  "hertz": 432000,
+  "channel": null
+ },
  {
   "name": "",
   "callsign": "IBA",
@@ -373,8 +513,8 @@
  {
   "name": "LATAKIA",
   "callsign": "LTK",
-  "beacon_type": 11,
-  "hertz": 414000000,
+  "beacon_type": 9,
+  "hertz": 414000,
   "channel": null
  },
  {
@@ -391,6 +531,41 @@
   "hertz": 337000,
   "channel": null
  },
+ {
+  "name": "Pafos",
+  "callsign": "PHA",
+  "beacon_type": 10,
+  "hertz": 328000,
+  "channel": null
+ },
+ {
+  "name": "",
+  "callsign": "IPA",
+  "beacon_type": 15,
+  "hertz": 108900000,
+  "channel": null
+ },
+ {
+  "name": "",
+  "callsign": "IPA",
+  "beacon_type": 14,
+  "hertz": 108900000,
+  "channel": null
+ },
+ {
+  "name": "Pafos",
+  "callsign": "IPA",
+  "beacon_type": 3,
+  "hertz": 108900000,
+  "channel": null
+ },
+ {
+  "name": "Pafos",
+  "callsign": "PHA",
+  "beacon_type": 4,
+  "hertz": 117900000,
+  "channel": null
+ },
  {
   "name": "RAMATDAVID",
   "callsign": "RMD",
@@ -398,6 +573,27 @@
   "hertz": 368000,
   "channel": null
  },
+ {
+  "name": "RAMATDAVID",
+  "callsign": "RMD",
+  "beacon_type": 6,
+  "hertz": 113700000,
+  "channel": 84
+ },
+ {
+  "name": "",
+  "callsign": "RMD",
+  "beacon_type": 14,
+  "hertz": 111100000,
+  "channel": null
+ },
+ {
+  "name": "",
+  "callsign": "RMD",
+  "beacon_type": 15,
+  "hertz": 111100000,
+  "channel": null
+ },
  {
   "name": "Cheka",
   "callsign": "CAK",

resources/factions/Israel-USN_2005_Allied_Sword.json

@@ -1,109 +0,0 @@
-{
-  "country": "Israel",
-  "name": "Israel-USN 2005 (Allied Sword)",
-  "authors": "Fuzzle",
-  "description": "<p>A joint US Navy/Israeli modern faction for use with the Operation Allied Sword scenario.</p>",
-  "aircrafts": [
-    "F_4E",
-    "F_15C",
-    "F_15E",
-    "F_16C_50",
-    "F_14B",
-    "FA_18C_hornet",
-    "AV8BNA",
-    "AH_1W",
-    "AH_64D",
-    "S_3B",
-    "SH_60B",
-    "UH_1H"
-  ],
-  "awacs": [
-    "E_2C"
-  ],
-  "tankers": [
-    "KC_135",
-    "KC130",
-    "S_3B_Tanker"
-  ],
-  "frontline_units": [
-    "APC_M113",
-    "APC_HMMWV__Scout",
-    "ATGM_HMMWV",
-    "MBT_Merkava_IV",
-    "SPAAA_Vulcan_M163"
-  ],
-  "artillery_units": [
-    "SPH_M109_Paladin_155mm",
-    "MLRS_M270_227mm"
-  ],
-  "logistics_units": [
-    "Truck_M818_6x6"
-  ],
-  "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
-  ],
-  "air_defenses": [
-    "ChaparralGenerator",
-    "HawkGenerator",
-    "VulcanGenerator",
-    "PatriotGenerator"
-  ],
-  "ewrs": [
-    "HawkEwrGenerator"
-  ],
-  "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
-  ],
-  "helicopter_carrier": [
-    "LHA_1_Tarawa"
-  ],
-  "destroyers": [
-    "DDG_Arleigh_Burke_IIa"
-  ],
-  "cruisers": [
-    "CG_Ticonderoga"
-  ],
-  "requirements": {
-  },
-  "carrier_names": [
-    "CVN-71 Theodore Roosevelt",
-    "CVN-72 Abraham Lincoln",
-    "CVN-73 George Washington",
-    "CVN-74 John C. Stennis",
-    "CVN-75 Harry S. Truman"
-  ],
-  "helicopter_carrier_names": [
-    "LHA-1 Tarawa",
-    "LHA-2 Saipan",
-    "LHA-3 Belleau Wood",
-    "LHA-4 Nassau",
-    "LHA-5 Peleliu"
-  ],
-  "navy_generators": [
-    "ArleighBurkeGroupGenerator",
-    "OliverHazardPerryGroupGenerator"
-
-  ],
-  "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
-  "doctrine": "modern",
-  "liveries_overrides": {
-    "F_14B": [
-      "VF-142 Ghostriders"
-    ],
-    "FA_18C_hornet": [
-      "VMFA-251 high visibility"
-    ],
-    "AV8BNA": [
-      "VMAT-542"
-    ],
-    "AH_1W": [
-      "Marines"
-    ],
-    "UH_1H": [
-      "US NAVY"
-    ]
-  }
-}

resources/factions/NATO_Desert_Storm.json

@@ -4,64 +4,64 @@
   "authors": "Hawkmoon",
   "description": "<p>A faction to recreate the actual unit lineup during Desert Storm as closely as possible</p>",
   "aircrafts": [
-    "F_15C",
-    "F_14A_135_GR",
-    "F_14B",
-    "F_15E",
-    "F_16C_50",
-    "FA_18C_hornet",
-    "A_10A",
-    "AV8BNA",
-    "UH_1H",
-    "AH_64A",
-    "B_52H",
-    "B_1B",
-    "Tornado_IDS",
-    "F_4E",
-    "F_117A",	
-    "M_2000C",
-    "S_3B",
-    "SA342M",
-    "SA342L",
-    "SA342Mistral",
-    "OH_58D"
+    "A-10A Thunderbolt II",
+    "AH-64A Apache",
+    "AV-8B Harrier II Night Attack",
+    "B-1B Lancer",
+    "B-52H Stratofortress",
+    "F-117A Nighthawk",
+    "F-14A Tomcat (Block 135-GR Late)",
+    "F-14B Tomcat",
+    "F-15C Eagle",
+    "F-15E Strike Eagle",
+    "F-16CM Fighting Falcon (Block 50)",
+    "F-4E Phantom II",
+    "F/A-18C Hornet (Lot 20)",
+    "Mirage 2000C",
+    "OH-58D Kiowa Warrior",
+    "S-3B Viking",
+    "SA 342L Gazelle",
+    "SA 342M Gazelle",
+    "SA 342M Gazelle Mistral",
+    "Tornado IDS",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A",
-    "E_2C"
+    "E-2C Hawkeye",
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130",
+    "KC-130",
+    "KC-135 Stratotanker",
     "S-3B Tanker"
   ],
   "frontline_units": [
-    "MBT_M1A2_Abrams",
-    "ATGM_Stryker",
-    "IFV_M2A2_Bradley",
-    "IFV_M1126_Stryker_ICV",
-    "IFV_LAV_25",
-    "Scout_HMMWV",
-    "ATGM_HMMWV",
-    "APC_TPz_Fuchs",
-    "IFV_Warrior",
-    "MBT_Challenger_II",	
-    "MBT_M60A3_Patton",
-    "SPG_Stryker_MGS",
-    "SAM_Avenger__Stinger",
-    "ATGM_VAB_Mephisto"
+    "FV4034 Challenger 2",
+    "FV510 Warrior",
+    "LAV-25",
+    "M1043 HMMWV (M2 HMG)",
+    "M1045 HMMWV (BGM-71 TOW)",
+    "M1097 Heavy HMMWV Avenger",
+    "M1126 Stryker ICV (M2 HMG)",
+    "M1128 Stryker Mobile Gun System",
+    "M1134 Stryker ATGM (BGM-71 TOW)",
+    "M1A2 Abrams",
+    "M2A2 Bradley",
+    "M60A3 \"Patton\"",
+    "TPz Fuchs",
+    "VAB Mephisto"
   ],
   "artillery_units": [
-    "MLRS_M270_227mm",
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -76,16 +76,16 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "FFG_Oliver_Hazzard_Perry"
+    "PERRY"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {},
   "carrier_names": [
@@ -99,5 +99,5 @@
     "OliverHazardPerryGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/Syria-Lebanon_2005_Allied_Sword.json

@@ -1,105 +0,0 @@
-{
-  "country": "Combined Joint Task Forces Red",
-  "name": "Syria-Lebanon 2005 (Allied Sword)",
-  "authors": "Fuzzle",
-  "description": "<p>Syria-Lebanon alliance in a modern setting with several imported Russian assets. Designed for use with the Allied Sword scenario.</p>",
-  "aircrafts": [
-    "MiG_23MLD",
-    "MiG_25PD",
-    "MiG_29S",
-    "Su_17M4",
-    "Su_24M",
-    "Su_30",
-    "Su_34",
-    "L_39ZA",
-    "Tu_22M3",
-    "Mi_24V",
-    "Mi_8MT",
-    "SA342M",
-    "SA342L"
-  ],
-  "awacs": [
-    "A_50"
-  ],
-  "tankers": [
-    "IL_78M"
-  ],
-  "frontline_units": [
-    "IFV_BMP_1",
-    "IFV_BMP_2",
-    "APC_BTR_80",
-    "IFV_BRDM_2",
-    "APC_MTLB",
-    "APC_Cobra__Scout",
-    "MBT_T_55",
-    "MBT_T_72B",
-    "MBT_T_90",
-    "SPAAA_ZSU_57_2"
-  ],
-  "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
-    "SPH_2S9_Nona_120mm_M",
-    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S1_Gvozdika_122mm"
-  ],
-  "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
-  ],
-  "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_S_Grouse"
-  ],
-  "air_defenses": [
-    "ColdWarFlakGenerator",
-    "SA2Generator",
-    "SA3Generator",
-    "SA6Generator",
-    "SA8Generator",
-    "SA9Generator",
-    "SA10Generator",
-    "SA11Generator",
-    "SA13Generator",
-    "SA19Generator",
-    "ZSU23Generator",
-    "ZU23Generator",
-    "ZU23UralGenerator",
-    "ZSU57Generator"
-  ],
-  "ewrs": [
-    "BoxSpringGenerator",
-    "TallRackGenerator"
-  ],
-  "missiles": [
-    "ScudGenerator"
-  ],
-  "missiles_group_count": 2,
-    "coastal_defenses": [
-    "SilkwormGenerator"
-  ],
-  "coastal_group_count": 4,
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-    "Frigate_1135M_Rezky",
-    "Corvette_1241_1_Molniya"
-  ],
-  "cruisers": [
-  ],
-  "requirements": {},
-  "carrier_names": [
-  ],
-  "coastal_group_count": 8,
-  "navy_generators": [
-    "GrishaGroupGenerator",
-    "MolniyaGroupGenerator",
-    "RussianNavyGroupGenerator",
-    "LaCombattanteIIGroupGenerator"
-  ]
-}

resources/factions/allies_1940.json

@@ -4,47 +4,40 @@
   "authors": "Khopa",
   "description": "<p>A generic WW2 ally factions for 1940 Battle of France or Battle of England.</p>",
   "aircrafts": [
-    "SpitfireLFMkIX",
-    "SpitfireLFMkIXCW",
-    "A_20G"
+    "Boston Mk.III",
+    "Spitfire LF Mk IX",
+    "Spitfire LF Mk IX (Clipped Wings)"
   ],
   "frontline_units": [
-    "APC_M2A1_Halftrack",
-    "HIT_Churchill_VII",
-    "Car_Daimler_Armored",
-    "LT_Mk_VII_Tetrarch",
-    "AAA_QF_3_7",
-    "AAA_Bofors_40mm"
-  ],
-  "artillery_units": [
+    "A17 Light Tank Mk VII Tetrarch",
+    "A22 Infantry Tank MK IV Churchill VII",
+    "Daimler Armoured Car Mk I",
+    "M2A1 Half-Track",
+    "QF 3.7-inch AA Gun",
+    "QF 40 mm Mark III"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_Bedford",
-    "Truck_GMC_Jimmy_6x6_Truck"
+    "Truck Bedford",
+    "Truck GMC \"Jimmy\" 6x6 Truck"
   ],
   "infantry_units": [
-    "Infantry_SMLE_No_4_Mk_1",
-    "Infantry_M1_Garand"
+    "Infantry M1 Garand",
+    "Infantry SMLE No.4 Mk-1"
   ],
   "air_defenses": [
     "AllyWW2FlakGenerator",
     "BoforsGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {
     "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "WW2LSTGroupGenerator"
   ],
@@ -52,4 +45,4 @@
   "has_jtac": false,
   "doctrine": "ww2",
   "building_set": "ww2ally"
-}
+}

resources/factions/allies_1944.json

@@ -4,60 +4,54 @@
   "authors": "Khopa",
   "description": "<p>A generic WW2 ally factions, with all their WW2 units.</p>",
   "aircrafts": [
-    "P_51D",
-    "P_51D_30_NA",
-    "P_47D_30",
-    "P_47D_30bl1",
-    "P_47D_40",
-    "SpitfireLFMkIX",
-    "SpitfireLFMkIXCW",
-    "A_20G",
-    "B_17G"
+    "A-20G Havoc",
+    "B-17G Flying Fortress",
+    "P-47D-30 Thunderbolt (Early)",
+    "P-47D-30 Thunderbolt (Late)",
+    "P-47D-40 Thunderbolt",
+    "P-51D-25-NA Mustang",
+    "P-51D-30-NA Mustang",
+    "Spitfire LF Mk IX",
+    "Spitfire LF Mk IX (Clipped Wings)"
   ],
   "frontline_units": [
-    "MT_M4A4_Sherman_Firefly",
-    "Tk_M4_Sherman",
-    "APC_M2A1_Halftrack",
-    "CT_Cromwell_IV",
-    "CT_Centaur_IV",
-    "HIT_Churchill_VII",
-    "Car_M8_Greyhound_Armored",
-    "SPG_M10_GMC",
-    "Car_Daimler_Armored",
-    "LT_Mk_VII_Tetrarch",
-    "AAA_QF_3_7",
-    "AAA_Bofors_40mm"
+    "A17 Light Tank Mk VII Tetrarch",
+    "A22 Infantry Tank MK IV Churchill VII",
+    "A27L Cruiser Tank MK VIII Centaur IV",
+    "A27M Cruiser Tank MK VIII Cromwell IV",
+    "Bofors 40 mm Gun",
+    "Daimler Armoured Car Mk I",
+    "M10 3-inch Gun Motor Carriage",
+    "M2A1 Half-Track",
+    "M4A2(75) Sherman",
+    "M4A4 Sherman Firefly",
+    "M8 Greyhound Light Armored Car",
+    "QF 3.7-inch AA Gun"
   ],
   "artillery_units": [
-    "SPG_M12_GMC_155mm"
+    "M12 Gun Motor Carriage"
   ],
   "logistics_units": [
-    "Truck_Bedford",
-    "Truck_GMC_Jimmy_6x6_Truck"
+    "Truck Bedford",
+    "Truck GMC \"Jimmy\" 6x6 Truck"
   ],
   "infantry_units": [
-    "Infantry_SMLE_No_4_Mk_1",
-    "Infantry_M1_Garand"
+    "Infantry M1 Garand",
+    "Infantry SMLE No.4 Mk-1"
   ],
   "air_defenses": [
     "AllyWW2FlakGenerator",
     "BoforsGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {
     "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "WW2LSTGroupGenerator"
   ],
@@ -65,4 +59,4 @@
   "has_jtac": false,
   "doctrine": "ww2",
   "building_set": "ww2ally"
-}
+}

resources/factions/allies_1944_free.json

@@ -4,49 +4,40 @@
   "authors": "Khopa",
   "description": "<p>A generic WW2 ally faction that does not requires the paid WW2 asset pack.</p>",
   "aircrafts": [
-    "P_51D",
-    "P_51D_30_NA",
-    "P_47D_30",
-    "P_47D_30bl1",
-    "P_47D_40",
-    "SpitfireLFMkIX",
-    "SpitfireLFMkIXCW",
-    "A_20G"
+    "A-20G Havoc",
+    "P-47D-30 Thunderbolt (Early)",
+    "P-47D-30 Thunderbolt (Late)",
+    "P-47D-40 Thunderbolt",
+    "P-51D-25-NA Mustang",
+    "P-51D-30-NA Mustang",
+    "Spitfire LF Mk IX",
+    "Spitfire LF Mk IX (Clipped Wings)"
   ],
   "frontline_units": [
-    "Tk_M4_Sherman",
-    "APC_M2A1_Halftrack",
-    "AAA_Bofors_40mm"
-  ],
-  "artillery_units": [
+    "Bofors 40 mm Gun",
+    "M2A1 Half-Track",
+    "M4A2(75) Sherman"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_Bedford"
+    "Truck Bedford"
   ],
   "infantry_units": [
-    "Paratrooper_AKS"
+    "Paratrooper AKS"
   ],
   "air_defenses": [
     "BoforsGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
-  "requirements": {
-  },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "navy_generators": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
+  "requirements": {},
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
+  "navy_generators": [],
   "navy_group_count": 0,
   "has_jtac": false,
   "doctrine": "ww2",
   "building_set": "ww2free"
-}
+}

resources/factions/australia_2005.json

@@ -4,34 +4,33 @@
   "authors": "Khopa",
   "description": "<p>The Australian army in 2005.</p><p>Some units might not be accurate, but were picked to represent at best this army.</p>",
   "aircrafts": [
-    "FA_18C_hornet",
-    "UH_1H",
-    "SH_60B",
-    "AH_1W"
+    "AH-1W SuperCobra",
+    "F/A-18C Hornet (Lot 20)",
+    "SH-60B Seahawk",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_M1A2_Abrams",
-    "MBT_Leopard_1A3",
-    "APC_M113",
-    "IFV_LAV_25",
-    "IFV_Warrior"
-  ],
-  "artillery_units": [
+    "FV510 Warrior",
+    "LAV-25",
+    "Leopard 1A3",
+    "M113",
+    "M1A2 Abrams"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "HawkGenerator",
@@ -40,19 +39,16 @@
   "ewrs": [
     "HawkEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
+  "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "DDG_Arleigh_Burke_IIa"
-  ],
-  "cruisers": [
+    "USS_Arleigh_Burke_IIa"
   ],
+  "cruisers": [],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "helicopter_carrier_names": [
     "HMAS Canberra",
     "HMAS Adelaide"
@@ -61,11 +57,11 @@
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
+  "jtac_unit": "MQ-9 Reaper",
   "liveries_overrides": {
-    "FA_18C_hornet": [
+    "F/A-18C Hornet (Lot 20)": [
       "Australian 75th Squadron",
       "Australian 77th Squadron"
     ]
   }
-}
+}

resources/factions/australia_2005_c130.json

@@ -4,35 +4,34 @@
   "authors": "Khopa, SpaceEnthusiast",
   "description": "<p>The Australian army in 2005.</p><p>Some units might not be accurate, but were picked to represent at best this army.</p>",
   "aircrafts": [
-    "FA_18C_hornet",
-    "UH_1H",
-    "SH_60B",
-    "AH_1W",
-	"Hercules"
+    "AH-1W SuperCobra",
+    "C-130J-30 Super Hercules",
+    "F/A-18C Hornet (Lot 20)",
+    "SH-60B Seahawk",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_M1A2_Abrams",
-    "MBT_Leopard_1A3",
-    "APC_M113",
-    "IFV_LAV_25",
-    "IFV_Warrior"
-  ],
-  "artillery_units": [
+    "FV510 Warrior",
+    "LAV-25",
+    "Leopard 1A3",
+    "M113",
+    "M1A2 Abrams"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "HawkGenerator",
@@ -41,21 +40,18 @@
   "ewrs": [
     "HawkEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
+  "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "DDG_Arleigh_Burke_IIa"
-  ],
-  "cruisers": [
+    "USS_Arleigh_Burke_IIa"
   ],
+  "cruisers": [],
   "requirements": {
     "C-130J-30 Super Hercules Mod by Anubis": "https://forums.eagle.ru/topic/252075-dcs-super-hercules-mod-by-anubis/"
   },
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "helicopter_carrier_names": [
     "HMAS Canberra",
     "HMAS Adelaide"
@@ -64,11 +60,11 @@
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
+  "jtac_unit": "MQ-9 Reaper",
   "liveries_overrides": {
-    "FA_18C_hornet": [
+    "F/A-18C Hornet (Lot 20)": [
       "Australian 75th Squadron",
       "Australian 77th Squadron"
     ]
   }
-}
+}

resources/factions/bluefor_coldwar.json

@@ -4,40 +4,40 @@
   "authors": "Khopa",
   "description": "<p>A generic bluefor coldwar faction.</p>",
   "aircrafts": [
-    "F_14A_135_GR",
-    "F_14B",
-    "F_4E",
-    "F_5E_3",
-    "A_10A",
-    "AJS37",
-    "UH_1H",
-    "SA342M",
-    "SA342L",
-    "B_52H"
+    "A-10A Thunderbolt II",
+    "AJS-37 Viggen",
+    "B-52H Stratofortress",
+    "F-14A Tomcat (Block 135-GR Late)",
+    "F-14B Tomcat",
+    "F-4E Phantom II",
+    "F-5E Tiger II",
+    "SA 342L Gazelle",
+    "SA 342M Gazelle",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "C_130",
-    "E_3A",
-    "E_2C"
+    "C-130",
+    "E-2C Hawkeye",
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_M60A3_Patton",
-    "APC_M113",
-    "SAM_Chaparral_M48"
+    "M113",
+    "M48 Chaparral",
+    "M60A3 \"Patton\""
   ],
   "artillery_units": [
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249"
+    "Infantry M249",
+    "Infantry M4"
   ],
   "air_defenses": [
     "ChaparralGenerator",
@@ -49,16 +49,16 @@
     "HawkEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "DDG_Arleigh_Burke_IIa"
+    "USS_Arleigh_Burke_IIa"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {},
   "carrier_names": [
@@ -78,6 +78,6 @@
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
+  "jtac_unit": "MQ-9 Reaper",
   "doctrine": "coldwar"
-}
+}

resources/factions/bluefor_coldwar_a4.json

@@ -4,41 +4,41 @@
   "authors": "Khopa",
   "description": "<p>A generic bluefor coldwar faction. (With the A-4E-C mod)</p>",
   "aircrafts": [
-    "F_14A_135_GR",
-    "F_14B",
-    "F_4E",
-    "F_5E_3",
-    "A_10A",
-    "AJS37",
-    "UH_1H",
-    "SA342M",
-    "SA342L",
-    "A_4E_C",
-    "B_52H"
+    "A-10A Thunderbolt II",
+    "A-4E Skyhawk",
+    "AJS-37 Viggen",
+    "B-52H Stratofortress",
+    "F-14A Tomcat (Block 135-GR Late)",
+    "F-14B Tomcat",
+    "F-4E Phantom II",
+    "F-5E Tiger II",
+    "SA 342L Gazelle",
+    "SA 342M Gazelle",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "C_130",
-    "E_3A",
-    "E_2C"
+    "C-130",
+    "E-2C Hawkeye",
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_M60A3_Patton",
-    "APC_M113",
-    "SAM_Chaparral_M48"
+    "M113",
+    "M48 Chaparral",
+    "M60A3 \"Patton\""
   ],
   "artillery_units": [
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249"
+    "Infantry M249",
+    "Infantry M4"
   ],
   "air_defenses": [
     "ChaparralGenerator",
@@ -50,16 +50,16 @@
     "HawkEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "DDG_Arleigh_Burke_IIa"
+    "USS_Arleigh_Burke_IIa"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {
     "Community A-4E": "https://heclak.github.io/community-a4e-c/"
@@ -81,6 +81,6 @@
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
+  "jtac_unit": "MQ-9 Reaper",
   "doctrine": "coldwar"
-}
+}

resources/factions/bluefor_coldwar_a4_mb339.json

@@ -4,42 +4,42 @@
   "authors": "Khopa",
   "description": "<p>A generic bluefor coldwar faction. (With the A-4E-C and the MB-339 mods)</p>",
   "aircrafts": [
-    "F_14A_135_GR",
-    "F_14B",
-    "F_4E",
-    "F_5E_3",
-    "A_10A",
-    "AJS37",
-    "UH_1H",
-    "SA342M",
-    "SA342L",
-    "A_4E_C",
-    "MB_339PAN",
-    "B_52H"
+    "A-10A Thunderbolt II",
+    "A-4E Skyhawk",
+    "AJS-37 Viggen",
+    "B-52H Stratofortress",
+    "F-14A Tomcat (Block 135-GR Late)",
+    "F-14B Tomcat",
+    "F-4E Phantom II",
+    "F-5E Tiger II",
+    "MB-339PAN",
+    "SA 342L Gazelle",
+    "SA 342M Gazelle",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "C_130",
-    "E_3A",
-    "E_2C"
+    "C-130",
+    "E-2C Hawkeye",
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_M60A3_Patton",
-    "APC_M113",
-    "SAM_Chaparral_M48"
+    "M113",
+    "M48 Chaparral",
+    "M60A3 \"Patton\""
   ],
   "artillery_units": [
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249"
+    "Infantry M249",
+    "Infantry M4"
   ],
   "air_defenses": [
     "ChaparralGenerator",
@@ -51,16 +51,16 @@
     "HawkEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "DDG_Arleigh_Burke_IIa"
+    "USS_Arleigh_Burke_IIa"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {
     "MB-339A/PAN by Frecce Tricolori Virtuali": "http://www.freccetricolorivirtuali.net/",
@@ -83,6 +83,6 @@
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
+  "jtac_unit": "MQ-9 Reaper",
   "doctrine": "coldwar"
-}
+}

resources/factions/bluefor_modern.json

@@ -4,64 +4,64 @@
   "authors": "Khopa",
   "description": "<p>A generic bluefor modern faction. This also includes many redfor units and is meant to be a faction that has access to most modern flyable modules.</p>",
   "aircrafts": [
-    "F_14B",
-    "F_15C",
-    "F_15E",
-    "F_16C_50",
-    "FA_18C_hornet",
-    "JF_17",
-    "M_2000C",
-    "F_5E_3",
-    "Su_27",
-    "Su_25T",
-    "A_10A",
-    "A_10C",
-    "A_10C_2",
-    "AV8BNA",
-    "AJS37",
-    "UH_1H",
-    "AH_64D",
-    "Ka_50",
-    "SA342M",
-    "SA342L",
-    "B_52H",
-    "B_1B"
+    "A-10A Thunderbolt II",
+    "A-10C Thunderbolt II (Suite 3)",
+    "A-10C Thunderbolt II (Suite 7)",
+    "AH-64D Apache Longbow",
+    "AJS-37 Viggen",
+    "AV-8B Harrier II Night Attack",
+    "B-1B Lancer",
+    "B-52H Stratofortress",
+    "F-14B Tomcat",
+    "F-15C Eagle",
+    "F-15E Strike Eagle",
+    "F-16CM Fighting Falcon (Block 50)",
+    "F-5E Tiger II",
+    "F/A-18C Hornet (Lot 20)",
+    "JF-17 Thunder",
+    "Ka-50 Hokum",
+    "Mirage 2000C",
+    "SA 342L Gazelle",
+    "SA 342M Gazelle",
+    "Su-25T Frogfoot",
+    "Su-27 Flanker-B",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A",
-    "E_2C"
+    "E-2C Hawkeye",
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC135MPRS",
-    "KC130",
+    "KC-130",
+    "KC-135 Stratotanker",
+    "KC-135 Stratotanker MPRS",
     "S-3B Tanker"
   ],
   "frontline_units": [
-    "MBT_M1A2_Abrams",
-    "MBT_Leopard_2A6M",
-    "MBT_Merkava_IV",
-    "ATGM_Stryker",
-    "IFV_M2A2_Bradley",
-    "IFV_Marder",
-    "IFV_LAV_25",
-    "Scout_HMMWV",
-    "ATGM_HMMWV",
-    "SAM_Linebacker___Bradley_M6",
-    "SAM_Avenger__Stinger",
-    "ATGM_VAB_Mephisto"
+    "LAV-25",
+    "Leopard 2",
+    "M1043 HMMWV (M2 HMG)",
+    "M1045 HMMWV (BGM-71 TOW)",
+    "M1097 Heavy HMMWV Avenger",
+    "M1134 Stryker ATGM (BGM-71 TOW)",
+    "M1A2 Abrams",
+    "M2A2 Bradley",
+    "M6 Linebacker",
+    "Marder 1A3",
+    "Merkava Mk IV",
+    "VAB Mephisto"
   ],
   "artillery_units": [
-    "MLRS_M270_227mm",
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -72,16 +72,16 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "DDG_Arleigh_Burke_IIa"
+    "USS_Arleigh_Burke_IIa"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {},
   "carrier_names": [
@@ -101,6 +101,6 @@
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
+  "jtac_unit": "MQ-9 Reaper",
   "unrestricted_satnav": true
-}
+}

resources/factions/canada_2005.json

@@ -3,37 +3,39 @@
   "name": "Canada 2005",
   "authors": "Khopa",
   "description": "<p>Canada in the 2000s, an F/A-18C Hornet focused faction.</p>",
-  "locales": ["en_US", "fr_CA"],
+  "locales": [
+    "en_US",
+    "fr_CA"
+  ],
   "aircrafts": [
-    "FA_18C_hornet",
-    "UH_1H",
-    "AH_1W"
+    "AH-1W SuperCobra",
+    "CF-188 Hornet",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_Leopard_1A3",
-    "MBT_Leopard_2A4",
-    "MBT_Leopard_2A6M",
-    "IFV_LAV_25",
-    "APC_M113",
-    "IFV_Warrior",
-    "SAM_Avenger__Stinger"
-  ],
-  "artillery_units": [
+    "FV510 Warrior",
+    "LAV-25",
+    "Leopard 1A3",
+    "Leopard 2",
+    "Leopard 2A4",
+    "M1097 Heavy HMMWV Avenger",
+    "M113"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -42,30 +44,26 @@
   "ewrs": [
     "HawkEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
   "destroyers": [
-    "DDG_Arleigh_Burke_IIa"
+    "USS_Arleigh_Burke_IIa"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {},
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
+  "jtac_unit": "MQ-9 Reaper",
   "liveries_overrides": {
-    "FA_18C_hornet": [
+    "CF-188 Hornet": [
       "Canada 409th Squadron",
       "Canada 425th Squadron"
     ]
   }
-}
+}

resources/factions/canada_2005_c130.json

@@ -3,38 +3,40 @@
   "name": "Canada 2005 (With C-130)",
   "authors": "Khopa, SpaceEnthusiast",
   "description": "<p>Canada in the 2000s, an F/A-18C Hornet focused faction.</p>",
-  "locales": ["en_US", "fr_CA"],
+  "locales": [
+    "en_US",
+    "fr_CA"
+  ],
   "aircrafts": [
-    "FA_18C_hornet",
-    "UH_1H",
-    "AH_1W",
-	"Hercules"
+    "AH-1W SuperCobra",
+    "C-130J-30 Super Hercules",
+    "CF-188 Hornet",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_Leopard_1A3",
-    "MBT_Leopard_2A4",
-    "MBT_Leopard_2A6M",
-    "IFV_LAV_25",
-    "APC_M113",
-    "IFV_Warrior",
-    "SAM_Avenger__Stinger"
-  ],
-  "artillery_units": [
+    "FV510 Warrior",
+    "LAV-25",
+    "Leopard 1A3",
+    "Leopard 2",
+    "Leopard 2A4",
+    "M1097 Heavy HMMWV Avenger",
+    "M113"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -43,35 +45,31 @@
   "ewrs": [
     "HawkEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
   "destroyers": [
-    "DDG_Arleigh_Burke_IIa"
+    "USS_Arleigh_Burke_IIa"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {
     "C-130J-30 Super Hercules Mod by Anubis": "https://forums.eagle.ru/topic/252075-dcs-super-hercules-mod-by-anubis/"
   },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
+  "jtac_unit": "MQ-9 Reaper",
   "liveries_overrides": {
-    "FA_18C_hornet": [
+    "CF-188 Hornet": [
       "Canada 409th Squadron",
       "Canada 425th Squadron"
     ],
-	"Hercules": [
+    "C-130J-30 Super Hercules": [
       "Royal Canadian AF CC-130J"
     ]
   }
-}
+}

resources/factions/china_2010.json

@@ -3,43 +3,45 @@
   "name": "China 2010",
   "authors": "Khopa",
   "description": "<p>China in the late 2000s, early 2010s.</p>",
-  "locales": ["zh_CN"],
+  "locales": [
+    "zh_CN"
+  ],
   "aircrafts": [
-    "MiG_21Bis",
-    "Su_30",
-    "Su_33",
-    "J_11A",
-    "JF_17",
-    "Mi_8MT",
-    "Mi_28N"
+    "FC-1 Fierce Dragon",
+    "J-11A Flanker-L",
+    "J-15 Flanker X-2",
+    "J-7B",
+    "Mi-28N Havoc",
+    "Mi-8MTV2 Hip",
+    "Su-30MKK Flanker-G"
   ],
   "awacs": [
-    "KJ_2000"
+    "KJ-2000"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "ZTZ_96B",
-    "MBT_T_55",
-    "ZBD_04A",
-    "IFV_BMP_1",
-    "HQ_7_Self_Propelled_LN"
+    "BMP-1",
+    "HQ-7 Launcher",
+    "T-55A",
+    "Type 04A (ZBD-04A)",
+    "Type 96B (ZTZ-96B)"
   ],
   "artillery_units": [
-    "MLRS_9A52_Smerch_HE_300mm",
-    "PLZ_05",
-    "SPM_2S9_Nona_120mm_M"
+    "2S9 Nona-S",
+    "BM-30 Smerch (9M55K5 HE Rockets)",
+    "PLZ-05"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "HQ7Generator",
@@ -64,7 +66,7 @@
   ],
   "coastal_group_count": 2,
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "carrier_names": [
     "001 Liaoning",
@@ -83,16 +85,16 @@
     "Wudang Shan"
   ],
   "destroyers": [
-    "Type_052B_Destroyer",
-    "Type_052C_Destroyer"
+    "Type_052B",
+    "Type_052C"
   ],
   "cruiser": [
-    "Type_054A_Frigate"
+    "Type_054A"
   ],
   "requirements": {},
   "navy_generators": [
     "Type54GroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "WingLoong_I"
-}
+  "jtac_unit": "WingLoong-I"
+}

resources/factions/dprk_1950_fictional.json

@@ -4,56 +4,47 @@
   "authors": "BenBenBeartrax",
   "description": "<p>Fictional DPRK (North Korea) army around 1955, during the Korean War, with some WW2 planes added in place of their post-war counterparts.</p>",
   "aircrafts": [
-    "MiG_15bis",
-    "I_16",
-    "FW_190A8",
-    "FW_190D9",
-    "Bf_109K_4"
-  ],
-  "awacs": [
-  ],
-  "tankers": [
+    "Bf 109 K-4 Kurf\u00fcrst",
+    "Fw 190 A-8 Anton",
+    "Fw 190 D-9 Dora",
+    "I-16 Ishak",
+    "MiG-15bis Fagot"
   ],
+  "awacs": [],
+  "tankers": [],
   "frontline_units": [
-    "Scout_BRDM_2",
-    "Grad_MRL_FDDM__FC",
-    "APC_MTLB",
-    "MBT_T_55",
-    "SPAAA_ZU_23_2_Mounted_Ural_375",
-    "AAA_8_8cm_Flak_18"
+    "8.8 cm Flak 18",
+    "BRDM-2",
+    "Grad MRL FDDM (FC)",
+    "MT-LB",
+    "T-55A",
+    "ZU-23 on Ural-375"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm"
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Infantry_AK_74_Rus",
-    "Infantry_RPG"
+    "Infantry AK-74 Rus",
+    "Infantry RPG"
   ],
   "air_defenses": [
     "FlakGenerator",
     "EarlyColdWarFlakGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {
     "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   },
-  "carrier_names": [
-  ],
-  "navy_generators": [
-  ],
+  "carrier_names": [],
+  "navy_generators": [],
   "has_jtac": false,
   "doctrine": "ww2"
-}
+}

resources/factions/france_1985_frenchpack.json

@@ -3,45 +3,47 @@
   "name": "France 1985 (Frenchpack)",
   "authors": "Colonel Panic",
   "description": "<p>1980s French equipment using FrenchPack.</p>",
-  "locales": ["fr_FR"],
+  "locales": [
+    "fr_FR"
+  ],
   "doctrine": "coldwar",
   "aircrafts": [
-    "M_2000C",
-    "SA342M",
-    "SA342L",
-    "SA342Mistral"
+    "Mirage 2000C",
+    "SA 342L Gazelle",
+    "SA 342M Gazelle",
+    "SA 342M Gazelle Mistral"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "AMX_10RCR",
-    "AMX_10RCR_SEPAR",
-    "ERC_90",
-    "TRM_2000_PAMELA",
-    "VAB__50",
-    "ATGM_VAB_Mephisto",
-    "VAB_T20_13",
-    "VBL__50",
-    "VBL_AANF1",
-    "AMX_30B2",
-    "SAM_Roland_ADS"
+    "AMX.30B2",
+    "Leclerc S\u00e9ries 2",
+    "Leclerc S\u00e9ries 2",
+    "Pamela",
+    "Panhard",
+    "Roland 2 (Marder Chassis)",
+    "VAB .50",
+    "VAB Mephisto",
+    "VAB T20/13",
+    "VBL .50",
+    "VBL AANF1"
   ],
   "artillery_units": [
-    "MLRS_M270_227mm",
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "RolandGenerator",
@@ -49,13 +51,13 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "DDG_Arleigh_Burke_IIa"
+    "USS_Arleigh_Burke_IIa"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {
     "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974"
@@ -73,5 +75,5 @@
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "SA342L"
-}
+  "jtac_unit": "SA 342L Gazelle"
+}

resources/factions/france_1995.json

@@ -3,41 +3,43 @@
   "name": "France 1995",
   "authors": "Khopa",
   "description": "<p>France in the late 90s before Rafale introduction. A Mirage-2000 centric faction choice.</p>",
-  "locales": ["fr_FR"],
+  "locales": [
+    "fr_FR"
+  ],
   "aircrafts": [
-    "M_2000C",
-    "Mirage_2000_5",
-    "SA342M",
-    "SA342L",
-    "SA342Mistral"
+    "Mirage 2000-5",
+    "Mirage 2000C",
+    "SA 342L Gazelle",
+    "SA 342M Gazelle",
+    "SA 342M Gazelle Mistral"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_Leclerc",
-    "APC_TPz_Fuchs",
-    "Scout_Cobra",
-    "IFV_LAV_25",
-    "ATGM_VAB_Mephisto",
-    "SAM_Roland_ADS"
+    "Cobra",
+    "LAV-25",
+    "Leclerc S\u00e9ries 2",
+    "Roland 2 (Marder Chassis)",
+    "TPz Fuchs",
+    "VAB Mephisto"
   ],
   "artillery_units": [
-    "MLRS_M270_227mm",
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger",
-    "Mortar_2B11_120mm"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger",
+    "Mortar 2B11 120mm"
   ],
   "air_defenses": [
     "RolandGenerator",
@@ -46,21 +48,19 @@
   "ewrs": [
     "HawkEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
+  "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "DDG_Arleigh_Burke_IIa",
-    "FFG_Oliver_Hazzard_Perry"
+    "USS_Arleigh_Burke_IIa",
+    "PERRY"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "helicopter_carrier_names": [
     "Jeanne d'Arc"
   ],
@@ -69,5 +69,5 @@
     "OliverHazardPerryGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/france_2005_frenchpack.json

@@ -3,66 +3,68 @@
   "name": "France 2005 (Frenchpack)",
   "authors": "HerrTom",
   "description": "<p>French equipment using the Frenchpack, but without the Rafale mod.</p>",
-  "locales": ["fr_FR"],
+  "locales": [
+    "fr_FR"
+  ],
   "aircrafts": [
-    "M_2000C",
-    "Mirage_2000_5",
-    "SA342M",
-    "SA342L",
-    "SA342Mistral"
+    "Mirage 2000-5",
+    "Mirage 2000C",
+    "SA 342L Gazelle",
+    "SA 342M Gazelle",
+    "SA 342M Gazelle Mistral"
   ],
   "awacs": [
-    "E_3A",
-    "E_2C"
+    "E-2C Hawkeye",
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "AMX_10RCR",
-    "AMX_10RCR_SEPAR",
-    "ERC_90",
-    "TRM_2000_PAMELA",
-    "VAB__50",
-    "VAB_T20_13",
-    "VAB_T20_13",
-    "VBL__50",
-    "VBL_AANF1",
-    "VBAE_CRAB",
-    "VBAE_CRAB_MMP",
-    "AMX_30B2",
-    "Leclerc_Serie_XXI",
-    "SAM_Roland_ADS",
-    "ATGM_VAB_Mephisto"
+    "AMX.30B2",
+    "Leclerc S\u00e9ries 2",
+    "Leclerc S\u00e9ries 2",
+    "Leclerc_XXI",
+    "Pamela",
+    "Panhard",
+    "Roland 2 (Marder Chassis)",
+    "VAB .50",
+    "VAB Mephisto",
+    "VAB T20/13",
+    "VAB T20/13",
+    "VBAE CRAB",
+    "VBAE CRAB MMP",
+    "VBL .50",
+    "VBL AANF1"
   ],
   "artillery_units": [
-    "MLRS_M270_227mm",
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "RolandGenerator",
     "HawkGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "DDG_Arleigh_Burke_IIa"
+    "USS_Arleigh_Burke_IIa"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {
     "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974"
@@ -80,5 +82,5 @@
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/gdr_1985.json

@@ -3,38 +3,41 @@
   "name": "German Democratic Republic 1985",
   "authors": "Colonel Panic",
   "description": "<p>The German Democratic Republic in 1985.</p>",
-  "locales": ["de_DE"],
+  "locales": [
+    "de_DE"
+  ],
   "doctrine": "coldwar",
   "aircrafts": [
-    "MiG_21Bis",
-    "MiG_23MLD",
-    "Su_17M4",
-    "L_39ZA",
-    "Mi_8MT",
-    "Mi_24V"
+    "L-39ZA Albatros",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-8MTV2 Hip",
+    "MiG-21bis Fishbed-N",
+    "MiG-23MLD Flogger-K",
+    "Su-17M4 Fitter-K"
   ],
   "awacs": [],
   "tankers": [],
   "frontline_units": [
-    "IFV_BMP_1",
-    "IFV_BMP_2",
-    "Scout_BRDM_2",
-    "APC_MTLB",
-    "MBT_T_55",
-    "MBT_T_72B"
+    "BMP-1",
+    "BMP-2",
+    "BRDM-2",
+    "MT-LB",
+    "T-55A",
+    "T-72B with Kontakt-1 ERA"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S1_Gvozdika_122mm"
+    "2S1 Gvozdika",
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Infantry_AK_74_Rus",
-    "Infantry_RPG",
-    "Mortar_2B11_120mm"
+    "Infantry AK-74 Rus",
+    "Infantry RPG",
+    "Mortar 2B11 120mm"
   ],
   "air_defenses": [
     "ColdWarFlakGenerator",
@@ -55,12 +58,12 @@
   "helicopter_carrier": [],
   "destroyers": [],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {},
   "carrier_names": [],
   "helicopter_carrier_names": [],
   "navy_generators": [],
   "has_jtac": true,
-  "jtac_unit": "Mi_8MT"
-}
+  "jtac_unit": "Mi-8MTV2 Hip"
+}

resources/factions/georgia_2008.json

@@ -4,35 +4,36 @@
   "authors": "HerrTom",
   "description": "<p>A faction that represents Georgia during the South Ossetian War. They will have a lot more aircraft than historically, and no real A2A capability.</p>",
   "aircrafts": [
-    "L_39ZA",
-    "Su_25",
-    "Mi_8MT",
-    "Mi_24V",
-    "UH_1H"
+    "L-39ZA Albatros",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-8MTV2 Hip",
+    "Su-25 Frogfoot",
+    "UH-1H Iroquois"
   ],
   "frontline_units": [
-    "APC_BTR_80",
-    "APC_MTLB",
-    "Scout_Cobra",
-    "IFV_BMP_1",
-    "IFV_BMP_2",
-    "MBT_T_72B",
-    "MBT_T_55",
-    "SAM_SA_13_Strela_10M3_Gopher_TEL"
+    "BMP-1",
+    "BMP-2",
+    "BTR-80",
+    "Cobra",
+    "MT-LB",
+    "SA-13 Gopher (9K35 Strela-10M3)",
+    "T-55A",
+    "T-72B with Kontakt-1 ERA"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S1_Gvozdika_122mm",
-    "SPH_2S3_Akatsia_152mm"
+    "2S1 Gvozdika",
+    "2S3 Akatsiya",
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "SA3Generator",
@@ -46,9 +47,9 @@
     "ZU23UralGenerator"
   ],
   "navy_generators": [
-     "LaCombattanteIIGroupGenerator"
+    "LaCombattanteIIGroupGenerator"
   ],
   "requirements": {},
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/germany_1940.json

@@ -3,48 +3,43 @@
   "name": "Germany 1940",
   "authors": "Khopa",
   "description": "<p>Germany 1940, Early german faction for Battle of France, or Battle of England.</p>",
-  "locales": ["de_DE"],
+  "locales": [
+    "de_DE"
+  ],
   "aircrafts": [
-    "FW_190A8",
-    "FW_190D9",
-    "Bf_109K_4",
-    "Ju_88A4"
+    "Bf 109 K-4 Kurf\u00fcrst",
+    "Fw 190 A-8 Anton",
+    "Fw 190 D-9 Dora",
+    "Ju 88 A-4"
   ],
   "frontline_units": [
-    "Tk_PzIV_H",
-    "APC_Sd_Kfz_251_Halftrack",
-    "IFV_Sd_Kfz_234_2_Puma",
-    "AAA_8_8cm_Flak_18"
-  ],
-  "artillery_units": [
+    "8.8 cm Flak 18",
+    "Panzerkampfwagen IV Ausf. H",
+    "Sd.Kfz.234/2 Puma",
+    "Sd.Kfz.251 \"Hanomag\""
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_Opel_Blitz",
-    "LUV_Kubelwagen_82",
-    "Carrier_Sd_Kfz_7_Tractor",
-    "LUV_Kettenrad"
+    "LUV Kettenrad",
+    "LUV Kubelwagen 82",
+    "Sd.Kfz.7 Tractor",
+    "Truck Opel Blitz"
   ],
   "infantry_units": [
-    "Infantry_Mauser_98"
+    "Infantry Mauser 98"
   ],
   "air_defenses": [
     "FlakGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {
     "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "UBoatGroupGenerator",
     "SchnellbootGroupGenerator"
@@ -53,4 +48,4 @@
   "has_jtac": false,
   "doctrine": "ww2",
   "building_set": "ww2germany"
-}
+}

resources/factions/germany_1942.json

@@ -3,51 +3,46 @@
   "name": "Germany 1942",
   "authors": "Khopa",
   "description": "<p>Germany 1942, is a faction that does not use the late war german units such as the Tiger tank, so it's a bit easier to perform CAS against them.</p>",
-  "locales": ["de_DE"],
+  "locales": [
+    "de_DE"
+  ],
   "aircrafts": [
-    "FW_190A8",
-    "FW_190D9",
-    "Bf_109K_4",
-    "Ju_88A4"
+    "Bf 109 K-4 Kurf\u00fcrst",
+    "Fw 190 A-8 Anton",
+    "Fw 190 D-9 Dora",
+    "Ju 88 A-4"
   ],
   "frontline_units": [
-    "Tk_PzIV_H",
-    "APC_Sd_Kfz_251_Halftrack",
-    "IFV_Sd_Kfz_234_2_Puma",
-    "SPG_Jagdpanzer_IV",
-    "AAA_8_8cm_Flak_18",
-    "SPG_Sturmpanzer_IV_Brummbar"
-  ],
-  "artillery_units": [
+    "8.8 cm Flak 18",
+    "Jagdpanzer IV",
+    "Panzerkampfwagen IV Ausf. H",
+    "Sd.Kfz.234/2 Puma",
+    "Sd.Kfz.251 \"Hanomag\"",
+    "Sturmpanzer IV Brummb\u00e4r"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_Opel_Blitz",
-    "LUV_Kubelwagen_82",
-    "Carrier_Sd_Kfz_7_Tractor",
-    "LUV_Kettenrad"
+    "LUV Kettenrad",
+    "LUV Kubelwagen 82",
+    "Sd.Kfz.7 Tractor",
+    "Truck Opel Blitz"
   ],
   "infantry_units": [
-    "Infantry_Mauser_98"
+    "Infantry Mauser 98"
   ],
   "air_defenses": [
     "FlakGenerator",
     "FreyaGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {
     "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "UBoatGroupGenerator",
     "SchnellbootGroupGenerator"
@@ -56,4 +51,4 @@
   "has_jtac": false,
   "doctrine": "ww2",
   "building_set": "ww2germany"
-}
+}

resources/factions/germany_1944.json

@@ -3,59 +3,54 @@
   "name": "Germany 1944",
   "authors": "Khopa",
   "description": "<p>Late war Germany with access to all the late-war ground units such as the Tiger and Tiger II tanks.</p>",
-  "locales": ["de_DE"],
+  "locales": [
+    "de_DE"
+  ],
   "aircrafts": [
-    "FW_190A8",
-    "FW_190D9",
-    "Bf_109K_4",
-    "Ju_88A4"
+    "Bf 109 K-4 Kurf\u00fcrst",
+    "Fw 190 A-8 Anton",
+    "Fw 190 D-9 Dora",
+    "Ju 88 A-4"
   ],
   "frontline_units": [
-    "MT_Pz_Kpfw_V_Panther_Ausf_G",
-    "Tk_PzIV_H",
-    "HT_Pz_Kpfw_VI_Tiger_I",
-    "HT_Pz_Kpfw_VI_Ausf__B_Tiger_II",
-    "APC_Sd_Kfz_251_Halftrack",
-    "IFV_Sd_Kfz_234_2_Puma",
-    "SPG_Sd_Kfz_184_Elefant",
-    "SPG_Jagdpanther_G1",
-    "SPG_Jagdpanzer_IV",
-    "SPG_StuG_III_Ausf__G",
-    "SPG_StuG_IV",
-    "AAA_8_8cm_Flak_18",
-    "AAA_8_8cm_Flak_41",
-    "SPG_Sturmpanzer_IV_Brummbar"
-  ],
-  "artillery_units": [
+    "8.8 cm Flak 18",
+    "8.8 cm Flak 41",
+    "Jagdpanther G1",
+    "Jagdpanzer IV",
+    "Panzerkampfwagen IV Ausf. H",
+    "Panzerkampfwagen Tiger Ausf. B Tiger II",
+    "Panzerkampfwagen V Panther Ausf. G",
+    "Panzerkampfwagen VI Tiger Ausf. E",
+    "Sd.Kfz.184 Elefant",
+    "Sd.Kfz.234/2 Puma",
+    "Sd.Kfz.251 \"Hanomag\"",
+    "Sturmgesch\u00fctz III Ausf. G",
+    "Sturmgesch\u00fctz IV",
+    "Sturmpanzer IV Brummb\u00e4r"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_Opel_Blitz",
-    "LUV_Kubelwagen_82",
-    "Carrier_Sd_Kfz_7_Tractor",
-    "LUV_Kettenrad"
+    "LUV Kettenrad",
+    "LUV Kubelwagen 82",
+    "Sd.Kfz.7 Tractor",
+    "Truck Opel Blitz"
   ],
   "infantry_units": [
-    "Infantry_Mauser_98"
+    "Infantry Mauser 98"
   ],
   "air_defenses": [
     "FlakGenerator",
     "FreyaGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {
     "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "SchnellbootGroupGenerator"
   ],
@@ -67,4 +62,4 @@
   "has_jtac": false,
   "doctrine": "ww2",
   "building_set": "ww2germany"
-}
+}

resources/factions/germany_1944_free.json

@@ -3,49 +3,41 @@
   "name": "Germany 1944 (Free)",
   "authors": "Khopa",
   "description": "<p>WW2 germany faction that does not require the WW2 asset pack.</p>",
-  "locales": ["de_DE"],
+  "locales": [
+    "de_DE"
+  ],
   "aircrafts": [
-    "FW_190A8",
-    "FW_190D9",
-    "Bf_109K_4"
+    "Bf 109 K-4 Kurf\u00fcrst",
+    "Fw 190 A-8 Anton",
+    "Fw 190 D-9 Dora"
   ],
   "frontline_units": [
-    "Tk_PzIV_H",
-    "APC_Sd_Kfz_251_Halftrack",
-    "AAA_8_8cm_Flak_18"
-  ],
-  "artillery_units": [
+    "8.8 cm Flak 18",
+    "Panzerkampfwagen IV Ausf. H",
+    "Sd.Kfz.251 \"Hanomag\""
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_Opel_Blitz"
+    "Truck Opel Blitz"
   ],
   "infantry_units": [
-    "Infantry_AK_74_Rus"
+    "Infantry AK-74 Rus"
   ],
   "air_defenses": [
     "Flak18Generator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
-  "requirements": {
-  },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "navy_generators": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
+  "requirements": {},
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
+  "navy_generators": [],
   "navy_group_count": 0,
-  "missiles": [
-  ],
+  "missiles": [],
   "missiles_group_count": 0,
   "has_jtac": false,
   "doctrine": "ww2",
   "building_set": "ww2free"
-}
+}

resources/factions/germany_1990.json

@@ -3,39 +3,40 @@
   "name": "Germany 1990",
   "authors": "Khopa",
   "description": "<p>1990s reunited Germany.</p>",
-  "locales": ["de_DE"],
+  "locales": [
+    "de_DE"
+  ],
   "aircrafts": [
-    "MiG_29G",
-    "Tornado_IDS",
-    "F_4E",
-    "UH_1H",
-    "SA342M",
-    "SA342L"
+    "F-4F Phantom II",
+    "MiG-29G Fulcrum-A",
+    "SA 342L Gazelle",
+    "SA 342M Gazelle",
+    "Tornado IDS",
+    "UH-1D Iroquois"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "APC_TPz_Fuchs",
-    "MBT_Leopard_1A3",
-    "MBT_Leopard_2A4",
-    "IFV_Marder",
-    "SPAAA_Gepard"
-  ],
-  "artillery_units": [
+    "Flakpanzer Gepard",
+    "Leopard 1A3",
+    "Leopard 2A4",
+    "Marder 1A3",
+    "TPz Fuchs"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "Mortar_2B11_120mm",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger",
+    "Mortar 2B11 120mm"
   ],
   "air_defenses": [
     "GepardGenerator",
@@ -46,25 +47,21 @@
   "ewrs": [
     "PatriotEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
   "destroyers": [
-    "FFG_Oliver_Hazzard_Perry"
+    "PERRY"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {},
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "OliverHazardPerryGroupGenerator",
     "LaCombattanteIIGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/greece_2005.json

@@ -3,53 +3,59 @@
   "name": "Greece 2005",
   "authors": "Malakhit",
   "description": "<p>Hellenic army in the mid/late 2000s.</p>",
-  "locales": ["el_GR"],
+  "locales": [
+    "el_GR"
+  ],
   "aircrafts": [
-    "F_16C_50",
-    "F_4E",
-    "M_2000C",
-    "Mirage_2000_5",
-    "UH_1H",
-    "AH_64A"
+    "AH-64A Apache",
+    "C-130",
+    "F-16CM Fighting Falcon (Block 50)",
+    "F-4E Phantom II",
+    "Mirage 2000-5",
+    "Mirage 2000C",
+    "UH-1H Iroquois"
+  ],
+  "awacs": [
+    "E-3A"
   ],
   "tankers": [
-    "KC130"
+    "KC-130"
   ],
   "frontline_units": [
-    "MBT_Leopard_2A4",
-    "MBT_Leopard_1A3",
-    "MBT_M60A3_Patton",
-    "Scout_HMMWV",
-    "ATGM_HMMWV",
-    "APC_M113",
-    "IFV_BMP_1"
+    "BMP-1",
+    "Leopard 1A3",
+    "Leopard 2A4",
+    "M1043 HMMWV (M2 HMG)",
+    "M1045 HMMWV (BGM-71 TOW)",
+    "M113",
+    "M60A3 \"Patton\""
   ],
   "artillery_units": [
-    "SPH_M109_Paladin_155mm",
-    "MLRS_M270_227mm"
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "HawkGenerator",
+    "PatriotGenerator",
     "SA8Generator",
     "SA10Generator",
     "SA15Generator",
     "ZU23Generator"
   ],
   "ewrs": [
-    "HawkEwrGenerator",
     "FlatFaceGenerator"
   ],
   "navy_generators": [
-     "LaCombattanteIIGroupGenerator"
+    "LaCombattanteIIGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/india_2010.json

@@ -3,41 +3,43 @@
   "name": "India 2010",
   "authors": "Khopa",
   "description": "<p>Indian faction in the late 2000s.</p>",
-  "locales": ["en_IN"],
+  "locales": [
+    "en_IN"
+  ],
   "aircrafts": [
-    "Mirage_2000_5",
-    "M_2000C",
-    "MiG_27K",
-    "MiG_21Bis",
-    "MiG_29S",
-    "Su_30",
-    "AH_64A",
-    "Mi_8MT"
+    "AH-64A Apache",
+    "Mi-8MTV2 Hip",
+    "MiG-21bis Fishbed-N",
+    "MiG-27K Flogger-J2",
+    "MiG-29S Fulcrum-C",
+    "Mirage 2000-5",
+    "Mirage 2000C",
+    "Su-30 Flanker-C"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "MBT_T_90",
-    "MBT_T_72B",
-    "IFV_BMP_2",
-    "SAM_SA_19_Tunguska_Grison"
+    "BMP-2",
+    "SA-19 Grison (2K22 Tunguska)",
+    "T-72B with Kontakt-1 ERA",
+    "T-90A"
   ],
   "artillery_units": [
-    "MLRS_9K57_Uragan_BM_27_220mm",
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S",
+    "BM-27 Uragan"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry M4",
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "SA3Generator",
@@ -57,17 +59,14 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
+    "KUZNECOW"
   ],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
   "destroyers": [
-    "Frigate_1135M_Rezky"
-  ],
-  "cruisers": [
+    "REZKY"
   ],
+  "cruisers": [],
   "requirements": {},
   "carrier_names": [
     "INS Vikramaditya"
@@ -77,5 +76,5 @@
     "MolniyaGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/insurgents.json

@@ -3,28 +3,27 @@
   "name": "Insurgents",
   "authors": "Khopa",
   "description": "<p>Insurgents faction.</p>",
-  "aircrafts": [
-  ],
+  "aircrafts": [],
   "frontline_units": [
-    "Scout_Cobra",
-    "APC_MTLB",
-    "Scout_BRDM_2",
-    "LT_PT_76",
-    "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375"
+    "BRDM-2",
+    "Cobra",
+    "MT-LB",
+    "PT-76",
+    "ZU-23 on Ural-375"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S",
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Insurgent_AK_74",
-    "Infantry_RPG",
-    "Mortar_2B11_120mm",
-    "MANPADS_SA_18_Igla_Grouse"
+    "Infantry RPG",
+    "Insurgent AK-74",
+    "MANPADS SA-18 Igla \"Grouse\"",
+    "Mortar 2B11 120mm"
   ],
   "air_defenses": [
     "SA9Generator",
@@ -32,4 +31,4 @@
     "ZU23Generator",
     "ZU23UralInsurgentGenerator"
   ]
-}
+}

resources/factions/insurgents_hard.json

@@ -3,33 +3,32 @@
   "name": "Insurgents (Hard)",
   "authors": "Khopa",
   "description": "<p>Insurgents faction.</p>",
-  "aircrafts": [
-  ],
+  "aircrafts": [],
   "frontline_units": [
-    "ATGM_HMMWV",
-    "Scout_HMMWV",
-    "Scout_BRDM_2",
-    "APC_BTR_80",
-    "APC_BTR_RD",
-    "LT_PT_76",
-    "IFV_BMP_1",
-    "MBT_T_55",
-    "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375",
-    "SPAAA_ZSU_57_2"
+    "BMP-1",
+    "BRDM-2",
+    "BTR-80",
+    "BTR-D",
+    "M1043 HMMWV (M2 HMG)",
+    "M1045 HMMWV (BGM-71 TOW)",
+    "PT-76",
+    "T-55A",
+    "ZSU-57-2 'Sparka'",
+    "ZU-23 on Ural-375"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S",
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Insurgent_AK_74",
-    "Infantry_RPG",
-    "Mortar_2B11_120mm",
-    "MANPADS_SA_18_Igla_Grouse"
+    "Infantry RPG",
+    "Insurgent AK-74",
+    "MANPADS SA-18 Igla \"Grouse\"",
+    "Mortar 2B11 120mm"
   ],
   "air_defenses": [
     "SA9Generator",
@@ -37,4 +36,4 @@
     "ZU23Generator",
     "ZU23UralInsurgentGenerator"
   ]
-}
+}

resources/factions/insurgents_modded.json

@@ -3,27 +3,26 @@
   "name": "Insurgents (Modded)",
   "authors": "Khopa",
   "description": "<p>Insurgents faction using the modded insurgents units from the frenchpack mods.</p>",
-  "aircrafts": [
-  ],
+  "aircrafts": [],
   "frontline_units": [
-    "DIM__TOYOTA_BLUE",
-    "DIM__TOYOTA_DESERT",
-    "DIM__TOYOTA_GREEN",
-    "DIM__KAMIKAZE",
-    "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375"
+    "DIM' KAMIKAZE",
+    "DIM' TOYOTA BLUE",
+    "DIM' TOYOTA DESERT",
+    "DIM' TOYOTA GREEN",
+    "ZU-23 on Ural-375"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S",
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Insurgent_AK_74",
-    "Infantry_RPG",
-    "MANPADS_SA_18_Igla_Grouse"
+    "Infantry RPG",
+    "Insurgent AK-74",
+    "MANPADS SA-18 Igla \"Grouse\""
   ],
   "air_defenses": [
     "SA9Generator",
@@ -33,4 +32,4 @@
   "requirements": {
     "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974"
   }
-}
+}

resources/factions/iran_1988.json

@@ -3,43 +3,45 @@
   "name": "Iran 1988",
   "authors": "Malakhit",
   "description": "<p>Iran at the end of the Iran-Iraq war</p>",
-  "locales": ["fa_IR"],
+  "locales": [
+    "fa_IR"
+  ],
   "aircrafts": [
-    "MiG_21Bis",
-    "F_4E",
-    "F_5E_3",
-    "F_14A_135_GR",
-    "AH_1W"
+    "AH-1J SeaCobra",
+    "F-14A Tomcat (Block 135-GR Late)",
+    "F-4E Phantom II",
+    "F-5E Tiger II",
+    "MiG-21bis Fishbed-N"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "APC_M113",
-    "APC_BTR_80",
-    "MBT_M60A3_Patton",
-    "MBT_Chieftain_Mk_3",
-    "IFV_BMP_1",
-    "SPAAA_ZSU_23_4_Shilka_Gun_Dish",
-    "SPAAA_ZSU_57_2",
-    "SPAAA_ZU_23_2_Mounted_Ural_375"
+    "Chieftain Mk.3",
+    "BMP-1",
+    "BTR-80",
+    "M113",
+    "M60A3 \"Patton\"",
+    "ZSU-23-4 Shilka",
+    "ZSU-57-2 'Sparka'",
+    "ZU-23 on Ural-375"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S1_Gvozdika_122mm"
+    "2S1 Gvozdika",
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Insurgent_AK_74",
-    "Infantry_RPG",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry RPG",
+    "Insurgent AK-74",
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper AKS"
   ],
   "air_defenses": [
     "HawkGenerator",
@@ -53,21 +55,17 @@
   "ewrs": [
     "TallRackGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
   "destroyers": [
-    "Frigate_1135M_Rezky"
+    "REZKY"
   ],
   "cruisers": [
-    "Corvette_1241_1_Molniya"
+    "MOLNIYA"
   ],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "missiles": [
     "ScudGenerator"
   ],
@@ -81,5 +79,5 @@
     "MolniyaGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/iran_2015.json

@@ -3,49 +3,52 @@
   "name": "Iran 2015",
   "authors": "Khopa",
   "description": "<p>Iranian 2010s faction</p>",
-  "locales": ["fa_IR"],
+  "locales": [
+    "fa_IR"
+  ],
   "aircrafts": [
-    "MiG_21Bis",
-    "MiG_29A",
-    "F_4E",
-    "F_5E_3",
-    "F_14A_135_GR",
-    "Su_17M4",
-    "Su_24M",
-    "Su_25",
-    "Su_25T",
-    "Mi_28N",
-    "Mi_24V"
+    "F-14A Tomcat (Block 135-GR Late)",
+    "F-4E Phantom II",
+    "F-5E Tiger II",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-28N Havoc",
+    "MiG-21bis Fishbed-N",
+    "MiG-29A Fulcrum-A",
+    "Su-22M4 Fitter-K",
+    "Su-24MK Fencer-D",
+    "Su-25 Frogfoot",
+    "Su-25T Frogfoot"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "APC_M113",
-    "APC_BTR_80",
-    "MBT_M60A3_Patton",
-    "MBT_Chieftain_Mk_3",
-    "IFV_BMP_1",
-    "MBT_T_72B",
-    "SPAAA_ZSU_23_4_Shilka_Gun_Dish",
-    "SPAAA_ZSU_57_2"
+    "Chieftain Mk.3",
+    "BMP-1",
+    "BTR-80",
+    "M113",
+    "M60A3 \"Patton\"",
+    "T-72B with Kontakt-1 ERA",
+    "ZSU-23-4 Shilka",
+    "ZSU-57-2 'Sparka'"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S",
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Insurgent_AK_74",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Insurgent AK-74",
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "HawkGenerator",
@@ -62,21 +65,17 @@
   "ewrs": [
     "TallRackGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
   "destroyers": [
-    "Frigate_1135M_Rezky"
+    "REZKY"
   ],
   "cruisers": [
-    "Corvette_1241_1_Molniya"
+    "MOLNIYA"
   ],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "missiles": [
     "ScudGenerator"
   ],
@@ -91,5 +90,5 @@
     "LaCombattanteIIGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/iraq_1991.json

@@ -4,51 +4,52 @@
   "authors": "Hawkmoon",
   "description": "<p>Iraq forces during desert Storm</p>",
   "aircrafts": [
-    "MiG_19P",
-    "MiG_21Bis",
-    "MiG_23MLD",
-    "MiG_25PD",
-    "Su_17M4",
-    "Mi_8MT",
-    "Su-25",
-    "Su-24M",
-    "Tu_22M3",
-    "L_39ZA",
-    "Mi_24V",
-    "MiG_29A",
-    "SA342M"
+    "L-39ZA Albatros",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-8MTV2 Hip",
+    "MiG-19P Farmer-B",
+    "MiG-21bis Fishbed-N",
+    "MiG-23ML Flogger-G",
+    "MiG-25PD Foxbat-E",
+    "MiG-29A Fulcrum-A",
+    "SA 342M Gazelle",
+    "Su-22M4 Fitter-K",
+    "Su-24M Fencer-D",
+    "Su-25 Frogfoot",
+    "Tu-22M3 Backfire-C"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "IFV_BMP_1",
-    "APC_MTLB",
-    "MBT_T_55",
-    "MBT_T_72B",
-    "MBT_Chieftain_Mk_3",
-    "APC_BTR_80",
-    "Scout_BRDM_2",
-    "LT_PT_76",
-    "SPH_2S1_Gvozdika_122mm",
-    "SPAAA_ZSU_57_2",
-    "SPAAA_ZSU_23_4_Shilka_Gun_Dish"
+    "2S1 Gvozdika",
+    "Chieftain Mk.3",
+    "BMP-1",
+    "BRDM-2",
+    "BTR-80",
+    "MT-LB",
+    "PT-76",
+    "T-55A",
+    "T-72B with Kontakt-1 ERA",
+    "ZSU-23-4 Shilka",
+    "ZSU-57-2 'Sparka'"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm"
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_Grouse"
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla \"Grouse\"",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "ColdWarFlakGenerator",
@@ -70,20 +71,14 @@
     "ScudGenerator"
   ],
   "missiles_group_count": 1,
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "navy_generators": [
     "GrishaGroupGenerator"
   ]
-}
+}

resources/factions/israel_1948.json

@@ -3,51 +3,45 @@
   "name": "Israel 1948",
   "authors": "Khopa",
   "description": "<p>Israel during the 1948 Arab-Israeli war.</p>",
-  "locales": ["he_IL"],
+  "locales": [
+    "he_IL"
+  ],
   "aircrafts": [
-    "SpitfireLFMkIXCW",
-    "SpitfireLFMkIX",
-    "P_51D",
-    "P_51D_30_NA",
-    "Bf_109K_4",
-    "B_17G"
+    "B-17G Flying Fortress",
+    "Bf 109 K-4 Kurf\u00fcrst",
+    "P-51D-25-NA Mustang",
+    "P-51D-30-NA Mustang",
+    "Spitfire LF Mk IX",
+    "Spitfire LF Mk IX (Clipped Wings)"
   ],
   "frontline_units": [
-    "MT_M4A4_Sherman_Firefly",
-    "APC_M2A1_Halftrack",
-    "Tk_M4_Sherman",
-    "Car_M8_Greyhound_Armored",
-    "AAA_Bofors_40mm"
-  ],
-  "artillery_units": [
+    "Bofors 40 mm Gun",
+    "M2A1 Half-Track",
+    "M4A2(75) Sherman",
+    "M4A4 Sherman Firefly",
+    "M8 Greyhound Light Armored Car"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_SMLE_No_4_Mk_1"
+    "Infantry SMLE No.4 Mk-1"
   ],
   "air_defenses": [
     "BoforsGenerator",
     "EarlyColdWarFlakGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {
     "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "navy_generators": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
+  "navy_generators": [],
   "has_jtac": false,
   "doctrine": "ww2"
-}
+}

resources/factions/israel_1973.json

@@ -3,34 +3,35 @@
   "name": "Israel 1973",
   "authors": "Khopa",
   "description": "<p>Israel during the 1973 Yom Kippur War.</p>",
-  "locales": ["he_IL"],
+  "locales": [
+    "he_IL"
+  ],
   "aircrafts": [
-    "F_4E",
-    "A_4E_C",
-    "UH_1H"
+    "A-4E Skyhawk",
+    "F-4E Phantom II",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_2C"
+    "E-2C Hawkeye"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "Tk_M4_Sherman",
-    "APC_M2A1_Halftrack",
-    "MBT_M60A3_Patton",
-    "APC_M113",
-    "SAM_Chaparral_M48"
-  ],
-  "artillery_units": [
+    "M113",
+    "M2A1 Half-Track",
+    "M48 Chaparral",
+    "M4A2(75) Sherman",
+    "M60A3 \"Patton\""
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249"
+    "Infantry M249",
+    "Infantry M4"
   ],
   "air_defenses": [
     "BoforsGenerator",
@@ -41,23 +42,16 @@
   "ewrs": [
     "HawkEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {
     "Community A-4E": "https://heclak.github.io/community-a4e-c/"
   },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "navy_generators": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
+  "navy_generators": [],
   "has_jtac": false,
   "doctrine": "coldwar"
-}
+}

resources/factions/israel_1982.json

@@ -3,37 +3,38 @@
   "name": "Israel 1982",
   "authors": "Khopa",
   "description": "<p>Israel during the 1982 war with Lebanon.</p>",
-  "locales": ["he_IL"],
+  "locales": [
+    "he_IL"
+  ],
   "aircrafts": [
-    "F_4E",
-    "A_4E_C",
-    "F_15C",
-    "F_16A",
-    "F_16C_50",
-    "UH_1H",
-    "AH_1W"
+    "A-4E Skyhawk",
+    "AH-1W SuperCobra",
+    "F-15C Eagle",
+    "F-16A",
+    "F-16CM Fighting Falcon (Block 50)",
+    "F-4E Phantom II",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_2C"
+    "E-2C Hawkeye"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "APC_M113",
-    "MBT_M60A3_Patton",
-    "MBT_Merkava_IV",
-    "SPAAA_Vulcan_M163"
-  ],
-  "artillery_units": [
+    "M113",
+    "M163 Vulcan Air Defense System",
+    "M60A3 \"Patton\"",
+    "Merkava Mk IV"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249"
+    "Infantry M249",
+    "Infantry M4"
   ],
   "air_defenses": [
     "ChaparralGenerator",
@@ -43,23 +44,16 @@
   "ewrs": [
     "HawkEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {
     "Community A-4E": "https://heclak.github.io/community-a4e-c/"
   },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "navy_generators": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
+  "navy_generators": [],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/israel_2000.json

@@ -3,41 +3,43 @@
   "name": "Israel 2000",
   "authors": "Khopa",
   "description": "<p>Modern Israeli faction.</p>",
-  "locales": ["he_IL"],
+  "locales": [
+    "he_IL"
+  ],
   "aircrafts": [
-    "F_4E",
-    "F_15C",
-    "F_15E",
-    "F_16C_50",
-    "UH_1H",
-    "AH_1W",
-    "AH_64D"
+    "AH-1W SuperCobra",
+    "AH-64D Apache Longbow",
+    "F-15C Eagle",
+    "F-15E Strike Eagle",
+    "F-16CM Fighting Falcon (Block 50)",
+    "F-4E Phantom II",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_2C"
+    "E-2C Hawkeye"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "APC_M113",
-    "Scout_HMMWV",
-    "ATGM_HMMWV",
-    "MBT_Merkava_IV",
-    "SPAAA_Vulcan_M163"
+    "M1043 HMMWV (M2 HMG)",
+    "M1045 HMMWV (BGM-71 TOW)",
+    "M113",
+    "M163 Vulcan Air Defense System",
+    "Merkava Mk IV"
   ],
   "artillery_units": [
-    "SPH_M109_Paladin_155mm",
-    "MLRS_M270_227mm"
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "ChaparralGenerator",
@@ -48,23 +50,16 @@
   "ewrs": [
     "HawkEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
-  "requirements": {
-  },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
+  "requirements": {},
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/israel_2012.json

@@ -3,42 +3,44 @@
   "name": "Israel 2012'ish",
   "authors": "Headiii",
   "description": "<p>A more modern Israeli faction with fictional Imports.</p>",
-  "locales": ["he_IL"],
+  "locales": [
+    "he_IL"
+  ],
   "aircrafts": [
-    "A_10C",
-    "F_15C",
-    "F_15E",
-    "F_16C_50",
-    "FA_18C_hornet",
-    "M_2000C",
-    "UH_1H",
-    "AH_64D"
+    "A-10C Thunderbolt II (Suite 3)",
+    "AH-64D Apache Longbow",
+    "F-15C Eagle",
+    "F-15E Strike Eagle",
+    "F-16CM Fighting Falcon (Block 50)",
+    "F/A-18C Hornet (Lot 20)",
+    "Mirage 2000C",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_2C"
+    "E-2C Hawkeye"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "APC_M113",
-    "Scout_HMMWV",
-    "ATGM_HMMWV",
-    "MBT_Merkava_IV",
-    "SPAAA_Vulcan_M163"
+    "M1043 HMMWV (M2 HMG)",
+    "M1045 HMMWV (BGM-71 TOW)",
+    "M113",
+    "M163 Vulcan Air Defense System",
+    "Merkava Mk IV"
   ],
   "artillery_units": [
-    "SPH_M109_Paladin_155mm",
-    "MLRS_M270_227mm"
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "ChaparralGenerator",
@@ -49,52 +51,45 @@
   "ewrs": [
     "HawkEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
-  "requirements": {
-  },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
+  "requirements": {},
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
+  "jtac_unit": "MQ-9 Reaper",
   "liveries_overrides": {
-    "A_10C": [
+    "A-10C Thunderbolt II (Suite 3)": [
       "Fictional Israel 115 Sqn Flying Dragon"
     ],
-    "F_15C": [
-    "390th Fighter SQN"
+    "F-15C Eagle": [
+      "390th Fighter SQN"
     ],
-    "F_15E":[
-    "IDF No 69 Hammers Squadron"
+    "F-15E Strike Eagle": [
+      "IDF No 69 Hammers Squadron"
     ],
-    "F_16C_50": [
+    "F-16CM Fighting Falcon (Block 50)": [
       "IAF_101st_squadron",
       "IAF_110th_Squadron",
       "IAF_115th_Aggressors_Squadron",
       "IAF_117th_Squadron"
     ],
-    "UH_1H": [
+    "UH-1H Iroquois": [
       "Israel Army"
     ],
-    "AH_64D":[
+    "AH-64D Apache Longbow": [
       "ah-64_d_isr"
     ],
-    "FA_18C_hornet": [
+    "F/A-18C Hornet (Lot 20)": [
       "Fictional Israel Air Force"
     ],
-    "M_2000C": [
+    "Mirage 2000C": [
       "UAE Air Force"
     ]
   }
-}
+}

resources/factions/italy_1990.json

@@ -3,35 +3,37 @@
   "name": "Italy 1990",
   "authors": "Khopa",
   "description": "<p>Italy in the 90s.</p>",
-  "locales": ["it_IT"],
+  "locales": [
+    "it_IT"
+  ],
   "aircrafts": [
-    "Tornado_IDS",
-    "AV8BNA",
-    "UH_1H",
-    "AH_1W"
+    "AH-1W SuperCobra",
+    "AV-8B Harrier II Night Attack",
+    "Tornado IDS",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_Leopard_1A3",
-    "APC_M113",
-    "SAM_Avenger__Stinger"
+    "Leopard 1A3",
+    "M1097 Heavy HMMWV Avenger",
+    "M113"
   ],
   "artillery_units": [
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -40,21 +42,18 @@
   "ewrs": [
     "HawkEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
+  "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "FFG_Oliver_Hazzard_Perry"
+    "PERRY"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
-  ],
-  "requirements": {
-  },
-  "carrier_names": [
+    "TICONDEROG"
   ],
+  "requirements": {},
+  "carrier_names": [],
   "helicopter_carrier_names": [
     "Giuseppe Garibaldi",
     "Cavour"
@@ -63,5 +62,5 @@
     "OliverHazardPerryGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/italy_1990_mb339.json

@@ -3,36 +3,38 @@
   "name": "Italy 1990 (With MB339)",
   "authors": "Khopa",
   "description": "<p>Italy in the 90s, with the MB339 mod.</p>",
-  "locales": ["it_IT"],
+  "locales": [
+    "it_IT"
+  ],
   "aircrafts": [
-    "Tornado_IDS",
-    "AV8BNA",
-    "MB_339PAN",
-    "UH_1H",
-    "AH_1W"
+    "AH-1W SuperCobra",
+    "AV-8B Harrier II Night Attack",
+    "MB-339PAN",
+    "Tornado IDS",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_Leopard_1A3",
-    "APC_M113",
-    "SAM_Avenger__Stinger"
+    "Leopard 1A3",
+    "M1097 Heavy HMMWV Avenger",
+    "M113"
   ],
   "artillery_units": [
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -41,22 +43,20 @@
   "ewrs": [
     "HawkEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
+  "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "FFG_Oliver_Hazzard_Perry"
+    "PERRY"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {
     "MB-339A/PAN by Frecce Tricolori Virtuali": "http://www.freccetricolorivirtuali.net/"
   },
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "helicopter_carrier_names": [
     "Giuseppe Garibaldi",
     "Cavour"
@@ -65,5 +65,5 @@
     "OliverHazardPerryGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/japan_2005.json

@@ -3,41 +3,43 @@
   "name": "Japan 2005",
   "authors": "Khopa",
   "description": "<p>Japanese self defense force, F-15C standing as F-15J, and F-16 as Mitsubishi F-2.</p><p>Ground units were also chosen to fit the existing vehicles of the japanese forces</p>",
-  "locales": ["ja_JP"],
+  "locales": [
+    "ja_JP"
+  ],
   "aircrafts": [
-    "F_15C",
-    "F_16C_50",
-    "F_4E",
-    "AH_1W",
-    "AH_64D"
+    "AH-1W SuperCobra",
+    "AH-64D Apache Longbow",
+    "F-15J Eagle",
+    "F-2A",
+    "F-4EJ Kai Phantom II"
   ],
   "awacs": [
-    "E_2C"
+    "E-2C Hawkeye"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_Merkava_IV",
-    "MBT_M1A2_Abrams",
-    "IFV_Marder",
-    "APC_TPz_Fuchs",
-    "IFV_LAV_25",
-    "Scout_HMMWV",
-    "SPAAA_Gepard"
+    "Flakpanzer Gepard",
+    "LAV-25",
+    "M1043 HMMWV (M2 HMG)",
+    "M1A2 Abrams",
+    "Marder 1A3",
+    "Merkava Mk IV",
+    "TPz Fuchs"
   ],
   "artillery_units": [
-    "SPH_M109_Paladin_155mm",
-    "MLRS_M270_227mm",
-    "MANPADS_Stinger"
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System",
+    "MANPADS Stinger"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249"
+    "Infantry M249",
+    "Infantry M4"
   ],
   "air_defenses": [
     "GepardGenerator",
@@ -47,21 +49,18 @@
   "ewrs": [
     "PatriotEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
+  "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "DDG_Arleigh_Burke_IIa"
+    "USS_Arleigh_Burke_IIa"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
-  ],
-  "requirements": {
-  },
-  "carrier_names": [
+    "TICONDEROG"
   ],
+  "requirements": {},
+  "carrier_names": [],
   "helicopter_carrier_names": [
     "Hyuga",
     "Ise"
@@ -70,5 +69,5 @@
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/jordan_2010.json

@@ -1,61 +0,0 @@
-{
-  "country": "Jordan",
-  "name": "Jordan 2010",
-  "authors": "Starfire",
-  "description": "<p>Royal Jordanian Armed Forces early 21st century</p>",
-  "aircrafts": [
-    "F_5E_3",
-    "C_101CC",
-    "SA342M",
-    "SA342L"
-  ],
-  "frontline_units": [
-    "MBT_Challenger_II",
-	"MBT_M60A3_Patton",
-	"IFV_Marder",
-    "IFV_BMP_2",
-	"APC_M113",
-	"APC_M1043_HMMWV_Armament",
-    "ATGM_M1045_HMMWV_TOW"
-  ],
-  "artillery_units": [
-    "MLRS_M270",
-	"SPH_M109_Paladin"
-  ],
-  "logistics_units": [
-    "Transport_M818"
-  ],
-  "infantry_units": [
-    "Infantry_M4",
-    "Soldier_M249",
-	"SAM_SA_18_Igla_S_MANPADS"
-  ],
-  "air_defenses": [
-    "SA8Generator",
-    "SA13Generator",
-    "VulcanGenerator",
-	"ZU23Generator",
-	"HawkGenerator"
-  ],
-  "ewrs": [
-    "HawkEwrGenerator"
-  ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
-  "requirements": {
-  },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "navy_generators": [
-  ],
-  "has_jtac": false,
-  "doctrine": "coldwar"
-}

resources/factions/libya_2011.json

@@ -4,38 +4,39 @@
   "authors": "Khopa",
   "description": "<p>Gaddafi's Lybian forces during the 2011 international intervention</p>",
   "aircrafts": [
-    "MiG_21Bis",
-    "MiG_23MLD",
-    "Su_17M4",
-    "Su_24M",
-    "Mi_24V"
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "MiG-21bis Fishbed-N",
+    "MiG-23MLD Flogger-K",
+    "Su-17M4 Fitter-K",
+    "Su-24M Fencer-D"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "IFV_BMP_1",
-    "Scout_BRDM_2",
-    "MBT_T_72B",
-    "MBT_T_55",
-    "LT_PT_76",
-    "SPAAA_ZSU_23_4_Shilka_Gun_Dish",
-    "SAM_SA_8_Osa_Gecko_TEL"
+    "BMP-1",
+    "BRDM-2",
+    "PT-76",
+    "SAM SA-8 Osa \"Gecko\" TEL",
+    "T-55A",
+    "T-72B with Kontakt-1 ERA",
+    "ZSU-23-4 Shilka"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm"
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Insurgent_AK_74",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_Grouse"
+    "Insurgent AK-74",
+    "MANPADS SA-18 Igla \"Grouse\"",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "HQ7Generator",
@@ -52,26 +53,24 @@
     "BoxSpringGenerator",
     "TallRackGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
   "missiles": [
     "ScudGenerator"
   ],
   "missiles_group_count": 1,
   "destroyers": [
-    "Frigate_1135M_Rezky"
+    "REZKY"
   ],
   "cruisers": [
-    "Corvette_1241_1_Molniya"
+    "MOLNIYA"
   ],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "navy_generators": [
-     "GrishaGroupGenerator", "MolniyaGroupGenerator", "LaCombattanteIIGroupGenerator"
+    "GrishaGroupGenerator",
+    "MolniyaGroupGenerator",
+    "LaCombattanteIIGroupGenerator"
   ]
-}
+}

resources/factions/netherlands_1990.json

@@ -3,33 +3,34 @@
   "name": "Netherlands 1990",
   "authors": "Khopa",
   "description": "<p>Netherlands forces in the 90s.</p>",
-  "locales": ["nl_NL"],
+  "locales": [
+    "nl_NL"
+  ],
   "aircrafts": [
-    "F_16C_50",
-    "F_5E_3",
-    "AH_64A"
+    "AH-64A Apache",
+    "F-16CM Fighting Falcon (Block 50)",
+    "F-5E Tiger II"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "APC_M113",
-    "MBT_Leopard_1A3",
-    "SAM_Avenger__Stinger"
-  ],
-  "artillery_units": [
+    "Leopard 1A3",
+    "M1097 Heavy HMMWV Avenger",
+    "M113"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -41,22 +42,16 @@
   "ewrs": [
     "PatriotEwrGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {},
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "OliverHazardPerryGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/north_korea_2000.json

@@ -4,45 +4,46 @@
   "authors": "Khopa",
   "description": "<p>North Korean army in the 2000s.</p>",
   "aircrafts": [
-    "MiG_15bis",
-    "MiG_19P",
-    "MiG_21Bis",
-    "MiG_23MLD",
-    "MiG_29A",
-    "Mi_8MT",
-    "Mi_24V"
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-8MTV2 Hip",
+    "MiG-15bis Fagot",
+    "MiG-19P Farmer-B",
+    "MiG-21bis Fishbed-N",
+    "MiG-23MLD Flogger-K",
+    "MiG-29A Fulcrum-A"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "Scout_BRDM_2",
-    "APC_BTR_80",
-    "IFV_BMP_1",
-    "MBT_T_55",
-    "MBT_T_72B",
-    "MBT_T_80U",
-    "LT_PT_76",
-    "SPAAA_ZSU_57_2",
-    "SAM_SA_9_Strela_1_Gaskin_TEL"
+    "BMP-1",
+    "BRDM-2",
+    "BTR-80",
+    "PT-76",
+    "SA-9 Strela",
+    "T-55A",
+    "T-72B with Kontakt-1 ERA",
+    "T-80UD",
+    "ZSU-57-2 'Sparka'"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm",
-    "MLRS_9K57_Uragan_BM_27_220mm",
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S",
+    "BM-21 Grad",
+    "BM-27 Uragan"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "SA2Generator",
@@ -58,19 +59,13 @@
     "BoxSpringGenerator",
     "TallRackGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "missiles": [
     "ScudGenerator"
   ],
@@ -80,4 +75,4 @@
     "MolniyaGroupGenerator"
   ],
   "has_jtac": false
-}
+}

resources/factions/pakistan_2015.json

@@ -4,41 +4,41 @@
   "authors": "Khopa",
   "description": "<p>Pakistan circa 2015 for JF-17 and F-16 enthusiasts.</p>",
   "aircrafts": [
-    "JF_17",
-    "F_16C_50",
-    "MiG_21Bis",
-    "MiG_19P",
-    "Mi_8MT",
-    "UH_1H",
-    "AH_1W"
+    "AH-1W SuperCobra",
+    "F-16CM Fighting Falcon (Block 50)",
+    "JF-17 Thunder",
+    "Mi-8MTV2 Hip",
+    "MiG-19P Farmer-B",
+    "MiG-21bis Fishbed-N",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "KJ_2000"
+    "KJ-2000"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "MBT_T_80U",
-    "MBT_T_55",
-    "ZBD_04A",
-    "APC_BTR_80",
-    "APC_M113",
-    "HQ_7_Self_Propelled_LN"
+    "BTR-80",
+    "HQ-7 Launcher",
+    "M113",
+    "T-55A",
+    "T-80UD",
+    "Type 04A (ZBD-04A)"
   ],
   "artillery_units": [
-    "MLRS_9A52_Smerch_HE_300mm",
-    "SPM_2S9_Nona_120mm_M"
+    "2S9 Nona-S",
+    "BM-30 Smerch (9M55K5 HE Rockets)"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16",
-    "MANPADS_Stinger"
+    "Infantry AK-74 Rus",
+    "MANPADS Stinger",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "HQ7Generator",
@@ -52,23 +52,17 @@
     "BoxSpringGenerator",
     "TallRackGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "carrier_names": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruiser": [
-  ],
+  "aircraft_carrier": [],
+  "carrier_names": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruiser": [],
   "requirements": {},
   "navy_generators": [
     "Type54GroupGenerator",
     "OliverHazardPerryGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "WingLoong_I"
-}
+  "jtac_unit": "WingLoong-I"
+}

resources/factions/pmc_russian.json

@@ -3,33 +3,36 @@
   "name": "Private Military Company - Russian",
   "authors": "Khopa",
   "description": "<p>A private military company using Russian units.</p>",
-  "locales": ["ru_RU"],
+  "locales": [
+    "ru_RU"
+  ],
   "aircrafts": [
-    "L_39ZA",
-    "Mi_8MT",
-    "Mi_24V",
-    "Ka_50"
+    "Ka-50 Hokum",
+    "L-39ZA Albatros",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-8MTV2 Hip"
   ],
   "frontline_units": [
-    "Scout_Cobra",
-    "APC_BTR_80",
-    "Scout_BRDM_2",
-    "SAM_SA_13_Strela_10M3_Gopher_TEL"
+    "BRDM-2",
+    "BTR-80",
+    "Cobra",
+    "SA-13 Gopher (9K35 Strela-10M3)"
   ],
   "artillery_units": [
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "SA9Generator",
     "SA13Generator"
   ]
-}
+}

resources/factions/pmc_us.json

@@ -4,30 +4,29 @@
   "authors": "Khopa",
   "description": "<p>A private military company using western units.</p>",
   "aircrafts": [
-    "C_101CC",
-    "UH_1H",
-    "Mi_8MT",
-    "SA342M"
+    "C-101CC Aviojet",
+    "Mi-8MTV2 Hip",
+    "SA 342M Gazelle",
+    "UH-1H Iroquois"
   ],
   "frontline_units": [
-    "Scout_HMMWV",
-    "IFV_Warrior",
-    "IFV_LAV_25",
-    "SAM_Avenger__Stinger"
-  ],
-  "artillery_units": [
+    "FV510 Warrior",
+    "LAV-25",
+    "M1043 HMMWV (M2 HMG)",
+    "M1097 Heavy HMMWV Avenger"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "AvengerGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/pmc_us_with_mb339.json

@@ -4,27 +4,26 @@
   "authors": "Khopa",
   "description": "<p>A private military company using western units (And using the MB339 mod).</p>",
   "aircrafts": [
-    "MB_339PAN",
-    "C_101CC",
-    "UH_1H",
-    "Mi_8MT",
-    "SA342M"
+    "C-101CC Aviojet",
+    "MB-339PAN",
+    "Mi-8MTV2 Hip",
+    "SA 342M Gazelle",
+    "UH-1H Iroquois"
   ],
   "frontline_units": [
-    "Scout_HMMWV",
-    "IFV_Warrior",
-    "IFV_LAV_25",
-    "SAM_Avenger__Stinger"
-  ],
-  "artillery_units": [
+    "FV510 Warrior",
+    "LAV-25",
+    "M1043 HMMWV (M2 HMG)",
+    "M1097 Heavy HMMWV Avenger"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "AvengerGenerator"
@@ -33,5 +32,5 @@
     "MB-339A/PAN by Frecce Tricolori Virtuali": "http://www.freccetricolorivirtuali.net/"
   },
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/poland_2010.json

@@ -3,40 +3,42 @@
   "name": "Poland 2010",
   "authors": "Malakhit",
   "description": "<p>Polish army in the 2010s.</p>",
-  "locales": ["pl_PL"],
+  "locales": [
+    "pl_PL"
+  ],
   "aircrafts": [
-    "Su_17M4",
-    "MiG_29A",
-    "F_16C_50",
-    "Mi_8MT"
+    "F-16CM Fighting Falcon (Block 50)",
+    "Mi-8MTV2 Hip",
+    "MiG-29A Fulcrum-A",
+    "Su-22M4 Fitter-K"
   ],
   "tankers": [
-    "KC130"
+    "KC-130"
   ],
   "frontline_units": [
-    "Scout_HMMWV",
-    "ATGM_HMMWV",
-    "IFV_M1126_Stryker_ICV",
-    "Scout_BRDM_2",
-    "IFV_BMP_1",
-    "APC_MTLB",
-    "MBT_Leopard_2A6M",
-    "MBT_T_72B3"
+    "BMP-1",
+    "BRDM-2",
+    "Leopard 2",
+    "M1043 HMMWV (M2 HMG)",
+    "M1045 HMMWV (BGM-71 TOW)",
+    "M1126 Stryker ICV (M2 HMG)",
+    "MT-LB",
+    "T-72B3 model 2011"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S1_Gvozdika_122mm",
-    "SPH_Dana_vz77_152mm"
+    "2S1 Gvozdika",
+    "BM-21 Grad",
+    "SpGH DANA"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Infantry_RPG",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry AK-74 Rus",
+    "Infantry RPG",
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper AKS"
   ],
   "air_defenses": [
     "SA6Generator",
@@ -54,4 +56,4 @@
     "MolniyaGroupGenerator",
     "OliverHazardPerryGroupGenerator"
   ]
-}
+}

resources/factions/redfor_china_2010.json

@@ -4,62 +4,63 @@
   "authors": "Robert Peary",
   "description": "<p>Combined Redfor under China's leadership in the late 2000s, early 2010s.</p>",
   "aircrafts": [
-    "J_11A",
-    "JF_17",
-    "Ka_50",
-    "L_39ZA",
-    "Mi_8MT",
-    "Mi_24V",
-    "Mi_28N",
-    "MiG_21Bis",
-    "MiG_29S",
-    "MiG_31",
-    "Su_24M",
-    "Su_25",
-    "Su_25T",
-    "Su_27",
-    "Su_30",
-    "Su_33",
-    "Su_34",
-    "Tu_22M3"
+    "FC-1 Fierce Dragon",
+    "J-11A Flanker-L",
+    "J-15 Flanker X-2",
+    "J-7B",
+    "Ka-50 Hokum",
+    "L-39ZA Albatros",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-28N Havoc",
+    "Mi-8MTV2 Hip",
+    "MiG-29S Fulcrum-C",
+    "MiG-31 Foxhound",
+    "Su-24M Fencer-D",
+    "Su-25 Frogfoot",
+    "Su-25T Frogfoot",
+    "Su-27 Flanker-B",
+    "Su-30MKK Flanker-G",
+    "Su-34 Fullback",
+    "Tu-22M3 Backfire-C"
   ],
   "awacs": [
-    "KJ_2000"
+    "KJ-2000"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "APC_BTR_80",
-    "IFV_BTR_82A",
-    "HQ_7_Self_Propelled_LN",
-    "IFV_BMP_1",
-    "IFV_BMP_2",
-    "IFV_BMP_3",
-    "MBT_T_55",
-    "MBT_T_72B3",
-    "MBT_T_80U",
-    "MBT_T_90",
-    "SAM_SA_19_Tunguska_Grison",
-    "ZBD_04A",
-    "ZTZ_96B"
+    "BMP-1",
+    "BMP-2",
+    "BMP-3",
+    "BTR-80",
+    "BTR-82A",
+    "HQ-7 Launcher",
+    "SA-19 Grison (2K22 Tunguska)",
+    "T-55A",
+    "T-72B3 model 2011",
+    "T-80UD",
+    "T-90A",
+    "Type 04A (ZBD-04A)",
+    "Type 96B (ZTZ-96B)"
   ],
   "artillery_units": [
-    "MLRS_9A52_Smerch_HE_300mm",
-    "MLRS_9K57_Uragan_BM_27_220mm",
-    "SPM_2S9_Nona_120mm_M",
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S",
+    "2S9 Nona-S",
+    "BM-27 Uragan",
+    "BM-30 Smerch (9M55K5 HE Rockets)"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Mortar_2B11_120mm",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_AKS",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_Grouse"
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla \"Grouse\"",
+    "Mortar 2B11 120mm",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "HQ7Generator",
@@ -84,7 +85,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "carrier_names": [
     "001 Liaoning",
@@ -103,18 +104,18 @@
     "Wudang Shan"
   ],
   "destroyers": [
-    "Frigate_1135M_Rezky",
-    "Type_052B_Destroyer",
-    "Type_052C_Destroyer"
+    "REZKY",
+    "Type_052B",
+    "Type_052C"
   ],
   "cruiser": [
-    "Corvette_1241_1_Molniya",
-    "Type_054A_Frigate"
+    "MOLNIYA",
+    "Type_054A"
   ],
   "requirements": {},
   "navy_generators": [
     "Type54GroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "WingLoong_I"
-}
+  "jtac_unit": "WingLoong-I"
+}

resources/factions/redfor_russia_2010.json

@@ -3,64 +3,67 @@
   "name": "Redfor (Russia) 2010",
   "authors": "Robert Peary",
   "description": "<p>Combined Redfor under Russia's leadership in the late 2000s, early 2010s.</p>",
-  "locales": ["ru_RU"],
+  "locales": [
+    "ru_RU"
+  ],
   "aircrafts": [
-    "J_11A",
-    "JF_17",
-    "Ka_50",
-    "L_39ZA",
-    "Mi_8MT",
-    "Mi_24V",
-    "Mi_28N",
-    "MiG_21Bis",
-    "MiG_29S",
-    "MiG_31",
-    "Su_24M",
-    "Su_25",
-    "Su_25T",
-    "Su_27",
-    "Su_30",
-    "Su_33",
-    "Su_34",
-    "Tu_22M3"
+    "J-11A Flanker-L",
+    "JF-17 Thunder",
+    "Ka-50 Hokum",
+    "L-39ZA Albatros",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-28N Havoc",
+    "Mi-8MTV2 Hip",
+    "MiG-21bis Fishbed-N",
+    "MiG-29S Fulcrum-C",
+    "MiG-31 Foxhound",
+    "Su-24M Fencer-D",
+    "Su-25 Frogfoot",
+    "Su-25T Frogfoot",
+    "Su-27 Flanker-B",
+    "Su-30 Flanker-C",
+    "Su-33 Flanker-D",
+    "Su-34 Fullback",
+    "Tu-22M3 Backfire-C"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "APC_BTR_80",
-    "IFV_BTR_82A",
-    "HQ_7_Self_Propelled_LN",
-    "IFV_BMP_1",
-    "IFV_BMP_2",
-    "IFV_BMP_3",
-    "MBT_T_55",
-    "MBT_T_72B3",
-    "MBT_T_80U",
-    "MBT_T_90",
-    "SAM_SA_19_Tunguska_Grison",
-    "ZBD_04A",
-    "ZTZ_96B"
+    "BMP-1",
+    "BMP-2",
+    "BMP-3",
+    "BTR-80",
+    "BTR-82A",
+    "HQ-7 Launcher",
+    "SA-19 Grison (2K22 Tunguska)",
+    "T-55A",
+    "T-72B3 model 2011",
+    "T-80UD",
+    "T-90A",
+    "Type 04A (ZBD-04A)",
+    "Type 96B (ZTZ-96B)"
   ],
   "artillery_units": [
-    "MLRS_9A52_Smerch_HE_300mm",
-    "MLRS_9K57_Uragan_BM_27_220mm",
-    "SPM_2S9_Nona_120mm_M",
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S",
+    "2S9 Nona-S",
+    "BM-27 Uragan",
+    "BM-30 Smerch (9M55K5 HE Rockets)"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Mortar_2B11_120mm",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_AKS",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_Grouse"
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla \"Grouse\"",
+    "Mortar 2B11 120mm",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "HQ7Generator",
@@ -85,7 +88,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [
     "Type_071_Amphibious_Transport_Dock"
@@ -95,13 +98,13 @@
     "Mitrofan Moskalenko"
   ],
   "destroyers": [
-    "Frigate_1135M_Rezky",
-    "Type_052B_Destroyer",
-    "Type_052C_Destroyer"
+    "REZKY",
+    "Type_052B",
+    "Type_052C"
   ],
   "cruisers": [
-    "Corvette_1241_1_Molniya",
-    "Type_054A_Frigate"
+    "MOLNIYA",
+    "Type_054A"
   ],
   "requirements": {},
   "carrier_names": [
@@ -112,5 +115,5 @@
     "KiloSubGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/russia_1955.json

@@ -3,55 +3,50 @@
   "name": "Russia 1955",
   "authors": "Khopa",
   "description": "<p>Soviet army around 1955, during the Korean War</p>",
-  "locales": ["ru_RU"],
+  "locales": [
+    "ru_RU"
+  ],
   "aircrafts": [
-    "MiG_15bis"
+    "MiG-15bis Fagot"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "Scout_BRDM_2",
-    "Grad_MRL_FDDM__FC",
-    "APC_MTLB",
-    "MBT_T_55",
-    "LT_PT_76",
-    "SPAAA_ZU_23_2_Mounted_Ural_375",
-    "AAA_8_8cm_Flak_18",
-    "AAA_S_60_57mm"
+    "8.8 cm Flak 18",
+    "BRDM-2",
+    "Grad MRL FDDM (FC)",
+    "MT-LB",
+    "PT-76",
+    "S-60 57mm",
+    "T-55A",
+    "ZU-23 on Ural-375"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm"
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Infantry_AK_74_Rus",
-    "Infantry_RPG"
+    "Infantry AK-74 Rus",
+    "Infantry RPG"
   ],
   "air_defenses": [
     "EarlyColdWarFlakGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {},
-  "carrier_names": [
-  ],
-  "navy_generators": [
-  ],
+  "carrier_names": [],
+  "navy_generators": [],
   "has_jtac": false,
   "doctrine": "coldwar"
-}
+}

resources/factions/russia_1965.json

@@ -3,42 +3,44 @@
   "name": "Russia 1965",
   "authors": "Khopa",
   "description": "<p>Soviet army in the 60s, ideal to fly the Mig-19 or the Mig-21.</p>",
-  "locales": ["ru_RU"],
+  "locales": [
+    "ru_RU"
+  ],
   "aircrafts": [
-    "MiG_15bis",
-    "MiG_19P",
-    "MiG_21Bis",
-    "Mi_8MT",
-    "Tu_95MS"
+    "Mi-8MTV2 Hip",
+    "MiG-15bis Fagot",
+    "MiG-19P Farmer-B",
+    "MiG-21bis Fishbed-N",
+    "Tu-95MS Bear-H"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "Scout_BRDM_2",
-    "APC_BTR_80",
-    "APC_BTR_RD",
-    "IFV_BMD_1",
-    "IFV_BMP_1",
-    "LT_PT_76",
-    "MBT_T_55",
-    "SPAAA_ZU_23_2_Mounted_Ural_375",
-    "SPAAA_ZSU_57_2",
-    "AAA_S_60_57mm"
+    "BMD-1",
+    "BMP-1",
+    "BRDM-2",
+    "BTR-80",
+    "BTR-D",
+    "PT-76",
+    "S-60 57mm",
+    "T-55A",
+    "ZSU-57-2 'Sparka'",
+    "ZU-23 on Ural-375"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm"
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Infantry_AK_74_Rus",
-    "Infantry_RPG"
+    "Infantry AK-74 Rus",
+    "Infantry RPG"
   ],
   "air_defenses": [
     "EarlyColdWarFlakGenerator",
@@ -52,21 +54,14 @@
   "ewrs": [
     "FlatFaceGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {},
-  "carrier_names": [
-  ],
-  "navy_generators": [
-  ],
+  "carrier_names": [],
+  "navy_generators": [],
   "has_jtac": false,
   "doctrine": "coldwar"
-}
+}

resources/factions/russia_1970_limited_air.json

@@ -3,34 +3,36 @@
   "name": "Russia 1970 Limited Air",
   "authors": "Starfire",
   "description": "<p>1970 Soviet Russia, with limited air units intended for a Viggen campaign.</p>",
-  "locales": ["ru_RU"],
+  "locales": [
+    "ru_RU"
+  ],
   "aircrafts": [
-    "MiG_19P",
-	"MiG_21Bis",
-	"Mi_8MT",
-    "Mi_24V"
+    "Mi-24V Hind-E",
+    "Mi-8MTV2 Hip",
+    "MiG-19P Farmer-B",
+    "MiG-21bis Fishbed-N"
   ],
   "frontline_units": [
-    "Scout_BRDM_2",
-    "APC_BTR_80",
-    "IFV_BMD_1",
-    "IFV_BMP_1",
-    "LT_PT_76",
-    "MBT_T_55",
-    "SPAAA_ZSU_57_2"
+    "BMD-1",
+    "BMP-1",
+    "BRDM-2",
+    "BTR-80",
+    "PT-76",
+    "T-55A",
+    "ZSU-57-2 'Sparka'"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm",
-    "SPM_2S9_Nona_120mm_M",
-    "SPH_2S1_Gvozdika_122mm"
+    "2S1 Gvozdika",
+    "2S9 Nona-S",
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Infantry_AK_74_Rus",
-    "Infantry_RPG"
+    "Infantry AK-74 Rus",
+    "Infantry RPG"
   ],
   "air_defenses": [
     "SA2Generator",
@@ -48,26 +50,20 @@
   "ewrs": [
     "FlatFaceGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
   "missiles": [
     "ScudGenerator"
   ],
   "missiles_group_count": 1,
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "navy_generators": [
-	"RussianNavyGroupGenerator"
+    "RussianNavyGroupGenerator"
   ],
   "has_jtac": false,
   "doctrine": "coldwar"
-}
+}

resources/factions/russia_1975.json

@@ -3,48 +3,51 @@
   "name": "Russia 1975",
   "authors": "Khopa",
   "description": "<p>Soviet army in the late 70s, using their prototype Mig-29A.</p>",
-  "locales": ["ru_RU"],
+  "locales": [
+    "ru_RU"
+  ],
   "aircrafts": [
-    "MiG_21Bis",
-    "MiG_23MLD",
-    "MiG_25PD",
-    "MiG_29A",
-    "Su_17M4",
-    "Su_24M",
-    "Su_25",
-    "Mi_8MT",
-    "Mi_24V",
-    "Tu_95MS",
-    "Tu_142"
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-8MTV2 Hip",
+    "MiG-21bis Fishbed-N",
+    "MiG-23MLD Flogger-K",
+    "MiG-25PD Foxbat-E",
+    "MiG-29A Fulcrum-A",
+    "Su-17M4 Fitter-K",
+    "Su-24M Fencer-D",
+    "Su-25 Frogfoot",
+    "Tu-142 Bear-F",
+    "Tu-95MS Bear-H"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "Scout_BRDM_2",
-    "APC_BTR_80",
-    "IFV_BMD_1",
-    "IFV_BMP_1",
-    "LT_PT_76",
-    "MBT_T_55",
-    "SAM_SA_8_Osa_Gecko_TEL"
+    "BMD-1",
+    "BMP-1",
+    "BRDM-2",
+    "BTR-80",
+    "PT-76",
+    "SAM SA-8 Osa \"Gecko\" TEL",
+    "T-55A"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm",
-    "SPM_2S9_Nona_120mm_M",
-    "SPH_2S1_Gvozdika_122mm"
+    "2S1 Gvozdika",
+    "2S9 Nona-S",
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Infantry_AK_74_Rus",
-    "Infantry_RPG",
-    "Mortar_2B11_120mm"
+    "Infantry AK-74 Rus",
+    "Infantry RPG",
+    "Mortar 2B11 120mm"
   ],
   "air_defenses": [
     "ColdWarFlakGenerator",
@@ -62,23 +65,17 @@
   "ewrs": [
     "FlatFaceGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
   "missiles": [
     "ScudGenerator"
   ],
   "missiles_group_count": 1,
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "navy_generators": [
     "MolniyaGroupGenerator"
   ],

resources/factions/russia_1990.json

@@ -3,52 +3,55 @@
   "name": "Russia 1990",
   "authors": "Khopa",
   "description": "<p>Soviet/Russian army in the 90s.</p>",
-  "locales": ["ru_RU"],
+  "locales": [
+    "ru_RU"
+  ],
   "aircrafts": [
-    "MiG_25PD",
-    "MiG_29S",
-    "MiG_31",
-    "Su_24M",
-    "Su_25",
-    "Su_25T",
-    "Su_27",
-    "Su_33",
-    "Ka_50",
-    "Mi_8MT",
-    "Mi_24V",
-    "Tu_22M3",
-    "Tu_95MS",
-    "Tu_142",
-    "Tu_160"
+    "Ka-50 Hokum",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-8MTV2 Hip",
+    "MiG-25PD Foxbat-E",
+    "MiG-29S Fulcrum-C",
+    "MiG-31 Foxhound",
+    "Su-24M Fencer-D",
+    "Su-25 Frogfoot",
+    "Su-25T Frogfoot",
+    "Su-27 Flanker-B",
+    "Su-33 Flanker-D",
+    "Tu-142 Bear-F",
+    "Tu-160 Blackjack",
+    "Tu-22M3 Backfire-C",
+    "Tu-95MS Bear-H"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "APC_BTR_80",
-    "IFV_BMP_1",
-    "IFV_BMP_2",
-    "MBT_T_72B",
-    "MBT_T_80U",
-    "SAM_SA_13_Strela_10M3_Gopher_TEL"
+    "BMP-1",
+    "BMP-2",
+    "BTR-80",
+    "SA-13 Gopher (9K35 Strela-10M3)",
+    "T-72B with Kontakt-1 ERA",
+    "T-80UD"
   ],
   "artillery_units": [
-    "MLRS_9K57_Uragan_BM_27_220mm",
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S",
+    "BM-27 Uragan"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16",
-    "Mortar_2B11_120mm",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Mortar 2B11 120mm",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "SA2Generator",
@@ -72,17 +75,15 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
+    "KUZNECOW"
   ],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
   "destroyers": [
-    "Frigate_1135M_Rezky"
+    "REZKY"
   ],
   "cruisers": [
-    "Corvette_1241_1_Molniya"
+    "MOLNIYA"
   ],
   "requirements": {},
   "carrier_names": [
@@ -93,5 +94,5 @@
     "RussianNavyGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/russia_2010.json

@@ -3,58 +3,61 @@
   "name": "Russia 2010",
   "authors": "Khopa",
   "description": "<p>Russian army in the early 2010s.</p>",
-  "locales": ["ru_RU"],
+  "locales": [
+    "ru_RU"
+  ],
   "aircrafts": [
-    "MiG_29S",
-    "MiG_31",
-    "Su_24M",
-    "Su_25",
-    "Su_25T",
-    "Su_27",
-    "Su_30",
-    "Su_33",
-    "Su_34",
-    "L_39ZA",
-    "Mi_8MT",
-    "Mi_24V",
-    "Mi_28N",
-    "Ka_50",
-    "Tu_22M3",
-    "Tu_95MS",
-    "Tu_142",
-    "Tu_160"
+    "Ka-50 Hokum",
+    "L-39ZA Albatros",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-28N Havoc",
+    "Mi-8MTV2 Hip",
+    "MiG-29S Fulcrum-C",
+    "MiG-31 Foxhound",
+    "Su-24M Fencer-D",
+    "Su-25 Frogfoot",
+    "Su-25T Frogfoot",
+    "Su-27 Flanker-B",
+    "Su-30 Flanker-C",
+    "Su-33 Flanker-D",
+    "Su-34 Fullback",
+    "Tu-142 Bear-F",
+    "Tu-160 Blackjack",
+    "Tu-22M3 Backfire-C",
+    "Tu-95MS Bear-H"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "IFV_BMP_1",
-    "IFV_BMP_2",
-    "IFV_BMP_3",
-    "APC_BTR_80",
-    "IFV_BTR_82A",
-    "MBT_T_90",
-    "MBT_T_80U",
-    "MBT_T_72B3",
-    "SAM_SA_19_Tunguska_Grison"
+    "BMP-1",
+    "BMP-2",
+    "BMP-3",
+    "BTR-80",
+    "BTR-82A",
+    "SA-19 Grison (2K22 Tunguska)",
+    "T-72B3 model 2011",
+    "T-80UD",
+    "T-90A"
   ],
   "artillery_units": [
-    "MLRS_9K57_Uragan_BM_27_220mm",
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S",
+    "BM-27 Uragan"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16",
-    "Mortar_2B11_120mm",
-    "MANPADS_SA_18_Igla_Grouse"
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla \"Grouse\"",
+    "Mortar 2B11 120mm",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "SA8Generator",
@@ -75,17 +78,15 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
+    "KUZNECOW"
   ],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
   "destroyers": [
-    "Frigate_1135M_Rezky"
+    "REZKY"
   ],
   "cruisers": [
-    "Corvette_1241_1_Molniya"
+    "MOLNIYA"
   ],
   "requirements": {},
   "carrier_names": [
@@ -95,5 +96,5 @@
     "RussianNavyGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/russia_2010_hds.json

@@ -3,58 +3,61 @@
   "name": "Russia 2010 (High Digit SAMs)",
   "authors": "Khopa",
   "description": "<p>Russian army in the early 2010s, featuring the High Digit SAMs mod units. </p>",
-  "locales": ["ru_RU"],
+  "locales": [
+    "ru_RU"
+  ],
   "aircrafts": [
-    "MiG_29S",
-    "MiG_31",
-    "Su_24M",
-    "Su_25",
-    "Su_25T",
-    "Su_27",
-    "Su_30",
-    "Su_33",
-    "Su_34",
-    "L_39ZA",
-    "Mi_8MT",
-    "Mi_24V",
-    "Mi_28N",
-    "Ka_50",
-    "Tu_22M3",
-    "Tu_95MS",
-    "Tu_142",
-    "Tu_160"
+    "Ka-50 Hokum",
+    "L-39ZA Albatros",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-28N Havoc",
+    "Mi-8MTV2 Hip",
+    "MiG-29S Fulcrum-C",
+    "MiG-31 Foxhound",
+    "Su-24M Fencer-D",
+    "Su-25 Frogfoot",
+    "Su-25T Frogfoot",
+    "Su-27 Flanker-B",
+    "Su-30 Flanker-C",
+    "Su-33 Flanker-D",
+    "Su-34 Fullback",
+    "Tu-142 Bear-F",
+    "Tu-160 Blackjack",
+    "Tu-22M3 Backfire-C",
+    "Tu-95MS Bear-H"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "IFV_BMP_1",
-    "IFV_BMP_2",
-    "IFV_BMP_3",
-    "APC_BTR_80",
-    "IFV_BTR_82A",
-    "MBT_T_90",
-    "MBT_T_80U",
-    "MBT_T_72B3",
-    "SAM_SA_19_Tunguska_Grison"
+    "BMP-1",
+    "BMP-2",
+    "BMP-3",
+    "BTR-80",
+    "BTR-82A",
+    "SA-19 Grison (2K22 Tunguska)",
+    "T-72B3 model 2011",
+    "T-80UD",
+    "T-90A"
   ],
   "artillery_units": [
-    "MLRS_9K57_Uragan_BM_27_220mm",
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S",
+    "BM-27 Uragan"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16",
-    "Mortar_2B11_120mm",
-    "MANPADS_SA_18_Igla_Grouse"
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla \"Grouse\"",
+    "Mortar 2B11 120mm",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "SA17Generator",
@@ -72,19 +75,19 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
+    "KUZNECOW"
   ],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
   "destroyers": [
-    "Frigate_1135M_Rezky"
+    "REZKY"
   ],
   "cruisers": [
-    "Corvette_1241_1_Molniya"
+    "MOLNIYA"
   ],
-  "requirements": { "High Digit SAMs":  "https://github.com/Auranis/HighDigitSAMs/releases"},
+  "requirements": {
+    "High Digit SAMs": "https://github.com/Auranis/HighDigitSAMs/releases"
+  },
   "carrier_names": [
     "Admiral Kuznetsov"
   ],
@@ -92,5 +95,5 @@
     "RussianNavyGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/russia_2020.json

@@ -3,55 +3,58 @@
   "name": "Russia 2020 (Modded)",
   "authors": "Khopa",
   "description": "<p>Russia in 2020, using the Su-57 mod by Cubanace.</p>",
-  "locales": ["ru_RU"],
+  "locales": [
+    "ru_RU"
+  ],
   "aircrafts": [
-    "MiG_29S",
-    "MiG_31",
-    "Su_24M",
-    "Su_25",
-    "Su_25T",
-    "Su_27",
-    "Su_30",
-    "Su_33",
-    "Su_34",
-    "Su_57",
-    "L_39ZA",
-    "Mi_8MT",
-    "Mi_24V",
-    "Mi_28N",
-    "Ka_50",
-    "Tu_22M3",
-    "Tu_95MS",
-    "Tu_142",
-    "Tu_160"
+    "Ka-50 Hokum",
+    "L-39ZA Albatros",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-28N Havoc",
+    "Mi-8MTV2 Hip",
+    "MiG-29S Fulcrum-C",
+    "MiG-31 Foxhound",
+    "Su-24M Fencer-D",
+    "Su-25 Frogfoot",
+    "Su-25T Frogfoot",
+    "Su-27 Flanker-B",
+    "Su-30 Flanker-C",
+    "Su-33 Flanker-D",
+    "Su-34 Fullback",
+    "Su-57 Felon",
+    "Tu-142 Bear-F",
+    "Tu-160 Blackjack",
+    "Tu-22M3 Backfire-C",
+    "Tu-95MS Bear-H"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "IFV_BMP_2",
-    "IFV_BMP_3",
-    "MBT_T_90",
-    "MBT_T_80U",
-    "MBT_T_72B",
-    "SAM_SA_19_Tunguska_Grison"
+    "BMP-2",
+    "BMP-3",
+    "SA-19 Grison (2K22 Tunguska)",
+    "T-72B with Kontakt-1 ERA",
+    "T-80UD",
+    "T-90A"
   ],
   "artillery_units": [
-    "MLRS_9K57_Uragan_BM_27_220mm",
-    "SPH_2S19_Msta_152mm"
+    "2S19 Msta-S",
+    "BM-27 Uragan"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "SA8Generator",
@@ -71,17 +74,15 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
+    "KUZNECOW"
   ],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
   "destroyers": [
-    "Frigate_1135M_Rezky"
+    "REZKY"
   ],
   "cruisers": [
-    "Corvette_1241_1_Molniya"
+    "MOLNIYA"
   ],
   "requirements": {
     "SU-57 Felon By CubanAce Simulations": "https://www.digitalcombatsimulator.com/fr/files/2539621/"
@@ -93,5 +94,5 @@
     "RussianNavyGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/soviet_union_1943.json

@@ -3,50 +3,45 @@
   "name": "Soviet Union 1943",
   "authors": "Khopa",
   "description": "<p>Soviet Union in 1943. Featuring the I16, and using some allies units to represent either lend leased vehicles or soviet equivalent vehicles. BM-21 is used to represent BM-13</p>",
-  "locales": ["ru_RU"],
+  "locales": [
+    "ru_RU"
+  ],
   "aircrafts": [
-    "SpitfireLFMkIX",
-    "I_16"
+    "I-16 Ishak",
+    "Spitfire LF Mk IX"
   ],
   "frontline_units": [
-    "Tk_M4_Sherman",
-    "APC_M2A1_Halftrack",
-    "Car_Daimler_Armored",
-    "LT_Mk_VII_Tetrarch",
-    "AAA_Bofors_40mm"
+    "A17 Light Tank Mk VII Tetrarch",
+    "Bofors 40 mm Gun",
+    "Daimler Armoured Car Mk I",
+    "M2A1 Half-Track",
+    "M4A2(75) Sherman"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm"
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Bedford",
-    "Truck_GMC_Jimmy_6x6_Truck"
+    "Truck Bedford",
+    "Truck GMC \"Jimmy\" 6x6 Truck"
   ],
   "infantry_units": [
-    "Infantry_SMLE_No_4_Mk_1"
+    "Infantry SMLE No.4 Mk-1"
   ],
   "air_defenses": [
     "AllyWW2FlakGenerator",
     "BoforsGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {
     "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "navy_generators": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
+  "navy_generators": [],
   "has_jtac": false,
   "doctrine": "ww2",
   "building_set": "ww2ally"
-}
+}

resources/factions/spain_1990.json

@@ -3,35 +3,36 @@
   "name": "Spain 1990",
   "authors": "Khopa",
   "description": "<p>Spain in the 90s</p>",
-  "locales": ["es_ES"],
+  "locales": [
+    "es_ES"
+  ],
   "aircrafts": [
-    "FA_18C_hornet",
-    "AV8BNA",
-    "F_5E_3",
-    "C_101CC",
-    "UH_1H"
+    "AV-8B Harrier II Night Attack",
+    "C-101CC Aviojet",
+    "EF-18A+ Hornet",
+    "F-5E Tiger II",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_M60A3_Patton",
-    "MBT_Leopard_2A4",
-    "APC_M113",
-    "SAM_Avenger__Stinger"
-  ],
-  "artillery_units": [
+    "Leopard 2A4",
+    "M1097 Heavy HMMWV Avenger",
+    "M113",
+    "M60A3 \"Patton\""
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249"
+    "Infantry M249",
+    "Infantry M4"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -43,16 +44,16 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "FFG_Oliver_Hazzard_Perry"
+    "PERRY"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {},
   "carrier_names": [
@@ -65,22 +66,22 @@
     "OliverHazardPerryGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
+  "jtac_unit": "MQ-9 Reaper",
   "liveries_overrides": {
-    "FA_18C_hornet": [
+    "EF-18A+ Hornet": [
       "Spain 111th Escuadron C.15-73",
       "Spain 111th Escuadron C.15-88",
-	  "Spain 121th Escuadron C.15-45",
-	  "Spain 121th Escuadron C.15-50",
-	  "Spain 121th Escuadron C.15-60",
-	  "Spain 151th Escuadron C.15-14",
-	  "Spain 151th Escuadron C.15-18",
-	  "Spain 151th Escuadron C.15-23",
-	  "Spain 151th Escuadron C.15-24",
-	  "Spain 211th Escuadron C.15-76",
-	  "Spain 211th Escuadron C.15-77",
-	  "Spain 462th Escuadron C.15-79",
-	  "Spain 462th Escuadron C.15-90"
+      "Spain 121th Escuadron C.15-45",
+      "Spain 121th Escuadron C.15-50",
+      "Spain 121th Escuadron C.15-60",
+      "Spain 151th Escuadron C.15-14",
+      "Spain 151th Escuadron C.15-18",
+      "Spain 151th Escuadron C.15-23",
+      "Spain 151th Escuadron C.15-24",
+      "Spain 211th Escuadron C.15-76",
+      "Spain 211th Escuadron C.15-77",
+      "Spain 462th Escuadron C.15-79",
+      "Spain 462th Escuadron C.15-90"
     ]
   }
-}
+}

resources/factions/sweden_1970.json

@@ -3,37 +3,38 @@
   "name": "Sweden 1970s Alternate Universe",
   "authors": "Starfire",
   "description": "<p>Sweden 1970</p><p>Since we do not yet have Heatblur's AI Draken, this faction includes the Mirage 2000C in order to provide Sweden with some form of A2A capability.</p>",
-  "locales": ["sv_SE"],
+  "locales": [
+    "sv_SE"
+  ],
   "aircrafts": [
-    "AJS37",
-    "M_2000C",
-	"UH_1H"
+    "AJS-37 Viggen",
+    "Mirage 2000C",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "IFV_Warrior",
-    "MBT_Leopard_2A4",
-    "IFV_M1126_Stryker_ICV",
-    "SAM_Chaparral_M48"
-  ],
-  "artillery_units": [
+    "FV510 Warrior",
+    "Leopard 2A4",
+    "M1126 Stryker ICV (M2 HMG)",
+    "M48 Chaparral"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249"
+    "Infantry M249",
+    "Infantry M4"
   ],
   "air_defenses": [
-	"ChaparralGenerator",
-	"EarlyColdWarFlakGenerator",
+    "ChaparralGenerator",
+    "EarlyColdWarFlakGenerator",
     "HawkGenerator",
     "VulcanGenerator"
   ],
@@ -45,4 +46,4 @@
   ],
   "has_jtac": false,
   "doctrine": "coldwar"
-  }
+}

resources/factions/sweden_1990.json

@@ -3,33 +3,34 @@
   "name": "Sweden 1990",
   "authors": "Khopa",
   "description": "<p>Sweden in the 90s.</p><p>Note : Since we're missing the Draken and the Air-to-Air variant of the Viggen, this faction will struggle in air-to-air scenarios.</p>",
-  "locales": ["sv_SE"],
+  "locales": [
+    "sv_SE"
+  ],
   "aircrafts": [
-    "AJS37",
-    "UH_1H"
+    "AJS-37 Viggen",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "IFV_Warrior",
-    "MBT_Leopard_2A4",
-    "IFV_M1126_Stryker_ICV",
-    "SAM_Avenger__Stinger"
-  ],
-  "artillery_units": [
+    "FV510 Warrior",
+    "Leopard 2A4",
+    "M1097 Heavy HMMWV Avenger",
+    "M1126 Stryker ICV (M2 HMG)"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -42,5 +43,5 @@
     "OliverHazardPerryGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/sweden_2002_with_gripen.json

@@ -3,35 +3,36 @@
   "name": "Sweden 2002",
   "authors": "Khopa (updated with Gripen by bgreman)",
   "description": "<p>Sweden in 2002 after the addition of the Gripen-C.</p>",
-  "locales": ["sv_SE"],
+  "locales": [
+    "sv_SE"
+  ],
   "aircrafts": [
-    "AJS37",
-    "JAS39Gripen",
-    "JAS39Gripen_AG",
-    "UH_1H"
+    "AJS-37 Viggen",
+    "JAS 39 Gripen",
+    "JAS 39 Gripen A/G",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "IFV_Warrior",
-    "MBT_Leopard_2A4",
-    "IFV_M1126_Stryker_ICV",
-    "SAM_Avenger__Stinger"
-  ],
-  "artillery_units": [
+    "FV510 Warrior",
+    "Leopard 2A4",
+    "M1097 Heavy HMMWV Avenger",
+    "M1126 Stryker ICV (M2 HMG)"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -47,5 +48,5 @@
     "JAS39 Gripen Mod by Community": "https://github.com/whisky-actual/Community-JAS-39-C"
   },
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/syria_1948.json

@@ -4,44 +4,38 @@
   "authors": "Khopa",
   "description": "<p>Syria and Arab armies in the 1948 war against Israel.</p>",
   "aircrafts": [
-    "SpitfireLFMkIX",
-    "SpitfireLFMkIXCW"
+    "Spitfire LF Mk IX",
+    "Spitfire LF Mk IX (Clipped Wings)"
   ],
   "frontline_units": [
-    "IFV_Sd_Kfz_234_2_Puma",
-    "APC_Sd_Kfz_251_Halftrack",
-    "Tk_PzIV_H",
-    "Tk_M4_Sherman",
-    "AAA_Bofors_40mm"
-  ],
-  "artillery_units": [
+    "Bofors 40 mm Gun",
+    "M4A2(75) Sherman",
+    "Panzerkampfwagen IV Ausf. H",
+    "Sd.Kfz.234/2 Puma",
+    "Sd.Kfz.251 \"Hanomag\""
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Infantry_SMLE_No_4_Mk_1"
+    "Infantry SMLE No.4 Mk-1"
   ],
   "air_defenses": [
     "FlakGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
-  "carrier_names": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
+  "carrier_names": [],
   "navy_generators": [
     "SchnellbootGroupGenerator"
-  ], "requirements": {
-      "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
+  ],
+  "requirements": {
+    "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   },
   "doctrine": "ww2"
-}
+}

resources/factions/syria_1967.json

@@ -4,38 +4,38 @@
   "authors": "Khopa",
   "description": "<p>Syria and Arab armies in the 1967 6 days war against Israel.</p>",
   "aircrafts": [
-    "MiG_15bis",
-    "MiG_19P",
-    "MiG_21Bis",
-    "Su_17M4",
-    "Mi_8MT"
+    "Mi-8MTV2 Hip",
+    "MiG-15bis Fagot",
+    "MiG-19P Farmer-B",
+    "MiG-21bis Fishbed-N",
+    "Su-17M4 Fitter-K"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "Scout_BRDM_2",
-    "Tk_PzIV_H",
-    "MBT_T_55",
-    "LT_PT_76",
-    "SPAAA_ZU_23_2_Mounted_Ural_375",
-    "SPAAA_ZSU_57_2",
-    "AAA_S_60_57mm"
+    "BRDM-2",
+    "PT-76",
+    "Panzerkampfwagen IV Ausf. H",
+    "S-60 57mm",
+    "T-55A",
+    "ZSU-57-2 'Sparka'",
+    "ZU-23 on Ural-375"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm"
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Infantry_RPG"
+    "Infantry AK-74 Rus",
+    "Infantry RPG",
+    "Paratrooper AKS"
   ],
   "air_defenses": [
     "SA2Generator",
@@ -48,21 +48,15 @@
   "ewrs": [
     "FlatFaceGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "navy_generators": [
     "GrishaGroupGenerator"
   ],
   "doctrine": "coldwar"
-}
+}

resources/factions/syria_1967_with_ww2_weapons.json

@@ -4,40 +4,39 @@
   "authors": "Khopa",
   "description": "<p>Syria and Arab armies in the 1967 6 days war against Israel. Using WW2 units to be more accurate (Yes, Syria used Panzer IV, Stug III and Jagdpanzer IV during this war)</p>",
   "aircrafts": [
-    "MiG_15bis",
-    "MiG_19P",
-    "MiG_21Bis",
-
-    "Su_17M4",
-    "Mi_8MT"
+    "Mi-8MTV2 Hip",
+    "MiG-15bis Fagot",
+    "MiG-19P Farmer-B",
+    "MiG-21bis Fishbed-N",
+    "Su-17M4 Fitter-K"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "Scout_BRDM_2",
-    "MBT_T_55",
-    "LT_PT_76",
-    "Tk_PzIV_H",
-    "SPG_StuG_III_Ausf__G",
-    "SPG_Jagdpanzer_IV",
-    "SPAAA_ZSU_57_2",
-    "AAA_S_60_57mm"
+    "BRDM-2",
+    "Jagdpanzer IV",
+    "PT-76",
+    "Panzerkampfwagen IV Ausf. H",
+    "S-60 57mm",
+    "Sturmgesch\u00fctz III Ausf. G",
+    "T-55A",
+    "ZSU-57-2 'Sparka'"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm"
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Infantry_RPG"
+    "Infantry AK-74 Rus",
+    "Infantry RPG",
+    "Paratrooper AKS"
   ],
   "air_defenses": [
     "EarlyColdWarFlakGenerator",
@@ -51,22 +50,17 @@
   "ewrs": [
     "FlatFaceGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
-  "carrier_names": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
+  "carrier_names": [],
   "navy_generators": [
     "GrishaGroupGenerator"
-  ], "requirements": {
-      "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
+  ],
+  "requirements": {
+    "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   },
   "doctrine": "coldwar"
-}
+}

resources/factions/syria_1973.json

@@ -2,40 +2,40 @@
   "country": "Syria",
   "name": "Syria 1973",
   "authors": "Khopa",
-  "description": "<p>Syria and Arab armies during the Yom Kippur War</p>" ,
+  "description": "<p>Syria and Arab armies during the Yom Kippur War</p>",
   "aircrafts": [
-    "MiG_21Bis",
-    "MiG_19P",
-    "MiG_15bis",
-    "Su_17M4",
-    "Mi_8MT"
+    "Mi-8MTV2 Hip",
+    "MiG-15bis Fagot",
+    "MiG-19P Farmer-B",
+    "MiG-21bis Fishbed-N",
+    "Su-17M4 Fitter-K"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "IFV_BMP_1",
-    "APC_MTLB",
-    "MBT_T_55",
-    "LT_PT_76",
-    "SPAAA_ZU_23_2_Mounted_Ural_375",
-    "SPAAA_ZSU_57_2",
-    "AAA_S_60_57mm"
+    "BMP-1",
+    "MT-LB",
+    "PT-76",
+    "S-60 57mm",
+    "T-55A",
+    "ZSU-57-2 'Sparka'",
+    "ZU-23 on Ural-375"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm"
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Infantry_RPG"
+    "Infantry AK-74 Rus",
+    "Infantry RPG",
+    "Paratrooper AKS"
   ],
   "air_defenses": [
     "EarlyColdWarFlakGenerator",
@@ -56,21 +56,15 @@
     "ScudGenerator"
   ],
   "missiles_group_count": 1,
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "navy_generators": [
     "GrishaGroupGenerator"
   ],
   "doctrine": "coldwar"
-}
+}

resources/factions/syria_1982.json

@@ -4,40 +4,40 @@
   "authors": "Khopa",
   "description": "<p>Syria and Arab armies in the 1982 invasion of Lebanon</p>",
   "aircrafts": [
-    "MiG_19P",
-    "MiG_21Bis",
-    "MiG_23MLD",
-    "MiG_25PD",
-    "Su_17M4",
-    "Mi_8MT"
+    "Mi-8MTV2 Hip",
+    "MiG-19P Farmer-B",
+    "MiG-21bis Fishbed-N",
+    "MiG-23MLD Flogger-K",
+    "MiG-25PD Foxbat-E",
+    "Su-17M4 Fitter-K"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "IFV_BMP_1",
-    "APC_MTLB",
-    "MBT_T_55",
-    "LT_PT_76",
-    "MBT_T_72B",
-    "SPAAA_ZU_23_2_Mounted_Ural_375",
-    "SPAAA_ZSU_57_2",
-    "AAA_S_60_57mm"
+    "BMP-1",
+    "MT-LB",
+    "PT-76",
+    "S-60 57mm",
+    "T-55A",
+    "T-72B with Kontakt-1 ERA",
+    "ZSU-57-2 'Sparka'",
+    "ZU-23 on Ural-375"
   ],
   "artillery_units": [
-    "MLRS_BM_21_Grad_122mm"
+    "BM-21 Grad"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16"
+    "Infantry AK-74 Rus",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "ColdWarFlakGenerator",
@@ -60,20 +60,14 @@
     "ScudGenerator"
   ],
   "missiles_group_count": 1,
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "navy_generators": [
     "GrishaGroupGenerator"
   ]
-}
+}

resources/factions/syria_2011.json

@@ -4,52 +4,53 @@
   "authors": "Khopa",
   "description": "<p>Syrian Arab Army at the start of the Syrian Civil War.</p>",
   "aircrafts": [
-    "MiG_21Bis",
-    "MiG_23MLD",
-    "MiG_25PD",
-    "MiG_29S",
-    "Su_17M4",
-    "Su_24M",
-    "L_39ZA",
-    "Mi_24V",
-    "Mi_8MT",
-    "SA342M",
-    "SA342L"
+    "L-39ZA Albatros",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-8MTV2 Hip",
+    "MiG-21bis Fishbed-N",
+    "MiG-23MLD Flogger-K",
+    "MiG-25PD Foxbat-E",
+    "MiG-29S Fulcrum-C",
+    "SA 342L Gazelle",
+    "SA 342M Gazelle",
+    "Su-17M4 Fitter-K",
+    "Su-24M Fencer-D"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "IFV_BMP_1",
-    "IFV_BMP_2",
-    "APC_BTR_80",
-    "Scout_BRDM_2",
-    "LT_PT_76",
-    "APC_MTLB",
-    "Scout_Cobra",
-    "MBT_T_55",
-    "MBT_T_72B",
-    "MBT_T_90",
-    "SPAAA_ZSU_57_2"
+    "BMP-1",
+    "BMP-2",
+    "BRDM-2",
+    "BTR-80",
+    "Cobra",
+    "MT-LB",
+    "PT-76",
+    "T-55A",
+    "T-72B with Kontakt-1 ERA",
+    "T-90A",
+    "ZSU-57-2 'Sparka'"
   ],
   "artillery_units": [
-    "MLRS_9K57_Uragan_BM_27_220mm",
-    "SPM_2S9_Nona_120mm_M",
-    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S1_Gvozdika_122mm"
+    "2S1 Gvozdika",
+    "2S9 Nona-S",
+    "BM-21 Grad",
+    "BM-27 Uragan"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "ColdWarFlakGenerator",
@@ -75,20 +76,15 @@
     "ScudGenerator"
   ],
   "missiles_group_count": 1,
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "navy_generators": [
-    "GrishaGroupGenerator", "MolniyaGroupGenerator"
+    "GrishaGroupGenerator",
+    "MolniyaGroupGenerator"
   ]
-}
+}

resources/factions/syria_2012.json

@@ -4,53 +4,54 @@
   "authors": "Headiii",
   "description": "<p>Syrian Army with more modern Imports and supported by a Russian Expeditionary Force.</p>",
   "aircrafts": [
-    "MiG_23MLD",
-    "MiG_25PD",
-    "MiG_29S",
-    "Su_24M",
-    "Su_25",
-    "Su_30",
-    "Su_34",
-    "L_39ZA",
-    "Mi_24V",
-    "Mi_8MT",
-    "SA342M",
-    "SA342L"
+    "L-39ZA Albatros",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-8MTV2 Hip",
+    "MiG-23MLD Flogger-K",
+    "MiG-25PD Foxbat-E",
+    "MiG-29S Fulcrum-C",
+    "SA 342L Gazelle",
+    "SA 342M Gazelle",
+    "Su-24M Fencer-D",
+    "Su-25 Frogfoot",
+    "Su-30 Flanker-C",
+    "Su-34 Fullback"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "IFV_BMP_1",
-    "IFV_BMP_2",
-    "APC_BTR_80",
-    "Scout_BRDM_2",
-    "LT_PT_76",
-    "APC_MTLB",
-    "Scout_Cobra",
-    "MBT_T_55",
-    "MBT_T_72B",
-    "MBT_T_90",
-    "SPAAA_ZSU_57_2"
+    "BMP-1",
+    "BMP-2",
+    "BRDM-2",
+    "BTR-80",
+    "Cobra",
+    "MT-LB",
+    "PT-76",
+    "T-55A",
+    "T-72B with Kontakt-1 ERA",
+    "T-90A",
+    "ZSU-57-2 'Sparka'"
   ],
   "artillery_units": [
-    "MLRS_9K57_Uragan_BM_27_220mm",
-    "SPM_2S9_Nona_120mm_M",
-    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S1_Gvozdika_122mm"
+    "2S1 Gvozdika",
+    "2S9 Nona-S",
+    "BM-21 Grad",
+    "BM-27 Uragan"
   ],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "ColdWarFlakGenerator",
@@ -76,21 +77,15 @@
     "ScudGenerator"
   ],
   "missiles_group_count": 1,
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "helicopter_carrier_names": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "helicopter_carrier_names": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "navy_generators": [
     "GrishaGroupGenerator",
     "MolniyaGroupGenerator"
   ]
-}
+}

resources/factions/turkey_2005.json

@@ -3,39 +3,47 @@
   "name": "Turkey 2005",
   "authors": "Khopa",
   "description": "<p>Turkish army in the mid/late 2000s.</p>",
-  "locales": ["tr_TR"],
+  "locales": [
+    "tr_TR"
+  ],
   "aircrafts": [
-    "F_16C_50",
-    "F_4E",
-    "UH_1H",
-    "AH_1W"
+    "AH-1W SuperCobra",
+    "C-130",
+    "CH-47D",
+    "F-16CM Fighting Falcon (Block 50)",
+    "F-4E Phantom II",
+    "OH-58D Kiowa Warrior",
+    "UH-1H Iroquois",
+    "UH-60A"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_Leopard_2A4_Trs",
-    "MBT_Leopard_1A3",
-    "MBT_M60A3_Patton",
-    "Scout_Cobra",
-    "APC_BTR_80",
-    "SAM_Avenger__Stinger"
+    "BTR-80",
+    "Cobra",
+    "Leopard 1A3",
+    "Leopard 2A4 Trs",
+    "M1097 Heavy HMMWV Avenger",
+    "M113",
+    "M60A3 \"Patton\""
   ],
   "artillery_units": [
-    "SPH_T155_Firtina_155mm"
+    "Firtina",
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "Paratrooper_AKS",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper AKS"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -51,5 +59,5 @@
     "OliverHazardPerryGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/uae_2005.json

@@ -4,32 +4,31 @@
   "authors": "Khopa",
   "description": "<p>UAR army in the 2000s.</p>",
   "aircrafts": [
-    "M_2000C",
-    "Mirage_2000_5",
-    "F_16C_50",
-    "AH_64D"
+    "AH-64D Apache Longbow",
+    "F-16CM Fighting Falcon (Block 50)",
+    "Mirage 2000-5",
+    "Mirage 2000C"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_Leclerc",
-    "APC_TPz_Fuchs",
-    "IFV_BMP_3"
-  ],
-  "artillery_units": [
+    "BMP-3",
+    "Leclerc S\u00e9ries 2",
+    "TPz Fuchs"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS SA-18 Igla-S \"Grouse\""
   ],
   "air_defenses": [
     "HawkGenerator",
@@ -39,11 +38,10 @@
     "HawkEwrGenerator"
   ],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "navy_generators": [
     "OliverHazardPerryGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "WingLoong_I"
-}
+  "jtac_unit": "WingLoong-I"
+}

resources/factions/uae_2015.json

@@ -4,36 +4,35 @@
   "authors": "Khopa",
   "description": "<p>UAE army in the 2010s.</p>",
   "aircrafts": [
-    "AH_64D",
-    "C_130",
-    "C_17A",
-    "CH_47D",
-    "F_16C_50",
-    "M_2000C",
-    "Mirage_2000_5",
-    "UH_60A"
+    "AH-64D Apache Longbow",
+    "C-130",
+    "C-17A",
+    "CH-47D",
+    "F-16CM Fighting Falcon (Block 50)",
+    "Mirage 2000-5",
+    "Mirage 2000C",
+    "UH-60A"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_Leclerc",
-    "APC_TPz_Fuchs",
-    "IFV_BMP_3"
-  ],
-  "artillery_units": [
+    "BMP-3",
+    "Leclerc S\u00e9ries 2",
+    "TPz Fuchs"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS SA-18 Igla-S \"Grouse\""
   ],
   "air_defenses": [
     "HawkGenerator",
@@ -44,11 +43,10 @@
     "PatriotEwrGenerator"
   ],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "navy_generators": [
     "OliverHazardPerryGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "WingLoong_I"
-}
+  "jtac_unit": "WingLoong-I"
+}

resources/factions/uk_1944.json

@@ -3,57 +3,52 @@
   "name": "United Kingdom 1944",
   "authors": "Khopa",
   "description": "<p>United Kingdom army in 1944.</p>",
-  "locales": ["en_UK"],
+  "locales": [
+    "en_UK"
+  ],
   "aircrafts": [
-    "P_51D",
-    "P_51D_30_NA",
-    "P_47D_30",
-    "P_47D_30bl1",
-    "P_47D_40",
-    "SpitfireLFMkIX",
-    "SpitfireLFMkIXCW",
-    "A_20G",
-    "B_17G"
+    "Boston Mk.III",
+    "Fortress Mk.III",
+    "Mustang Mk.IV (Early)",
+    "Mustang Mk.IV (Late)",
+    "Spitfire LF Mk IX",
+    "Spitfire LF Mk IX (Clipped Wings)",
+    "Thunderbolt Mk.II (Early)",
+    "Thunderbolt Mk.II (Late)",
+    "Thunderbolt Mk.II (Mid)"
   ],
   "frontline_units": [
-    "MT_M4A4_Sherman_Firefly",
-    "Tk_M4_Sherman",
-    "APC_M2A1_Halftrack",
-    "CT_Cromwell_IV",
-    "CT_Centaur_IV",
-    "HIT_Churchill_VII",
-    "Car_Daimler_Armored",
-    "LT_Mk_VII_Tetrarch",
-    "AAA_Bofors_40mm"
-  ],
-  "artillery_units": [
+    "A17 Light Tank Mk VII Tetrarch",
+    "A22 Infantry Tank MK IV Churchill VII",
+    "A27L Cruiser Tank MK VIII Centaur IV",
+    "A27M Cruiser Tank MK VIII Cromwell IV",
+    "Daimler Armoured Car Mk I",
+    "M2A1 Half-Track",
+    "QF 40 mm Mark III",
+    "Sherman Firefly VC",
+    "Sherman III"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_Bedford",
-    "Truck_GMC_Jimmy_6x6_Truck"
+    "Truck Bedford",
+    "Truck GMC \"Jimmy\" 6x6 Truck"
   ],
   "infantry_units": [
-    "Infantry_SMLE_No_4_Mk_1"
+    "Infantry SMLE No.4 Mk-1"
   ],
   "air_defenses": [
     "AllyWW2FlakGenerator",
     "BoforsGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {
     "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "WW2LSTGroupGenerator"
   ],
@@ -61,4 +56,4 @@
   "has_jtac": false,
   "doctrine": "ww2",
   "building_set": "ww2ally"
-}
+}

resources/factions/uk_1990.json

@@ -3,41 +3,43 @@
   "name": "United Kingdom 1990",
   "authors": "Khopa",
   "description": "<p>United Kingdom Army in the 1990s.</p>",
-  "locales": ["en_UK"],
+  "locales": [
+    "en_UK"
+  ],
   "aircrafts": [
-    "Tornado_GR4",
-    "AV8BNA",
-    "F_4E",
-    "SA342M",
-    "AH_64A"
+    "AH-64A Apache",
+    "AV-8B Harrier II Night Attack",
+    "Gazelle AH.1",
+    "Phantom F.3",
+    "Tornado GR4"
   ],
   "awacs": [
-    "E_3A"
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_Challenger_II",
-    "MBT_Chieftain_Mk_3",
-    "IFV_Warrior",
-    "Scout_HMMWV",
-    "ATGM_HMMWV",
-    "SAM_Avenger__Stinger"
+    "Chieftain Mk.3",
+    "FV4034 Challenger 2",
+    "FV510 Warrior",
+    "M1043 HMMWV (M2 HMG)",
+    "M1045 HMMWV (BGM-71 TOW)",
+    "M1097 Heavy HMMWV Avenger"
   ],
   "artillery_units": [
-    "MLRS_M270_227mm",
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "Mortar_2B11_120mm",
-    "MANPADS_Stinger"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger",
+    "Mortar 2B11 120mm"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -48,20 +50,19 @@
     "HawkEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "FFG_Oliver_Hazzard_Perry"
+    "PERRY"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {},
-  "carrier_names": [
-  ],
+  "carrier_names": [],
   "helicopter_carrier_names": [
     "HMS Invincible",
     "HMS Illustrious",
@@ -72,5 +73,5 @@
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
-}
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/ukraine_2010.json

@@ -4,41 +4,41 @@
   "authors": "Khopa",
   "description": "<p>Ukrainian army in the 2010s.</p>",
   "aircrafts": [
-    "Su_25",
-    "Su_25T",
-    "Su_24M",
-    "Su_27",
-    "MiG_29S",
-    "L_39ZA",
-    "Mi_8MT",
-    "Mi_24V"
+    "L-39ZA Albatros",
+    "Mi-24V Hind-E",
+    "Mi-24P Hind-F",
+    "Mi-8MTV2 Hip",
+    "MiG-29S Fulcrum-C",
+    "Su-24M Fencer-D",
+    "Su-25 Frogfoot",
+    "Su-25T Frogfoot",
+    "Su-27 Flanker-B"
   ],
   "awacs": [
-    "A_50"
+    "A-50"
   ],
   "tankers": [
-    "IL_78M"
+    "IL-78M"
   ],
   "frontline_units": [
-    "Scout_HMMWV",
-    "IFV_BMP_3",
-    "IFV_BMP_2",
-    "APC_BTR_80",
-    "MBT_T_80U",
-    "MBT_T_72B",
-    "SAM_SA_13_Strela_10M3_Gopher_TEL"
-  ],
-  "artillery_units": [
+    "BMP-2",
+    "BMP-3",
+    "BTR-80",
+    "M1043 HMMWV (M2 HMG)",
+    "SA-13 Gopher (9K35 Strela-10M3)",
+    "T-72B with Kontakt-1 ERA",
+    "T-80UD"
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_Ural_375",
-    "LUV_UAZ_469_Jeep"
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
   ],
   "infantry_units": [
-    "Paratrooper_AKS",
-    "Infantry_AK_74_Rus",
-    "Paratrooper_RPG_16",
-    "MANPADS_SA_18_Igla_S_Grouse"
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla-S \"Grouse\"",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16"
   ],
   "air_defenses": [
     "SA3Generator",
@@ -67,4 +67,4 @@
   "navy_generators": [
     "GrishaGroupGenerator"
   ]
-}
+}

resources/factions/unc_1950_fictional.json

@@ -4,28 +4,28 @@
   "authors": "BenBenBeartrax",
   "description": "<p>Fictional United Nations Command around 1955 during the Korean War, with some WW2 planes added in place of their post-war counterparts.</p>",
   "aircrafts": [
-    "F_86F_Sabre",
-    "P_51D",
-    "P_51D_30_NA",
-    "B_17G",
-    "A_20G",
-    "P_47D_40"
+    "A-20G Havoc",
+    "B-17G Flying Fortress",
+    "F-86F Sabre",
+    "P-47D-40 Thunderbolt",
+    "P-51D-25-NA Mustang",
+    "P-51D-30-NA Mustang"
   ],
   "frontline_units": [
-    "Tk_M4_Sherman",
-    "MBT_M60A3_Patton",
-    "APC_M2A1_Halftrack",
-    "Car_M8_Greyhound_Armored",
-    "AAA_Bofors_40mm"
+    "Bofors 40 mm Gun",
+    "M2A1 Half-Track",
+    "M4A2(75) Sherman",
+    "M60A3 \"Patton\"",
+    "M8 Greyhound Light Armored Car"
   ],
   "artillery_units": [
-    "SPG_M12_GMC_155mm"
+    "M12 Gun Motor Carriage"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4"
+    "Infantry M4"
   ],
   "air_defenses": [
     "AllyWW2FlakGenerator",
@@ -36,6 +36,6 @@
   "doctrine": "ww2",
   "building_set": "ww2ally",
   "requirements": {
-      "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
+    "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   }
-}
+}

resources/factions/us_aggressors.json

@@ -3,54 +3,56 @@
   "name": "USAF Aggressors",
   "authors": "Khopa",
   "description": "<p>USAF aggresors.</p>",
-  "locales": ["en_US"],
+  "locales": [
+    "en_US"
+  ],
   "aircrafts": [
-    "F_15C",
-    "F_15E",
-    "F_14B",
-    "FA_18C_hornet",
-    "F_16C_50",
-    "A_10A",
-    "A_10C",
-    "AV8BNA",
-    "UH_1H",
-    "SH_60B",
-    "AH_64D",
-    "Ka_50",
-    "B_52H",
-    "B_1B",
-    "F_117A",
-    "Su_27"
+    "A-10A Thunderbolt II",
+    "A-10C Thunderbolt II (Suite 3)",
+    "AH-64D Apache Longbow",
+    "AV-8B Harrier II Night Attack",
+    "B-1B Lancer",
+    "B-52H Stratofortress",
+    "F-117A Nighthawk",
+    "F-14B Tomcat",
+    "F-15C Eagle",
+    "F-15E Strike Eagle",
+    "F-16CM Fighting Falcon (Block 50)",
+    "F/A-18C Hornet (Lot 20)",
+    "Ka-50 Hokum",
+    "SH-60B Seahawk",
+    "Su-27 Flanker-B",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_3A",
-    "E_2C"
+    "E-2C Hawkeye",
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC135MPRS",
-    "KC130",
+    "KC-130",
+    "KC-135 Stratotanker",
+    "KC-135 Stratotanker MPRS",
     "S-3B Tanker"
   ],
   "frontline_units": [
-    "MBT_M1A2_Abrams",
-    "MBT_Leopard_2A4",
-    "ATGM_Stryker",
-    "IFV_M2A2_Bradley",
-    "IFV_LAV_25",
-    "Scout_HMMWV",
-    "SAM_Avenger__Stinger"
+    "LAV-25",
+    "Leopard 2A4",
+    "M1043 HMMWV (M2 HMG)",
+    "M1097 Heavy HMMWV Avenger",
+    "M1134 Stryker ATGM (BGM-71 TOW)",
+    "M1A2 Abrams",
+    "M2A2 Bradley"
   ],
   "artillery_units": [
-    "MLRS_M270_227mm",
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249"
+    "Infantry M249",
+    "Infantry M4"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -65,24 +67,25 @@
     "OliverHazardPerryGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
+  "jtac_unit": "MQ-9 Reaper",
   "liveries_overrides": {
-    "FA_18C_hornet": [
-      "NSAWC brown splinter",
+    "F/A-18C Hornet (Lot 20)": [
       "NAWDC black",
+      "NSAWC brown splinter",
       "VFC-12"
     ],
-    "F_15C": [
+    "F-15C Eagle": [
       "65th Aggressor SQN (WA) MiG",
       "65th Aggressor SQN (WA) MiG",
       "65th Aggressor SQN (WA) SUPER_Flanker"
     ],
-    "F_16C_50": [
+    "F-16CM Fighting Falcon (Block 50)": [
+      "64th_aggressor_squadron_ghost",
       "usaf 64th aggressor sqn - shark",
-      "usaf 64th aggressor sqn-splinter",
-      "64th_aggressor_squadron_ghost"
-    ], "F_14B": [
+      "usaf 64th aggressor sqn-splinter"
+    ],
+    "F-14B Tomcat": [
       "vf-74 adversary"
     ]
   }
-}
+}

resources/factions/usa_1944.json

@@ -3,53 +3,49 @@
   "name": "USA 1944",
   "authors": "Khopa",
   "description": "<p>US army in 1944, western front.</p>",
-  "locales": ["en_US"],
+  "locales": [
+    "en_US"
+  ],
   "aircrafts": [
-    "P_51D",
-    "P_51D_30_NA",
-    "P_47D_30",
-    "P_47D_30bl1",
-    "P_47D_40",
-    "SpitfireLFMkIX",
-    "A_20G",
-    "B_17G"
+    "A-20G Havoc",
+    "B-17G Flying Fortress",
+    "P-47D-30 Thunderbolt (Early)",
+    "P-47D-30 Thunderbolt (Late)",
+    "P-47D-40 Thunderbolt",
+    "P-51D-25-NA Mustang",
+    "P-51D-30-NA Mustang",
+    "Spitfire LF Mk IX"
   ],
   "frontline_units": [
-    "MT_M4A4_Sherman_Firefly",
-    "Tk_M4_Sherman",
-    "APC_M2A1_Halftrack",
-    "Car_M8_Greyhound_Armored",
-    "SPG_M10_GMC",
-    "AAA_QF_3_7"
+    "M10 3-inch Gun Motor Carriage",
+    "M2A1 Half-Track",
+    "M4A2(75) Sherman",
+    "M4A4 Sherman Firefly",
+    "M8 Greyhound Light Armored Car",
+    "QF 3.7-inch AA Gun"
   ],
   "artillery_units": [
-    "SPG_M12_GMC_155mm"
+    "M12 Gun Motor Carriage"
   ],
   "logistics_units": [
-    "Truck_GMC_Jimmy_6x6_Truck"
+    "Truck GMC \"Jimmy\" 6x6 Truck"
   ],
   "infantry_units": [
-    "Infantry_M1_Garand"
+    "Infantry M1 Garand"
   ],
   "air_defenses": [
     "AllyWW2FlakGenerator",
     "BoforsGenerator"
   ],
-  "aircraft_carrier": [
-  ],
-  "helicopter_carrier": [
-  ],
-  "destroyers": [
-  ],
-  "cruisers": [
-  ],
+  "aircraft_carrier": [],
+  "helicopter_carrier": [],
+  "destroyers": [],
+  "cruisers": [],
   "requirements": {
     "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   },
-  "carrier_names": [
-  ],
-  "helicopter_carrier_names": [
-  ],
+  "carrier_names": [],
+  "helicopter_carrier_names": [],
   "navy_generators": [
     "WW2LSTGroupGenerator"
   ],
@@ -57,4 +53,4 @@
   "has_jtac": false,
   "doctrine": "ww2",
   "building_set": "ww2ally"
-}
+}

resources/factions/usa_1955.json

@@ -3,28 +3,30 @@
   "name": "USA 1955",
   "authors": "Khopa",
   "description": "<p>US army in the 50s, circa Korean War.</p>",
-  "locales": ["en_US"],
+  "locales": [
+    "en_US"
+  ],
   "aircrafts": [
-    "B_52H",
-    "C_130",
-    "F_86F_Sabre",
-    "P_51D",
-    "P_51D_30_NA"
+    "B-52H Stratofortress",
+    "C-130",
+    "F-86F Sabre",
+    "P-51D-25-NA Mustang",
+    "P-51D-30-NA Mustang"
   ],
   "frontline_units": [
-    "Tk_M4_Sherman",
-    "MBT_M60A3_Patton",
-    "APC_M2A1_Halftrack",
-    "AAA_Bofors_40mm"
+    "Bofors 40 mm Gun",
+    "M2A1 Half-Track",
+    "M4A2(75) Sherman",
+    "M60A3 \"Patton\""
   ],
   "artillery_units": [
-    "SPG_M12_GMC_155mm"
+    "M12 Gun Motor Carriage"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4"
+    "Infantry M4"
   ],
   "air_defenses": [
     "BoforsGenerator",
@@ -33,6 +35,6 @@
   "doctrine": "ww2",
   "building_set": "ww2ally",
   "requirements": {
-      "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
+    "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   }
-}
+}

resources/factions/usa_1960.json

@@ -3,27 +3,28 @@
   "name": "USA 1960",
   "authors": "Khopa",
   "description": "<p>US army in the 60s, pre-Vietnam war.</p>",
-  "locales": ["en_US"],
+  "locales": [
+    "en_US"
+  ],
   "aircrafts": [
-    "B_52H",
-    "C_130",
-    "F_86F_Sabre",
-    "P_51D",
-    "P_51D_30_NA",
-    "UH_1H"
+    "B-52H Stratofortress",
+    "C-130",
+    "F-86F Sabre",
+    "P-51D-25-NA Mustang",
+    "P-51D-30-NA Mustang",
+    "UH-1H Iroquois"
   ],
   "frontline_units": [
-    "MBT_M60A3_Patton",
-    "APC_M113",
-    "SPAAA_Vulcan_M163"
-  ],
-  "artillery_units": [
+    "M113",
+    "M163 Vulcan Air Defense System",
+    "M60A3 \"Patton\""
   ],
+  "artillery_units": [],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4"
+    "Infantry M4"
   ],
   "air_defenses": [
     "EarlyColdWarFlakGenerator",

resources/factions/usa_1965.json

@@ -3,36 +3,38 @@
   "name": "USA 1965",
   "authors": "Khopa",
   "description": "<p>US army in the late 60s, during Vietnam war.</p>",
-  "locales": ["en_US"],
+  "locales": [
+    "en_US"
+  ],
   "aircrafts": [
-    "B_52H",
-    "CH_47D",
-    "C_130",
-    "F_4E",
-    "F_5E_3",
-    "UH_1H"
+    "B-52H Stratofortress",
+    "C-130",
+    "CH-47D",
+    "F-4E Phantom II",
+    "F-5E Tiger II",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_2C"
+    "E-2C Hawkeye"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_M60A3_Patton",
-    "APC_M113",
-    "SPAAA_Vulcan_M163"
+    "M113",
+    "M163 Vulcan Air Defense System",
+    "M60A3 \"Patton\""
   ],
   "artillery_units": [
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249"
+    "Infantry M249",
+    "Infantry M4"
   ],
   "air_defenses": [
     "ChaparralGenerator",

resources/factions/usa_1975.json

@@ -3,40 +3,42 @@
   "name": "USA 1975",
   "authors": "Khopa",
   "description": "<p>US army in the 70s at the end of the war in Vietnam.</p>",
-  "locales": ["en_US"],
+  "locales": [
+    "en_US"
+  ],
   "aircrafts": [
-    "B_52H",
-    "CH_47D",
-    "CH_53E",
-    "C_130",
-    "F_14A_135_GR",
-    "F_4E",
-    "F_5E_3",
-    "S_3B",
-    "UH_1H"
+    "B-52H Stratofortress",
+    "C-130",
+    "CH-47D",
+    "CH-53E",
+    "F-14A Tomcat (Block 135-GR Late)",
+    "F-4E Phantom II",
+    "F-5E Tiger II",
+    "S-3B Viking",
+    "UH-1H Iroquois"
   ],
   "awacs": [
-    "E_2C"
+    "E-2C Hawkeye"
   ],
   "tankers": [
-    "KC_135",
-    "KC130"
+    "KC-130",
+    "KC-135 Stratotanker"
   ],
   "frontline_units": [
-    "MBT_M60A3_Patton",
-    "APC_M113",
-    "SAM_Chaparral_M48",
-    "SPAAA_Vulcan_M163"
+    "M113",
+    "M163 Vulcan Air Defense System",
+    "M48 Chaparral",
+    "M60A3 \"Patton\""
   ],
   "artillery_units": [
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249"
+    "Infantry M249",
+    "Infantry M4"
   ],
   "air_defenses": [
     "ChaparralGenerator",

resources/factions/usa_1990.json

@@ -3,60 +3,62 @@
   "name": "USA 1990",
   "authors": "Khopa",
   "description": "<p>US army in the 90s, Gulf War/Desert Storm.</p>",
-  "locales": ["en_US"],
+  "locales": [
+    "en_US"
+  ],
   "aircrafts": [
-    "AH_64A",
-    "AV8BNA",
-    "A_10A",
-    "B_1B",
-    "B_52H",
-    "CH_47D",
-    "CH_53E",
-    "C_130",
-    "FA_18C_hornet",
-    "F_117A",
-    "F_14A_135_GR",
-    "F_14B",
-    "F_15C",
-    "F_15E",
-    "F_16C_50",
-    "SH_60B",
-    "SH_60B",
-    "S_3B",
-    "UH_1H",
-    "UH_60A"
+    "A-10A Thunderbolt II",
+    "AH-64A Apache",
+    "AV-8B Harrier II Night Attack",
+    "B-1B Lancer",
+    "B-52H Stratofortress",
+    "C-130",
+    "CH-47D",
+    "CH-53E",
+    "F-117A Nighthawk",
+    "F-14A Tomcat (Block 135-GR Late)",
+    "F-14B Tomcat",
+    "F-15C Eagle",
+    "F-15E Strike Eagle",
+    "F-16CM Fighting Falcon (Block 50)",
+    "F/A-18C Hornet (Lot 20)",
+    "S-3B Viking",
+    "SH-60B Seahawk",
+    "SH-60B Seahawk",
+    "UH-1H Iroquois",
+    "UH-60A"
   ],
   "awacs": [
-    "E_3A",
-    "E_2C"
+    "E-2C Hawkeye",
+    "E-3A"
   ],
   "tankers": [
-    "KC_135",
-    "KC130",
+    "KC-130",
+    "KC-135 Stratotanker",
     "S-3B Tanker"
   ],
   "frontline_units": [
-    "MBT_M1A2_Abrams",
-    "ATGM_Stryker",
-    "IFV_M1126_Stryker_ICV",
-    "IFV_M2A2_Bradley",
-    "IFV_LAV_25",
-    "Scout_HMMWV",
-    "ATGM_HMMWV",
-    "SAM_Avenger__Stinger"
+    "LAV-25",
+    "M1043 HMMWV (M2 HMG)",
+    "M1045 HMMWV (BGM-71 TOW)",
+    "M1097 Heavy HMMWV Avenger",
+    "M1126 Stryker ICV (M2 HMG)",
+    "M1134 Stryker ATGM (BGM-71 TOW)",
+    "M1A2 Abrams",
+    "M2A2 Bradley"
   ],
   "artillery_units": [
-    "MLRS_M270_227mm",
-    "SPH_M109_Paladin_155mm"
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
   ],
   "logistics_units": [
-    "Truck_M818_6x6"
+    "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Infantry_M4",
-    "Infantry_M249",
-    "MANPADS_Stinger",
-    "Mortar_2B11_120mm"
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger",
+    "Mortar 2B11 120mm"
   ],
   "air_defenses": [
     "AvengerGenerator",
@@ -68,17 +70,17 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
-    "FFG_Oliver_Hazzard_Perry",
-    "DDG_Arleigh_Burke_IIa"
+    "PERRY",
+    "USS_Arleigh_Burke_IIa"
   ],
   "cruisers": [
-    "CG_Ticonderoga"
+    "TICONDEROG"
   ],
   "requirements": {},
   "carrier_names": [
@@ -100,16 +102,16 @@
     "ArleighBurkeGroupGenerator"
   ],
   "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper",
+  "jtac_unit": "MQ-9 Reaper",
   "liveries_overrides": {
-    "FA_18C_hornet": [
-      "VFA-37",
+    "F/A-18C Hornet (Lot 20)": [
       "VFA-106",
       "VFA-113",
       "VFA-122",
       "VFA-131",
       "VFA-192",
       "VFA-34",
+      "VFA-37",
       "VFA-83",
       "VFA-87",
       "VFA-97",
@@ -121,4 +123,4 @@
       "VMFA-323"
     ]
   }
-}
+}