Merge remote-tracking branch 'origin/master'

README.md

@@ -1,4 +1,6 @@
-WIP [DCS World](https://www.digitalcombatsimulator.com/en/products/world/) single-player liberation dynamic campaign. 
+[DCS World](https://www.digitalcombatsimulator.com/en/products/world/) single-player liberation dynamic campaign. 
+
+[Installation instructions/Manual](https://github.com/shdwp/dcs_liberation/wiki)
 
 Inspired by *ARMA Liberation* mission.
 

theater/start_generator.py

@@ -28,8 +28,8 @@ def generate_initial(theater: ConflictTheater, enemy: str, sams: bool, multiplie
             variety = int(UNIT_VARIETY)
             unittypes = db.choose_units(task, importance_factor, variety, enemy)
 
-            if not sams:
-                unittypes = [x for x in unittypes if x not in db.SAM_BAN]
+            if not sams and task == AirDefence:
+                unittypes = [x for x in db.find_unittype(AirDefence, enemy) if x not in db.SAM_BAN]
 
             count_log = math.log(cp.importance + 0.01, UNIT_COUNT_IMPORTANCE_LOG)
             count = max(COUNT_BY_TASK[task] * multiplier * (1+count_log), 1)

userdata/debriefing.py

@@ -14,6 +14,8 @@ from dcs.unit import UnitType
 
 from game import db
 
+from .persistency import _base_path
+
 DEBRIEFING_LOG_EXTENSION = "log"
 
 
@@ -92,7 +94,7 @@ class Debriefing:
 
 
 def debriefing_directory_location() -> str:
-    return os.path.expanduser("~\Saved Games\DCS\liberation_debriefings")
+    return os.path.join(_base_path(), "liberation_debriefings")
 
 
 def _logfiles_snapshot() -> typing.Dict[str, float]:

userdata/persistency.py

@@ -4,12 +4,20 @@ import os
 import shutil
 
 
+def _base_path() -> str:
+    openbeta_path = os.path.expanduser("~\Saved Games\DCS.openbeta")
+    if os.path.exists(openbeta_path):
+        return openbeta_path
+    else:
+        return os.path.expanduser("~\Saved Games\DCS")
+
+
 def _save_file() -> str:
-    return os.path.expanduser("~\Saved Games\DCS\liberation_save")
+    return os.path.join(_base_path(), "liberation_save")
 
 
 def _temporary_save_file() -> str:
-    return os.path.expanduser("~\Saved Games\DCS\liberation_save_tmp")
+    return os.path.join(_base_path(), "liberation_save_tmp")
 
 
 def _save_file_exists() -> bool:
@@ -17,7 +25,7 @@ def _save_file_exists() -> bool:
 
 
 def mission_path_for(name: str) -> str:
-    return os.path.expanduser("~\Saved Games\DCS\Missions\{}".format(name))
+    return os.path.join(_base_path(), "Missions\{}".format(name))
 
 
 def restore_game():