diff --git a/changelog.md b/changelog.md index f12e9098..77d98430 100644 --- a/changelog.md +++ b/changelog.md @@ -48,7 +48,7 @@ * **[Squadrons]** Add livery selector in Squadron Dialog, allowing you to change the livery during the campaign. * **[New Game Wizard]** Automatically invert factions when 'Invert Map' is selected. * **[Flight Plans]** Added "SEAD Sweep" flight plan, which basically reintroduces the legacy "SEAD Escort" flight plan where the flight will engage whatever it can find without actually escorting the primary flight. - +* **[Flight Plans]** Added SEAD capability to F-16A MLU and SEAD Escort & SEAD to F-16A. ## Fixes * **[New Game Wizard]** Settings would not persist when going back to a previous page (obsolete due to overhaul). @@ -56,6 +56,7 @@ * **[Mission Generation]** Fixed (potential) bug in helipad assignments at FOBs/FARPs. * **[Mission Generation]** Fix AI immediately returning to base when forced to air-start due to insufficient parking space. * **[Modding]** Fixed a bug where F-16Ds were not correctly removed from the faction when the F-16I/F-16D mod was not selected +* **[UI]** Fixed F-16A MLU icon and banner. # Retribution v1.1.1 (hotfix) diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index 1f53cd05..44ae11b3 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -203,7 +203,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["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 index 00e06d96..84c5aee1 100644 --- a/resources/customized_payloads/F-16A MLU.lua +++ b/resources/customized_payloads/F-16A MLU.lua @@ -2,19 +2,19 @@ local unitPayloads = { ["name"] = "F-16A MLU", ["payloads"] = { [1] = { - ["displayName"] = "Retribution DEAD", - ["name"] = "Retribution DEAD", + ["displayName"] = "CAP", + ["name"] = "CAP", ["pylons"] = { [1] = { ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", ["num"] = 1, }, [2] = { - ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", ["num"] = 2, }, [3] = { - ["CLSID"] = "{9BCC2A2B-5708-4860-B1F1-053A18442067}", + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", ["num"] = 3, }, [4] = { @@ -30,24 +30,23 @@ local unitPayloads = { ["num"] = 7, }, [7] = { - ["CLSID"] = "{9BCC2A2B-5708-4860-B1F1-053A18442067}", + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", ["num"] = 8, }, [8] = { - ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", ["num"] = 9, }, [9] = { ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", ["num"] = 10, }, - [10] = { - ["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}", - ["num"] = 5, - }, }, ["tasks"] = { - [1] = 29, + [1] = 18, + [2] = 19, + [3] = 11, + [4] = 10, }, }, [2] = { @@ -158,107 +157,6 @@ local unitPayloads = { }, }, [4] = { - ["displayName"] = "Retribution ANTISHIP", - ["name"] = "Retribution ANTISHIP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", - ["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"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", - ["num"] = 10, - }, - [10] = { - ["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}", - ["num"] = 5, - }, - }, - ["tasks"] = { - [1] = 29, - }, - }, - [5] = { - ["displayName"] = "CAP", - ["name"] = "CAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", - ["num"] = 1, - }, - [2] = { - ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", - ["num"] = 2, - }, - [3] = { - ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", - ["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"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", - ["num"] = 10, - }, - [10] = { - ["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}", - ["num"] = 5, - }, - }, - ["tasks"] = { - [1] = 18, - [2] = 19, - [3] = 11, - [4] = 10, - }, - }, - [6] = { ["displayName"] = "SEAD", ["name"] = "SEAD", ["pylons"] = { @@ -307,9 +205,9 @@ local unitPayloads = { [1] = 29, }, }, - [7] = { - ["displayName"] = "Retribution OCA/Runway", - ["name"] = "Retribution OCA/Runway", + [5] = { + ["displayName"] = "Retribution DEAD", + ["name"] = "Retribution DEAD", ["pylons"] = { [1] = { ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", @@ -320,7 +218,7 @@ local unitPayloads = { ["num"] = 2, }, [3] = { - ["CLSID"] = "{GBU-31}", + ["CLSID"] = "{9BCC2A2B-5708-4860-B1F1-053A18442067}", ["num"] = 3, }, [4] = { @@ -336,7 +234,7 @@ local unitPayloads = { ["num"] = 7, }, [7] = { - ["CLSID"] = "{GBU-31}", + ["CLSID"] = "{9BCC2A2B-5708-4860-B1F1-053A18442067}", ["num"] = 8, }, [8] = { @@ -353,13 +251,105 @@ local unitPayloads = { }, }, ["tasks"] = { - [1] = 18, - [2] = 19, - [3] = 11, - [4] = 10, - [5] = 32, - [6] = 33, - [7] = 34, + [1] = 29, + }, + }, + [6] = { + ["displayName"] = "ANTISHIP", + ["name"] = "ANTISHIP", + ["pylons"] = { + [1] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["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"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 10, + }, + [10] = { + ["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 29, + }, + }, + [7] = { + ["displayName"] = "Retribution SEAD Sweep", + ["name"] = "Retribution SEAD Sweep", + ["pylons"] = { + [1] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "LAU_88_AGM_65H_2_L", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{8A0BE8AE-58D4-4572-9263-3144C0D06364}", + ["num"] = 6, + }, + [6] = { + ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", + ["num"] = 7, + }, + [7] = { + ["CLSID"] = "LAU_88_AGM_65H_2_R", + ["num"] = 8, + }, + [8] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 9, + }, + [9] = { + ["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + ["num"] = 10, + }, + [10] = { + ["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 29, }, }, }, diff --git a/resources/customized_payloads/F-16A.lua b/resources/customized_payloads/F-16A.lua index b4f162b4..5fdc27db 100644 --- a/resources/customized_payloads/F-16A.lua +++ b/resources/customized_payloads/F-16A.lua @@ -2,6 +2,50 @@ local unitPayloads = { ["name"] = "F-16A", ["payloads"] = { [1] = { + ["name"] = "CAP", + ["pylons"] = { + [1] = { + ["CLSID"] = "{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 8, + }, + [3] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 2, + }, + [5] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 9, + }, + [6] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [7] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 10, + }, + [8] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 7, + }, + [9] = { + ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", + ["num"] = 4, + }, + }, + ["tasks"] = { + [1] = 11, + }, + }, + [2] = { ["name"] = "CAS", ["pylons"] = { [1] = { @@ -45,7 +89,7 @@ local unitPayloads = { [1] = 11, }, }, - [2] = { + [3] = { ["name"] = "STRIKE", ["pylons"] = { [1] = { @@ -54,64 +98,10 @@ local unitPayloads = { }, [2] = { ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 3, - ["settings"] = { - ["GUI_fuze_type"] = 1, - ["arm_delay_ctrl_FMU139CB_LD"] = 1, - ["function_delay_ctrl_FMU139CB_LD"] = 0, - }, + ["num"] = 8, }, [3] = { - ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", - ["num"] = 2, - }, - [4] = { - ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", - ["num"] = 9, - }, - [5] = { - ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", - ["num"] = 1, - }, - [6] = { - ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", - ["num"] = 10, - }, - [7] = { - ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", - ["num"] = 4, - }, - [8] = { - ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", - ["num"] = 7, - }, - [9] = { ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 8, - ["settings"] = { - ["GUI_fuze_type"] = 1, - ["arm_delay_ctrl_FMU139CB_LD"] = 1, - ["function_delay_ctrl_FMU139CB_LD"] = 0, - }, - }, - }, - ["tasks"] = { - [1] = 11, - }, - }, - [3] = { - ["name"] = "CAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}", - ["num"] = 6, - }, - [2] = { - ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", - ["num"] = 8, - }, - [3] = { - ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", ["num"] = 3, }, [4] = { @@ -132,11 +122,11 @@ local unitPayloads = { }, [8] = { ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", - ["num"] = 4, + ["num"] = 7, }, [9] = { ["CLSID"] = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", - ["num"] = 7, + ["num"] = 4, }, }, ["tasks"] = { @@ -195,11 +185,11 @@ local unitPayloads = { ["num"] = 6, }, [2] = { - ["CLSID"] = "{E6A6262A-CA08-4B3D-B030-E1A993B98453}", + ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", ["num"] = 8, }, [3] = { - ["CLSID"] = "{E6A6262A-CA08-4B3D-B030-E1A993B98452}", + ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", ["num"] = 3, }, [4] = { @@ -231,6 +221,50 @@ local unitPayloads = { [1] = 11, }, }, + [6] = { + ["name"] = "Retribution SEAD Sweep", + ["pylons"] = { + [1] = { + ["CLSID"] = "{8A0BE8AE-58D4-4572-9263-3144C0D06364}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "LAU_88_AGM_65H_2_R", + ["num"] = 8, + }, + [3] = { + ["CLSID"] = "LAU_88_AGM_65H_2_L", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 2, + }, + [5] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 9, + }, + [6] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [7] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 10, + }, + [8] = { + ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", + ["num"] = 7, + }, + [9] = { + ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", + ["num"] = 4, + }, + }, + ["tasks"] = { + [1] = 11, + }, + }, }, ["unitType"] = "F-16A", } diff --git a/resources/ui/units/aircrafts/banners/F-16A_MLU.jpg b/resources/ui/units/aircrafts/banners/F-16A MLU.jpg similarity index 100% rename from resources/ui/units/aircrafts/banners/F-16A_MLU.jpg rename to resources/ui/units/aircrafts/banners/F-16A MLU.jpg diff --git a/resources/units/aircraft/F-16A MLU.yaml b/resources/units/aircraft/F-16A MLU.yaml index 06f894de..764d5cc3 100644 --- a/resources/units/aircraft/F-16A MLU.yaml +++ b/resources/units/aircraft/F-16A MLU.yaml @@ -15,3 +15,4 @@ tasks: OCA/Runway: 570 Strike: 570 TARCAP: 420 + SEAD: 150 diff --git a/resources/units/aircraft/F-16A.yaml b/resources/units/aircraft/F-16A.yaml index 3ee749c7..e8e6b4a6 100644 --- a/resources/units/aircraft/F-16A.yaml +++ b/resources/units/aircraft/F-16A.yaml @@ -12,3 +12,5 @@ tasks: OCA/Runway: 570 Strike: 570 TARCAP: 420 + SEAD: 150 + SEAD Escort: 150 \ No newline at end of file