Merge branch 'develop' into briefing_jinja

2025-11-10 14:22:26 +00:00 · 2020-11-05 16:08:16 -06:00
parent a8b59cc567 f4d3660eac
commit 6f71d92a7b
57 changed files with 1083 additions and 140 deletions
--- a/resources/customized_payloads/B-1B.lua
+++ b/resources/customized_payloads/B-1B.lua
@@ -0,0 +1,96 @@
+local unitPayloads = {
+	["name"] = "B-1B",
+	["payloads"] = {
+		[1] = {
+			["name"] = "SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}",
+					["num"] = 2,
+				},
+				[3] = {
+					["CLSID"] = "{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[2] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "B-1B_Mk-84*8",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "B-1B_Mk-84*8",
+					["num"] = 2,
+				},
+				[3] = {
+					["CLSID"] = "B-1B_Mk-84*8",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+				[1] = 34,
+				[2] = 32,
+			},
+		},
+		[3] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}",
+					["num"] = 2,
+				},
+				[3] = {
+					["CLSID"] = "{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[4] = {
+			["name"] = "CAP",
+			["pylons"] = {
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[5] = {
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "CBU97*10",
+					["num"] = 3,
+				},
+				[2] = {
+					["CLSID"] = "CBU97*10",
+					["num"] = 2,
+				},
+				[3] = {
+					["CLSID"] = "CBU97*10",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+	},
+	["unitType"] = "B-1B",
+}
+return unitPayloads
--- a/resources/customized_payloads/B-52H.lua
+++ b/resources/customized_payloads/B-52H.lua
@@ -0,0 +1,82 @@
+local unitPayloads = {
+	["name"] = "B-52H",
+	["payloads"] = {
+		[1] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{585D626E-7F42-4073-AB70-41E728C333E2}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{6C47D097-83FF-4FB2-9496-EAB36DDF0B05}",
+					["num"] = 2,
+				},
+				[3] = {
+					["CLSID"] = "{585D626E-7F42-4073-AB70-41E728C333E2}",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+				[1] = 32,
+				[2] = 34,
+			},
+		},
+		[2] = {
+			["name"] = "SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{45447F82-01B5-4029-A572-9AAD28AF0275}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{8DCAF3A3-7FCF-41B8-BB88-58DEDA878EDE}",
+					["num"] = 2,
+				},
+				[3] = {
+					["CLSID"] = "{45447F82-01B5-4029-A572-9AAD28AF0275}",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[3] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{46ACDCF8-5451-4E26-BDDB-E78D5830E93C}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 30,
+			},
+		},
+		[4] = {
+			["name"] = "CAP",
+			["pylons"] = {
+			},
+			["tasks"] = {
+			},
+		},
+		[5] = {
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{4CD2BB0F-5493-44EF-A927-9760350F7BA1}",
+					["num"] = 3,
+				},
+				[2] = {
+					["CLSID"] = "{4CD2BB0F-5493-44EF-A927-9760350F7BA1}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+	},
+	["unitType"] = "B-52H",
+}
+return unitPayloads
--- a/resources/customized_payloads/F-117A.lua
+++ b/resources/customized_payloads/F-117A.lua
@@ -0,0 +1,79 @@
+local unitPayloads = {
+	["name"] = "F-117A",
+	["payloads"] = {
+		[1] = {
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[2] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[3] = {
+			["name"] = "SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[4] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[5] = {
+			["name"] = "CAP",
+			["pylons"] = {
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+	},
+	["unitType"] = "F-117A",
+}
+return unitPayloads
--- a/resources/customized_payloads/Tu-142.lua
+++ b/resources/customized_payloads/Tu-142.lua
@@ -0,0 +1,67 @@
+local unitPayloads = {
+	["name"] = "Tu-142",
+	["payloads"] = {
+		[1] = {
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{C42EE4C3-355C-4B83-8B22-B39430B8F4AE}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 30,
+			},
+		},
+		[2] = {
+			["name"] = "SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{C42EE4C3-355C-4B83-8B22-B39430B8F4AE}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 30,
+			},
+		},
+		[3] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{C42EE4C3-355C-4B83-8B22-B39430B8F4AE}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 30,
+			},
+		},
+		[4] = {
+			["name"] = "CAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{C42EE4C3-355C-4B83-8B22-B39430B8F4AE}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 30,
+			},
+		},
+		[5] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{C42EE4C3-355C-4B83-8B22-B39430B8F4AE}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 30,
+			},
+		},
+	},
+	["unitType"] = "Tu-142",
+}
+return unitPayloads
--- a/resources/customized_payloads/Tu-160.lua
+++ b/resources/customized_payloads/Tu-160.lua
@@ -0,0 +1,82 @@
+local unitPayloads = {
+	["name"] = "Tu-160",
+	["payloads"] = {
+		[1] = {
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[2] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[3] = {
+			["name"] = "SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[4] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[5] = {
+			["name"] = "CAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+	},
+	["unitType"] = "Tu-160",
+}
+return unitPayloads
--- a/resources/customized_payloads/Tu-22M3.lua
+++ b/resources/customized_payloads/Tu-22M3.lua
@@ -0,0 +1,123 @@
+local unitPayloads = {
+	["name"] = "Tu-22M3",
+	["payloads"] = {
+		[1] = {
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 5,
+				},
+				[2] = {
+					["CLSID"] = "{E1AAE713-5FC3-4CAA-9FF5-3FDCFB899E33}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{E1AAE713-5FC3-4CAA-9FF5-3FDCFB899E33}",
+					["num"] = 2,
+				},
+				[5] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 30,
+			},
+		},
+		[2] = {
+			["name"] = "CAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 5,
+				},
+				[2] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 3,
+				},
+				[3] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 30,
+			},
+		},
+		[3] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{E1AAE713-5FC3-4CAA-9FF5-3FDCFB899E33}",
+					["num"] = 5,
+				},
+				[2] = {
+					["CLSID"] = "{E1AAE713-5FC3-4CAA-9FF5-3FDCFB899E33}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{AD5E5863-08FC-4283-B92C-162E2B2BD3FF}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{E1AAE713-5FC3-4CAA-9FF5-3FDCFB899E33}",
+					["num"] = 2,
+				},
+				[5] = {
+					["CLSID"] = "{E1AAE713-5FC3-4CAA-9FF5-3FDCFB899E33}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 30,
+			},
+		},
+		[4] = {
+			["name"] = "SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 5,
+				},
+				[2] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+				[1] = 30,
+			},
+		},
+		[5] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 5,
+				},
+				[2] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 3,
+				},
+				[3] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 30,
+			},
+		},
+	},
+	["unitType"] = "Tu-22M3",
+}
+return unitPayloads
--- a/resources/customized_payloads/Tu-95MS.lua
+++ b/resources/customized_payloads/Tu-95MS.lua
@@ -0,0 +1,67 @@
+local unitPayloads = {
+	["name"] = "Tu-95MS",
+	["payloads"] = {
+		[1] = {
+			["name"] = "CAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[2] = {
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[3] = {
+			["name"] = "SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[4] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[5] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{0290F5DE-014A-4BB1-9843-D717749B1DED}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+	},
+	["unitType"] = "Tu-95MS",
+}
+return unitPayloads
--- a/resources/factions/allies_1944.json
+++ b/resources/factions/allies_1944.json
@@ -17,7 +17,7 @@
    "MT_M4_Sherman",
    "APC_M2A1",
    "CT_Cromwell_IV",
-    "ST_Centaur_IV",
+    "CT_Centaur_IV",
    "HIT_Churchill_VII",
    "M30_Cargo_Carrier",
    "LAC_M8_Greyhound",
--- a/resources/factions/allies_1944_free.json
+++ b/resources/factions/allies_1944_free.json
@@ -0,0 +1,52 @@
+{
+  "country": "USA",
+  "name": "Allies 1944 (Free)",
+  "authors": "Khopa",
+  "description": "A WW2 ally faction that does not requires the paid WW2 asset pack.",
+  "aircrafts": [
+    "P_51D",
+    "P_51D_30_NA",
+    "P_47D_30",
+    "SpitfireLFMkIX",
+    "SpitfireLFMkIXCW",
+    "A_20G"
+  ],
+  "frontline_units": [
+    "MT_M4_Sherman",
+    "APC_M2A1"
+  ],
+  "artillery_units": [
+  ],
+  "logistics_units": [
+    "Bedford_MWD"
+  ],
+  "infantry_units": [
+    "Paratrooper_AKS"
+  ],
+  "shorads": [
+    "BoforsGenerator"
+  ],
+  "sams": [
+    "BoforsGenerator"
+  ],
+  "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"
+}
--- a/resources/factions/bluefor_coldwar.json
+++ b/resources/factions/bluefor_coldwar.json
@@ -37,6 +37,7 @@
    "Soldier_M249"
  ],
  "shorads": [
+    "EarlyColdWarFlakGenerator",
    "VulcanGenerator"
  ],
  "sams": [
--- a/resources/factions/bluefor_coldwar_a4.json
+++ b/resources/factions/bluefor_coldwar_a4.json
@@ -38,6 +38,7 @@
    "Soldier_M249"
  ],
  "shorads": [
+    "EarlyColdWarFlakGenerator",
    "VulcanGenerator"
  ],
  "sams": [
--- a/resources/factions/bluefor_coldwar_a4_mb339.json
+++ b/resources/factions/bluefor_coldwar_a4_mb339.json
@@ -39,6 +39,7 @@
    "Soldier_M249"
  ],
  "shorads": [
+    "EarlyColdWarFlakGenerator",
    "VulcanGenerator"
  ],
  "sams": [
--- a/resources/factions/bluefor_modern.json
+++ b/resources/factions/bluefor_modern.json
@@ -6,6 +6,7 @@
  "aircrafts": [
    "F_14B",
    "F_15C",
+    "F_15E",
    "F_16C_50",
    "FA_18C_hornet",
    "JF_17",
--- a/resources/factions/germany_1942.json
+++ b/resources/factions/germany_1942.json
@@ -1,6 +1,6 @@
 {
  "country": "Third Reich",
-  "name": "Germany 1944",
+  "name": "Germany 1942",
  "authors": "Khopa",
  "description": "",
  "aircrafts": [
@@ -12,7 +12,7 @@
  "frontline_units": [
    "MT_Pz_Kpfw_IV_Ausf_H",
    "APC_Sd_Kfz_251",
-    "IFV_Sd_Kfz_234_2_Puma",
+    "AC_Sd_Kfz_234_2_Puma",
    "TD_Jagdpanzer_IV"
  ],
  "artillery_units": [
--- a/resources/factions/germany_1944.json
+++ b/resources/factions/germany_1944.json
@@ -13,9 +13,9 @@
    "MT_Pz_Kpfw_V_Panther_Ausf_G",
    "MT_Pz_Kpfw_IV_Ausf_H",
    "HT_Pz_Kpfw_VI_Tiger_I",
-    "HT_Pz_Kpfw_VI_Ausf__B__Tiger_II",
+    "HT_Pz_Kpfw_VI_Ausf__B_Tiger_II",
    "APC_Sd_Kfz_251",
-    "IFV_Sd_Kfz_234_2_Puma",
+    "AC_Sd_Kfz_234_2_Puma",
    "Sd_Kfz_184_Elefant",
    "TD_Jagdpanther_G1",
    "TD_Jagdpanzer_IV"
--- a/resources/factions/germany_1944_free.json
+++ b/resources/factions/germany_1944_free.json
@@ -0,0 +1,52 @@
+{
+  "country": "Third Reich",
+  "name": "Germany 1944 (Free)",
+  "authors": "Khopa",
+  "description": "",
+  "aircrafts": [
+    "FW_190A8",
+    "FW_190D9",
+    "Bf_109K_4"
+  ],
+  "frontline_units": [
+    "MT_Pz_Kpfw_IV_Ausf_H",
+    "APC_Sd_Kfz_251"
+  ],
+  "artillery_units": [
+  ],
+  "logistics_units": [
+    "Blitz_3_6_6700A"
+  ],
+  "infantry_units": [
+    "Infantry_Soldier_Rus"
+  ],
+  "shorads": [
+    "Flak18Generator"
+  ],
+  "sams": [
+    "Flak18Generator"
+  ],
+  "aircraft_carrier": [
+  ],
+  "helicopter_carrier": [
+  ],
+  "destroyers": [
+  ],
+  "cruisers": [
+  ],
+  "requirements": {
+  },
+  "carrier_names": [
+  ],
+  "helicopter_carrier_names": [
+  ],
+  "navy_generators": [
+  ],
+  "navy_group_count": 0,
+  "missiles": [
+  ],
+  "missiles_group_count": 0,
+  "has_jtac": false,
+  "doctrine": "ww2",
+  "building_set": "ww2free"
+}
--- a/resources/factions/israel_1948.json
+++ b/resources/factions/israel_1948.json
@@ -29,6 +29,7 @@
    "BoforsGenerator"
  ],
  "sams": [
+    "EarlyColdWarFlakGenerator",
    "BoforsGenerator"
  ],
  "aircraft_carrier": [
--- a/resources/factions/israel_1973.json
+++ b/resources/factions/israel_1973.json
@@ -16,7 +16,7 @@
    "KC130"
  ],
  "frontline_units": [
-    "MT_M4A4_Sherman_Firefly",
+    "MT_M4_Sherman",
    "APC_M2A1",
    "MBT_M60A3_Patton",
    "APC_M113"
@@ -46,8 +46,7 @@
  "cruisers": [
  ],
  "requirements": {
-    "Community A-4E": "https://heclak.github.io/community-a4e-c/",
-    "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
+    "Community A-4E": "https://heclak.github.io/community-a4e-c/"
  },
  "carrier_names": [
  ],
--- a/resources/factions/russia_1955.json
+++ b/resources/factions/russia_1955.json
@@ -31,14 +31,10 @@
    "Soldier_RPG"
  ],
  "shorads": [
-    "ZSU23Generator",
-    "ZU23Generator",
-    "ZU23UralGenerator"
+    "EarlyColdWarFlakGenerator"
  ],
  "sams": [
-    "ZSU23Generator",
-    "ZU23Generator",
-    "ZU23UralGenerator"
+    "EarlyColdWarFlakGenerator"
  ],
  "aircraft_carrier": [
  ],
--- a/resources/factions/russia_1965.json
+++ b/resources/factions/russia_1965.json
@@ -36,8 +36,8 @@
  ],
  "shorads": [
    "ZSU23Generator",
-    "ZU23Generator",
-    "ZU23UralGenerator"
+    "EarlyColdWarFlakGenerator",
+    "ZU23Generator"
  ],
  "sams": [
    "SA2Generator",
--- a/resources/factions/russia_1975.json
+++ b/resources/factions/russia_1975.json
@@ -41,9 +41,9 @@
    "Soldier_RPG"
  ],
  "shorads": [
+    "ColdWarFlakGenerator",
    "ZSU23Generator",
-    "ZU23Generator",
-    "ZU23UralGenerator"
+    "ZU23Generator"
  ],
  "sams": [
    "SA3Generator",
--- a/resources/factions/syria_1948.json
+++ b/resources/factions/syria_1948.json
@@ -8,7 +8,7 @@
    "SpitfireLFMkIXCW"
  ],
  "frontline_units": [
-    "IFV_Sd_Kfz_234_2_Puma",
+    "AC_Sd_Kfz_234_2_Puma",
    "APC_Sd_Kfz_251",
    "MT_Pz_Kpfw_IV_Ausf_H",
    "MT_M4_Sherman"
--- a/resources/factions/syria_1967.json
+++ b/resources/factions/syria_1967.json
@@ -18,6 +18,7 @@
  ],
  "frontline_units": [
    "ARV_BRDM_2",
+    "MT_Pz_Kpfw_IV_Ausf_H",
    "MBT_T_55"
  ],
  "artillery_units": [
--- a/resources/factions/syria_1967_with_ww2_weapons.json
+++ b/resources/factions/syria_1967_with_ww2_weapons.json
@@ -38,9 +38,11 @@
  ],
  "shorads": [
    "ZU23Generator",
+    "EarlyColdWarFlakGenerator",
    "ZU23UralGenerator"
  ],
  "sams": [
+    "EarlyColdWarFlakGenerator",
    "SA2Generator"
  ],
  "aircraft_carrier": [
--- a/resources/factions/syria_1973.json
+++ b/resources/factions/syria_1973.json
@@ -34,9 +34,8 @@
    "Soldier_RPG"
  ],
  "shorads": [
-    "ZSU23Generator",
-    "ZU23Generator",
-    "ZU23UralGenerator"
+    "EarlyColdWarFlakGenerator",
+    "ZU23Generator"
  ],
  "sams": [
    "SA2Generator",
--- a/resources/factions/syria_1982.json
+++ b/resources/factions/syria_1982.json
@@ -36,10 +36,9 @@
    "Paratrooper_RPG_16"
  ],
  "shorads": [
-    "ZSU23Generator",
    "ZU23Generator",
-    "ZU23Generator",
-    "ZU23UralGenerator"
+    "EarlyColdWarFlakGenerator",
+    "ColdWarFlakGenerator"
  ],
  "sams": [
    "SA2Generator",
--- a/resources/factions/syria_2011.json
+++ b/resources/factions/syria_2011.json
@@ -53,7 +53,8 @@
    "SA9Generator",
    "SA13Generator",
    "SA19Generator",
-    "ZSU23Generator"
+    "ZSU23Generator",
+    "ColdWarFlakGenerator"
  ],
  "sams": [
    "SA2Generator",
--- a/resources/factions/uk_1944.json
+++ b/resources/factions/uk_1944.json
@@ -17,7 +17,7 @@
    "MT_M4_Sherman",
    "APC_M2A1",
    "CT_Cromwell_IV",
-    "ST_Centaur_IV",
+    "CT_Centaur_IV",
    "HIT_Churchill_VII"
  ],
  "artillery_units": [
--- a/resources/factions/usa_1955.json
+++ b/resources/factions/usa_1955.json
@@ -10,7 +10,6 @@
    "B_52H"
  ],
  "frontline_units": [
-    "MT_M4A4_Sherman_Firefly",
    "MT_M4_Sherman",
    "MBT_M60A3_Patton",
    "APC_M2A1"
@@ -22,13 +21,13 @@
    "Transport_M818"
  ],
  "infantry_units": [
-    "Infantry_M1_Garand"
+    "Infantry_M4"
  ],
  "shorads": [
    "BoforsGenerator"
  ],
  "sams": [
-    "BoforsGenerator"
+    "EarlyColdWarFlakGenerator"
  ],
  "doctrine": "ww2",
  "building_set": "ww2ally",
--- a/resources/factions/usa_1960.json
+++ b/resources/factions/usa_1960.json
@@ -23,6 +23,7 @@
    "Infantry_M4"
  ],
  "shorads": [
+    "EarlyColdWarFlakGenerator",
    "VulcanGenerator"
  ],
  "sams": [
--- a/resources/factions/usa_1965.json
+++ b/resources/factions/usa_1965.json
@@ -25,7 +25,8 @@
  ],
  "shorads": [
    "VulcanGenerator",
-    "ChaparralGenerator"
+    "ChaparralGenerator",
+    "EarlyColdWarFlakGenerator"
  ],
  "sams": [
    "HawkGenerator",
--- a/resources/factions/usa_1975.json
+++ b/resources/factions/usa_1975.json
@@ -25,6 +25,7 @@
    "Soldier_M249"
  ],
  "shorads": [
+    "EarlyColdWarFlakGenerator",
    "VulcanGenerator",
    "ChaparralGenerator"
  ],