Minor tweaks and double-quoted strings converted into single-quoted strings
This commit is contained in:
Eriks K
parent
0936dee06c
commit
b71cb0c263
File diff suppressed because it is too large
Load Diff
@ -28,7 +28,7 @@ class ErepublikNetworkException(ErepublikException):
|
||||
class Holding:
|
||||
id: int
|
||||
region: int
|
||||
companies: List["Company"]
|
||||
companies: List['Company']
|
||||
name: str
|
||||
_citizen = weakref.ReferenceType
|
||||
|
||||
@ -36,16 +36,16 @@ class Holding:
|
||||
self._citizen = weakref.ref(citizen)
|
||||
self.id: int = _id
|
||||
self.region: int = region
|
||||
self.companies: List["Company"] = list()
|
||||
self.companies: List['Company'] = list()
|
||||
if name:
|
||||
self.name = name
|
||||
else:
|
||||
comp_sum = len(self.companies)
|
||||
name = f"Holding (#{self.id}) with {comp_sum} "
|
||||
if comp_sum == 1:
|
||||
name += "company"
|
||||
name += 'company'
|
||||
else:
|
||||
name += "companies"
|
||||
name += 'companies'
|
||||
self.name = name
|
||||
|
||||
@property
|
||||
@ -53,20 +53,20 @@ class Holding:
|
||||
return len([1 for company in self.companies if company.wam_enabled and not company.already_worked])
|
||||
|
||||
@property
|
||||
def wam_companies(self) -> Iterable["Company"]:
|
||||
def wam_companies(self) -> Iterable['Company']:
|
||||
return [company for company in self.companies if company.wam_enabled]
|
||||
|
||||
@property
|
||||
def employable_companies(self) -> Iterable["Company"]:
|
||||
def employable_companies(self) -> Iterable['Company']:
|
||||
return [company for company in self.companies if company.preset_works]
|
||||
|
||||
def add_company(self, company: "Company") -> NoReturn:
|
||||
def add_company(self, company: 'Company') -> NoReturn:
|
||||
self.companies.append(company)
|
||||
self.companies.sort()
|
||||
|
||||
def get_wam_raw_usage(self) -> Dict[str, Decimal]:
|
||||
frm = Decimal("0.00")
|
||||
wrm = Decimal("0.00")
|
||||
frm = Decimal('0.00')
|
||||
wrm = Decimal('0.00')
|
||||
for company in self.wam_companies:
|
||||
if company.industry in [1, 7, 8, 9, 10, 11]:
|
||||
frm += company.raw_usage
|
||||
@ -74,11 +74,11 @@ class Holding:
|
||||
wrm += company.raw_usage
|
||||
return dict(frm=frm, wrm=wrm)
|
||||
|
||||
def get_wam_companies(self, raw_factory: bool = None) -> List["Company"]:
|
||||
def get_wam_companies(self, raw_factory: bool = None) -> List['Company']:
|
||||
raw = []
|
||||
factory = []
|
||||
for company in self.wam_companies:
|
||||
if not company.already_worked and not company.cannot_wam_reason == "war":
|
||||
if not company.already_worked and not company.cannot_wam_reason == 'war':
|
||||
if company.is_raw:
|
||||
raw.append(company)
|
||||
else:
|
||||
@ -92,9 +92,9 @@ class Holding:
|
||||
comp = len(self.companies)
|
||||
name = f"Holding (#{self.id}) with {comp} "
|
||||
if comp == 1:
|
||||
name += "company"
|
||||
name += 'company'
|
||||
else:
|
||||
name += "companies"
|
||||
name += 'companies'
|
||||
return name
|
||||
|
||||
def __repr__(self):
|
||||
@ -146,10 +146,10 @@ class Company:
|
||||
self.raw_usage = - self.products_made * raw_usage
|
||||
|
||||
def _get_real_quality(self, quality) -> int:
|
||||
# 7: "FRM q1", 8: "FRM q2", 9: "FRM q3", 10: "FRM q4", 11: "FRM q5",
|
||||
# 12: "WRM q1", 13: "WRM q2", 14: "WRM q3", 15: "WRM q4", 16: "WRM q5",
|
||||
# 18: "HRM q1", 19: "HRM q2", 20: "HRM q3", 21: "HRM q4", 22: "HRM q5",
|
||||
# 24: "ARM q1", 25: "ARM q2", 26: "ARM q3", 27: "ARM q4", 28: "ARM q5",
|
||||
# 7: 'FRM q1', 8: 'FRM q2', 9: 'FRM q3', 10: 'FRM q4', 11: 'FRM q5',
|
||||
# 12: 'WRM q1', 13: 'WRM q2', 14: 'WRM q3', 15: 'WRM q4', 16: 'WRM q5',
|
||||
# 18: 'HRM q1', 19: 'HRM q2', 20: 'HRM q3', 21: 'HRM q4', 22: 'HRM q5',
|
||||
# 24: 'ARM q1', 25: 'ARM q2', 26: 'ARM q3', 27: 'ARM q4', 28: 'ARM q5',
|
||||
if 7 <= self.industry <= 11:
|
||||
return self.industry % 6
|
||||
elif 12 <= self.industry <= 16:
|
||||
@ -163,10 +163,10 @@ class Company:
|
||||
|
||||
@property
|
||||
def _internal_industry(self) -> int:
|
||||
# 7: "FRM q1", 8: "FRM q2", 9: "FRM q3", 10: "FRM q4", 11: "FRM q5",
|
||||
# 12: "WRM q1", 13: "WRM q2", 14: "WRM q3", 15: "WRM q4", 16: "WRM q5",
|
||||
# 18: "HRM q1", 19: "HRM q2", 20: "HRM q3", 21: "HRM q4", 22: "HRM q5",
|
||||
# 24: "ARM q1", 25: "ARM q2", 26: "ARM q3", 27: "ARM q4", 28: "ARM q5",
|
||||
# 7: 'FRM q1', 8: 'FRM q2', 9: 'FRM q3', 10: 'FRM q4', 11: 'FRM q5',
|
||||
# 12: 'WRM q1', 13: 'WRM q2', 14: 'WRM q3', 15: 'WRM q4', 16: 'WRM q5',
|
||||
# 18: 'HRM q1', 19: 'HRM q2', 20: 'HRM q3', 21: 'HRM q4', 22: 'HRM q5',
|
||||
# 24: 'ARM q1', 25: 'ARM q2', 26: 'ARM q3', 27: 'ARM q4', 28: 'ARM q5',
|
||||
if 7 <= self.industry <= 11:
|
||||
return 7
|
||||
elif 12 <= self.industry <= 16:
|
||||
@ -185,22 +185,22 @@ class Company:
|
||||
def __hash__(self):
|
||||
return hash(self._sort_keys)
|
||||
|
||||
def __lt__(self, other: "Company"):
|
||||
def __lt__(self, other: 'Company'):
|
||||
return self._sort_keys < other._sort_keys
|
||||
|
||||
def __le__(self, other: "Company"):
|
||||
def __le__(self, other: 'Company'):
|
||||
return self._sort_keys <= other._sort_keys
|
||||
|
||||
def __gt__(self, other: "Company"):
|
||||
def __gt__(self, other: 'Company'):
|
||||
return self._sort_keys > other._sort_keys
|
||||
|
||||
def __ge__(self, other: "Company"):
|
||||
def __ge__(self, other: 'Company'):
|
||||
return self._sort_keys >= other._sort_keys
|
||||
|
||||
def __eq__(self, other: "Company"):
|
||||
def __eq__(self, other: 'Company'):
|
||||
return self._sort_keys == other._sort_keys
|
||||
|
||||
def __ne__(self, other: "Company"):
|
||||
def __ne__(self, other: 'Company'):
|
||||
return self._sort_keys != other._sort_keys
|
||||
|
||||
def __str__(self):
|
||||
@ -467,6 +467,7 @@ class Details:
|
||||
pp: int = 0
|
||||
pin: str = None
|
||||
gold: float = 0
|
||||
level: int = 0
|
||||
next_pp: List[int] = None
|
||||
citizen_id: int = 0
|
||||
citizenship: constants.Country
|
||||
@ -511,11 +512,15 @@ class Details:
|
||||
@property
|
||||
def as_dict(self) -> Dict[str, Union[int, float, str, constants.Country, bool]]:
|
||||
return dict(xp=self.xp, cc=self.cc, pp=self.pp, pin=self.pin, gold=self.gold, next_pp=self.next_pp,
|
||||
citizen_id=self.citizen_id, citizenship=self.citizenship, current_region=self.current_region,
|
||||
current_country=self.current_country, residence_region=self.residence_region,
|
||||
residence_country=self.residence_country, daily_task_done=self.daily_task_done,
|
||||
daily_task_reward=self.daily_task_reward, mayhem_skills=self.mayhem_skills,
|
||||
xp_till_level_up=self.xp_till_level_up)
|
||||
level=self.level, citizen_id=self.citizen_id, citizenship=self.citizenship,
|
||||
current_region=self.current_region, current_country=self.current_country,
|
||||
residence_region=self.residence_region, residence_country=self.residence_country,
|
||||
daily_task_done=self.daily_task_done, daily_task_reward=self.daily_task_reward,
|
||||
mayhem_skills=self.mayhem_skills, xp_till_level_up=self.xp_till_level_up)
|
||||
|
||||
@property
|
||||
def is_elite(self):
|
||||
return self.level > 100
|
||||
|
||||
|
||||
class Politics:
|
||||
@ -574,7 +579,7 @@ class Reporter:
|
||||
self._citizen = weakref.ref(citizen)
|
||||
self._req = Session()
|
||||
self.url = "https://api.erep.lv"
|
||||
self._req.headers.update({"user-agent": "eRepublik Script Reporter v3",
|
||||
self._req.headers.update({"user-agent": 'eRepublik Script Reporter v3',
|
||||
'erep-version': utils.__version__,
|
||||
'erep-user-id': str(self.citizen_id),
|
||||
'erep-user-name': self.citizen.name})
|
||||
@ -609,13 +614,13 @@ class Reporter:
|
||||
if not self.__registered:
|
||||
try:
|
||||
r = self.__bot_update(dict(key=self.key, check=True, player_id=self.citizen_id))
|
||||
if not r.json().get("status"):
|
||||
if not r.json().get('status'):
|
||||
self._req.post(f"{self.url}/bot/register", json=dict(name=self.name, email=self.email,
|
||||
player_id=self.citizen_id))
|
||||
finally:
|
||||
self.__registered = True
|
||||
self.allowed = True
|
||||
self.report_action("STARTED", value=utils.now().strftime("%F %T"))
|
||||
self.report_action('STARTED', value=utils.now().strftime("%F %T"))
|
||||
|
||||
def send_state_update(self, xp: int, cc: float, gold: float, inv_total: int, inv: int,
|
||||
hp_limit: int, hp_interval: int, hp_available: int, food: int, pp: int):
|
||||
@ -643,7 +648,7 @@ class Reporter:
|
||||
else:
|
||||
self.__to_update.append(json_data)
|
||||
|
||||
def report_fighting(self, battle: "Battle", invader: bool, division: "BattleDivision", damage: float, hits: int):
|
||||
def report_fighting(self, battle: 'Battle', invader: bool, division: 'BattleDivision', damage: float, hits: int):
|
||||
side = battle.invader if invader else battle.defender
|
||||
self.report_action('FIGHT', dict(battle_id=battle.id, side=side, dmg=damage,
|
||||
air=battle.has_air, hits=hits,
|
||||
@ -662,7 +667,7 @@ class Reporter:
|
||||
def report_promo(self, kind: str, time_until: datetime.datetime):
|
||||
self._req.post(f"{self.url}/promos/add/", data=dict(kind=kind, time_untill=time_until))
|
||||
|
||||
def fetch_battle_priorities(self, country: constants.Country) -> List["Battle"]:
|
||||
def fetch_battle_priorities(self, country: constants.Country) -> List['Battle']:
|
||||
try:
|
||||
battle_response = self._req.get(f'{self.url}/api/v1/battles/{country.id}')
|
||||
return [self.citizen.all_battles[bid] for bid in battle_response.json().get('battle_ids', []) if
|
||||
@ -713,12 +718,12 @@ class BattleSide:
|
||||
points: int
|
||||
deployed: List[constants.Country]
|
||||
allies: List[constants.Country]
|
||||
battle: "Battle"
|
||||
battle: 'Battle'
|
||||
_battle: weakref.ReferenceType
|
||||
country: constants.Country
|
||||
is_defender: bool
|
||||
|
||||
def __init__(self, battle: "Battle", country: constants.Country, points: int, allies: List[constants.Country],
|
||||
def __init__(self, battle: 'Battle', country: constants.Country, points: int, allies: List[constants.Country],
|
||||
deployed: List[constants.Country], defender: bool):
|
||||
self._battle = weakref.ref(battle)
|
||||
self.country = country
|
||||
@ -732,11 +737,11 @@ class BattleSide:
|
||||
return self.country.id
|
||||
|
||||
def __repr__(self):
|
||||
side_text = "Defender" if self.is_defender else "Invader "
|
||||
side_text = 'Defender' if self.is_defender else 'Invader '
|
||||
return f"<BattleSide: {side_text} {self.country.name}|{self.points:>2d}p>"
|
||||
|
||||
def __str__(self):
|
||||
side_text = "Defender" if self.is_defender else "Invader "
|
||||
side_text = 'Defender' if self.is_defender else 'Invader '
|
||||
return f"{side_text} {self.country.name} - {self.points:>2d} points"
|
||||
|
||||
def __format__(self, format_spec):
|
||||
@ -762,7 +767,7 @@ class BattleDivision:
|
||||
inv_medal: Dict[str, int]
|
||||
terrain: int
|
||||
div: int
|
||||
battle: "Battle"
|
||||
battle: 'Battle'
|
||||
_battle: weakref.ReferenceType
|
||||
|
||||
@property
|
||||
@ -778,7 +783,7 @@ class BattleDivision:
|
||||
def div_end(self) -> bool:
|
||||
return utils.now() >= self.end
|
||||
|
||||
def __init__(self, battle: "Battle", div_id: int, end: datetime.datetime, epic: bool, div: int, wall_for: int,
|
||||
def __init__(self, battle: 'Battle', div_id: int, end: datetime.datetime, epic: bool, div: int, wall_for: int,
|
||||
wall_dom: float, terrain_id: int = 0):
|
||||
"""Battle division helper class
|
||||
|
||||
@ -794,7 +799,7 @@ class BattleDivision:
|
||||
self.id = div_id
|
||||
self.end = end
|
||||
self.epic = epic
|
||||
self.wall = dict({"for": wall_for, "dom": wall_dom})
|
||||
self.wall = {'for': wall_for, 'dom': wall_dom}
|
||||
self.terrain = terrain_id
|
||||
self.div = div
|
||||
|
||||
@ -807,7 +812,7 @@ class BattleDivision:
|
||||
if self.terrain:
|
||||
base_name += f" ({self.terrain_display})"
|
||||
if self.div_end:
|
||||
base_name += " Ended"
|
||||
base_name += ' Ended'
|
||||
return base_name
|
||||
|
||||
def __repr__(self):
|
||||
@ -899,8 +904,8 @@ class Battle:
|
||||
|
||||
battle_div = BattleDivision(self, div_id=data.get('id'), div=data.get('div'), end=end,
|
||||
epic=data.get('epic_type') in [1, 5],
|
||||
wall_for=data.get('wall').get("for"),
|
||||
wall_dom=data.get('wall').get("dom"),
|
||||
wall_for=data.get('wall').get('for'),
|
||||
wall_dom=data.get('wall').get('dom'),
|
||||
terrain_id=data.get('terrain', 0))
|
||||
|
||||
self.div.update({div: battle_div})
|
||||
@ -986,7 +991,7 @@ class TelegramReporter:
|
||||
self._last_time = utils.good_timedelta(utils.now(), datetime.timedelta(minutes=-5))
|
||||
self._last_full_energy_report = utils.good_timedelta(utils.now(), datetime.timedelta(minutes=-30))
|
||||
if self.__queue:
|
||||
self.send_message("Telegram initialized")
|
||||
self.send_message('Telegram initialized')
|
||||
|
||||
def send_message(self, message: str) -> bool:
|
||||
self.__queue.append(message)
|
||||
@ -1014,7 +1019,7 @@ class TelegramReporter:
|
||||
new_line = '\n' if multiple else ''
|
||||
self.send_message(f"New award: {new_line}*{msg}*")
|
||||
|
||||
def report_fight(self, battle: "Battle", invader: bool, division: "BattleDivision", damage: float, hits: int):
|
||||
def report_fight(self, battle: 'Battle', invader: bool, division: 'BattleDivision', damage: float, hits: int):
|
||||
side_txt = (battle.invader if invader else battle.defender).country.iso
|
||||
self.send_message(f"*Fight report*:\n{int(damage):,d} dmg ({hits} hits) in"
|
||||
f" [battle {battle.id} for {battle.region_name[:16]}]({battle.link}) in d{division.div} on "
|
||||
@ -1037,7 +1042,7 @@ class TelegramReporter:
|
||||
message = "\n\n".join(self.__queue)
|
||||
if self.player_name:
|
||||
message = f"Player *{self.player_name}*\n\n" + message
|
||||
response = post(self.api_url, json=dict(chat_id=self.chat_id, text=message, parse_mode="Markdown"))
|
||||
response = post(self.api_url, json=dict(chat_id=self.chat_id, text=message, parse_mode='Markdown'))
|
||||
self._last_time = utils.now()
|
||||
if response.json().get('ok'):
|
||||
self.__queue.clear()
|
||||
|
||||
@ -3,8 +3,8 @@ from typing import Dict, Optional, Union
|
||||
|
||||
import pytz
|
||||
|
||||
__all__ = ["erep_tz", 'min_datetime', "max_datetime", "Country", "AIR_RANKS", "COUNTRIES", "FOOD_ENERGY",
|
||||
"GROUND_RANKS", "GROUND_RANK_POINTS", "INDUSTRIES", "TERRAINS"]
|
||||
__all__ = ['erep_tz', 'min_datetime', 'max_datetime', 'Country', 'AIR_RANKS', 'COUNTRIES', 'FOOD_ENERGY',
|
||||
'GROUND_RANKS', 'GROUND_RANK_POINTS', 'INDUSTRIES', 'TERRAINS']
|
||||
|
||||
erep_tz = pytz.timezone('US/Pacific')
|
||||
min_datetime = erep_tz.localize(datetime.datetime(2007, 11, 20))
|
||||
@ -60,11 +60,11 @@ class Industries:
|
||||
'wrm q1': 12, 'wrm q2': 13, 'wrm q3': 14, 'wrm q4': 15, 'wrm q5': 16,
|
||||
'hrm q1': 18, 'hrm q2': 19, 'hrm q3': 20, 'hrm q4': 21, 'hrm q5': 22,
|
||||
'arm q1': 24, 'arm q2': 25, 'arm q3': 26, 'arm q4': 27, 'arm q5': 28}
|
||||
__by_id = {1: "Food", 2: "Weapon", 3: "Ticket", 4: "House", 23: "Aircraft",
|
||||
7: "foodRaw", 8: "FRM q2", 9: "FRM q3", 10: "FRM q4", 11: "FRM q5",
|
||||
12: "weaponRaw", 13: "WRM q2", 14: "WRM q3", 15: "WRM q4", 16: "WRM q5",
|
||||
17: "houseRaw", 18: "houseRaw", 19: "HRM q2", 20: "HRM q3", 21: "HRM q4", 22: "HRM q5",
|
||||
24: "aircraftRaw", 25: "ARM q2", 26: "ARM q3", 27: "ARM q4", 28: "ARM q5"}
|
||||
__by_id = {1: 'Food', 2: 'Weapon', 3: 'Ticket', 4: 'House', 23: 'Aircraft',
|
||||
7: 'foodRaw', 8: 'FRM q2', 9: 'FRM q3', 10: 'FRM q4', 11: 'FRM q5',
|
||||
12: 'weaponRaw', 13: 'WRM q2', 14: 'WRM q3', 15: 'WRM q4', 16: 'WRM q5',
|
||||
17: 'houseRaw', 18: 'houseRaw', 19: 'HRM q2', 20: 'HRM q3', 21: 'HRM q4', 22: 'HRM q5',
|
||||
24: 'aircraftRaw', 25: 'ARM q2', 26: 'ARM q3', 27: 'ARM q4', 28: 'ARM q5'}
|
||||
|
||||
def __getitem__(self, item) -> Optional[Union[int, str]]:
|
||||
if isinstance(item, int):
|
||||
@ -82,21 +82,21 @@ class Industries:
|
||||
|
||||
|
||||
AIR_RANKS: Dict[int, str] = {
|
||||
1: "Airman", 2: "Airman 1st Class", 3: "Airman 1st Class*", 4: "Airman 1st Class**", 5: "Airman 1st Class***",
|
||||
6: "Airman 1st Class****", 7: "Airman 1st Class*****", 8: "Senior Airman", 9: "Senior Airman*",
|
||||
10: "Senior Airman**", 11: "Senior Airman***", 12: "Senior Airman****", 13: "Senior Airman*****",
|
||||
14: "Staff Sergeant", 15: "Staff Sergeant*", 16: "Staff Sergeant**", 17: "Staff Sergeant***",
|
||||
18: "Staff Sergeant****", 19: "Staff Sergeant*****", 20: "Aviator", 21: "Aviator*", 22: "Aviator**",
|
||||
23: "Aviator***", 24: "Aviator****", 25: "Aviator*****", 26: "Flight Lieutenant", 27: "Flight Lieutenant*",
|
||||
28: "Flight Lieutenant**", 29: "Flight Lieutenant***", 30: "Flight Lieutenant****", 31: "Flight Lieutenant*****",
|
||||
32: "Squadron Leader", 33: "Squadron Leader*", 34: "Squadron Leader**", 35: "Squadron Leader***",
|
||||
36: "Squadron Leader****", 37: "Squadron Leader*****", 38: "Chief Master Sergeant", 39: "Chief Master Sergeant*",
|
||||
40: "Chief Master Sergeant**", 41: "Chief Master Sergeant***", 42: "Chief Master Sergeant****",
|
||||
43: "Chief Master Sergeant*****", 44: "Wing Commander", 45: "Wing Commander*", 46: "Wing Commander**",
|
||||
47: "Wing Commander***", 48: "Wing Commander****", 49: "Wing Commander*****", 50: "Group Captain",
|
||||
51: "Group Captain*", 52: "Group Captain**", 53: "Group Captain***", 54: "Group Captain****",
|
||||
55: "Group Captain*****", 56: "Air Commodore", 57: "Air Commodore*", 58: "Air Commodore**", 59: "Air Commodore***",
|
||||
60: "Air Commodore****", 61: "Air Commodore*****",
|
||||
1: 'Airman', 2: 'Airman 1st Class', 3: 'Airman 1st Class*', 4: 'Airman 1st Class**', 5: 'Airman 1st Class***',
|
||||
6: 'Airman 1st Class****', 7: 'Airman 1st Class*****', 8: 'Senior Airman', 9: 'Senior Airman*',
|
||||
10: 'Senior Airman**', 11: 'Senior Airman***', 12: 'Senior Airman****', 13: 'Senior Airman*****',
|
||||
14: 'Staff Sergeant', 15: 'Staff Sergeant*', 16: 'Staff Sergeant**', 17: 'Staff Sergeant***',
|
||||
18: 'Staff Sergeant****', 19: 'Staff Sergeant*****', 20: 'Aviator', 21: 'Aviator*', 22: 'Aviator**',
|
||||
23: 'Aviator***', 24: 'Aviator****', 25: 'Aviator*****', 26: 'Flight Lieutenant', 27: 'Flight Lieutenant*',
|
||||
28: 'Flight Lieutenant**', 29: 'Flight Lieutenant***', 30: 'Flight Lieutenant****', 31: 'Flight Lieutenant*****',
|
||||
32: 'Squadron Leader', 33: 'Squadron Leader*', 34: 'Squadron Leader**', 35: 'Squadron Leader***',
|
||||
36: 'Squadron Leader****', 37: 'Squadron Leader*****', 38: 'Chief Master Sergeant', 39: 'Chief Master Sergeant*',
|
||||
40: 'Chief Master Sergeant**', 41: 'Chief Master Sergeant***', 42: 'Chief Master Sergeant****',
|
||||
43: 'Chief Master Sergeant*****', 44: 'Wing Commander', 45: 'Wing Commander*', 46: 'Wing Commander**',
|
||||
47: 'Wing Commander***', 48: 'Wing Commander****', 49: 'Wing Commander*****', 50: 'Group Captain',
|
||||
51: 'Group Captain*', 52: 'Group Captain**', 53: 'Group Captain***', 54: 'Group Captain****',
|
||||
55: 'Group Captain*****', 56: 'Air Commodore', 57: 'Air Commodore*', 58: 'Air Commodore**', 59: 'Air Commodore***',
|
||||
60: 'Air Commodore****', 61: 'Air Commodore*****',
|
||||
}
|
||||
|
||||
COUNTRIES: Dict[int, Country] = {
|
||||
@ -145,27 +145,27 @@ COUNTRIES: Dict[int, Country] = {
|
||||
FOOD_ENERGY: Dict[str, int] = dict(q1=2, q2=4, q3=6, q4=8, q5=10, q6=12, q7=20)
|
||||
|
||||
GROUND_RANKS: Dict[int, str] = {
|
||||
1: "Recruit", 2: "Private", 3: "Private*", 4: "Private**", 5: "Private***",
|
||||
6: "Corporal", 7: "Corporal*", 8: "Corporal**", 9: "Corporal***",
|
||||
10: "Sergeant", 11: "Sergeant*", 12: "Sergeant**", 13: "Sergeant***",
|
||||
14: "Lieutenant", 15: "Lieutenant*", 16: "Lieutenant**", 17: "Lieutenant***",
|
||||
18: "Captain", 19: "Captain*", 20: "Captain**", 21: "Captain***",
|
||||
22: "Major", 23: "Major*", 24: "Major**", 25: "Major***",
|
||||
26: "Commander", 27: "Commander*", 28: "Commander**", 29: "Commander***",
|
||||
30: "Lt Colonel", 31: "Lt Colonel*", 32: "Lt Colonel**", 33: "Lt Colonel***",
|
||||
34: "Colonel", 35: "Colonel*", 36: "Colonel**", 37: "Colonel***",
|
||||
38: "General", 39: "General*", 40: "General**", 41: "General***",
|
||||
42: "Field Marshal", 43: "Field Marshal*", 44: "Field Marshal**", 45: "Field Marshal***",
|
||||
46: "Supreme Marshal", 47: "Supreme Marshal*", 48: "Supreme Marshal**", 49: "Supreme Marshal***",
|
||||
50: "National Force", 51: "National Force*", 52: "National Force**", 53: "National Force***",
|
||||
54: "World Class Force", 55: "World Class Force*", 56: "World Class Force**", 57: "World Class Force***",
|
||||
58: "Legendary Force", 59: "Legendary Force*", 60: "Legendary Force**", 61: "Legendary Force***",
|
||||
62: "God of War", 63: "God of War*", 64: "God of War**", 65: "God of War***",
|
||||
66: "Titan", 67: "Titan*", 68: "Titan**", 69: "Titan***",
|
||||
70: "Legends I", 71: "Legends II", 72: "Legends III", 73: "Legends IV", 74: "Legends V", 75: "Legends VI",
|
||||
76: "Legends VII", 77: "Legends VIII", 78: "Legends IX", 79: "Legends X", 80: "Legends XI", 81: "Legends XII",
|
||||
82: "Legends XIII", 83: "Legends XIV", 84: "Legends XV", 85: "Legends XVI", 86: "Legends XVII", 87: "Legends XVIII",
|
||||
88: "Legends XIX", 89: "Legends XX",
|
||||
1: 'Recruit', 2: 'Private', 3: 'Private*', 4: 'Private**', 5: 'Private***',
|
||||
6: 'Corporal', 7: 'Corporal*', 8: 'Corporal**', 9: 'Corporal***',
|
||||
10: 'Sergeant', 11: 'Sergeant*', 12: 'Sergeant**', 13: 'Sergeant***',
|
||||
14: 'Lieutenant', 15: 'Lieutenant*', 16: 'Lieutenant**', 17: 'Lieutenant***',
|
||||
18: 'Captain', 19: 'Captain*', 20: 'Captain**', 21: 'Captain***',
|
||||
22: 'Major', 23: 'Major*', 24: 'Major**', 25: 'Major***',
|
||||
26: 'Commander', 27: 'Commander*', 28: 'Commander**', 29: 'Commander***',
|
||||
30: 'Lt Colonel', 31: 'Lt Colonel*', 32: 'Lt Colonel**', 33: 'Lt Colonel***',
|
||||
34: 'Colonel', 35: 'Colonel*', 36: 'Colonel**', 37: 'Colonel***',
|
||||
38: 'General', 39: 'General*', 40: 'General**', 41: 'General***',
|
||||
42: 'Field Marshal', 43: 'Field Marshal*', 44: 'Field Marshal**', 45: 'Field Marshal***',
|
||||
46: 'Supreme Marshal', 47: 'Supreme Marshal*', 48: 'Supreme Marshal**', 49: 'Supreme Marshal***',
|
||||
50: 'National Force', 51: 'National Force*', 52: 'National Force**', 53: 'National Force***',
|
||||
54: 'World Class Force', 55: 'World Class Force*', 56: 'World Class Force**', 57: 'World Class Force***',
|
||||
58: 'Legendary Force', 59: 'Legendary Force*', 60: 'Legendary Force**', 61: 'Legendary Force***',
|
||||
62: 'God of War', 63: 'God of War*', 64: 'God of War**', 65: 'God of War***',
|
||||
66: 'Titan', 67: 'Titan*', 68: 'Titan**', 69: 'Titan***',
|
||||
70: 'Legends I', 71: 'Legends II', 72: 'Legends III', 73: 'Legends IV', 74: 'Legends V', 75: 'Legends VI',
|
||||
76: 'Legends VII', 77: 'Legends VIII', 78: 'Legends IX', 79: 'Legends X', 80: 'Legends XI', 81: 'Legends XII',
|
||||
82: 'Legends XIII', 83: 'Legends XIV', 84: 'Legends XV', 85: 'Legends XVI', 86: 'Legends XVII', 87: 'Legends XVIII',
|
||||
88: 'Legends XIX', 89: 'Legends XX',
|
||||
}
|
||||
|
||||
GROUND_RANK_POINTS: Dict[int, int] = {
|
||||
@ -186,6 +186,6 @@ GROUND_RANK_POINTS: Dict[int, int] = {
|
||||
|
||||
INDUSTRIES = Industries()
|
||||
|
||||
TERRAINS: Dict[int, str] = {0: "Standard", 1: 'Industrial', 2: 'Urban', 3: 'Suburbs', 4: 'Airport', 5: 'Plains',
|
||||
TERRAINS: Dict[int, str] = {0: 'Standard', 1: 'Industrial', 2: 'Urban', 3: 'Suburbs', 4: 'Airport', 5: 'Plains',
|
||||
6: 'Wasteland', 7: 'Mountains', 8: 'Beach', 9: 'Swamp', 10: 'Mud', 11: 'Hills',
|
||||
12: 'Jungle', 13: 'Forest', 14: 'Desert'}
|
||||
|
||||
@ -106,22 +106,21 @@ silent_sleep = time.sleep
|
||||
def _write_log(msg, timestamp: bool = True, should_print: bool = False):
|
||||
erep_time_now = now()
|
||||
txt = f"[{erep_time_now.strftime('%F %T')}] {msg}" if timestamp else msg
|
||||
txt = "\n".join(["\n".join(textwrap.wrap(line, 120)) for line in txt.splitlines()])
|
||||
if not os.path.isdir('log'):
|
||||
os.mkdir('log')
|
||||
with open("log/%s.log" % erep_time_now.strftime('%F'), 'a', encoding="utf-8") as f:
|
||||
f.write("%s\n" % txt)
|
||||
with open(f'log/{erep_time_now.strftime("%F")}.log', 'a', encoding='utf-8') as f:
|
||||
f.write(f'{txt}\n')
|
||||
if should_print:
|
||||
print(txt)
|
||||
|
||||
|
||||
def write_interactive_log(*args, **kwargs):
|
||||
kwargs.pop("should_print", None)
|
||||
kwargs.pop('should_print', None)
|
||||
_write_log(should_print=True, *args, **kwargs)
|
||||
|
||||
|
||||
def write_silent_log(*args, **kwargs):
|
||||
kwargs.pop("should_print", None)
|
||||
kwargs.pop('should_print', None)
|
||||
_write_log(should_print=False, *args, **kwargs)
|
||||
|
||||
|
||||
@ -129,7 +128,7 @@ def get_file(filepath: str) -> str:
|
||||
file = Path(filepath)
|
||||
if file.exists():
|
||||
if file.is_dir():
|
||||
return str(file / "new_file.txt")
|
||||
return str(file / 'new_file.txt')
|
||||
else:
|
||||
version = 1
|
||||
try:
|
||||
@ -168,17 +167,16 @@ def write_request(response: requests.Response, is_error: bool = False):
|
||||
|
||||
try:
|
||||
json.loads(html)
|
||||
ext = "json"
|
||||
ext = 'json'
|
||||
except json.decoder.JSONDecodeError:
|
||||
ext = "html"
|
||||
ext = 'html'
|
||||
|
||||
if not is_error:
|
||||
filename = f"debug/requests/{now().strftime('%F_%H-%M-%S')}_{name}.{ext}"
|
||||
write_file(filename, html)
|
||||
else:
|
||||
return {"name": f"{now().strftime('%F_%H-%M-%S')}_{name}.{ext}",
|
||||
"content": html.encode('utf-8'),
|
||||
"mimetype": "application/json" if ext == "json" else "text/html"}
|
||||
return dict(name=f"{now().strftime('%F_%H-%M-%S')}_{name}.{ext}", content=html.encode('utf-8'),
|
||||
mimetype="application/json" if ext == 'json' else "text/html")
|
||||
|
||||
|
||||
def send_email(name: str, content: List[Any], player=None, local_vars: Dict[str, Any] = None,
|
||||
@ -187,21 +185,21 @@ def send_email(name: str, content: List[Any], player=None, local_vars: Dict[str,
|
||||
local_vars = {}
|
||||
from erepublik import Citizen
|
||||
|
||||
file_content_template = "<html><head><title>{title}</title></head><body>{body}</body></html>"
|
||||
file_content_template = '<html><head><title>{title}</title></head><body>{body}</body></html>'
|
||||
if isinstance(player, Citizen) and player.r:
|
||||
resp = write_request(player.r, is_error=True)
|
||||
else:
|
||||
resp = {"name": "None.html", "mimetype": "text/html",
|
||||
"content": file_content_template.format(body="<br/>".join(content), title="Error"), }
|
||||
resp = dict(name='None.html', mimetype='text/html',
|
||||
content=file_content_template.format(body='<br/>'.join(content), title='Error'))
|
||||
|
||||
if promo:
|
||||
resp = {"name": "%s.html" % name, "mimetype": "text/html",
|
||||
"content": file_content_template.format(title="Promo", body="<br/>".join(content))}
|
||||
resp = dict(name=f"{name}.html", mimetype='text/html',
|
||||
content=file_content_template.format(title='Promo', body='<br/>'.join(content)))
|
||||
subject = f"[eBot][{now().strftime('%F %T')}] Promos: {name}"
|
||||
|
||||
elif captcha:
|
||||
resp = {"name": "%s.html" % name, "mimetype": "text/html",
|
||||
"content": file_content_template.format(title="ReCaptcha", body="<br/>".join(content))}
|
||||
resp = dict(name=f'{name}.html', mimetype='text/html',
|
||||
content=file_content_template.format(title='ReCaptcha', body='<br/>'.join(content)))
|
||||
subject = f"[eBot][{now().strftime('%F %T')}] RECAPTCHA: {name}"
|
||||
else:
|
||||
subject = f"[eBot][{now().strftime('%F %T')}] Bug trace: {name}"
|
||||
@ -211,18 +209,18 @@ def send_email(name: str, content: List[Any], player=None, local_vars: Dict[str,
|
||||
"\n".join(content)
|
||||
data = dict(send_mail=True, subject=subject, bugtrace=body)
|
||||
if promo:
|
||||
data.update({'promo': True})
|
||||
data.update(promo=True)
|
||||
elif captcha:
|
||||
data.update({'captcha': True})
|
||||
data.update(captcha=True)
|
||||
else:
|
||||
data.update({"bug": True})
|
||||
data.update(bug=True)
|
||||
|
||||
files = [('file', (resp.get("name"), resp.get("content"), resp.get("mimetype"))), ]
|
||||
filename = "log/%s.log" % now().strftime('%F')
|
||||
files = [('file', (resp.get('name'), resp.get('content'), resp.get('mimetype'))), ]
|
||||
filename = f'log/{now().strftime("%F")}.log'
|
||||
if os.path.isfile(filename):
|
||||
files.append(('file', (filename[4:], open(filename, 'rb'), "text/plain")))
|
||||
files.append(('file', (filename[4:], open(filename, 'rb'), 'text/plain')))
|
||||
if local_vars:
|
||||
if "state_thread" in local_vars:
|
||||
if 'state_thread' in local_vars:
|
||||
local_vars.pop('state_thread', None)
|
||||
|
||||
if isinstance(local_vars.get('self'), Citizen):
|
||||
@ -233,15 +231,15 @@ def send_email(name: str, content: List[Any], player=None, local_vars: Dict[str,
|
||||
local_vars['citizen'] = repr(local_vars['citizen'])
|
||||
|
||||
from erepublik.classes import ErepublikJSONEncoder
|
||||
files.append(('file', ("local_vars.json", json.dumps(local_vars, cls=ErepublikJSONEncoder),
|
||||
files.append(('file', ('local_vars.json', json.dumps(local_vars, cls=ErepublikJSONEncoder),
|
||||
"application/json")))
|
||||
if isinstance(player, Citizen):
|
||||
files.append(('file', ("instance.json", player.to_json(indent=True), "application/json")))
|
||||
files.append(('file', ('instance.json', player.to_json(indent=True), "application/json")))
|
||||
requests.post('https://pasts.72.lv', data=data, files=files)
|
||||
|
||||
|
||||
def normalize_html_json(js: str) -> str:
|
||||
js = re.sub(r' \'(.*?)\'', lambda a: '"%s"' % a.group(1), js)
|
||||
js = re.sub(r' \'(.*?)\'', lambda a: f'"{a.group(1)}"', js)
|
||||
js = re.sub(r'(\d\d):(\d\d):(\d\d)', r'\1\2\3', js)
|
||||
js = re.sub(r'([{\s,])(\w+)(:)(?!"})', r'\1"\2"\3', js)
|
||||
js = re.sub(r',\s*}', '}', js)
|
||||
@ -249,7 +247,7 @@ def normalize_html_json(js: str) -> str:
|
||||
|
||||
|
||||
def caught_error(e: Exception):
|
||||
process_error(str(e), "Unclassified", sys.exc_info(), interactive=False)
|
||||
process_error(str(e), 'Unclassified', sys.exc_info(), interactive=False)
|
||||
|
||||
|
||||
def process_error(log_info: str, name: str, exc_info: tuple, citizen=None, commit_id: str = None,
|
||||
@ -284,10 +282,8 @@ def process_error(log_info: str, name: str, exc_info: tuple, citizen=None, commi
|
||||
if trace:
|
||||
local_vars = trace[-1][0].f_locals
|
||||
if local_vars.get('__name__') == '__main__':
|
||||
local_vars.update({'commit_id': local_vars.get('COMMIT_ID'),
|
||||
'interactive': local_vars.get('INTERACTIVE'),
|
||||
'version': local_vars.get('__version__'),
|
||||
'config': local_vars.get('CONFIG')})
|
||||
local_vars.update(commit_id=local_vars.get('COMMIT_ID'), interactive=local_vars.get('INTERACTIVE'),
|
||||
version=local_vars.get('__version__'), config=local_vars.get('CONFIG'))
|
||||
else:
|
||||
local_vars = dict()
|
||||
send_email(name, content, citizen, local_vars=local_vars)
|
||||
@ -305,7 +301,7 @@ def process_warning(log_info: str, name: str, exc_info: tuple, citizen=None, com
|
||||
type_, value_, traceback_ = exc_info
|
||||
content = [log_info]
|
||||
if commit_id:
|
||||
content += ["Commit id: %s" % commit_id]
|
||||
content += [f'Commit id: {commit_id}']
|
||||
content += [str(value_), str(type_), ''.join(traceback.format_tb(traceback_))]
|
||||
|
||||
trace = inspect.trace()
|
||||
@ -346,7 +342,7 @@ def calculate_hit(strength: float, rang: int, tp: bool, elite: bool, ne: bool, b
|
||||
|
||||
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()
|
||||
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']
|
||||
elite = r['citizenAttributes']['level'] > 100
|
||||
@ -358,7 +354,7 @@ def get_ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_
|
||||
|
||||
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()
|
||||
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
|
||||
return calculate_hit(0, rang, true_patriot, elite, natural_enemy, booster, weapon_power)
|
||||
@ -414,12 +410,12 @@ def json_decode_object_hook(
|
||||
if o.get('__type__'):
|
||||
_type = o.get('__type__')
|
||||
if _type == 'datetime':
|
||||
dt = datetime.datetime.strptime(f"{o['date']} {o['time']}", "%Y-%m-%d %H:%M:%S")
|
||||
dt = datetime.datetime.strptime(f"{o['date']} {o['time']}", '%Y-%m-%d %H:%M:%S')
|
||||
if o.get('tzinfo'):
|
||||
dt = pytz.timezone(o['tzinfo']).localize(dt)
|
||||
return dt
|
||||
elif _type == 'date':
|
||||
dt = datetime.datetime.strptime(f"{o['date']}", "%Y-%m-%d")
|
||||
dt = datetime.datetime.strptime(f"{o['date']}", '%Y-%m-%d')
|
||||
return dt.date()
|
||||
elif _type == 'timedelta':
|
||||
return datetime.timedelta(seconds=o['total_seconds'])
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user