From b4e5efe3c099179f213bf92f93a8bb3986dfe092 Mon Sep 17 00:00:00 2001 From: MetalStormGhost Date: Sun, 24 Apr 2022 16:39:21 +0300 Subject: [PATCH] Added "F-16I Sufa" and "F-16C Fighting Falcon (IDF mod)" to Israel factions and added missing planemod decorators. --- game/ato/ai_flight_planner_db.py | 11 +++++++++++ game/factions/faction.py | 5 +++++ pydcs_extensions/f16i_idf/f16i_idf.py | 7 +++++-- resources/factions/Israel-USN_2005_Allied_Sword.json | 2 ++ resources/factions/israel_2000.json | 2 ++ resources/factions/israel_2012.json | 2 ++ 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/game/ato/ai_flight_planner_db.py b/game/ato/ai_flight_planner_db.py index 77c0c4e5..efce6edd 100644 --- a/game/ato/ai_flight_planner_db.py +++ b/game/ato/ai_flight_planner_db.py @@ -122,6 +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.f104.f104 import VSN_F104G, VSN_F104S, VSN_F104S_AG +from pydcs_extensions.f16i_idf.f16i_idf import F_16C_BARAK_2020, F_16I from pydcs_extensions.f22a.f22a import F_22A from pydcs_extensions.hercules.hercules import Hercules from pydcs_extensions.jas39.jas39 import JAS39Gripen, JAS39Gripen_AG @@ -149,6 +150,8 @@ CAP_CAPABLE = [ Su_27, MiG_29S, F_16C_50, + F_16C_BARAK_2020, + F_16I, FA_18C_hornet, JF_17, JAS39Gripen, @@ -207,6 +210,8 @@ CAS_CAPABLE = [ Su_25, F_15E, F_16C_50, + F_16C_BARAK_2020, + F_16I, FA_18C_hornet, Tornado_GR4, Tornado_IDS, @@ -284,6 +289,8 @@ CAS_CAPABLE = [ SEAD_CAPABLE = [ JF_17, F_16C_50, + F_16C_BARAK_2020, + F_16I, FA_18C_hornet, Tornado_IDS, Su_25T, @@ -345,6 +352,8 @@ STRIKE_CAPABLE = [ AJS37, Tornado_GR4, F_16C_50, + F_16C_BARAK_2020, + F_16I, FA_18C_hornet, AV8BNA, JF_17, @@ -446,6 +455,8 @@ RUNWAY_ATTACK_CAPABLE = [ F_15E, AJS37, F_16C_50, + F_16C_BARAK_2020, + F_16I, FA_18C_hornet, AV8BNA, JF_17, diff --git a/game/factions/faction.py b/game/factions/faction.py index 1fa8ff59..80b6930d 100644 --- a/game/factions/faction.py +++ b/game/factions/faction.py @@ -310,6 +310,11 @@ class Faction: if not mod_settings.uh_60l: self.remove_aircraft("UH-60L") self.remove_aircraft("KC130J") + if not mod_settings.f_16_idf: + self.remove_aircraft("F-16I") + self.remove_aircraft("F-16C-BARAK 2020") + else: + inject_F16I() if not mod_settings.f22_raptor: self.remove_aircraft("F-22A") if not mod_settings.f104_starfighter: diff --git a/pydcs_extensions/f16i_idf/f16i_idf.py b/pydcs_extensions/f16i_idf/f16i_idf.py index aa5434ac..21c50178 100644 --- a/pydcs_extensions/f16i_idf/f16i_idf.py +++ b/pydcs_extensions/f16i_idf/f16i_idf.py @@ -6,6 +6,7 @@ from dcs import task from dcs.planes import F_16C_50, PlaneType from dcs.weapons_data import Weapons +from game.modsupport import planemod from pydcs_extensions.pylon_injector import inject_pylon from pydcs_extensions.weapon_injector import inject_weapons from qt_ui.uiconstants import AIRCRAFT_ICONS, AIRCRAFT_BANNERS @@ -297,6 +298,7 @@ def inject_F16I() -> None: inject_custom_payloads(Path(THIS_DIR.parent / "resources/mod_payloads/f16i_idf")) +@planemod class F_16I(PlaneType): id = "F-16I" height = 5.02 @@ -4156,7 +4158,7 @@ class F_16I(PlaneType): class Pylon12: ALQ_184 = (12, Weapons.ALQ_184) - pylons: {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12} + pylons = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12} tasks = [ task.CAP, @@ -4175,6 +4177,7 @@ class F_16I(PlaneType): task_default = task.CAP +@planemod class F_16C_BARAK_2020(PlaneType): id = "F-16C-BARAK 2020" height = 5.02 @@ -5185,7 +5188,7 @@ class F_16C_BARAK_2020(PlaneType): class Pylon14: ALQ_184 = (14, Weapons.ALQ_184) - pylons: {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14} + pylons = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14} tasks = [ task.CAP, diff --git a/resources/factions/Israel-USN_2005_Allied_Sword.json b/resources/factions/Israel-USN_2005_Allied_Sword.json index ed7e2fc8..54ea2f04 100644 --- a/resources/factions/Israel-USN_2005_Allied_Sword.json +++ b/resources/factions/Israel-USN_2005_Allied_Sword.json @@ -11,6 +11,8 @@ "F-15C Eagle", "F-15E Strike Eagle", "F-16CM Fighting Falcon (Block 50)", + "F-16C Fighting Falcon (IDF mod)", + "F-16I Sufa", "F-14B Tomcat", "F/A-18C Hornet (Lot 20)", "AV-8B Harrier II Night Attack", diff --git a/resources/factions/israel_2000.json b/resources/factions/israel_2000.json index c81a3515..1a621d59 100644 --- a/resources/factions/israel_2000.json +++ b/resources/factions/israel_2000.json @@ -15,6 +15,8 @@ "F-15C Eagle", "F-15E Strike Eagle", "F-16CM Fighting Falcon (Block 50)", + "F-16C Fighting Falcon (IDF mod)", + "F-16I Sufa", "F-4E Phantom II", "UH-1H Iroquois", "UH-60L" diff --git a/resources/factions/israel_2012.json b/resources/factions/israel_2012.json index c8cc4160..1ed7ea65 100644 --- a/resources/factions/israel_2012.json +++ b/resources/factions/israel_2012.json @@ -15,6 +15,8 @@ "F-15C Eagle", "F-15E Strike Eagle", "F-16CM Fighting Falcon (Block 50)", + "F-16C Fighting Falcon (IDF mod)", + "F-16I Sufa", "F/A-18C Hornet (Lot 20)", "Mirage 2000C", "UH-1H Iroquois",