diff --git a/changelog.md b/changelog.md index 9e9b167f..67c1b93c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,16 +1,19 @@ # 2.0.11 ## Features/Improvements : -**[Units/Factions]** Added Mig-31, Su-30, Mi-24V, Mi-28N to Russia 2010 faction. -**[Mission Generator]** Added a parameter to choose whether the JTACs should use smoke markers or not + +* **[Units/Factions]** Added Mig-31, Su-30, Mi-24V, Mi-28N to Russia 2010 faction. +* **[Units/Factions]** Added F-15E to USA 2005 and USA 1990 factions. +* **[Mission Generator]** Added a parameter to choose whether the JTACs should use smoke markers or not ## Fixed issues : -**[Units/Factions]** Fixed big performance issue in new release UI that occurred only when running the .exe -**[Units/Factions]** Fixed mission generation not working with Libya faction -**[Units/Factions]** Fixed OH-58D not being used by AI -**[Units/Factions]** Fixed Tanker Tacan channel not being the same as the briefing one. (Sorry) -**[Mission Generator]** Neutral airbases services will now be disabled. (Not possible to refuel or re-arm there) -**[Mission Generator]** Destroyed units carcass will not appear on airfields to avoid having a destroyed vehicle blocking a runway or taxiway. + +* **[Units/Factions]** Fixed big performance issue in new release UI that occurred only when running the .exe +* **[Units/Factions]** Fixed mission generation not working with Libya faction +* **[Units/Factions]** Fixed OH-58D not being used by AI +* **[Units/Factions]** Fixed Tanker Tacan channel not being the same as the briefing one. (Sorry) +* **[Mission Generator]** Neutral airbases services will now be disabled. (Not possible to refuel or re-arm there) +* **[Mission Generator]** Destroyed units carcass will not appear on airfields to avoid having a destroyed vehicle blocking a runway or taxiway. # 2.0.10 diff --git a/game/db.py b/game/db.py index 16cc5641..26df9aaa 100644 --- a/game/db.py +++ b/game/db.py @@ -166,13 +166,14 @@ PRICES = { AV8BNA: 14, M_2000C: 16, - Mirage_2000_5: 22, - FA_18C_hornet: 24, - F_15C: 26, + Mirage_2000_5: 20, + FA_18C_hornet: 22, + F_15C: 22, + F_15E: 24, F_16C_50: 20, - F_14B: 22, - Tornado_IDS: 24, - Tornado_GR4: 24, + F_14B: 24, + Tornado_IDS: 20, + Tornado_GR4: 20, # bomber Su_17M4: 10, @@ -421,6 +422,7 @@ UNIT_BY_TASK = { SA342Mistral ], CAS: [ + F_15E, F_86F_Sabre, MiG_15bis, L_39ZA, @@ -873,6 +875,7 @@ PLANE_PAYLOAD_OVERRIDES = { F_5E_3: COMMON_OVERRIDE, F_14B: COMMON_OVERRIDE, F_15C: COMMON_OVERRIDE, + F_15E: COMMON_OVERRIDE, F_16C_50: COMMON_OVERRIDE, JF_17: COMMON_OVERRIDE, M_2000C: COMMON_OVERRIDE, diff --git a/game/factions/usa_1990.py b/game/factions/usa_1990.py index ae090e17..0eed7850 100644 --- a/game/factions/usa_1990.py +++ b/game/factions/usa_1990.py @@ -8,6 +8,7 @@ USA_1990 = { "side": "blue", "units": [ F_15C, + F_15E, F_14B, FA_18C_hornet, @@ -23,6 +24,7 @@ USA_1990 = { UH_1H, AH_64A, + OH_58D, Armor.MBT_M1A2_Abrams, Armor.IFV_LAV_25, diff --git a/game/factions/usa_2005.py b/game/factions/usa_2005.py index 5425aa92..19c8400e 100644 --- a/game/factions/usa_2005.py +++ b/game/factions/usa_2005.py @@ -8,6 +8,7 @@ USA_2005 = { "side": "blue", "units": [ F_15C, + F_15E, F_14B, FA_18C_hornet, F_16C_50, @@ -21,6 +22,7 @@ USA_2005 = { UH_1H, AH_64D, + OH_58D, Armor.MBT_M1A2_Abrams, Armor.ATGM_M1134_Stryker, diff --git a/gen/flights/ai_flight_planner_db.py b/gen/flights/ai_flight_planner_db.py index d427fc49..70e70e3a 100644 --- a/gen/flights/ai_flight_planner_db.py +++ b/gen/flights/ai_flight_planner_db.py @@ -50,6 +50,7 @@ CAP_CAPABLE = [ F_5E_3, F_14B, F_15C, + F_15E, F_16C_50, FA_18C_hornet, @@ -98,6 +99,7 @@ CAS_CAPABLE = [ F_86F_Sabre, F_5E_3, F_14B, + F_15E, F_16C_50, FA_18C_hornet, @@ -140,6 +142,7 @@ CAS_CAPABLE = [ SEAD_CAPABLE = [ F_4E, FA_18C_hornet, + F_15E, # F_16C_50, Not yet AV8BNA, JF_17, @@ -180,6 +183,7 @@ STRIKE_CAPABLE = [ F_86F_Sabre, F_5E_3, F_14B, + F_15E, F_16C_50, FA_18C_hornet, @@ -209,6 +213,7 @@ ANTISHIP_CAPABLE = [ Su_24M, Su_17M4, F_A_18C, + F_15E, AV8BNA, JF_17, F_16C_50, diff --git a/resources/customized_payloads/F-15E.lua b/resources/customized_payloads/F-15E.lua new file mode 100644 index 00000000..77955c5f --- /dev/null +++ b/resources/customized_payloads/F-15E.lua @@ -0,0 +1,283 @@ +local unitPayloads = { + ["name"] = "F-15E", + ["payloads"] = { + [1] = { + ["name"] = "CAS", + ["pylons"] = { + [1] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 3, + }, + [3] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 4, + }, + [4] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 6, + }, + [5] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 7, + }, + [6] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 9, + }, + [7] = { + ["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}", + ["num"] = 10, + }, + [8] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 11, + }, + [9] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 13, + }, + [10] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 14, + }, + [11] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 16, + }, + [12] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 19, + }, + [13] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 17, + }, + [14] = { + ["CLSID"] = "{444BA8AE-82A7-4345-842E-76154EFCCA46}", + ["num"] = 18, + }, + [15] = { + ["CLSID"] = "{444BA8AE-82A7-4345-842E-76154EFCCA46}", + ["num"] = 2, + }, + }, + ["tasks"] = { + [1] = 32, + }, + }, + [2] = { + ["name"] = "STRIKE", + ["pylons"] = { + [1] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 3, + }, + [3] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 4, + }, + [4] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 6, + }, + [5] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 7, + }, + [6] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 9, + }, + [7] = { + ["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}", + ["num"] = 10, + }, + [8] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 11, + }, + [9] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 13, + }, + [10] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 14, + }, + [11] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 16, + }, + [12] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 19, + }, + [13] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 17, + }, + }, + ["tasks"] = { + [1] = 32, + }, + }, + [3] = { + ["name"] = "CAP", + ["pylons"] = { + [1] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 3, + }, + [3] = { + ["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}", + ["num"] = 10, + }, + [4] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 19, + }, + [5] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 17, + }, + [6] = { + ["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}", + ["num"] = 18, + }, + [7] = { + ["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}", + ["num"] = 2, + }, + }, + ["tasks"] = { + [1] = 32, + }, + }, + [4] = { + ["name"] = "ANTISHIP", + ["pylons"] = { + [1] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 3, + }, + [3] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 9, + }, + [4] = { + ["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}", + ["num"] = 10, + }, + [5] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 11, + }, + [6] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 19, + }, + [7] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 17, + }, + [8] = { + ["CLSID"] = "{444BA8AE-82A7-4345-842E-76154EFCCA46}", + ["num"] = 18, + }, + [9] = { + ["CLSID"] = "{444BA8AE-82A7-4345-842E-76154EFCCA46}", + ["num"] = 2, + }, + [10] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 12, + }, + [11] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 8, + }, + }, + ["tasks"] = { + [1] = 32, + }, + }, + [5] = { + ["name"] = "SEAD", + ["pylons"] = { + [1] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 3, + }, + [3] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 9, + }, + [4] = { + ["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}", + ["num"] = 10, + }, + [5] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 11, + }, + [6] = { + ["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}", + ["num"] = 19, + }, + [7] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 17, + }, + [8] = { + ["CLSID"] = "{9BCC2A2B-5708-4860-B1F1-053A18442067}", + ["num"] = 18, + }, + [9] = { + ["CLSID"] = "{9BCC2A2B-5708-4860-B1F1-053A18442067}", + ["num"] = 2, + }, + [10] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 12, + }, + [11] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 8, + }, + [12] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 13, + }, + [13] = { + ["CLSID"] = "{GBU-38}", + ["num"] = 7, + }, + }, + ["tasks"] = { + [1] = 32, + }, + }, + }, + ["unitType"] = "F-15E", +} +return unitPayloads