Merge branch 'develop' into helipads

# Conflicts: # game/data/weapons.py # game/db.py # game/theater/conflicttheater.py # resources/factions/france_1995.json # resources/factions/insurgents.json # resources/factions/iraq_1991.json # resources/factions/syria_1967_with_ww2_weapons.json # resources/factions/syria_2011.json
2025-11-10 14:22:26 +00:00 · 2021-05-21 13:58:22 +02:00
parent cc93c686d9 39b9a7f0ed
commit f31861441b
55 changed files with 345 additions and 132 deletions
--- a/resources/factions/NATO_Desert_Storm.json
+++ b/resources/factions/NATO_Desert_Storm.json
@@ -47,7 +47,8 @@
    "MBT_Challenger_II",	
    "MBT_M60A3_Patton",
    "SPG_Stryker_MGS",
-    "SAM_Avenger__Stinger"
+    "SAM_Avenger__Stinger",
+    "ATGM_VAB_Mephisto"
  ],
  "artillery_units": [
    "MLRS_M270_227mm",
--- a/resources/factions/bluefor_modern.json
+++ b/resources/factions/bluefor_modern.json
@@ -46,7 +46,8 @@
    "Scout_HMMWV",
    "ATGM_HMMWV",
    "SAM_Linebacker___Bradley_M6",
-    "SAM_Avenger__Stinger"
+    "SAM_Avenger__Stinger",
+    "ATGM_VAB_Mephisto"
  ],
  "artillery_units": [
    "MLRS_M270_227mm",
--- a/resources/factions/france_1985_frenchpack.json
+++ b/resources/factions/france_1985_frenchpack.json
@@ -23,13 +23,10 @@
    "ERC_90",
    "TRM_2000_PAMELA",
    "VAB__50",
-    "VAB_MEPHISTO",
-    "VAB_T20_13",
+    "ATGM_VAB_Mephisto",
    "VAB_T20_13",
    "VBL__50",
    "VBL_AANF1",
-    "VBAE_CRAB",
-    "VBAE_CRAB_MMP",
    "AMX_30B2",
    "SAM_Roland_ADS"
  ],
--- a/resources/factions/france_1995.json
+++ b/resources/factions/france_1995.json
@@ -21,10 +21,8 @@
    "MBT_Leclerc",
    "APC_TPz_Fuchs",
    "Scout_Cobra",
-    "ATGM_Stryker",
    "IFV_LAV_25",
-    "Scout_HMMWV",
-    "ATGM_HMMWV",
+    "ATGM_VAB_Mephisto",
    "SAM_Roland_ADS"
  ],
  "artillery_units": [
--- a/resources/factions/france_2005_frenchpack.json
+++ b/resources/factions/france_2005_frenchpack.json
@@ -24,7 +24,6 @@
    "ERC_90",
    "TRM_2000_PAMELA",
    "VAB__50",
-    "VAB_MEPHISTO",
    "VAB_T20_13",
    "VAB_T20_13",
    "VBL__50",
@@ -33,7 +32,8 @@
    "VBAE_CRAB_MMP",
    "AMX_30B2",
    "Leclerc_Serie_XXI",
-    "SAM_Roland_ADS"
+    "SAM_Roland_ADS",
+    "ATGM_VAB_Mephisto"
  ],
  "artillery_units": [
    "MLRS_M270_227mm",
--- a/resources/factions/georgia_2008.json
+++ b/resources/factions/georgia_2008.json
@@ -45,6 +45,9 @@
    "ZU23Generator",
    "ZU23UralGenerator"
  ],
+  "navy_generators": [
+     "LaCombattanteIIGroupGenerator"
+  ],
  "requirements": {},
  "has_jtac": true,
  "jtac_unit": "MQ_9_Reaper"
--- a/resources/factions/germany_1990.json
+++ b/resources/factions/germany_1990.json
@@ -61,7 +61,8 @@
  "helicopter_carrier_names": [
  ],
  "navy_generators": [
-    "OliverHazardPerryGroupGenerator"
+    "OliverHazardPerryGroupGenerator",
+    "LaCombattanteIIGroupGenerator"
  ],
  "has_jtac": true,
  "jtac_unit": "MQ_9_Reaper"
--- a/resources/factions/greece_2005.json
+++ b/resources/factions/greece_2005.json
@@ -46,6 +46,9 @@
    "HawkEwrGenerator",
    "FlatFaceGenerator"
  ],
+  "navy_generators": [
+     "LaCombattanteIIGroupGenerator"
+  ],
  "has_jtac": true,
  "jtac_unit": "MQ_9_Reaper"
 }
--- a/resources/factions/insurgents.json
+++ b/resources/factions/insurgents.json
@@ -9,6 +9,7 @@
    "Scout_Cobra",
    "APC_MTLB",
    "Scout_BRDM_2",
+    "LT_PT_76",
    "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375"
  ],
  "artillery_units": [
--- a/resources/factions/insurgents_hard.json
+++ b/resources/factions/insurgents_hard.json
@@ -11,6 +11,7 @@
    "Scout_BRDM_2",
    "APC_BTR_80",
    "APC_BTR_RD",
+    "LT_PT_76",
    "IFV_BMP_1",
    "MBT_T_55",
    "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375",
--- a/resources/factions/iran_1988.json
+++ b/resources/factions/iran_1988.json
@@ -20,6 +20,7 @@
    "APC_M113",
    "APC_BTR_80",
    "MBT_M60A3_Patton",
+    "MBT_Chieftain_Mk_3",
    "IFV_BMP_1",
    "SPAAA_ZSU_23_4_Shilka_Gun_Dish",
    "SPAAA_ZSU_57_2",
@@ -75,7 +76,7 @@
  ],
  "coastal_group_count": 2,
  "navy_generators": [
-    "GrishaGroupGenerator",
+    "LaCombattanteIIGroupGenerator",
    "MolniyaGroupGenerator"
  ],
  "has_jtac": true,
--- a/resources/factions/iran_2015.json
+++ b/resources/factions/iran_2015.json
@@ -26,6 +26,7 @@
    "APC_M113",
    "APC_BTR_80",
    "MBT_M60A3_Patton",
+    "MBT_Chieftain_Mk_3",
    "IFV_BMP_1",
    "MBT_T_72B",
    "SPAAA_ZSU_23_4_Shilka_Gun_Dish",
@@ -85,7 +86,8 @@
  "coastal_group_count": 3,
  "navy_generators": [
    "GrishaGroupGenerator",
-    "MolniyaGroupGenerator"
+    "MolniyaGroupGenerator",
+    "LaCombattanteIIGroupGenerator"
  ],
  "has_jtac": true,
  "jtac_unit": "MQ_9_Reaper"
--- a/resources/factions/iraq_1991.json
+++ b/resources/factions/iraq_1991.json
@@ -29,8 +29,10 @@
    "APC_MTLB",
    "MBT_T_55",
    "MBT_T_72B",
+    "MBT_Chieftain_Mk_3",
    "APC_BTR_80",
    "Scout_BRDM_2",
+    "LT_PT_76",
    "SPH_2S1_Gvozdika_122mm",
    "SPAAA_ZSU_57_2",
    "SPAAA_ZSU_23_4_Shilka_Gun_Dish"
--- a/resources/factions/libya_2011.json
+++ b/resources/factions/libya_2011.json
@@ -21,6 +21,7 @@
    "Scout_BRDM_2",
    "MBT_T_72B",
    "MBT_T_55",
+    "LT_PT_76",
    "SPAAA_ZSU_23_4_Shilka_Gun_Dish",
    "SAM_SA_8_Osa_Gecko_TEL"
  ],
@@ -71,6 +72,6 @@
  "carrier_names": [
  ],
  "navy_generators": [
-     "GrishaGroupGenerator", "MolniyaGroupGenerator"
+     "GrishaGroupGenerator", "MolniyaGroupGenerator", "LaCombattanteIIGroupGenerator"
  ]
 }
--- a/resources/factions/north_korea_2000.json
+++ b/resources/factions/north_korea_2000.json
@@ -25,6 +25,7 @@
    "MBT_T_55",
    "MBT_T_72B",
    "MBT_T_80U",
+    "LT_PT_76",
    "SPAAA_ZSU_57_2",
    "SAM_SA_9_Strela_1_Gaskin_TEL"
  ],
--- a/resources/factions/russia_1955.json
+++ b/resources/factions/russia_1955.json
@@ -17,6 +17,7 @@
    "Grad_MRL_FDDM__FC",
    "APC_MTLB",
    "MBT_T_55",
+    "LT_PT_76",
    "SPAAA_ZU_23_2_Mounted_Ural_375",
    "AAA_8_8cm_Flak_18",
    "AAA_S_60_57mm"
--- a/resources/factions/russia_1965.json
+++ b/resources/factions/russia_1965.json
@@ -22,6 +22,7 @@
    "APC_BTR_RD",
    "IFV_BMD_1",
    "IFV_BMP_1",
+    "LT_PT_76",
    "MBT_T_55",
    "SPAAA_ZU_23_2_Mounted_Ural_375",
    "SPAAA_ZSU_57_2",
--- a/resources/factions/russia_1970_limited_air.json
+++ b/resources/factions/russia_1970_limited_air.json
@@ -14,6 +14,7 @@
    "APC_BTR_80",
    "IFV_BMD_1",
    "IFV_BMP_1",
+    "LT_PT_76",
    "MBT_T_55",
    "SPAAA_ZSU_57_2"
  ],
--- a/resources/factions/russia_1975.json
+++ b/resources/factions/russia_1975.json
@@ -27,6 +27,7 @@
    "APC_BTR_80",
    "IFV_BMD_1",
    "IFV_BMP_1",
+    "LT_PT_76",
    "MBT_T_55",
    "SAM_SA_8_Osa_Gecko_TEL"
  ],
--- a/resources/factions/syria_1967.json
+++ b/resources/factions/syria_1967.json
@@ -20,6 +20,7 @@
    "Scout_BRDM_2",
    "Tk_PzIV_H",
    "MBT_T_55",
+    "LT_PT_76",
    "SPAAA_ZU_23_2_Mounted_Ural_375",
    "SPAAA_ZSU_57_2",
    "AAA_S_60_57mm"
--- a/resources/factions/syria_1967_with_ww2_weapons.json
+++ b/resources/factions/syria_1967_with_ww2_weapons.json
@@ -20,6 +20,7 @@
  "frontline_units": [
    "Scout_BRDM_2",
    "MBT_T_55",
+    "LT_PT_76",
    "Tk_PzIV_H",
    "SPG_StuG_III_Ausf__G",
    "SPG_Jagdpanzer_IV",
--- a/resources/factions/syria_1973.json
+++ b/resources/factions/syria_1973.json
@@ -20,6 +20,7 @@
    "IFV_BMP_1",
    "APC_MTLB",
    "MBT_T_55",
+    "LT_PT_76",
    "SPAAA_ZU_23_2_Mounted_Ural_375",
    "SPAAA_ZSU_57_2",
    "AAA_S_60_57mm"
--- a/resources/factions/syria_1982.json
+++ b/resources/factions/syria_1982.json
@@ -21,6 +21,7 @@
    "IFV_BMP_1",
    "APC_MTLB",
    "MBT_T_55",
+    "LT_PT_76",
    "MBT_T_72B",
    "SPAAA_ZU_23_2_Mounted_Ural_375",
    "SPAAA_ZSU_57_2",
--- a/resources/factions/syria_2011.json
+++ b/resources/factions/syria_2011.json
@@ -27,6 +27,7 @@
    "IFV_BMP_2",
    "APC_BTR_80",
    "Scout_BRDM_2",
+    "LT_PT_76",
    "APC_MTLB",
    "Scout_Cobra",
    "MBT_T_55",
--- a/resources/factions/turkey_2005.json
+++ b/resources/factions/turkey_2005.json
@@ -25,7 +25,7 @@
    "SAM_Avenger__Stinger"
  ],
  "artillery_units": [
-    "SPH_M109_Paladin_155mm"
+    "SPH_T155_Firtina_155mm"
  ],
  "logistics_units": [
    "Truck_M818_6x6"
--- a/resources/factions/uk_1990.json
+++ b/resources/factions/uk_1990.json
@@ -19,6 +19,7 @@
  ],
  "frontline_units": [
    "MBT_Challenger_II",
+    "MBT_Chieftain_Mk_3",
    "IFV_Warrior",
    "Scout_HMMWV",
    "ATGM_HMMWV",
--- a/resources/ui/map/map.js
+++ b/resources/ui/map/map.js
@@ -570,7 +570,7 @@ class Waypoint {
  }

  includeInPath() {
-    return !this.waypoint.isDivert;
+    return !this.waypoint.isDivert && !this.waypoint.isBullseye;
  }
 }