From ddc412b3482bb484fd189464860aceb1c26545b7 Mon Sep 17 00:00:00 2001 From: Eriks K Date: Tue, 2 Feb 2021 23:52:32 +0200 Subject: [PATCH 1/4] accesspoint update to change side in RW --- erepublik/access_points.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erepublik/access_points.py b/erepublik/access_points.py index 65f738c..d95161d 100644 --- a/erepublik/access_points.py +++ b/erepublik/access_points.py @@ -418,8 +418,10 @@ class ErepublikMilitaryAPI(CitizenBaseAPI): data = dict(_token=self.token, sideCountryId=side_id, battleId=battle_id) return self.post(f"{self.url}/main/battlefieldTravel", data=data) - def _post_main_battlefield_change_division(self, battle_id: int, division_id: int) -> Response: + def _post_main_battlefield_change_division(self, battle_id: int, division_id: int, side_id: int = None) -> Response: data = dict(_token=self.token, battleZoneId=division_id, battleId=battle_id) + if side_id is not None: + data.update(sideCountryId=side_id) return self.post(f"{self.url}/main/battlefieldTravel", data=data) def _get_wars_show(self, war_id: int) -> Response: From 0e1c42a8fb98e0320fe6b779d22bf0e57faaea6c Mon Sep 17 00:00:00 2001 From: Eriks K Date: Tue, 2 Feb 2021 23:52:38 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Bump=20version:=200.23.4.14=20=E2=86=92=200?= =?UTF-8?q?.23.4.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erepublik/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index f0a4bee..32eccd3 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -4,7 +4,7 @@ __author__ = """Eriks Karls""" __email__ = 'eriks@72.lv' -__version__ = '0.23.4.14' +__version__ = '0.23.4.15' from erepublik import classes, constants, utils from erepublik.citizen import Citizen diff --git a/setup.cfg b/setup.cfg index 6097ec3..31eaf06 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.23.4.14 +current_version = 0.23.4.15 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? diff --git a/setup.py b/setup.py index cafe516..b8954de 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,6 @@ setup( test_suite='tests', tests_require=test_requirements, url='https://github.com/eeriks/erepublik/', - version='0.23.4.14', + version='0.23.4.15', zip_safe=False, ) From e38f603e8ba5bc0d8f37872b04bc64267bf3bdbf Mon Sep 17 00:00:00 2001 From: Eriks K Date: Tue, 2 Feb 2021 23:57:54 +0200 Subject: [PATCH 3/4] Division switch bugfix for option to switch side --- erepublik/citizen.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/erepublik/citizen.py b/erepublik/citizen.py index 0974f39..a2e8eba 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -1984,16 +1984,18 @@ class CitizenMilitary(CitizenTravel): self._report_action('MILITARY_BOMB', f"Deployed {deployed_count} bombs in battle {battle.id}") return deployed_count - def change_division(self, battle: classes.Battle, division: classes.BattleDivision) -> bool: + def change_division(self, battle: classes.Battle, division: classes.BattleDivision, side: classes.BattleSide = None) -> bool: """Change division. - :param battle: Battle - :type battle: Battle + :param battle: classes.Battle + :type battle: classes.Battle :param division: int target division to switch to - :type division: BattleDivision + :type division: classes.BattleDivision + :param side: Side to choose + :type side: classes.BattleSide :return: """ - resp = self._post_main_battlefield_change_division(battle.id, division.id) + resp = self._post_main_battlefield_change_division(battle.id, division.id, side.id if side else None) if resp.json().get('error'): self.write_log(resp.json().get('message')) return False From 7860fa3669b33ed9e94dd8c812e400322c7b4527 Mon Sep 17 00:00:00 2001 From: Eriks K Date: Tue, 2 Feb 2021 23:57:58 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=200.23.4.15=20=E2=86=92=200?= =?UTF-8?q?.23.4.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erepublik/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 32eccd3..b0bced5 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -4,7 +4,7 @@ __author__ = """Eriks Karls""" __email__ = 'eriks@72.lv' -__version__ = '0.23.4.15' +__version__ = '0.23.4.16' from erepublik import classes, constants, utils from erepublik.citizen import Citizen diff --git a/setup.cfg b/setup.cfg index 31eaf06..ae7449c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.23.4.15 +current_version = 0.23.4.16 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? diff --git a/setup.py b/setup.py index b8954de..5135442 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,6 @@ setup( test_suite='tests', tests_require=test_requirements, url='https://github.com/eeriks/erepublik/', - version='0.23.4.15', + version='0.23.4.16', zip_safe=False, )