From 0dd1ae9ac5c5bf9f5fa0775fa0311a50969dd7b2 Mon Sep 17 00:00:00 2001 From: Eriks Karls Date: Tue, 14 Jan 2020 13:42:34 +0200 Subject: [PATCH 1/4] Too broad exception was cought without notifying about actual error - when Telegram isn't enabled --- erepublik/citizen.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erepublik/citizen.py b/erepublik/citizen.py index 681bc0d..dc1cbbb 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -156,7 +156,7 @@ class Citizen(CitizenAPI): raise ErepublikException("Something went wrong! Can't find token in page! Exiting!") try: self.update_citizen_info(resp.text) - except: + except (AttributeError, json.JSONDecodeError, ValueError, KeyError): pass def _login(self): @@ -212,8 +212,8 @@ class Citizen(CitizenAPI): return self.get(url, **kwargs) try: - self.update_citizen_info(html=response.text) - except: + self.update_citizen_info(response.text) + except (AttributeError, json.JSONDecodeError, ValueError, KeyError): pass if self._errors_in_response(response): From 00b87dc83245d6f4111ede9affe4cb7d5cfd0b19 Mon Sep 17 00:00:00 2001 From: Eriks Karls Date: Tue, 14 Jan 2020 13:43:10 +0200 Subject: [PATCH 2/4] when full energy update citizen info would stop working because trying to get timedelta from now - _last_full_energy_report --- erepublik/classes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erepublik/classes.py b/erepublik/classes.py index 2b5b59b..f4e2761 100644 --- a/erepublik/classes.py +++ b/erepublik/classes.py @@ -1257,6 +1257,7 @@ class TelegramBot: self._threads = [] self.__queue = [] self.__thread_stopper = threading.Event() if stop_event is None else stop_event + self._last_time = self._last_full_energy_report = utils.now().min @property def __dict__(self): From a2cf4791354d69cd2706f701a18051f3118a1213 Mon Sep 17 00:00:00 2001 From: Eriks Karls Date: Thu, 16 Jan 2020 13:49:24 +0200 Subject: [PATCH 3/4] Some TelegramBot tweaks --- erepublik/classes.py | 16 ++++++++-------- erepublik/utils.py | 36 +++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/erepublik/classes.py b/erepublik/classes.py index f4e2761..06c91b7 100644 --- a/erepublik/classes.py +++ b/erepublik/classes.py @@ -1242,11 +1242,11 @@ class EnergyToFight: class TelegramBot: - __initialized = False + __initialized: bool = False __queue: List[str] - chat_id = 0 - api_url = "" - player_name = "" + chat_id: int = 0 + api_url: str = "" + player_name: str = "" __thread_stopper: threading.Event _last_time: datetime.datetime _last_full_energy_report: datetime.datetime @@ -1257,13 +1257,13 @@ class TelegramBot: self._threads = [] self.__queue = [] self.__thread_stopper = threading.Event() if stop_event is None else stop_event - self._last_time = self._last_full_energy_report = utils.now().min + self._last_full_energy_report = self._next_time = self._last_time = utils.good_timedelta(utils.now(), datetime.timedelta(hours=1)) @property def __dict__(self): - return dict(chat_id=self.chat_id, api_url=self.api_url, player=self.player_name, last_time=self._last_time, - next_time=self._next_time, queue=self.__queue, initialized=self.__initialized, - has_threads=bool(len(self._threads))) + return {'chat_id': self.chat_id, 'api_url': self.api_url, 'player': self.player_name, + 'last_time': self._last_time, 'next_time': self._next_time, 'queue': self.__queue, + 'initialized': self.__initialized, 'has_threads': bool(len(self._threads))} def do_init(self, chat_id: int, token: str, player_name: str = ""): self.chat_id = chat_id diff --git a/erepublik/utils.py b/erepublik/utils.py index 9b28dea..9046487 100644 --- a/erepublik/utils.py +++ b/erepublik/utils.py @@ -6,6 +6,7 @@ import sys import time import traceback import unicodedata +from decimal import Decimal from pathlib import Path from typing import Any, List, Mapping, NoReturn, Optional, Union @@ -393,27 +394,28 @@ def slugify(value, allow_unicode=False) -> str: def calculate_hit(strength: float, rang: int, tp: bool, elite: bool, ne: bool, booster: int = 0, - weapon: int = 200) -> float: - base_dmg = 10 * (1 + strength / 400) * (1 + rang / 5) * (1 + weapon / 100) - dmg = int(base_dmg * 10 + 5) // 10 + weapon: int = 200, is_deploy: bool = False) -> Decimal: + dec = 3 if is_deploy else 0 + base_str = (1 + Decimal(str(round(strength, 3))) / 400) + base_rnk = (1 + Decimal(str(rang / 5))) + base_wpn = (1 + Decimal(str(weapon / 100))) + dmg = 10 * base_str * base_rnk * base_wpn - booster_multiplier = (100 + booster) / 100 - booster_dmg = dmg * booster_multiplier - dmg = int(booster_dmg * 10 + 5) // 10 + if elite: + dmg = dmg * 11 / 10 - elite = 1.1 if elite else 1 - elite_dmg = dmg * elite - dmg = int(elite_dmg) + if tp and rang >= 70: + dmg = dmg * (1 + Decimal((rang - 69) / 10)) - legend = 1 if (not tp or rang < 70) else 1 + (rang - 69) / 10 - legend_dmg = dmg * legend - dmg = int(legend_dmg) + dmg = dmg * (100 + booster) / 100 - return dmg * (1.1 if ne else 1) + if ne: + dmg = dmg * 11 / 10 + return round(dmg, dec) -def ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, - booster: int = 0, weapon_power: int = 200) -> float: +def get_ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, + booster: int = 0, weapon_power: int = 200) -> Decimal: r = requests.get(f"https://www.erepublik.com/en/main/citizen-profile-json/{citizen_id}").json() rang = r['military']['militaryData']['ground']['rankNumber'] strength = r['military']['militaryData']['ground']['strength'] @@ -424,8 +426,8 @@ def ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patr return calculate_hit(strength, rang, true_patriot, elite, natural_enemy, booster, weapon_power) -def air_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, booster: int = 0, - weapon_power: int = 0) -> float: +def get_air_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, booster: int = 0, + weapon_power: int = 0) -> Decimal: r = requests.get(f"https://www.erepublik.com/en/main/citizen-profile-json/{citizen_id}").json() rang = r['military']['militaryData']['aircraft']['rankNumber'] elite = r['citizenAttributes']['level'] > 100 From 5c258d7aae872cbbceb2b6dfc5ce7d97538a9cba Mon Sep 17 00:00:00 2001 From: Eriks Karls Date: Sun, 26 Jan 2020 20:44:21 +0200 Subject: [PATCH 4/4] Hey Plato! If You're reading this - fix your variable types and there will be 90% less bugs in Your code!!! {'weaponId': 6, 'weaponQuantity': 0, 'damage': 120} {'weaponId': '7', 'weaponQuantity': 1185, 'inClip': 7, 'damage': 200} {'weaponId': 10, 'weaponQuantity': 0, 'damage': 100} --- erepublik/citizen.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/erepublik/citizen.py b/erepublik/citizen.py index dc1cbbb..3daa4f5 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -2195,11 +2195,14 @@ class Citizen(CitizenAPI): while not isinstance(available_weapons, list): available_weapons = self._get_military_show_weapons(battle_id).json() weapon_quality = -1 + weapon_damage = 0 if not battle.is_air: for weapon in available_weapons: - if weapon['weaponId'] == 7 and weapon['weaponQuantity'] > 30: - weapon_quality = 7 - break + try: + if weapon['weaponQuantity'] > 30 and weapon['damage'] > weapon_damage: + weapon_quality = int(weapon['weaponId']) + except ValueError: + pass return self.change_weapon(battle_id, weapon_quality) def change_weapon(self, battle_id: int, weapon_quality: int) -> int: