Compare commits

...

6 Commits

Author SHA1 Message Date
Vasiliy Horbachenko
07128bb5e6 fixed capture issue when two or more points were attacking the base 2018-07-17 05:53:55 +03:00
Vasyl Horbachenko
3831658162 more base recovery after attack 2018-07-16 22:55:29 +03:00
Vasyl Horbachenko
26e43f5e54 Merge branch 'master' of https://github.com/shdwp/dcs_liberation 2018-07-16 22:12:31 +03:00
Vasyl Horbachenko
44ba5c32c6 use correct join char for paths 2018-07-16 22:11:47 +03:00
Vasyl Horbachenko
ce7d3a89c0 fixed user path for regular DCS 2018-07-16 22:11:03 +03:00
Vasyl Horbachenko
c74b1205df fixed user path for regular DCS 2018-07-16 22:05:42 +03:00
2 changed files with 5 additions and 5 deletions

View File

@@ -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):

View File

@@ -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():