diff --git a/changelog.md b/changelog.md index b40f56f4..86d113d7 100644 --- a/changelog.md +++ b/changelog.md @@ -6,6 +6,7 @@ * **[Campaign]** Add 3 new campaigns by Oscar Juliet from WRL * **[Campaign]** Add ability to define livery overrides also for ground/naval units * **[Data]** Added data to support C-47 Skytrain. +* **[Data]** Added data to support F-16A MLU. * **[Data]** Added data to support KS-19 & SON-9, including support for "AAA Site" layout. * **[Mission Generation]** Add option to configure the maximum front-line length in settings * **[Mission Generation]** Use Escort & SEAD tasks for Escort & SEAD Escort flights diff --git a/game/ato/ai_flight_planner_db.py b/game/ato/ai_flight_planner_db.py index 264ac752..e513d42f 100644 --- a/game/ato/ai_flight_planner_db.py +++ b/game/ato/ai_flight_planner_db.py @@ -51,6 +51,7 @@ from dcs.planes import ( F_15C, F_15E, F_16A, + F_16A_MLU, F_16C_50, F_4E, F_5E_3, @@ -181,6 +182,7 @@ ESCORT_CAPABLE = [ FA_18C_hornet, JF_17, JAS39Gripen, + F_16A_MLU, F_16A, F_4E, VSN_F4B, @@ -244,7 +246,6 @@ CAS_CAPABLE = [ Su_25, F_15D, F_15E, - F_16A, F_16C_50, F_16I, F_16D_Barak, @@ -259,6 +260,8 @@ CAS_CAPABLE = [ JF_17, AV8BNA, A_10A, + F_16A_MLU, + F_16A, B_1B, A_4E_C, F_14B, @@ -372,6 +375,7 @@ SEAD_ESCORT_CAPABLE = [ SEAD_CAPABLE = SEAD_ESCORT_CAPABLE + [ + F_16A_MLU, F_14B, F_14A_135_GR, ] @@ -434,6 +438,7 @@ STRIKE_CAPABLE = [ FA_18C_hornet, AV8BNA, JF_17, + F_16A_MLU, F_16A, F_14B, F_14A_135_GR, @@ -509,9 +514,10 @@ ANTISHIP_CAPABLE = [ Tu_142, Tu_22M3, H_6J, - F_16A, FA_18C_hornet, JAS39Gripen_AG, + F_16A_MLU, + F_16A, Su_24M, Su_17M4, JF_17, @@ -565,6 +571,7 @@ RUNWAY_ATTACK_CAPABLE = [ FA_18C_hornet, AV8BNA, JF_17, + F_16A_MLU, F_16A, F_14B, F_14A_135_GR, diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index e32ab635..f37edc49 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -205,6 +205,7 @@ def load_aircraft_icons(): os.path.join("./resources/ui/units/aircrafts/icons/", aircraft) ) AIRCRAFT_ICONS["F-16C_50"] = AIRCRAFT_ICONS["F-16C"] + AIRCRAFT_ICONS["F-16A_MLU"] = AIRCRAFT_ICONS["F-16A"] AIRCRAFT_ICONS["FA-18C_hornet"] = AIRCRAFT_ICONS["FA-18C"] AIRCRAFT_ICONS["A-10C_2"] = AIRCRAFT_ICONS["A-10C"] f1_refuel = ["Mirage-F1CT", "Mirage-F1EE", "Mirage-F1M-EE", "Mirage-F1EQ"] diff --git a/resources/customized_payloads/F-16A MLU.lua b/resources/customized_payloads/F-16A MLU.lua new file mode 100644 index 00000000..2ff70ea7 --- /dev/null +++ b/resources/customized_payloads/F-16A MLU.lua @@ -0,0 +1,313 @@ +local unitPayloads = { + ["name"] = "F-16A MLU", + ["payloads"] = { + [1] = { + ["displayName"] = "CAP", + ["name"] = "CAP", + ["pylons"] = { + [1] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}", + ["num"] = 6, + }, + [6] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 7, + }, + [7] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 8, + }, + [8] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 9, + }, + [9] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 10, + }, + [10] = { + ["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 18, + [2] = 19, + [3] = 11, + [4] = 10, + }, + }, + [2] = { + ["displayName"] = "CAS", + ["name"] = "CAS", + ["pylons"] = { + [1] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}", + ["num"] = 6, + }, + [6] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 7, + }, + [7] = { + ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", + ["num"] = 8, + }, + [8] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 9, + }, + [9] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 10, + }, + [10] = { + ["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 18, + [2] = 19, + [3] = 11, + [4] = 10, + [5] = 31, + }, + }, + [3] = { + ["displayName"] = "STRIKE", + ["name"] = "STRIKE", + ["pylons"] = { + [1] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{GBU-31}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}", + ["num"] = 6, + }, + [6] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 7, + }, + [7] = { + ["CLSID"] = "{GBU-31}", + ["num"] = 8, + }, + [8] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 9, + }, + [9] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 10, + }, + [10] = { + ["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 18, + [2] = 19, + [3] = 11, + [4] = 10, + [5] = 32, + [6] = 33, + }, + }, + [4] = { + ["displayName"] = "SEAD", + ["name"] = "SEAD", + ["pylons"] = { + [1] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}", + ["num"] = 6, + }, + [6] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 7, + }, + [7] = { + ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", + ["num"] = 8, + }, + [8] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 9, + }, + [9] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 10, + }, + [10] = { + ["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 29, + }, + }, + [5] = { + ["displayName"] = "Retribution DEAD", + ["name"] = "Retribution DEAD", + ["pylons"] = { + [1] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{9BCC2A2B-5708-4860-B1F1-053A18442067}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}", + ["num"] = 6, + }, + [6] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 7, + }, + [7] = { + ["CLSID"] = "{9BCC2A2B-5708-4860-B1F1-053A18442067}", + ["num"] = 8, + }, + [8] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 9, + }, + [9] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 10, + }, + [10] = { + ["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 29, + }, + }, + [6] = { + ["displayName"] = "Retribution ANTISHIP", + ["name"] = "Retribution ANTISHIP", + ["pylons"] = { + [1] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{7B8DCEB4-820B-4015-9B48-1028A4195692}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}", + ["num"] = 6, + }, + [6] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 7, + }, + [7] = { + ["CLSID"] = "{7B8DCEB4-820B-4015-9B48-1028A4195692}", + ["num"] = 8, + }, + [8] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 9, + }, + [9] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 10, + }, + [10] = { + ["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 29, + }, + }, + }, + ["unitType"] = "F-16A MLU", +} +return unitPayloads diff --git a/resources/factions/NATO_Desert_Storm.json b/resources/factions/NATO_Desert_Storm.json index 2e632f87..862a3eb4 100644 --- a/resources/factions/NATO_Desert_Storm.json +++ b/resources/factions/NATO_Desert_Storm.json @@ -17,6 +17,7 @@ "F-14B Tomcat", "F-15C Eagle", "F-15E Strike Eagle", + "F-16A MLU", "F-16CM Fighting Falcon (Block 50)", "F-16D Fighting Falcon (Block 52+)", "F-16D Fighting Falcon (Block 52)", diff --git a/resources/factions/NATO_OIF.json b/resources/factions/NATO_OIF.json index 390cb378..13e18b88 100644 --- a/resources/factions/NATO_OIF.json +++ b/resources/factions/NATO_OIF.json @@ -18,6 +18,7 @@ "F-14B Tomcat", "F-15C Eagle", "F-15E Strike Eagle", + "F-16A MLU", "F-16CM Fighting Falcon (Block 50)", "F-16D Fighting Falcon (Block 52+)", "F-16D Fighting Falcon (Block 52)", diff --git a/resources/factions/bluefor_modern.json b/resources/factions/bluefor_modern.json index 0f264109..2537be58 100644 --- a/resources/factions/bluefor_modern.json +++ b/resources/factions/bluefor_modern.json @@ -19,6 +19,7 @@ "F-15C Eagle", "F-15D Baz", "F-15E Strike Eagle", + "F-16A MLU", "F-16CM Fighting Falcon (Block 50)", "F-16D Fighting Falcon (Block 52+)", "F-16D Fighting Falcon (Block 52)", diff --git a/resources/factions/netherlands_1990.json b/resources/factions/netherlands_1990.json index 40740715..8932d5fa 100644 --- a/resources/factions/netherlands_1990.json +++ b/resources/factions/netherlands_1990.json @@ -9,6 +9,7 @@ "aircrafts": [ "AH-64A Apache", "C-130", + "F-16A MLU", "F-16CM Fighting Falcon (Block 50)", "F-5E Tiger II", "F-104G Starfighter", diff --git a/resources/factions/usa_1990.json b/resources/factions/usa_1990.json index 9c57b9c4..1479d187 100644 --- a/resources/factions/usa_1990.json +++ b/resources/factions/usa_1990.json @@ -22,6 +22,7 @@ "F-14B Tomcat", "F-15C Eagle", "F-15E Strike Eagle", + "F-16A MLU", "F-16CM Fighting Falcon (Block 50)", "F-16D Fighting Falcon (Block 52+)", "F-16D Fighting Falcon (Block 52)", diff --git a/resources/ui/units/aircrafts/banners/F-16A_MLU_24.jpg b/resources/ui/units/aircrafts/banners/F-16A_MLU_24.jpg new file mode 100644 index 00000000..9dced760 Binary files /dev/null and b/resources/ui/units/aircrafts/banners/F-16A_MLU_24.jpg differ diff --git a/resources/units/aircraft/F-16A_MLU.yaml b/resources/units/aircraft/F-16A_MLU.yaml new file mode 100644 index 00000000..f476550a --- /dev/null +++ b/resources/units/aircraft/F-16A_MLU.yaml @@ -0,0 +1,6 @@ +description: The F-16A MLU (Mid-Life Upgrade) block 20 was the result of the an upgrade program that included + many changes to its avionics and even a new engine, essentially making the aircraft equivalent to a block 50/52 model. +price: 18 +max_range: 350 +variants: + F-16A MLU: null