fixed capture issue when two or more points were attacking the base

game/event/capture.py

@@ -13,7 +13,7 @@ from .event import Event
 class CaptureEvent(Event):
     silent = True
     BONUS_BASE = 15
-    STRENGTH_RECOVERY = 0.35
+    STRENGTH_RECOVERY = 0.55
 
     def __str__(self):
         return "Attack from {} to {}".format(self.from_cp, self.to_cp)
@@ -41,7 +41,7 @@ class CaptureEvent(Event):
             self.to_cp.base.affect_strength(+self.STRENGTH_RECOVERY)
 
     def skip(self):
-        if self.to_cp.captured:
+        if not self.is_player_attacking and self.to_cp.captured:
             self.to_cp.captured = False
 
     def player_defending(self, interceptors: db.PlaneDict, clients: db.PlaneDict):

gen/triggergen.py

@@ -140,10 +140,6 @@ class TriggersGenerator:
         player_coalition = self.game.player == "USA" and "blue" or "red"
         enemy_coalition = player_coalition == "blue" and "red" or "blue"
 
-        # dcs require at least some slots on both sides for the mission to start
-        self.mission.groundControl.red_observer = 1
-        self.mission.groundControl.blue_observer = 1
-
         self.mission.coalition[player_coalition].bullseye = {"x": self.conflict.position.x,
                                                              "y": self.conflict.position.y}
 

start.bat

@@ -1 +1 @@
-py.exe __init__.py "C:\Users\shdwp" > logs.txt 2>&1
+py.exe __init__.py %UserProfile% > logs.txt 2>&1

theater/nevada.py

@@ -51,5 +51,4 @@ class NevadaTheater(ConflictTheater):
         self.add_controlpoint(self.laughlin, connected_to=[self.jean, self.las_vegas])
 
         self.mina.captured = True
-        self.pahute_mesa.captured = True
-        self.groom_lake.captured = True
+

theater/persiangulf.py

@@ -69,7 +69,6 @@ class PersianGulfTheater(ConflictTheater):
         self.add_controlpoint(self.west_carrier)
 
         self.west_carrier.captured = True
-
         self.al_dhafra.captured = True
 
         """

userdata/debriefing.py

@@ -29,18 +29,18 @@ def parse_mutliplayer_debriefing(contents: str):
     for line in [x.strip() for x in contents.splitlines()]:
         if line.startswith("events ="):
             in_events = True
-        elif line.startswith("}, -- end of events"):
+        elif line.startswith("} -- end of events"):
             in_events = False
 
         if not in_events:
             continue
 
         key = None
-        if line.startswith("initiator"):
+        if line.startswith("initiator\t"):
             key = "initiator"
             if element is None:
                 element = {}
-        elif line.startswith("type"):
+        elif line.startswith("type\t"):
             key = "type"
             if element is None:
                 element = {}

userdata/persistency.py

@@ -15,11 +15,11 @@ def base_path() -> str:
     global _user_folder
     assert _user_folder
 
-    openbeta_path = os.path.join(_user_folder, "Saved Games\DCS.openbeta")
+    openbeta_path = os.path.join(_user_folder, "Saved Games", "DCS.openbeta")
     if os.path.exists(openbeta_path):
         return openbeta_path
     else:
-        return os.path.expanduser("~\Saved Games\DCS")
+        return os.path.join(_user_folder, "Saved Games" , "DCS")
 
 
 def _save_file() -> str:
@@ -35,7 +35,7 @@ def _save_file_exists() -> bool:
 
 
 def mission_path_for(name: str) -> str:
-    return os.path.join(base_path(), "Missions\{}".format(name))
+    return os.path.join(base_path(), "Missions", "{}".format(name))
 
 
 def restore_game():