diff --git a/game/db.py b/game/db.py index 6f95a1d6..61426d12 100644 --- a/game/db.py +++ b/game/db.py @@ -87,6 +87,14 @@ vehicle_map["Toyota_bleu"] = frenchpack.DIM__TOYOTA_BLUE vehicle_map["Toyota_vert"] = frenchpack.DIM__TOYOTA_GREEN vehicle_map["Toyota_desert"] = frenchpack.DIM__TOYOTA_DESERT vehicle_map["Kamikaze"] = frenchpack.DIM__KAMIKAZE +vehicle_map["AMX1375"] = frenchpack.AMX_13_75mm +vehicle_map["AMX1390"] = frenchpack.AMX_13_90mm +vehicle_map["VBCI"] = frenchpack.VBCI +vehicle_map["T62"] = frenchpack.Char_T_62 +vehicle_map["T64BV"] = frenchpack.Char_T_64BV +vehicle_map["T72M"] = frenchpack.Char_T_72A +vehicle_map["KORNET"] = frenchpack.KORNET_ATGM + vehicle_map[highdigitsams.AAA_SON_9_Fire_Can.id] = highdigitsams.AAA_SON_9_Fire_Can vehicle_map[highdigitsams.AAA_100mm_KS_19.id] = highdigitsams.AAA_100mm_KS_19 diff --git a/game/factions/faction.py b/game/factions/faction.py index 452fb9a7..83a8f0fa 100644 --- a/game/factions/faction.py +++ b/game/factions/faction.py @@ -301,6 +301,13 @@ class Faction: self.remove_vehicle("Toyota_vert") self.remove_vehicle("Toyota_desert") self.remove_vehicle("Kamikaze") + self.remove_vehicle("AMX1375") + self.remove_vehicle("AMX1390") + self.remove_vehicle("VBCI") + self.remove_vehicle("T62") + self.remove_vehicle("T64BV") + self.remove_vehicle("T72M") + self.remove_vehicle("KORNET") # high digit sams if not mod_settings.high_digit_sams: self.remove_air_defenses("SA10BGenerator") diff --git a/pydcs_extensions/frenchpack/frenchpack.py b/pydcs_extensions/frenchpack/frenchpack.py index 2f02f9e0..faeb6981 100644 --- a/pydcs_extensions/frenchpack/frenchpack.py +++ b/pydcs_extensions/frenchpack/frenchpack.py @@ -256,8 +256,8 @@ class _53T2(unittype.VehicleType): id = "AA20" name = "53T2" detection_range = 5000 - threat_range = 2000 - air_weapon_dist = 2000 + threat_range = 4000 + air_weapon_dist = 4000 class TRM_2000_53T2(unittype.VehicleType): @@ -278,6 +278,71 @@ class TRM_2000_PAMELA(unittype.VehicleType): eplrs = True +class Leclerc_Serie_XXI_Desert(unittype.VehicleType): + id = "Leclerc_XXI_Desert" + name = "Leclerc Série XXI Désert" + detection_range = 0 + threat_range = 4000 + air_weapon_dist = 4000 + + +class AMX_13_75mm(unittype.VehicleType): + id = "AMX1375" + name = "AMX-13 75mm" + detection_range = 0 + threat_range = 3500 + air_weapon_dist = 3500 + + +class AMX_13_90mm(unittype.VehicleType): + id = "AMX1390" + name = "AMX-13 90mm" + detection_range = 0 + threat_range = 3500 + air_weapon_dist = 3500 + + +class VBCI(unittype.VehicleType): + id = "VBCI" + name = "VBCI" + detection_range = 0 + threat_range = 3500 + air_weapon_dist = 3500 + eplrs = True + + +class Char_T_62(unittype.VehicleType): + id = "T62" + name = "Char T-62" + detection_range = 0 + threat_range = 4000 + air_weapon_dist = 4000 + + +class Char_T_64BV(unittype.VehicleType): + id = "T64BV" + name = "Char T-64BV" + detection_range = 0 + threat_range = 4000 + air_weapon_dist = 4000 + + +class Char_T_72A(unittype.VehicleType): + id = "T72M" + name = "Char T-72A" + detection_range = 0 + threat_range = 4000 + air_weapon_dist = 4000 + + +class KORNET_ATGM(unittype.VehicleType): + id = "KORNET" + name = "KORNET ATGM" + detection_range = 0 + threat_range = 0 + air_weapon_dist = 0 + + ## INFANTRY diff --git a/pydcs_extensions/mod_units.py b/pydcs_extensions/mod_units.py index d923c4c5..805818e6 100644 --- a/pydcs_extensions/mod_units.py +++ b/pydcs_extensions/mod_units.py @@ -49,6 +49,13 @@ MODDED_VEHICLES = [ frenchpack.DIM__TOYOTA_GREEN, frenchpack.DIM__TOYOTA_DESERT, frenchpack.DIM__KAMIKAZE, + frenchpack.VBCI, + frenchpack.AMX_13_75mm, + frenchpack.AMX_13_90mm, + frenchpack.Char_T_62, + frenchpack.Char_T_64BV, + frenchpack.Char_T_72A, + frenchpack.KORNET_ATGM, highdigitsams.AAA_SON_9_Fire_Can, highdigitsams.AAA_100mm_KS_19, highdigitsams.SAM_SA_10B_S_300PS_54K6_CP, diff --git a/resources/factions/france_1985.json b/resources/factions/france_1985.json index a23613d0..c1b77dbc 100644 --- a/resources/factions/france_1985.json +++ b/resources/factions/france_1985.json @@ -2,7 +2,7 @@ "country": "France", "name": "France 1985", "authors": "Colonel Panic", - "description": "

1980s French equipment using FrenchPack.

", + "description": "

France 1985. Frenchpack 4.6+ mod is recommended to enable most of the ground units of this faction available.

", "locales": [ "fr_FR" ], @@ -32,6 +32,9 @@ "VAB Mephisto", "VAB T20/13", "VBL .50", + "VBL AANF1", + "AMX-13 75mm", + "AMX-13 90mm", "VBL AANF1" ], "artillery_units": [ diff --git a/resources/factions/france_1995.json b/resources/factions/france_1995.json index 1615dd24..761b12c6 100644 --- a/resources/factions/france_1995.json +++ b/resources/factions/france_1995.json @@ -2,7 +2,7 @@ "country": "France", "name": "France 1995", "authors": "Khopa", - "description": "

France in the late 90s before Rafale introduction. A Mirage-2000 centric faction choice.

", + "description": "

France in the late 90s before Rafale introduction. A Mirage-2000 centric faction choice. Frenchpack 4.6+ mod is recommended to enable most of the ground units of this faction available.

", "locales": [ "fr_FR" ], @@ -22,12 +22,19 @@ "KC-135 Stratotanker" ], "frontline_units": [ - "Cobra", - "LAV-25", + "AMX-10 RCR", + "AMX-13 90mm", + "AMX.30B2", "Leclerc S\u00e9ries 2", + "Leclerc_XXI", + "Pamela", + "Panhard", "Roland 2 (Marder Chassis)", - "TPz Fuchs", - "VAB Mephisto" + "VAB .50", + "VAB Mephisto", + "VAB T20/13", + "VBL .50", + "VBL AANF1" ], "artillery_units": [ "M109A6 Paladin", @@ -71,4 +78,4 @@ ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" -} \ No newline at end of file +} diff --git a/resources/factions/france_2005.json b/resources/factions/france_2005.json index 3b460ed4..18a079b8 100644 --- a/resources/factions/france_2005.json +++ b/resources/factions/france_2005.json @@ -2,7 +2,7 @@ "country": "France", "name": "France 2005", "authors": "HerrTom", - "description": "

French equipment using the Frenchpack, but without the Rafale mod.

", + "description": "

France 2005. Frenchpack 4.6+ mod is recommended to enable most of the ground units of this faction available.

", "locales": [ "fr_FR" ], @@ -23,7 +23,7 @@ "KC-135 Stratotanker" ], "frontline_units": [ - "AMX.30B2", + "AMX-10RCR SEPAR", "Leclerc S\u00e9ries 2", "Leclerc_XXI", "Pamela", @@ -33,7 +33,8 @@ "VAB Mephisto", "VAB T20/13", "VBL .50", - "VBL AANF1" + "VBL AANF1", + "VBCI" ], "artillery_units": [ "M109A6 Paladin", diff --git a/resources/units/ground_units/AA20.yaml b/resources/units/ground_units/AA20.yaml index 01ab88a9..c5289c6a 100644 --- a/resources/units/ground_units/AA20.yaml +++ b/resources/units/ground_units/AA20.yaml @@ -1,3 +1,4 @@ +class: SHORADS price: 4 variants: 53T2: null diff --git a/resources/units/ground_units/AMX1375.yaml b/resources/units/ground_units/AMX1375.yaml new file mode 100644 index 00000000..9a821254 --- /dev/null +++ b/resources/units/ground_units/AMX1375.yaml @@ -0,0 +1,9 @@ +class: Tank +description: "The AMX-13 is a French light tank produced from 1952 to 1987. It served with the French Army, as the Char 13t-75 Modèle 51, and was exported to more than 26 other nations. Named after its initial weight of 13 tonnes, and featuring a tough and reliable chassis,[1] it was fitted with an oscillating turret built by GIAT Industries (now Nexter) with revolver type magazines, which were also used on the Austrian SK-105 Kürassier.[1] Including prototypes and export versions, there are over a hundred variants including self-propelled guns, anti-aircraft systems, APCs, and ATGM versions. This specific version isan early one fitted with a 75mm gun." +introduced: 1952 +manufacturer: Atelier de Construction d'Issy-les-Moulineaux +origin: France +price: 10 +role: Light Tank +variants: + AMX-13 75mm: {} diff --git a/resources/units/ground_units/AMX1390.yaml b/resources/units/ground_units/AMX1390.yaml new file mode 100644 index 00000000..dd17d2cd --- /dev/null +++ b/resources/units/ground_units/AMX1390.yaml @@ -0,0 +1,9 @@ +class: Tank +description: "The AMX-13 is a French light tank produced from 1952 to 1987. It served with the French Army, as the Char 13t-75 Modèle 51, and was exported to more than 26 other nations. Named after its initial weight of 13 tonnes, and featuring a tough and reliable chassis,[1] it was fitted with an oscillating turret built by GIAT Industries (now Nexter) with revolver type magazines, which were also used on the Austrian SK-105 Kürassier.[1] Including prototypes and export versions, there are over a hundred variants including self-propelled guns, anti-aircraft systems, APCs, and ATGM versions. This specific version is a late one fitted with a 90mm gun." +introduced: 1966 +manufacturer: Atelier de Construction d'Issy-les-Moulineaux +origin: France +price: 12 +role: Light Tank +variants: + AMX-13 90mm: {} diff --git a/resources/units/ground_units/TRM2000_AA20.yaml b/resources/units/ground_units/TRM2000_AA20.yaml index 55b8b273..4adf1de6 100644 --- a/resources/units/ground_units/TRM2000_AA20.yaml +++ b/resources/units/ground_units/TRM2000_AA20.yaml @@ -1,3 +1,4 @@ +class: SHORADS price: 8 variants: - TRM-2000 53T2: null + TRM-2000 53T2: {} diff --git a/resources/units/ground_units/TRMMISTRAL.yaml b/resources/units/ground_units/TRMMISTRAL.yaml index 0df6ee7e..40b2f9fb 100644 --- a/resources/units/ground_units/TRMMISTRAL.yaml +++ b/resources/units/ground_units/TRMMISTRAL.yaml @@ -1,5 +1,5 @@ -class: ATGM -description: WIP - Mistral Missile on a Truck. +class: SHORADS +description: Mistral Missile on a Truck. introduced: 1993 manufacturer: GIAT Industries origin: France diff --git a/resources/units/ground_units/VAB_HOT.yaml b/resources/units/ground_units/VAB_HOT.yaml index 2995601e..9fb72a2b 100644 --- a/resources/units/ground_units/VAB_HOT.yaml +++ b/resources/units/ground_units/VAB_HOT.yaml @@ -7,4 +7,4 @@ origin: France price: 8 role: ATGM Vehicle variants: - VAB Mephisto: {} + VAB Mephisto Frenchpack: {} diff --git a/resources/units/ground_units/VBCI.yaml b/resources/units/ground_units/VBCI.yaml new file mode 100644 index 00000000..54874564 --- /dev/null +++ b/resources/units/ground_units/VBCI.yaml @@ -0,0 +1,9 @@ +class: IFV +description: "The Véhicule Blindé de Combat d'Infanterie (VBCI : Armoured vehicle for infantry combat) is a French Infantry fighting vehicle designed to replace the AMX-10P." +introduced: 2005 +manufacturer: Nexter Systems +origin: France +price: 14 +role: Infantry Fighting Vehicle +variants: + VBCI: {} diff --git a/resources/units/ground_units/VBL50.yaml b/resources/units/ground_units/VBL50.yaml index fb73295e..679f737d 100644 --- a/resources/units/ground_units/VBL50.yaml +++ b/resources/units/ground_units/VBL50.yaml @@ -1,3 +1,9 @@ -price: 4 +class: Recon +description: The Panhard Véhicule Blindé Léger ("Light armoured vehicle"), also known by its acronym Panhard VBL or simply VBL, is a French wheeled 4x4 all-terrain vehicle built by Panhard. The vehicle is offered in various configurations, and was designed to combine the agility of the Peugeot P4 liaison vehicle with adequate protection against small arms fire, artillery fragments, mines and NBC weapons. Produced between 1985 and 2010, the vehicle has been used by the French Army and other European, African and Central American armies in various conflicts since the 1980s. This variant is equiped with .50 cal gun. +introduced: 1985 +manufacturer: Panhard +origin: France +price: 2 +role: Recon Vehicle variants: VBL .50: null diff --git a/resources/units/ground_units/VBLANF1.yaml b/resources/units/ground_units/VBLANF1.yaml index 48b18b81..b36516ae 100644 --- a/resources/units/ground_units/VBLANF1.yaml +++ b/resources/units/ground_units/VBLANF1.yaml @@ -1,3 +1,9 @@ +class: Recon +description: The Panhard Véhicule Blindé Léger ("Light armoured vehicle"), also known by its acronym Panhard VBL or simply VBL, is a French wheeled 4x4 all-terrain vehicle built by Panhard. The vehicle is offered in various configurations, and was designed to combine the agility of the Peugeot P4 liaison vehicle with adequate protection against small arms fire, artillery fragments, mines and NBC weapons. Produced between 1985 and 2010, the vehicle has been used by the French Army and other European, African and Central American armies in various conflicts since the 1980s. This variant is equiped with the AN/F1 machine gun. +introduced: 1985 +manufacturer: Panhard +origin: France price: 2 +role: Recon Vehicle variants: VBL AANF1: null