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

Summer challange shanged battle list API

Browse Source
This commit is contained in:
Eriks K 2020-07-04 00:31:26 +03:00
parent 7ac22b5e11
commit bcb27da54f
3 changed files with 106 additions and 102 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.1.7' __version__ = '0.20.1.7'
__commit_id__ = "d1e078e" __commit_id__ = "7ac22b5"
from erepublik import classes, utils from erepublik import classes, utils
from erepublik.citizen import Citizen from erepublik.citizen import Citizen

156
erepublik/citizen.py
View File

@ -12,7 +12,7 @@ from requests import HTTPError, RequestException, Response
from erepublik import utils from erepublik import utils
from erepublik.access_points import CitizenAPI from erepublik.access_points import CitizenAPI
from erepublik.classes import Battle, BattleDivision, Config, Details, Energy, \ from erepublik.classes import Battle, Config, Details, Energy, \
ErepublikException, MyCompanies, MyJSONEncoder, OfferItem, Politics, Reporter, TelegramBot ErepublikException, MyCompanies, MyJSONEncoder, OfferItem, Politics, Reporter, TelegramBot
@ -1388,75 +1388,73 @@ class CitizenMilitary(CitizenTravel):
def get_available_weapons(self, battle_id: int): def get_available_weapons(self, battle_id: int):
return self._get_military_show_weapons(battle_id).json() return self._get_military_show_weapons(battle_id).json()
def set_default_weapon(self, battle_id: int) -> int: def set_default_weapon(self, battle_id: int, battle_zone: int) -> int:
battle = self.all_battles.get(battle_id) battle = self.all_battles.get(battle_id)
available_weapons = self._get_military_show_weapons(battle_id).json() available_weapons = self._get_military_show_weapons(battle_id).json()
while not isinstance(available_weapons, list): while not isinstance(available_weapons, list):
available_weapons = self._get_military_show_weapons(battle_id).json() available_weapons = self._get_military_show_weapons(battle_id).json()
weapon_quality = -1 weapon_quality = -1
weapon_damage = 0 weapon_damage = 0
if not battle.is_air: if not battle.div[battle_zone].div == 11:
for weapon in available_weapons: for weapon in available_weapons:
try: try:
if weapon['weaponQuantity'] > 30 and weapon['weaponInfluence'] > weapon_damage: if weapon['weaponQuantity'] > 30 and weapon['weaponInfluence'] > weapon_damage:
weapon_quality = int(weapon['weaponId']) weapon_quality = int(weapon['weaponId'])
except ValueError: except ValueError:
pass pass
return self.change_weapon(battle_id, weapon_quality) return self.change_weapon(battle_id, weapon_quality, battle_zone)
def change_weapon(self, battle_id: int, quality: int) -> int: def change_weapon(self, battle_id: int, quality: int, battle_zone: int) -> int:
battle = self.all_battles.get(battle_id)
battle_zone = battle.div[11 if battle.is_air else self.division].battle_zone_id
r = self._post_military_change_weapon(battle_id, battle_zone, quality) r = self._post_military_change_weapon(battle_id, battle_zone, quality)
influence = r.json().get('weaponInfluence') influence = r.json().get('weaponInfluence')
self._report_action("MILITARY_WEAPON", f"Switched to q{quality} weapon," self._report_action("MILITARY_WEAPON", f"Switched to q{quality} weapon,"
f" new influence {influence}", kwargs=r.json()) f" new influence {influence}", kwargs=r.json())
return influence return influence
def check_epic_battles(self): # def check_epic_battles(self):
active_fs = False # active_fs = False
for battle_id in self.sorted_battles(self.config.sort_battles_time): # for battle_id in self.sorted_battles(self.config.sort_battles_time):
battle = self.all_battles.get(battle_id) # battle = self.all_battles.get(battle_id)
if not battle.is_air: # if not battle.is_air:
my_div: BattleDivision = battle.div.get(self.division) # my_div: BattleDivision = battle.div.get(self.division)
if my_div.epic and my_div.end > self.now: # if my_div.epic and my_div.end > self.now:
if self.energy.food_fights > 50: # if self.energy.food_fights > 50:
inv_allies = battle.invader.deployed + [battle.invader.id] # inv_allies = battle.invader.deployed + [battle.invader.id]
def_allies = battle.defender.deployed + [battle.defender.id] # def_allies = battle.defender.deployed + [battle.defender.id]
all_allies = inv_allies + def_allies # all_allies = inv_allies + def_allies
if self.details.current_country not in all_allies: # if self.details.current_country not in all_allies:
if self.details.current_country in battle.invader.allies: # if self.details.current_country in battle.invader.allies:
allies = battle.invader.deployed # allies = battle.invader.deployed
side = battle.invader.id # side = battle.invader.id
else: # else:
allies = battle.defender.deployed # allies = battle.defender.deployed
side = battle.defender.id # side = battle.defender.id
#
self.travel_to_battle(battle.id, allies) # self.travel_to_battle(battle.id, allies)
#
else: # else:
if self.details.current_country in inv_allies: # if self.details.current_country in inv_allies:
side = battle.invader.id # side = battle.invader.id
elif self.details.current_country in def_allies: # elif self.details.current_country in def_allies:
side = battle.defender.id # side = battle.defender.id
else: # else:
self.write_log( # self.write_log(
f"Country {self.details.current_country} not in all allies list ({all_allies}) and " # f"Country {self.details.current_country} not in all allies list ({all_allies}) and "
f"also not in inv allies ({inv_allies}) nor def allies ({def_allies})") # f"also not in inv allies ({inv_allies}) nor def allies ({def_allies})")
break # break
error_count = 0 # error_count = 0
while self.energy.food_fights > 5 and error_count < 20: # while self.energy.food_fights > 5 and error_count < 20:
errors = self.fight(battle_id, side_id=side, count=self.energy.food_fights - 5) # errors = self.fight(battle_id, side_id=side, count=self.energy.food_fights - 5)
if errors: # if errors:
error_count += errors # error_count += errors
if self.config.epic_hunt_ebs: # if self.config.epic_hunt_ebs:
self._eat('orange') # self._eat('orange')
self.travel_to_residence() # self.travel_to_residence()
break # break
elif bool(my_div.epic): # elif bool(my_div.epic):
active_fs = True # active_fs = True
#
self.active_fs = active_fs # self.active_fs = active_fs
def sorted_battles(self, sort_by_time: bool = True) -> List[int]: def sorted_battles(self, sort_by_time: bool = True) -> List[int]:
cs_battles_priority_air: List[int] = [] cs_battles_priority_air: List[int] = []
@ -1488,7 +1486,7 @@ class CitizenMilitary(CitizenTravel):
continue continue
# CS Battles # CS Battles
elif self.details.citizenship in battle_sides: elif self.details.citizenship in battle_sides:
if battle.is_air: if battle.has_air:
if battle.defender.id == self.details.citizenship: if battle.defender.id == self.details.citizenship:
cs_battles_priority_air.append(battle.id) cs_battles_priority_air.append(battle.id)
else: else:
@ -1501,7 +1499,7 @@ class CitizenMilitary(CitizenTravel):
# Current location battles: # Current location battles:
elif self.details.current_country in battle_sides: elif self.details.current_country in battle_sides:
if battle.is_air: if battle.has_air:
deployed_battles_air.append(battle.id) deployed_battles_air.append(battle.id)
else: else:
deployed_battles_ground.append(battle.id) deployed_battles_ground.append(battle.id)
@ -1509,18 +1507,18 @@ class CitizenMilitary(CitizenTravel):
# Deployed battles and allied battles: # Deployed battles and allied battles:
elif self.details.current_country in battle.invader.allies + battle.defender.allies + battle_sides: elif self.details.current_country in battle.invader.allies + battle.defender.allies + battle_sides:
if self.details.current_country in battle.invader.deployed + battle.defender.deployed: if self.details.current_country in battle.invader.deployed + battle.defender.deployed:
if battle.is_air: if battle.has_air:
deployed_battles_air.append(battle.id) deployed_battles_air.append(battle.id)
else: else:
deployed_battles_ground.append(battle.id) deployed_battles_ground.append(battle.id)
# Allied battles: # Allied battles:
else: else:
if battle.is_air: if battle.has_air:
ally_battles_air.append(battle.id) ally_battles_air.append(battle.id)
else: else:
ally_battles_ground.append(battle.id) ally_battles_ground.append(battle.id)
else: else:
if battle.is_air: if battle.has_air:
other_battles_air.append(battle.id) other_battles_air.append(battle.id)
else: else:
other_battles_ground.append(battle.id) other_battles_ground.append(battle.id)
@ -1542,8 +1540,17 @@ class CitizenMilitary(CitizenTravel):
battle = self.all_battles.get(battle_id) battle = self.all_battles.get(battle_id)
if not isinstance(battle, Battle): if not isinstance(battle, Battle):
continue continue
div = 11 if battle.is_air else self.division battle_zone = 0
for div in battle.div.values():
if div.terrain == 0:
if self.config.air and div.is_air:
battle_zone = div.id
break
elif self.config.ground and not div.is_air and div.div == self.division:
battle_zone = div.id
break
else:
return
allies = battle.invader.deployed + battle.defender.deployed + [battle.invader.id, battle.defender.id] allies = battle.invader.deployed + battle.defender.deployed + [battle.invader.id, battle.defender.id]
travel_needed = self.details.current_country not in allies travel_needed = self.details.current_country not in allies
@ -1553,20 +1560,13 @@ class CitizenMilitary(CitizenTravel):
else: else:
side = self.details.current_country in battle.defender.allies + [battle.defender.id, ] side = self.details.current_country in battle.defender.allies + [battle.defender.id, ]
side_id = battle.defender.id if side else battle.invader.id side_id = battle.defender.id if side else battle.invader.id
try:
def_points = battle.div.get(div).dom_pts.get('def')
inv_points = battle.div.get(div).dom_pts.get('inv')
except KeyError:
self.report_error(f"Division {div} not available for battle {battle.id}!")
def_points = inv_points = 3600
self.write_log(battle) self.write_log(battle)
points = def_points <= 1700 and inv_points <= 1700
b_type = battle.is_air and self.config.air or not battle.is_air and self.config.ground
travel = (self.config.travel_to_fight and self.should_travel_to_fight() or self.config.force_travel) \ travel = (self.config.travel_to_fight and self.should_travel_to_fight() or self.config.force_travel) \
if travel_needed else True if travel_needed else True
if not (points and b_type and travel): if not travel:
continue continue
if battle.start > self.now: if battle.start > self.now:
@ -1584,12 +1584,12 @@ class CitizenMilitary(CitizenTravel):
if not self.travel_to_battle(battle_id, country_ids_to_travel): if not self.travel_to_battle(battle_id, country_ids_to_travel):
break break
self.set_default_weapon(battle_id) self.set_default_weapon(battle_id, battle_zone)
self.fight(battle_id, side_id) self.fight(battle_id, battle_zone, side_id)
self.travel_to_residence() self.travel_to_residence()
break break
def fight(self, battle_id: int, side_id: int = None, count: int = None, division: int = None) -> int: def fight(self, battle_id: int, battle_zone: int, side_id: int = None, count: 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.
@ -1600,8 +1600,8 @@ class CitizenMilitary(CitizenTravel):
:type side_id: int :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 :type count: int
:param division: int Division number to fight in available choices 1,2,3,4,11 :param battle_zone: int Division number to fight in available choices
:type division: int :type battle_zone: int
:return: None if no errors while fighting, otherwise error count. :return: None if no errors while fighting, otherwise error count.
:rtype: int :rtype: int
""" """
@ -1614,9 +1614,7 @@ 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)
division = self.division if division is None else division if not battle.div[battle_zone].is_air and self.config.boosters:
zone_id = battle.div[11 if battle.is_air else division].battle_zone_id
if not battle.is_air and self.config.boosters:
self.activate_dmg_booster() self.activate_dmg_booster()
error_count = 0 error_count = 0
ok_to_fight = True ok_to_fight = True
@ -1628,7 +1626,7 @@ class CitizenMilitary(CitizenTravel):
side = battle.invader.id == side_id or side_id in battle.invader.deployed side = battle.invader.id == side_id or side_id in battle.invader.deployed
while ok_to_fight and error_count < 10 and count > 0: while ok_to_fight and error_count < 10 and count > 0:
while all((count > 0, error_count < 10, self.energy.recovered >= 50)): while all((count > 0, error_count < 10, self.energy.recovered >= 50)):
hits, error, damage = self._shoot(battle_id, side, zone_id) hits, error, damage = self._shoot(battle_id, side, battle_zone)
count -= hits count -= hits
total_hits += hits total_hits += hits
total_damage += damage total_damage += damage
@ -1640,13 +1638,13 @@ class CitizenMilitary(CitizenTravel):
ok_to_fight = False ok_to_fight = False
if total_damage: if total_damage:
self.reporter.report_action("FIGHT", dict(battle=battle_id, side=side_id, dmg=total_damage, self.reporter.report_action("FIGHT", dict(battle=battle_id, side=side_id, dmg=total_damage,
air=battle.is_air, hits=total_hits)) air=battle.has_air, hits=total_hits))
return error_count return error_count
def _shoot(self, battle_id: int, inv_side: bool, zone_id: int): def _shoot(self, battle_id: int, inv_side: bool, zone_id: int):
battle = self.all_battles.get(battle_id) battle = self.all_battles.get(battle_id)
side_id = battle.invader.id if inv_side else battle.defender.id side_id = battle.invader.id if inv_side else battle.defender.id
if battle.is_air: if battle.div[zone_id].is_air:
response = self._post_military_fight_air(battle_id, side_id, zone_id) response = self._post_military_fight_air(battle_id, side_id, zone_id)
else: else:
response = self._post_military_fight_ground(battle_id, side_id, zone_id) response = self._post_military_fight_ground(battle_id, side_id, zone_id)
@ -1665,7 +1663,7 @@ class CitizenMilitary(CitizenTravel):
if r_json.get("message") == "SHOOT_LOCKOUT" or r_json.get("message") == "ZONE_INACTIVE": if r_json.get("message") == "SHOOT_LOCKOUT" or r_json.get("message") == "ZONE_INACTIVE":
pass pass
elif r_json.get("message") == "NOT_ENOUGH_WEAPONS": elif r_json.get("message") == "NOT_ENOUGH_WEAPONS":
self.set_default_weapon(battle_id) self.set_default_weapon(battle_id, zone_id)
else: else:
if r_json.get("message") == "UNKNOWN_SIDE": if r_json.get("message") == "UNKNOWN_SIDE":
self._rw_choose_side(battle_id, side_id) self._rw_choose_side(battle_id, side_id)

50
erepublik/classes.py
View File

@ -637,33 +637,36 @@ class BattleDivision:
battle_zone_id: int battle_zone_id: int
def_medal: Dict[str, int] def_medal: Dict[str, int]
inv_medal: Dict[str, int] inv_medal: Dict[str, int]
terrain: int
div: int
@property
def is_air(self):
return self.div == 11
@property @property
def div_end(self) -> bool: def div_end(self) -> bool:
return utils.now() >= self.end return utils.now() >= self.end
def __init__(self, div_id: int, end: datetime.datetime, epic: bool, inv_pts: int, def_pts: int, def __init__(self, div_id: int, end: datetime.datetime, epic: bool, div: int, wall_for: int, wall_dom: float,
wall_for: int, wall_dom: float, def_medal: Tuple[int, int], inv_medal: Tuple[int, int]): terrain_id: int = 0):
"""Battle division helper class """Battle division helper class
:type div_id: int :type div_id: int
:type end: datetime.datetime :type end: datetime.datetime
:type epic: bool :type epic: bool
:type inv_pts: int :type div: int
:type def_pts: int :type terrain_id: int
:type wall_for: int :type wall_for: int
:type wall_dom: float :type wall_dom: float
:type def_medal: Tuple[int, int]
:type inv_medal: Tuple[int, int]
""" """
self.battle_zone_id = div_id self.battle_zone_id = div_id
self.end = end self.end = end
self.epic = epic self.epic = epic
self.dom_pts = dict({"inv": inv_pts, "def": def_pts})
self.wall = dict({"for": wall_for, "dom": wall_dom}) self.wall = dict({"for": wall_for, "dom": wall_dom})
self.def_medal = {"id": def_medal[0], "dmg": def_medal[1]} self.terrain = terrain_id
self.inv_medal = {"id": inv_medal[0], "dmg": inv_medal[1]} self.div = div
@property @property
def id(self): def id(self):
@ -682,9 +685,19 @@ class Battle:
div: Dict[int, BattleDivision] div: Dict[int, BattleDivision]
@property @property
def is_air(self) -> bool: def has_air(self) -> bool:
for div in self.div.values():
if div.div == 11:
return True
return not bool(self.zone_id % 4) return not bool(self.zone_id % 4)
@property
def has_ground(self) -> bool:
for div in self.div.values():
if div.div != 11:
return True
return bool(self.zone_id % 4)
def __init__(self, battle: Dict[str, Any]): def __init__(self, battle: Dict[str, Any]):
"""Object representing eRepublik battle. """Object representing eRepublik battle.
@ -719,18 +732,11 @@ class Battle:
else: else:
end = utils.localize_dt(datetime.datetime.max - datetime.timedelta(days=1)) end = utils.localize_dt(datetime.datetime.max - datetime.timedelta(days=1))
if not data.get('stats',{}).get('def'): battle_div = BattleDivision(div_id=data.get('id'), div=data.get('dev'), end=end,
def_medal = (0, 0) epic=data.get('epic_type') in [1, 5],
else: wall_for=data.get('wall').get("for"),
def_medal = (data['stats']['def']['citizenId'], data['stats']['def']['damage']) wall_dom=data.get('wall').get("dom"),
if not data.get('stats').get('inv'): terrain_id=data.get('terrain', 0))
inv_medal = (0, 0)
else:
inv_medal = (data['stats']['inv']['citizenId'], data['stats']['inv']['damage'])
battle_div = BattleDivision(div_id=data.get('id'), end=end, epic=data.get('epic_type') in [1, 5],
inv_pts=data.get('dom_pts').get("inv"), def_pts=data.get('dom_pts').get("def"),
wall_for=data.get('wall').get("for"), wall_dom=data.get('wall').get("dom"),
def_medal=def_medal, inv_medal=inv_medal)
self.div.update({div: battle_div}) self.div.update({div: battle_div})