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

Fighting also available in other divisions for Maverick players

Browse Source
This commit is contained in:
Eriks Karls 2020-04-14 18:56:45 +03:00
parent 1b5b5f736f
commit 2efc9496a0
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erepublik/__init__.py
View File

@ -5,7 +5,7 @@
__author__ = """Eriks Karls""" __author__ = """Eriks Karls"""
__email__ = 'eriks@72.lv' __email__ = 'eriks@72.lv'
__version__ = '0.20.0' __version__ = '0.20.0'
__commit_id__ = "4b4ed18" __commit_id__ = "1b5b5f7"
from erepublik import classes, utils from erepublik import classes, utils
from erepublik.citizen import Citizen from erepublik.citizen import Citizen

11
erepublik/citizen.py
View File

@ -1473,14 +1473,20 @@ class CitizenMilitary(CitizenTravel):
self.travel_to_residence() self.travel_to_residence()
break break
def fight(self, battle_id: int, side_id: int = None, count: int = None) -> int: def fight(self, battle_id: int, side_id: int = None, count: int = None, division: int= None) -> int:
"""Fight in a battle. """Fight in a battle.
Will auto activate booster and travel if allowed to do it. Will auto activate booster and travel if allowed to do it.
:param battle_id: int BattleId - battle to fight in :param battle_id: int BattleId - battle to fight in
:type battle_id: int
:param side_id: int or None. Battle side to fight in, If side_id not == invader id or not in invader deployed allies list, then defender's side is chosen :param side_id: int or None. Battle side to fight in, If side_id not == invader id or not in invader deployed allies list, then defender's side is chosen
:type side_id: int
:param count: How many hits to do, if not specified self.should_fight() is called. :param count: How many hits to do, if not specified self.should_fight() is called.
:type count: int
:param division: int Division number to fight in available choices 1,2,3,4,11
:type division: int
:return: None if no errors while fighting, otherwise error count. :return: None if no errors while fighting, otherwise error count.
:rtype: int
""" """
if not isinstance(battle_id, int): if not isinstance(battle_id, int):
self.report_error(f"WARNINNG! Parameter battle_id should be 'int', but it is '{type(battle_id).__name__}'") self.report_error(f"WARNINNG! Parameter battle_id should be 'int', but it is '{type(battle_id).__name__}'")
@ -1488,7 +1494,8 @@ class CitizenMilitary(CitizenTravel):
if battle_id not in self.all_battles: if battle_id not in self.all_battles:
self.update_war_info() self.update_war_info()
battle = self.all_battles.get(battle_id) battle = self.all_battles.get(battle_id)
zone_id = battle.div[11 if battle.is_air else self.division].battle_zone_id division = self.division if division is None else division
zone_id = battle.div[11 if battle.is_air else division].battle_zone_id
if not battle.is_air and self.config.boosters: if not battle.is_air and self.config.boosters:
self.activate_dmg_booster() self.activate_dmg_booster()
error_count = 0 error_count = 0