Merge branch 'master' into develop

# Conflicts: # changelog.md # game/db.py # game/game.py # game/income.py # game/theater/theatergroundobject.py # game/version.py # qt_ui/windows/finances/QFinancesMenu.py
2025-11-10 14:22:26 +00:00 · 2021-01-05 19:50:29 +01:00
parent ef143a7ebb 068f9e42d7
commit cf583bcd55
79 changed files with 133 additions and 134 deletions
--- a/resources/factions/france_1995.json
+++ b/resources/factions/france_1995.json
@@ -37,7 +37,8 @@
  "infantry_units": [
    "Infantry_M4",
    "Soldier_M249",
-    "Stinger_MANPADS"
+    "Stinger_MANPADS",
+    "_2B11_mortar"
  ],
  "air_defenses": [
    "RolandGenerator",
--- a/resources/factions/germany_1944.json
+++ b/resources/factions/germany_1944.json
@@ -19,6 +19,8 @@
    "Sd_Kfz_184_Elefant",
    "TD_Jagdpanther_G1",
    "TD_Jagdpanzer_IV",
+    "StuG_III_Ausf__G",
+    "StuG_IV",
    "AAA_8_8cm_Flak_18",
    "AAA_8_8cm_Flak_41"
  ],
--- a/resources/factions/germany_1990.json
+++ b/resources/factions/germany_1990.json
@@ -33,6 +33,7 @@
  "infantry_units": [
    "Infantry_M4",
    "Soldier_M249",
+    "_2B11_mortar",
    "Stinger_MANPADS"
  ],
  "air_defenses": [
--- a/resources/factions/insurgents.json
+++ b/resources/factions/insurgents.json
@@ -22,6 +22,7 @@
  "infantry_units": [
    "Infantry_Soldier_Insurgents",
    "Soldier_RPG",
+    "_2B11_mortar",
    "SAM_SA_18_Igla_MANPADS"
  ],
  "air_defenses": [
--- a/resources/factions/insurgents_hard.json
+++ b/resources/factions/insurgents_hard.json
@@ -1,6 +1,6 @@
 {
  "country": "Insurgents",
-  "name": "Insurgents",
+  "name": "Insurgents (Hard)",
  "authors": "Khopa",
  "description": "<p>Insurgents faction.</p>",
  "aircrafts": [
@@ -14,7 +14,6 @@
    "IFV_BMP_1",
    "MBT_T_55",
    "AAA_ZU_23_Insurgent_on_Ural_375",
-    "AAA_ZSU_57_2",
    "AAA_ZSU_57_2"
  ],
  "artillery_units": [
@@ -28,6 +27,7 @@
  "infantry_units": [
    "Infantry_Soldier_Insurgents",
    "Soldier_RPG",
+    "_2B11_mortar",
    "SAM_SA_18_Igla_MANPADS"
  ],
  "air_defenses": [
--- a/resources/factions/russia_1975.json
+++ b/resources/factions/russia_1975.json
@@ -39,7 +39,8 @@
  ],
  "infantry_units": [
    "Infantry_Soldier_Rus",
-    "Soldier_RPG"
+    "Soldier_RPG",
+    "_2B11_mortar"
  ],
  "air_defenses": [
    "ColdWarFlakGenerator",
--- a/resources/factions/russia_1990.json
+++ b/resources/factions/russia_1990.json
@@ -44,6 +44,7 @@
    "Paratrooper_AKS",
    "Infantry_Soldier_Rus",
    "Paratrooper_RPG_16",
+    "_2B11_mortar",
    "SAM_SA_18_Igla_S_MANPADS"
  ],
  "air_defenses": [
--- a/resources/factions/russia_2010.json
+++ b/resources/factions/russia_2010.json
@@ -49,6 +49,7 @@
    "Paratrooper_AKS",
    "Infantry_Soldier_Rus",
    "Paratrooper_RPG_16",
+    "_2B11_mortar",
    "SAM_SA_18_Igla_MANPADS"
  ],
  "air_defenses": [
--- a/resources/factions/uk_1990.json
+++ b/resources/factions/uk_1990.json
@@ -34,6 +34,7 @@
  "infantry_units": [
    "Infantry_M4",
    "Soldier_M249",
+    "_2B11_mortar",
    "Stinger_MANPADS"
  ],
  "air_defenses": [
--- a/resources/factions/usa_1990.json
+++ b/resources/factions/usa_1990.json
@@ -45,7 +45,8 @@
  "infantry_units": [
    "Infantry_M4",
    "Soldier_M249",
-    "Stinger_MANPADS"
+    "Stinger_MANPADS",
+    "_2B11_mortar"
  ],
  "air_defenses": [
    "AvengerGenerator",
--- a/resources/factions/usa_2005.json
+++ b/resources/factions/usa_2005.json
@@ -46,7 +46,8 @@
  "infantry_units": [
    "Infantry_M4",
    "Soldier_M249",
-    "Stinger_MANPADS"
+    "Stinger_MANPADS",
+    "_2B11_mortar"
  ],
  "air_defenses": [
    "AvengerGenerator",
--- a/resources/factions/usa_2005_c130.json
+++ b/resources/factions/usa_2005_c130.json
@@ -47,7 +47,8 @@
  "infantry_units": [
    "Infantry_M4",
    "Soldier_M249",
-    "Stinger_MANPADS"
+    "Stinger_MANPADS",
+    "_2B11_mortar"
  ],
  "air_defenses": [
    "AvengerGenerator",
--- a/resources/factions/usa_2005_modded.json
+++ b/resources/factions/usa_2005_modded.json
@@ -47,7 +47,8 @@
  "infantry_units": [
    "Infantry_M4",
    "Soldier_M249",
-    "Stinger_MANPADS"
+    "Stinger_MANPADS",
+    "_2B11_mortar"
  ],
  "air_defenses": [
    "AvengerGenerator",
--- a/resources/factions/usn_1985.json
+++ b/resources/factions/usn_1985.json
@@ -33,6 +33,7 @@
  "infantry_units": [
    "Infantry_M4",
    "Soldier_M249",
+    "_2B11_mortar",
    "Stinger_MANPADS"
  ],
  "air_defenses": [