diff --git a/game/db.py b/game/db.py index 267d5487..c74dd967 100644 --- a/game/db.py +++ b/game/db.py @@ -90,6 +90,7 @@ from dcs.planes import ( P_51D_30_NA, PlaneType, RQ_1A_Predator, + S_3B, S_3B_Tanker, SpitfireLFMkIX, SpitfireLFMkIXCW, @@ -311,6 +312,7 @@ PRICES = { A_10A: 16, A_10C: 22, A_10C_2: 24, + S_3B: 10, # heli Ka_50: 13, @@ -671,6 +673,7 @@ UNIT_BY_TASK = { RQ_1A_Predator, Rafale_A_S, Rafale_B, + S_3B, SA342L, SA342M, SA342Minigun, @@ -685,7 +688,8 @@ UNIT_BY_TASK = { Tu_160, Tu_22M3, Tu_95MS, - UH_1H, + UH_1H, + SH_60B, WingLoong_I, Hercules ], @@ -709,9 +713,6 @@ UNIT_BY_TASK = { A_50, KJ_2000 ], - AntishipStrike: [ - SH_60B - ], PinpointStrike: [ Armor.APC_MTLB, Armor.APC_MTLB, @@ -1049,7 +1050,7 @@ EXPANDED_TASK_PAYLOAD_OVERRIDE = { "ESCORT": ("CAP HEAVY", "CAP"), "BAI": ( "BAI", "CAS MAVERICK F", "CAS"), "SWEEP": ("CAP HEAVY", "CAP"), - "OCA_RUNWAY": ("RUNWAY_ATTACK","STRIKE"), + "OCA_RUNWAY": ("RUNWAY_ATTACK","RUNWAY_STRIKE","STRIKE"), "OCA_AIRCRAFT": ("OCA","CAS MAVERICK F", "CAS") } @@ -1121,6 +1122,7 @@ PLANE_PAYLOAD_OVERRIDES: Dict[Type[PlaneType], Dict[Type[Task], str]] = { Tornado_IDS: COMMON_OVERRIDE, Mirage_2000_5: COMMON_OVERRIDE, MiG_31: COMMON_OVERRIDE, + S_3B: COMMON_OVERRIDE, SA342M: COMMON_OVERRIDE, SA342L: COMMON_OVERRIDE, SA342Mistral: COMMON_OVERRIDE, @@ -1234,6 +1236,7 @@ CARRIER_CAPABLE = [ Su_33, A_4E_C, Rafale_M, + S_3B, UH_1H, Mi_8MT, diff --git a/gen/flights/ai_flight_planner_db.py b/gen/flights/ai_flight_planner_db.py index b64c66fc..82211f03 100644 --- a/gen/flights/ai_flight_planner_db.py +++ b/gen/flights/ai_flight_planner_db.py @@ -13,7 +13,7 @@ from dcs.helicopters import ( SA342L, SA342M, UH_1H, - SH_60B, + SH_60B ) from dcs.planes import ( AJS37, @@ -64,6 +64,7 @@ from dcs.planes import ( P_51D, P_51D_30_NA, RQ_1A_Predator, + S_3B, SpitfireLFMkIX, SpitfireLFMkIXCW, Su_17M4, @@ -172,6 +173,7 @@ CAS_CAPABLE = [ Su_24M, Su_17M4, AV8BNA, + S_3B, Su_34, Su_30, MiG_29S, @@ -272,6 +274,7 @@ STRIKE_CAPABLE = [ A_10C_2, A_10C, AV8BNA, + S_3B, A_4E_C, M_2000C, MiG_27K, @@ -311,6 +314,7 @@ ANTISHIP_CAPABLE = [ Tornado_IDS, Tornado_GR4, AV8BNA, + S_3B, Ju_88A4, C_101CC, SH_60B, diff --git a/resources/customized_payloads/S-3B.lua b/resources/customized_payloads/S-3B.lua new file mode 100644 index 00000000..bdbdd472 --- /dev/null +++ b/resources/customized_payloads/S-3B.lua @@ -0,0 +1,168 @@ +local unitPayloads = { + ["name"] = "S-3B", + ["payloads"] = { + [1] = { + ["name"] = "SEAD", + ["pylons"] = { + [1] = { + ["CLSID"] = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 5, + }, + [6] = { + ["CLSID"] = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}", + ["num"] = 6, + }, + }, + ["tasks"] = { + [1] = 29, + }, + }, + [2] = { + ["name"] = "ANTISHIP", + ["pylons"] = { + [1] = { + ["CLSID"] = "{8B7CADF9-4954-46B3-8CFB-93F2F5B90B03}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 5, + }, + [6] = { + ["CLSID"] = "{8B7CADF9-4954-46B3-8CFB-93F2F5B90B03}", + ["num"] = 6, + }, + }, + ["tasks"] = { + [1] = 30, + }, + }, + [3] = { + ["name"] = "STRIKE", + ["pylons"] = { + [1] = { + ["CLSID"] = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 5, + }, + [6] = { + ["CLSID"] = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}", + ["num"] = 6, + }, + }, + ["tasks"] = { + [1] = 32, + [1] = 33, + }, + }, + [4] = { + ["name"] = "CAS", + ["pylons"] = { + [1] = { + ["CLSID"] = "{A76344EB-32D2-4532-8FA2-0C1BDC00747E}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + ["num"] = 5, + }, + [6] = { + ["CLSID"] = "{A76344EB-32D2-4532-8FA2-0C1BDC00747E}", + ["num"] = 6, + }, + }, + ["tasks"] = { + [1] = 31, + }, + }, + }, + [5] = { + ["name"] = "RUNWAY_ATTACK", + ["pylons"] = { + [1] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 5, + }, + [6] = { + ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + ["num"] = 6, + }, + }, + ["tasks"] = { + [1] = 34, + }, + }, + ["unitType"] = "S-3B", +} +return unitPayloads diff --git a/resources/factions/usa_1975.json b/resources/factions/usa_1975.json index e8588a89..13093f04 100644 --- a/resources/factions/usa_1975.json +++ b/resources/factions/usa_1975.json @@ -7,6 +7,7 @@ "F_5E_3", "F_4E", "F_14A_135_GR", + "S_3B", "B_52H", "UH_1H" ], diff --git a/resources/factions/usa_1990.json b/resources/factions/usa_1990.json index 8904f404..f33fbdb1 100644 --- a/resources/factions/usa_1990.json +++ b/resources/factions/usa_1990.json @@ -13,6 +13,7 @@ "A_10A", "AV8BNA", "UH_1H", + "S_3B", "SH_60B", "AH_64A", "B_52H", diff --git a/resources/factions/usa_2005.json b/resources/factions/usa_2005.json index 3bee8dda..86bb1330 100644 --- a/resources/factions/usa_2005.json +++ b/resources/factions/usa_2005.json @@ -7,17 +7,18 @@ "F_15C", "F_15E", "F_14B", + "F_117A", "FA_18C_hornet", "F_16C_50", "A_10C", "A_10C_2", "AV8BNA", "UH_1H", + "S_3B", "SH_60B", "AH_64D", "B_52H", - "B_1B", - "F_117A" + "B_1B" ], "awacs": [ "E_3A" diff --git a/resources/factions/usa_2005_c130.json b/resources/factions/usa_2005_c130.json index ccec35db..31997a78 100644 --- a/resources/factions/usa_2005_c130.json +++ b/resources/factions/usa_2005_c130.json @@ -13,6 +13,7 @@ "A_10C_2", "AV8BNA", "UH_1H", + "S_3B", "SH_60B", "AH_64D", "B_52H", diff --git a/resources/factions/usa_2005_modded.json b/resources/factions/usa_2005_modded.json index 9991f540..da821175 100644 --- a/resources/factions/usa_2005_modded.json +++ b/resources/factions/usa_2005_modded.json @@ -13,6 +13,7 @@ "A_10C_2", "AV8BNA", "UH_1H", + "S_3B", "SH_60B", "AH_64D", "B_52H", diff --git a/resources/factions/usn_1985.json b/resources/factions/usn_1985.json index 7be3a7fd..08230c1d 100644 --- a/resources/factions/usn_1985.json +++ b/resources/factions/usn_1985.json @@ -4,13 +4,13 @@ "authors": "HerrTom", "description": "

Highway to the Danger Zone! For Tomcat lovers.

", "aircrafts": [ + "AH_1W", "F_4E", "F_14A_135_GR", "F_14B", "S_3B", - "UH_1H", "SH_60B", - "AH_1W" + "UH_1H" ], "awacs": [ "E_2C"