Compare commits

...

4 Commits

5 changed files with 13 additions and 9 deletions

View File

@ -4,7 +4,7 @@
__author__ = """Eriks Karls"""
__email__ = 'eriks@72.lv'
__version__ = '0.23.4.14'
__version__ = '0.23.4.16'
from erepublik import classes, constants, utils
from erepublik.citizen import Citizen

View File

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

View File

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

View File

@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.23.4.14
current_version = 0.23.4.16
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?

View File

@ -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.16',
zip_safe=False,
)