From 6fb342a42cb13d5841505a73201c228aed060223 Mon Sep 17 00:00:00 2001 From: Vasyl Horbachenko Date: Wed, 12 Sep 2018 00:20:35 +0300 Subject: [PATCH] updated location argument; updated ground units placement during attack operation --- gen/conflictgen.py | 4 ++-- resources/tools/mkrelease.py | 2 +- userdata/persistency.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gen/conflictgen.py b/gen/conflictgen.py index 2372c3aa..39860aa6 100644 --- a/gen/conflictgen.py +++ b/gen/conflictgen.py @@ -215,10 +215,10 @@ class Conflict: distance = GROUND_DISTANCE attackers_location = position.point_from_heading(attack_heading, distance) - attackers_location = Conflict._find_ground_position(attackers_location, distance * 2, _heading_sum(attack_heading, 180), theater) + attackers_location = Conflict._find_ground_position(attackers_location, distance * 2, attack_heading, theater) defenders_location = position.point_from_heading(defense_heading, 0) - defenders_location = Conflict._find_ground_position(defenders_location, distance * 2, _heading_sum(defense_heading, 180), theater) + defenders_location = Conflict._find_ground_position(defenders_location, distance * 2, defense_heading, theater) return cls( position=position, diff --git a/resources/tools/mkrelease.py b/resources/tools/mkrelease.py index c8776e78..2295267b 100644 --- a/resources/tools/mkrelease.py +++ b/resources/tools/mkrelease.py @@ -43,7 +43,7 @@ def _mk_archieve(): return archieve = ZipFile(path, "w") - archieve.writestr("start.bat", "py.exe __init__.py \"%UserProfile%\" \"{}\"".format(VERSION)) + archieve.writestr("start.bat", "py.exe __init__.py \"%UserProfile%\\Saved Games\" \"{}\"".format(VERSION)) _zip_dir(archieve, ".") os.chdir("submodules\\dcs") _zip_dir(archieve, "dcs") diff --git a/userdata/persistency.py b/userdata/persistency.py index 175fef5c..dbb42705 100644 --- a/userdata/persistency.py +++ b/userdata/persistency.py @@ -17,11 +17,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, "DCS.openbeta") if "--force-stable-DCS" not in sys.argv and os.path.exists(openbeta_path): return openbeta_path else: - return os.path.join(_user_folder, "Saved Games", "DCS") + return os.path.join(_user_folder, "DCS") def _save_file() -> str: