diff --git a/game/db.py b/game/db.py index 9b4fafc8..f0f19fe0 100644 --- a/game/db.py +++ b/game/db.py @@ -213,18 +213,18 @@ PRICES = { B_1B: 50, # special - IL_76MD: 13, - An_26B: 13, - An_30M: 13, - Yak_40: 13, - S_3B_Tanker: 13, - IL_78M: 13, - KC_135: 13, - KC130: 13, + IL_76MD: 30, + An_26B: 25, + An_30M: 25, + Yak_40: 25, + S_3B_Tanker: 20, + IL_78M: 25, + KC_135: 25, + KC130: 25, - A_50: 8, - E_3A: 8, - C_130: 8, + A_50: 50, + E_3A: 50, + C_130: 25, # WW2 P_51D_30_NA: 18, @@ -232,6 +232,11 @@ PRICES = { P_47D_30: 18, B_17G: 30, + # Drones + MQ_9_Reaper: 12, + RQ_1A_Predator: 6, + WingLoong_I: 6, + # Modded Rafale_M: 26, Rafale_A_S: 26, @@ -464,7 +469,10 @@ UNIT_BY_TASK = { Ju_88A4, B_17G, MB_339PAN, - Rafale_A_S + Rafale_A_S, + WingLoong_I, + MQ_9_Reaper, + RQ_1A_Predator ], Transport: [ IL_76MD, @@ -946,6 +954,9 @@ PLANE_PAYLOAD_OVERRIDES = { Rafale_A_S: COMMON_OVERRIDE, OH_58D: COMMON_OVERRIDE, F_16A: COMMON_OVERRIDE, + MQ_9_Reaper: COMMON_OVERRIDE, + RQ_1A_Predator: COMMON_OVERRIDE, + WingLoong_I: COMMON_OVERRIDE, AH_64D:{ CAS: "AGM-114K*16" diff --git a/game/factions/china_2010.py b/game/factions/china_2010.py index b13faec4..148fdbd0 100644 --- a/game/factions/china_2010.py +++ b/game/factions/china_2010.py @@ -23,6 +23,7 @@ China_2010 = { A_50, Mi_8MT, + Mi_28N, AirDefence.SAM_SA_10_S_300PS_LN_5P85C, # Standing as HQ-9+ AirDefence.SAM_SA_6_Kub_LN_2P25, @@ -73,5 +74,7 @@ China_2010 = { "002 Shandong", ], "boat":[ "Type54GroupGenerator" - ], "has_jtac": True + ], + "has_jtac": True, + "jtac_unit": WingLoong_I } \ No newline at end of file diff --git a/gen/armor.py b/gen/armor.py index d2d74a91..5d9a8b29 100644 --- a/gen/armor.py +++ b/gen/armor.py @@ -101,9 +101,14 @@ class GroundConflictGenerator: if "has_jtac" in self.game.player_faction and self.game.player_faction["has_jtac"] and self.game.settings.include_jtac_if_available: n = "JTAC" + str(self.conflict.from_cp.id) + str(self.conflict.to_cp.id) code = 1688 - len(self.game.jtacs) + + utype = MQ_9_Reaper + if "jtac_unit" in self.game.player_faction: + utype = self.game.player_faction["jtac_unit"] + jtac = self.mission.flight_group(country=self.mission.country(self.game.player_country), name=n, - aircraft_type=MQ_9_Reaper, + aircraft_type=utype, position=position[0], airport=None, altitude=5000) diff --git a/gen/flights/ai_flight_planner_db.py b/gen/flights/ai_flight_planner_db.py index ad909110..ba989284 100644 --- a/gen/flights/ai_flight_planner_db.py +++ b/gen/flights/ai_flight_planner_db.py @@ -138,7 +138,11 @@ CAS_CAPABLE = [ FW_190A8, A_4E_C, - Rafale_A_S + Rafale_A_S, + + WingLoong_I, + MQ_9_Reaper, + RQ_1A_Predator ] # Aircraft used for SEAD / DEAD tasks @@ -227,4 +231,10 @@ ANTISHIP_CAPABLE = [ Ju_88A4, Rafale_A_S -] \ No newline at end of file +] + +DRONES = [ + MQ_9_Reaper, + RQ_1A_Predator, + WingLoong_I +] diff --git a/resources/customized_payloads/MQ-9 Reaper.lua b/resources/customized_payloads/MQ-9 Reaper.lua new file mode 100644 index 00000000..3fcba86c --- /dev/null +++ b/resources/customized_payloads/MQ-9 Reaper.lua @@ -0,0 +1,33 @@ +local unitPayloads = { + ["name"] = "MQ-9 Reaper", + ["payloads"] = { + [1] = { + ["name"] = "CAS", + ["pylons"] = { + [1] = { + ["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}", + ["num"] = 4, + }, + [2] = { + ["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "AGM114x2_OH_58", + ["num"] = 2, + }, + [4] = { + ["CLSID"] = "AGM114x2_OH_58", + ["num"] = 3, + }, + }, + ["tasks"] = { + [1] = 17, + }, + }, + }, + ["tasks"] = { + }, + ["unitType"] = "MQ-9 Reaper", +} +return unitPayloads diff --git a/resources/customized_payloads/RQ-1A Predator.lua b/resources/customized_payloads/RQ-1A Predator.lua new file mode 100644 index 00000000..71efb9d8 --- /dev/null +++ b/resources/customized_payloads/RQ-1A Predator.lua @@ -0,0 +1,23 @@ +local unitPayloads = { + ["name"] = "RQ-1A Predator", + ["payloads"] = { + [1] = { + ["name"] = "CAS", + ["pylons"] = { + [1] = { + ["CLSID"] = "{ee368869-c35a-486a-afe7-284beb7c5d52}", + ["num"] = 2, + }, + [2] = { + ["CLSID"] = "{ee368869-c35a-486a-afe7-284beb7c5d52}", + ["num"] = 1, + }, + }, + ["tasks"] = { + [1] = 17, + }, + }, + }, + ["unitType"] = "RQ-1A Predator", +} +return unitPayloads diff --git a/resources/customized_payloads/WingLoong-I.lua b/resources/customized_payloads/WingLoong-I.lua new file mode 100644 index 00000000..aa1a019a --- /dev/null +++ b/resources/customized_payloads/WingLoong-I.lua @@ -0,0 +1,25 @@ +local unitPayloads = { + ["name"] = "WingLoong-I", + ["payloads"] = { + [1] = { + ["name"] = "CAS", + ["pylons"] = { + [1] = { + ["CLSID"] = "DIS_AKD-10", + ["num"] = 2, + }, + [2] = { + ["CLSID"] = "DIS_AKD-10", + ["num"] = 1, + }, + }, + ["tasks"] = { + [1] = 17, + }, + }, + }, + ["tasks"] = { + }, + ["unitType"] = "WingLoong-I", +} +return unitPayloads