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

resources/campaigns/emirates.json

@@ -3,106 +3,5 @@
   "theater": "Persian Gulf",
   "authors": "Khopa",
   "description": "<p>In this scenario, you can play an invasion of the Emirates and Oman, where your forces starts in Fujairah.</p><p><strong>Note:</strong> Fujairah airfield has very few slots for aircrafts, so it recommended to operate from carriers at the start of the campaign. Thus, a carrier-capable faction is recommended.</p>",
-  "player_points": [
-    {
-      "type": "airbase",
-      "id": "Fujairah Intl",
-      "radials": [
-        180,
-        225,
-        270,
-        315,
-        0
-      ],
-      "size": 1000,
-      "importance": 1,
-      "captured_invert": true
-    },
-    {
-      "type": "lha",
-      "id": 1002,
-      "x": -79770,
-      "y": 49430,
-      "captured_invert": true
-    },
-    {
-      "type": "carrier",
-      "id": 1001,
-      "x": -61770,
-      "y": 69039,
-      "captured_invert": true
-    }
-  ],
-  "enemy_points": [
-    {
-      "type": "airbase",
-      "id": "Al Dhafra AB",
-      "size": 2000,
-      "importance": 1.2
-    },
-    {
-      "type": "airbase",
-      "id": "Al Ain International Airport",
-      "size": 2000,
-      "importance": 1
-    },
-    {
-      "type": "airbase",
-      "id": "Al Maktoum Intl",
-      "size": 2000,
-      "importance": 1
-    },
-    {
-      "type": "airbase",
-      "id": "Al Minhad AB",
-      "size": 1000,
-      "importance": 1
-    },
-    {
-      "type": "airbase",
-      "id": "Sharjah Intl",
-      "size": 2000,
-      "importance": 1
-    },
-    {
-      "type": "airbase",
-      "id": "Ras Al Khaimah",
-      "size": 1000,
-      "importance": 1
-    }
-  ],
-  "links": [
-    [
-      "Al Ain International Airport",
-      "Al Dhafra AB"
-    ],
-    [
-      "Al Dhafra AB",
-      "Al Maktoum Intl"
-    ],
-    [
-      "Al Ain International Airport",
-      "Fujairah Intl"
-    ],
-    [
-      "Al Ain International Airport",
-      "Al Maktoum Intl"
-    ],
-    [
-      "Al Maktoum Intl",
-      "Al Minhad AB"
-    ],
-    [
-      "Al Minhad AB",
-      "Sharjah Intl"
-    ],
-    [
-      "Ras Al Khaimah",
-      "Sharjah Intl"
-    ],
-    [
-      "Fujairah Intl",
-      "Sharjah Intl"
-    ]
-  ]
+  "miz": "emirates.miz"
 }

resources/factions/france_1995.json

@@ -37,7 +37,8 @@
   "infantry_units": [
     "Infantry_M4",
     "Soldier_M249",
-    "Stinger_MANPADS"
+    "Stinger_MANPADS",
+    "_2B11_mortar"
   ],
   "air_defenses": [
     "RolandGenerator",

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"
   ],

resources/factions/germany_1990.json

@@ -33,6 +33,7 @@
   "infantry_units": [
     "Infantry_M4",
     "Soldier_M249",
+    "_2B11_mortar",
     "Stinger_MANPADS"
   ],
   "air_defenses": [

resources/factions/insurgents.json

@@ -22,6 +22,7 @@
   "infantry_units": [
     "Infantry_Soldier_Insurgents",
     "Soldier_RPG",
+    "_2B11_mortar",
     "SAM_SA_18_Igla_MANPADS"
   ],
   "air_defenses": [

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": [

resources/factions/russia_1975.json

@@ -39,7 +39,8 @@
   ],
   "infantry_units": [
     "Infantry_Soldier_Rus",
-    "Soldier_RPG"
+    "Soldier_RPG",
+    "_2B11_mortar"
   ],
   "air_defenses": [
     "ColdWarFlakGenerator",

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": [

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": [

resources/factions/uk_1990.json

@@ -34,6 +34,7 @@
   "infantry_units": [
     "Infantry_M4",
     "Soldier_M249",
+    "_2B11_mortar",
     "Stinger_MANPADS"
   ],
   "air_defenses": [

resources/factions/usa_1990.json

@@ -45,7 +45,8 @@
   "infantry_units": [
     "Infantry_M4",
     "Soldier_M249",
-    "Stinger_MANPADS"
+    "Stinger_MANPADS",
+    "_2B11_mortar"
   ],
   "air_defenses": [
     "AvengerGenerator",

resources/factions/usa_2005.json

@@ -46,7 +46,8 @@
   "infantry_units": [
     "Infantry_M4",
     "Soldier_M249",
-    "Stinger_MANPADS"
+    "Stinger_MANPADS",
+    "_2B11_mortar"
   ],
   "air_defenses": [
     "AvengerGenerator",

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",

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",

resources/factions/usn_1985.json

@@ -33,6 +33,7 @@
   "infantry_units": [
     "Infantry_M4",
     "Soldier_M249",
+    "_2B11_mortar",
     "Stinger_MANPADS"
   ],
   "air_defenses": [