diff --git a/game/ato/ai_flight_planner_db.py b/game/ato/ai_flight_planner_db.py index 6f0cdd5f..ae82f447 100644 --- a/game/ato/ai_flight_planner_db.py +++ b/game/ato/ai_flight_planner_db.py @@ -122,7 +122,7 @@ from dcs.unittype import FlyingType from game.dcs.aircrafttype import AircraftType from pydcs_extensions.a4ec.a4ec import A_4E_C from pydcs_extensions.f100.f100 import VSN_F100 -from pydcs_extensions.f104.f104 import VSN_F104G, VSN_F104S, VSN_F104S_AG +from pydcs_extensions.f104.f104 import VSN_F104C, VSN_F104G, VSN_F104S, VSN_F104S_AG from pydcs_extensions.f105.f105 import VSN_F105D, VSN_F105G from pydcs_extensions.f15d.f15d import F_15D from pydcs_extensions.f22a.f22a import F_22A @@ -185,6 +185,7 @@ CAP_CAPABLE = [ F_5E_3, VSN_F104S, VSN_F104G, + VSN_F104C, MiG_19P, VSN_F100, A_4E_C, @@ -279,6 +280,7 @@ CAS_CAPABLE = [ VSN_F105D, VSN_F104S_AG, VSN_F104G, + VSN_F104C, VSN_F100, A_20G, Ju_88A4, @@ -344,6 +346,7 @@ DEAD_CAPABLE = SEAD_CAPABLE + [ VSN_F105D, VSN_F104S_AG, VSN_F104G, + VSN_F104C, VSN_F100, P_47D_40, P_47D_30bl1, @@ -426,6 +429,7 @@ STRIKE_CAPABLE = [ Ju_88A4, VSN_F104S_AG, VSN_F104G, + VSN_F104C, VSN_F100, P_47D_40, P_47D_30bl1, @@ -537,6 +541,7 @@ RUNWAY_ATTACK_CAPABLE = [ Ju_88A4, VSN_F104S_AG, VSN_F104G, + VSN_F104C, VSN_F100, P_47D_40, P_47D_30bl1, diff --git a/qt_ui/windows/newgame/QNewGameWizard.py b/qt_ui/windows/newgame/QNewGameWizard.py index 0730b98d..cb82a22f 100644 --- a/qt_ui/windows/newgame/QNewGameWizard.py +++ b/qt_ui/windows/newgame/QNewGameWizard.py @@ -718,7 +718,11 @@ class GeneratorOptions(QtWidgets.QWizardPage): # Section break here for readability modLayout.addWidget(QtWidgets.QWidget(), modLayout_row, 0) modLayout_row += 1 - modLayout.addWidget(QtWidgets.QLabel("F-104 Starfighter"), modLayout_row, 0) + modLayout.addWidget( + QtWidgets.QLabel("F-104 Starfighter (version 2.7.11.222.01)"), + modLayout_row, + 0, + ) modLayout.addWidget(f104_starfighter, modLayout_row, 1) modLayout_row += 1 modLayout.addWidget( diff --git a/resources/customized_payloads/VSN_F104C.lua b/resources/customized_payloads/VSN_F104C.lua new file mode 100644 index 00000000..fe50cf07 --- /dev/null +++ b/resources/customized_payloads/VSN_F104C.lua @@ -0,0 +1,154 @@ +local unitPayloads = { + ["name"] = "VSN_F104C", + ["payloads"] = { + [1] = { + ["displayName"] = "CAP", + ["name"] = "CAP", + ["pylons"] = { + [1] = { + ["CLSID"] = "{VSN_F104_LAU115C_AIM9L}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "VSN_F104G_L_PTB", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{AIM-9L}", + ["num"] = 8, + }, + [4] = { + ["CLSID"] = "VSN_F104G_R_PTB", + ["num"] = 10, + }, + [5] = { + ["CLSID"] = "{AIM-9L}", + ["num"] = 4, + }, + }, + ["tasks"] = { + [1] = 11, + }, + }, + [2] = { + ["displayName"] = "DEAD", + ["name"] = "DEAD", + ["pylons"] = { + [1] = { + ["CLSID"] = "{VSN_F104_LAU115C_AIM9L}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "VSN_F104G_L_PTB", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{FD90A1DC-9147-49FA-BF56-CB83EF0BD32B}", + ["num"] = 8, + }, + [4] = { + ["CLSID"] = "VSN_F104G_R_PTB", + ["num"] = 10, + }, + [5] = { + ["CLSID"] = "{FD90A1DC-9147-49FA-BF56-CB83EF0BD32B}", + ["num"] = 4, + }, + }, + ["tasks"] = { + [1] = 19, + }, + }, + [3] = { + ["displayName"] = "CAS", + ["name"] = "CAS", + ["pylons"] = { + [1] = { + ["CLSID"] = "{VSN_F104_LAU115C_AIM9L}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "VSN_F104G_L_PTB", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{FD90A1DC-9147-49FA-BF56-CB83EF0BD32B}", + ["num"] = 8, + }, + [4] = { + ["CLSID"] = "VSN_F104G_R_PTB", + ["num"] = 10, + }, + [5] = { + ["CLSID"] = "{FD90A1DC-9147-49FA-BF56-CB83EF0BD32B}", + ["num"] = 4, + }, + }, + ["tasks"] = { + [1] = 19, + }, + }, + [4] = { + ["displayName"] = "STRIKE", + ["name"] = "STRIKE", + ["pylons"] = { + [1] = { + ["CLSID"] = "{VSN_F104_LAU115C_AIM9L}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "VSN_F104G_L_PTB", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}", + ["num"] = 8, + }, + [4] = { + ["CLSID"] = "VSN_F104G_R_PTB", + ["num"] = 10, + }, + [5] = { + ["CLSID"] = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}", + ["num"] = 4, + }, + }, + ["tasks"] = { + [1] = 19, + }, + }, + [5] = { + ["displayName"] = "OCA", + ["name"] = "OCA", + ["pylons"] = { + [1] = { + ["CLSID"] = "{VSN_F104_LAU115C_AIM9L}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "VSN_F104G_L_PTB", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}", + ["num"] = 8, + }, + [4] = { + ["CLSID"] = "VSN_F104G_R_PTB", + ["num"] = 10, + }, + [5] = { + ["CLSID"] = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}", + ["num"] = 4, + }, + }, + ["tasks"] = { + [1] = 19, + }, + }, + }, + ["tasks"] = { + }, + ["unitType"] = "VSN_F104C", +} +return unitPayloads diff --git a/resources/factions/usa_1960.json b/resources/factions/usa_1960.json index 1f51d076..f2e3656b 100644 --- a/resources/factions/usa_1960.json +++ b/resources/factions/usa_1960.json @@ -11,6 +11,7 @@ "C-130", "F-86F Sabre", "F-100 Super Sabre", + "F-104C Starfighter", "P-51D-25-NA Mustang", "P-51D-30-NA Mustang", "F-105D Thunderchief", diff --git a/resources/factions/usa_1965.json b/resources/factions/usa_1965.json index 4ed06128..40b24bd5 100644 --- a/resources/factions/usa_1965.json +++ b/resources/factions/usa_1965.json @@ -14,6 +14,7 @@ "F-4E Phantom II", "F-5E Tiger II", "F-100 Super Sabre", + "F-104C Starfighter", "F-105D Thunderchief", "F-105G Thunderchief", "UH-1H Iroquois" diff --git a/resources/ui/units/aircrafts/banners/VSN_F104C_24.jpg b/resources/ui/units/aircrafts/banners/VSN_F104C_24.jpg new file mode 100644 index 00000000..faf4586b Binary files /dev/null and b/resources/ui/units/aircrafts/banners/VSN_F104C_24.jpg differ diff --git a/resources/ui/units/aircrafts/icons/VSN_F104C_24.jpg b/resources/ui/units/aircrafts/icons/VSN_F104C_24.jpg new file mode 100644 index 00000000..d9487a2d Binary files /dev/null and b/resources/ui/units/aircrafts/icons/VSN_F104C_24.jpg differ diff --git a/resources/units/aircraft/VSN_F104C.yaml b/resources/units/aircraft/VSN_F104C.yaml new file mode 100644 index 00000000..381efb6a --- /dev/null +++ b/resources/units/aircraft/VSN_F104C.yaml @@ -0,0 +1,17 @@ +description: + "The Lockheed F-104 Starfighter is a single-engine, supersonic interceptor aircraft\ + \ which was extensively deployed as a fighter-bomber during the Cold War. Created \ + \ as a day fighter by Lockheed as one of the Century Series of fighter aircraft \ + \ for the United States Air Force (USAF), it was developed into an all-weather \ + \ multirole aircraft in the early 1960s and produced by several other nations, \ + \ seeing widespread service outside the United States. \ + \ The F-104C variant was a fighter-bomber for the USAF Tactical Air Command." +introduced: 1958 +manufacturer: Lockheed +origin: USA +price: 9 +role: Fighter-Bomber +max_range: 100 +gunfighter: true +variants: + F-104C Starfighter: {}