eriks/erepublik-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix-v0.23.4'

Browse Source 
# Conflicts:
#	erepublik/__init__.py
#	setup.cfg
#	setup.py
This commit is contained in:
Eriks K 2021-02-03 00:50:03 +02:00
commit f4896e0b79
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erepublik/access_points.py
View File

@ -436,8 +436,10 @@ class ErepublikMilitaryAPI(CitizenBaseAPI):
data = dict(_token=self.token, sideCountryId=side_id, battleId=battle_id) data = dict(_token=self.token, sideCountryId=side_id, battleId=battle_id)
return self.post(f"{self.url}/main/battlefieldTravel", data=data) 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) 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) return self.post(f"{self.url}/main/battlefieldTravel", data=data)
def _get_wars_show(self, war_id: int) -> Response: def _get_wars_show(self, war_id: int) -> Response:

12
erepublik/citizen.py
View File

@ -2036,16 +2036,18 @@ class CitizenMilitary(CitizenTravel):
self._report_action('MILITARY_BOMB', f"Deployed {deployed_count} bombs in battle {battle.id}") self._report_action('MILITARY_BOMB', f"Deployed {deployed_count} bombs in battle {battle.id}")
return deployed_count 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. """Change division.
:param battle: Battle :param battle: classes.Battle
:type battle: Battle :type battle: classes.Battle
:param division: int target division to switch to :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: :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'): if resp.json().get('error'):
self.logger.warning(resp.json().get('message')) self.logger.warning(resp.json().get('message'))
return False return False