From ed4961cdbc9293500d5afa3886ebf355d6034e2e Mon Sep 17 00:00:00 2001
From: Starfire13 <72491792+Starfire13@users.noreply.github.com>
Date: Fri, 10 Jan 2025 06:58:12 +1100
Subject: [PATCH] New Redfor factions with CurrentHill mods + update Graveyard
 of Empires (#449)

* Add files via upload

* Add files via upload

* Update and rename redfor_modern.json to redfor_current.json
---
 resources/campaigns/graveyard_of_empires.yaml |   7 +-
 resources/factions/redfor_china_2020.json     |   5 +-
 resources/factions/redfor_current.json        | 203 ++++++++++++++++++
 resources/factions/redfor_russia_2020.json    | 161 ++++++++++++++
 4 files changed, 371 insertions(+), 5 deletions(-)
 create mode 100644 resources/factions/redfor_current.json
 create mode 100644 resources/factions/redfor_russia_2020.json

diff --git a/resources/campaigns/graveyard_of_empires.yaml b/resources/campaigns/graveyard_of_empires.yaml
index 4dcae75a..4ec66f4b 100644
--- a/resources/campaigns/graveyard_of_empires.yaml
+++ b/resources/campaigns/graveyard_of_empires.yaml
@@ -3,8 +3,10 @@ name: Afghanistan - Graveyard of Empires
 theater: Afghanistan
 authors: Starfire
 recommended_player_faction: Bluefor Modern
-recommended_enemy_faction: Redfor (Russia) 2010
+recommended_enemy_faction: Redfor (Russia) 2020
 description:
+  <p><strong>This campaign is intended to be run with CurrentHill's Russia Asset 
+  Pack installed, though this is not mandatory.</strong></p>
   <p>Following the 9/11 attacks, the United States and its NATO allies launched a 
   full-scale invasion of Afghanistan to dismantle the Taliban regime and root out 
   Al-Qaeda. As the conflict progressed, Russia grew increasingly concerned that the 
@@ -30,6 +32,7 @@ performance: 1
 recommended_start_date: 2002-01-27
 version: "10.7"
 settings:
+  russianmilitaryassetspack: true
   hercules: true
   squadron_start_full: true
 squadrons:
@@ -171,6 +174,6 @@ squadrons:
     - primary: CAS
       secondary: any
       aircraft:
+         - "[CH] Ka-52"
          - Ka-50 Hokum III
-         - Ka-50 Hokum (Blackshark 3)
       size: 4
\ No newline at end of file
diff --git a/resources/factions/redfor_china_2020.json b/resources/factions/redfor_china_2020.json
index 2ca7af1e..12e420ef 100644
--- a/resources/factions/redfor_china_2020.json
+++ b/resources/factions/redfor_china_2020.json
@@ -13,7 +13,7 @@
     "J-15 Flanker X-2",
     "J-7B",
     "Ka-50 Hokum",
-    "Ka-50 Hokum (Blackshark 3)",
+    "Ka-50 Hokum III",
     "L-39ZA Albatros",
     "Mi-24V Hind-E",
     "Mi-24P Hind-F",
@@ -129,7 +129,6 @@
     "SA-13 Gopher (9K35 Strela-10M3)",
     "SA-15 Tor",
     "SA-19 Grison (2K22 Tunguska)",
-    "ZU-23 on Ural-375",
     "ZSU-23-4 Shilka",
     "[CH] LD-3000 C-RAM Mobile",
     "[CH] LD-3000 C-RAM Stationary",
@@ -151,7 +150,7 @@
     "Wudang Shan"
   ],
   "requirements": {
-    "Chinese Military Assets for DCS by Currenthill": "https://www.currenthill.com/china"
+    "CurrentHill China Asset Pack": "https://www.currenthill.com/china"
   },
   "has_jtac": true,
   "jtac_unit": "WingLoong-I"
diff --git a/resources/factions/redfor_current.json b/resources/factions/redfor_current.json
new file mode 100644
index 00000000..b24a0d48
--- /dev/null
+++ b/resources/factions/redfor_current.json
@@ -0,0 +1,203 @@
+{
+  "country": "Combined Joint Task Forces Red",
+  "name": "Redfor Current",
+  "authors": "Starfire",
+  "description": "<p>Combined Redfor in the 2020s intended for use with CurrentHill's Russia and China asset packs.",
+  "locales": [
+    "ru_RU"
+  ],
+  "aircrafts": [
+    "IL-76MD",
+    "J-11A Flanker-L",
+    "JF-17 Thunder",
+    "Ka-50 Hokum",
+    "Ka-50 Hokum III",
+    "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-30SM Flanker-H",
+    "Su-33 Flanker-D",
+    "Su-34 Fullback",
+    "Tu-22M3 Backfire-C",
+    "Tu-95MS Bear-H",
+    "Tu-16 Badger",
+    "[CH] Ka-52",
+    "[CH] Ka-52K",
+    "[CH] Mi-28N AH",
+    "[CH] Tu-160M2",
+    "[CH] Tu-95MSM"
+  ],
+  "awacs": [
+    "A-50",
+    "KJ-2000"
+  ],
+  "tankers": [
+    "IL-78M"
+  ],
+  "frontline_units": [
+    "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",
+    "MT Type 59",
+    "Type 04A (ZBD-04A)",
+    "Type 96B (ZTZ-96B)",
+    "[CH] T-14 MBT",
+    "[CH] T-90M MBT",
+    "[CH] Tigr-M",
+    "[CH] T-90A MBT",
+    "[CH] T-80BVM MBT",
+    "[CH] BMD-4 IFV",
+    "[CH] ZBL-09 IFV",
+    "[CH] ZBD-04A AT SPATGM",
+    "Type 04A (ZBD-04A)",
+    "Type 96B (ZTZ-96B)",
+    "[CH] ZTL-11 AFV",
+    "[CH] ZTZ-99A2 MBT"
+  ],
+  "artillery_units": [
+    "2S19 Msta-S",
+    "2S9 Nona-S",
+    "BM-27 Uragan",
+    "BM-30 Smerch (9M55K5 HE Rockets)",
+    "[CH] 2S35 SPG",
+    "[CH] TOS-1A MRL",
+    "PLZ-05",
+    "[CH] PCL-181 SPG GP155",
+    "[CH] PHL-11 SPMRL (DPICM)",
+    "[CH] PHL-11 SPMRL (HE)",
+    "[CH] PHL-16 SPMRL (FD280)",
+    "[CH] PLZ-07 SPG"
+  ],
+  "logistics_units": [
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375",
+    "[CH] SX2190 Truck"
+  ],
+  "infantry_units": [
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla \"Grouse\"",
+    "Mortar 2B11 120mm",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16",
+    "[CH] DShK HMG",
+    "[CH] 9M133 ATGM Soldier",
+    "[CH] Kord HMG Soldier"
+  ],
+  "missiles": [
+    "[CH] Iskander-M SRBM",
+    "[CH] Iskander-K GLCM",
+    "[CH] DF-21D LBASBM",
+    "[CH] CJ-10 GLCM",
+    "[CH] YJ-12B LBASM"
+  ],
+  "preset_groups": [
+    "SA-2/S-75",
+    "SA-2/S-75 V-759/5V23",
+    "SA-6",
+    "SA-11",
+    "HQ-7",
+    "SA-10/S-300PS",
+    "SA-10B/S-300PS",
+    "SA-17",
+    "SA-12/S-300V",
+    "SA-20/S-300PMU-1",
+    "SA-20B/S-300PMU-2",
+    "SA-23/S-300VM",
+    "Russian Navy",
+    "BAL LBASM",
+    "Bastion-P LBASM",
+    "BUK M3",
+    "HQ-2",
+    "HQ-22",
+    "Silkworm",
+    "Chinese Navy",
+    "[CH] Russian Navy"
+  ],
+  "naval_units": [
+    "SSK 877V Kilo",
+    "Frigate 1135M Rezky",
+    "Type 052B Destroyer",
+    "Type 052C Destroyer",
+    "Corvette 1241.1 Molniya",
+    "Type 054A Frigate",
+    "CV 1143.5 Admiral Kuznetsov",
+    "Type 071 Amphibious Transport Dock",
+    "Type 093 Attack Submarine",
+    "[CH] Project 22160 Patrol Ship",
+    "[CH] Project 22350 Admiral Gorshkov Frigate",
+    "[CH] Project 11356R Admiral Grigorovich Frigate (AShM)",
+    "[CH] Project 11356R Admiral Grigorovich Frigate (LACM)",
+    "[CH] Project 22800 Karakurt Corvette AShM",
+    "[CH] Project 22800 Karakurt Corvette LACM",
+    "[CH] Project 20381 Steregushchiy Corvette",
+    "[CH] Project 20385 Gremyashchiy Corvette (AShM)",
+    "[CH] Project 20385 Gremyashchiy Corvette (LACM)",
+    "[CH] Type 022 FAC",
+    "[CH] Type 054B Frigate",
+    "[CH] Type 056A Corvette",
+    "[CH] Type 052D Destroyer",
+    "[CH] Type 055 Destroyer"
+  ],
+  "air_defense_units": [
+    "EWR 1L13",
+    "EWR 55G6",
+    "SAM SA-8 Osa \"Gecko\" TEL",
+    "SA-9 Strela",
+    "SA-13 Gopher (9K35 Strela-10M3)",
+    "SA-15 Tor",
+    "SA-19 Grison (2K22 Tunguska)",
+    "ZSU-23-4 Shilka",
+    "[CH] 2S38 SPAAG (LG-HE)",
+    "[CH] 2S38 SPAAG",
+    "[CH] Pantsir-S1 SPAAGM",
+    "[CH] Pantsir-S2 SPAAGM",
+    "[CH] Tor M2K SHORAD",
+    "[CH] Tor M2 SHORAD",
+    "[CH] Tor M2M SHORAD",
+    "[CH] LD-3000 C-RAM Mobile",
+    "[CH] LD-3000 C-RAM Stationary",
+    "[CH] PGZ-09 SPAAG",
+    "[CH] PGZ-95 SPAAG",
+    "[CH] HQ-17A SHORAD"
+  ],
+  "helicopter_carrier_names": [
+    "Ivan Rogov",
+    "Mitrofan Moskalenko",
+    "Kunlun Shan",
+    "Jinggang Shan",
+    "Changbai Shan",
+    "Yimeng Shan",
+    "Longhu Shan",
+    "Wuzhi Shan",
+    "Wudang Shan"
+  ],
+  "requirements": {
+    "CurrentHill Russia Asset Pack": "https://www.currenthill.com/russia",
+    "CurrentHill China Asset Pack": "https://www.currenthill.com/china"
+  },
+  "carrier_names": [
+    "Admiral Kuznetsov",
+    "001 Liaoning",
+    "002 Shandong"
+  ],
+  "has_jtac": true,
+  "jtac_unit": "WingLoong-I"
+}
diff --git a/resources/factions/redfor_russia_2020.json b/resources/factions/redfor_russia_2020.json
new file mode 100644
index 00000000..5ff58289
--- /dev/null
+++ b/resources/factions/redfor_russia_2020.json
@@ -0,0 +1,161 @@
+{
+  "country": "Combined Joint Task Forces Red",
+  "name": "Redfor (Russia) 2020",
+  "authors": "Starfire",
+  "description": "<p>Combined Redfor under Russia's leadership in the 2020s.</p><p>Installation of the CurrentHill Russia Asset Pack is recommended, although not mandatory.</p>",
+  "locales": [
+    "ru_RU"
+  ],
+  "aircrafts": [
+    "IL-76MD",
+    "J-11A Flanker-L",
+    "JF-17 Thunder",
+    "Ka-50 Hokum",
+    "Ka-50 Hokum III",
+    "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-30SM Flanker-H",
+    "Su-33 Flanker-D",
+    "Su-34 Fullback",
+    "Tu-22M3 Backfire-C",
+    "Tu-95MS Bear-H",
+    "Tu-16 Badger",
+    "[CH] Ka-52",
+    "[CH] Ka-52K",
+    "[CH] Mi-28N AH",
+    "[CH] Tu-160M2",
+    "[CH] Tu-95MSM"
+  ],
+  "awacs": [
+    "A-50",
+    "KJ-2000"
+  ],
+  "tankers": [
+    "IL-78M"
+  ],
+  "frontline_units": [
+    "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)",
+    "[CH] T-14 MBT",
+    "[CH] T-90M MBT",
+    "[CH] Tigr-M",
+    "[CH] T-90A MBT",
+    "[CH] T-80BVM MBT",
+    "[CH] BMD-4 IFV"
+  ],
+  "artillery_units": [
+    "2S19 Msta-S",
+    "2S9 Nona-S",
+    "BM-27 Uragan",
+    "BM-30 Smerch (9M55K5 HE Rockets)",
+    "[CH] 2S35 SPG",
+    "[CH] TOS-1A MRL"
+  ],
+  "logistics_units": [
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
+  ],
+  "infantry_units": [
+    "Infantry AK-74 Rus",
+    "MANPADS SA-18 Igla \"Grouse\"",
+    "Mortar 2B11 120mm",
+    "Paratrooper AKS",
+    "Paratrooper RPG-16",
+    "[CH] DShK HMG",
+    "[CH] 9M133 ATGM Soldier",
+    "[CH] Kord HMG Soldier"
+  ],
+  "missiles": [
+    "[CH] Iskander-M SRBM",
+    "[CH] Iskander-K GLCM"
+  ],
+  "preset_groups": [
+    "SA-2/S-75",
+    "SA-2/S-75 V-759/5V23",
+    "SA-6",
+    "SA-11",
+    "HQ-7",
+    "SA-10/S-300PS",
+    "SA-10B/S-300PS",
+    "SA-17",
+    "SA-12/S-300V",
+    "SA-20/S-300PMU-1",
+    "SA-20B/S-300PMU-2",
+    "SA-23/S-300VM",
+    "Russian Navy",
+    "BAL LBASM",
+    "Bastion-P LBASM",
+    "BUK M3",
+    "[CH] Russian Navy"
+  ],
+  "naval_units": [
+    "SSK 877V Kilo",
+    "Frigate 1135M Rezky",
+    "Type 052B Destroyer",
+    "Type 052C Destroyer",
+    "Corvette 1241.1 Molniya",
+    "Type 054A Frigate",
+    "CV 1143.5 Admiral Kuznetsov",
+    "Type 071 Amphibious Transport Dock",
+    "[CH] Project 22160 Patrol Ship",
+    "[CH] Project 22350 Admiral Gorshkov Frigate",
+    "[CH] Project 11356R Admiral Grigorovich Frigate (AShM)",
+    "[CH] Project 11356R Admiral Grigorovich Frigate (LACM)",
+    "[CH] Project 22800 Karakurt Corvette AShM",
+    "[CH] Project 22800 Karakurt Corvette LACM",
+    "[CH] Project 20381 Steregushchiy Corvette",
+    "[CH] Project 20385 Gremyashchiy Corvette (AShM)",
+    "[CH] Project 20385 Gremyashchiy Corvette (LACM)"
+  ],
+  "air_defense_units": [
+    "EWR 1L13",
+    "EWR 55G6",
+    "SAM SA-8 Osa \"Gecko\" TEL",
+    "SA-9 Strela",
+    "SA-13 Gopher (9K35 Strela-10M3)",
+    "SA-15 Tor",
+    "SA-19 Grison (2K22 Tunguska)",
+    "ZSU-23-4 Shilka",
+    "[CH] 2S38 SPAAG (LG-HE)",
+    "[CH] 2S38 SPAAG",
+    "[CH] Pantsir-S1 SPAAGM",
+    "[CH] Pantsir-S2 SPAAGM",
+    "[CH] Tor M2K SHORAD",
+    "[CH] Tor M2 SHORAD",
+    "[CH] Tor M2M SHORAD"
+  ],
+  "helicopter_carrier_names": [
+    "Ivan Rogov",
+    "Mitrofan Moskalenko"
+  ],
+  "requirements": {
+    "CurrentHill Russia Asset Pack": "https://www.currenthill.com/russia"
+  },
+  "carrier_names": [
+    "Admiral Kuznetsov"
+  ],
+  "has_jtac": true,
+  "jtac_unit": "WingLoong-I"
+}
\ No newline at end of file