diff --git a/erepublik_script/__init__.py b/erepublik_script/__init__.py index 6c84dde..a2eb17a 100644 --- a/erepublik_script/__init__.py +++ b/erepublik_script/__init__.py @@ -5,7 +5,6 @@ __author__ = """Eriks Karls""" __email__ = 'eriks@72.lv' __version__ = '0.14.3' -__all__ = ["Citizen"] from erepublik_script import classes, utils from erepublik_script.citizen import Citizen diff --git a/erepublik_script/utils.py b/erepublik_script/utils.py index cd11361..eee147e 100644 --- a/erepublik_script/utils.py +++ b/erepublik_script/utils.py @@ -284,156 +284,6 @@ def send_email(name, content: list, player=None, local_vars=dict, promo: bool = requests.post('https://pasts.72.lv', data=data, files=files) -def parse_input(msg: str) -> bool: - msg += " (y|n):" - data = None - while data not in ['', 'y', 'Y', 'n', 'N']: - try: - data = input(msg) - except EOFError: - data = 'n' - - return data in ['', 'y', 'Y'] - - -def parse_config(config=None) -> dict: - if config is None: - config = {} - - if not config.get('email'): - config['email'] = input("Player email: ") - - if not config.get('password'): - config['password'] = input("Player password: ") - - if 'wt' in config: - config['work'] = config['wt'] - config['train'] = config['wt'] - - if 'work' not in config: - config['work'] = parse_input('Should I work') - - if 'train' not in config: - config['train'] = parse_input('Should I train') - - if 'ot' not in config: - config['ot'] = parse_input('Should I work overtime') - - if 'wam' not in config: - config['wam'] = parse_input('Should I WAM') - - if 'employ' not in config: - config['employ'] = parse_input('Should I employ employees') - - if config['wam'] or config['employ']: - if "autosell" in config: - config.pop("autosell") - if "autosell_raw" in config: - config.pop("autosell_raw") - if "autosell_final" in config: - config.pop("autosell_final") - - if 'auto_sell' not in config or not isinstance(config['auto_sell'], list): - if parse_input('Should I auto sell produced products'): - config['auto_sell'] = [] - if parse_input("Should I auto sell Food products"): - if parse_input("Should I auto sell Food products"): - config['auto_sell'].append("food") - if parse_input("Should I auto sell Weapon products"): - config['auto_sell'].append("weapon") - if parse_input("Should I auto sell House products"): - config['auto_sell'].append("house") - if parse_input("Should I auto sell Aircraft products"): - config['auto_sell'].append("airplane") - if parse_input("Should I auto sell raw products"): - if parse_input("Should I auto sell Food raw"): - config['auto_sell'].append("foodRaw") - if parse_input("Should I auto sell Weapon raw"): - config['auto_sell'].append("weaponRaw") - if parse_input("Should I auto sell House raw"): - config['auto_sell'].append("houseRaw") - if parse_input("Should I auto sell Airplane raw"): - config['auto_sell'].append("airplaneRaw") - if config['auto_sell']: - if 'auto_sell_all' not in config: - print("When selling produced items should I also sell items already in inventory?") - config['auto_sell_all'] = parse_input('Y - sell all, N - only just produced') - else: - config['auto_sell_all'] = False - - if 'auto_buy_raw' not in config: - config['auto_buy_raw'] = parse_input('Should I auto buy raw deficit at WAM or employ') - else: - config['auto_sell'] = [] - config['auto_sell_all'] = False - config['auto_buy_raw'] = False - - if 'fight' not in config: - config['fight'] = parse_input('Should I fight') - - if config.get('fight'): - if 'air' not in config: - config['air'] = parse_input('Should I fight in AIR') - - if 'ground' not in config: - config['ground'] = parse_input('Should I fight in GROUND') - - if 'all_in' not in config: - print("When full energy should I go all in") - config['all_in'] = parse_input('Y - all in, N - 1h worth of energy') - - if 'next_energy' not in config: - config['next_energy'] = parse_input('Should I fight when next pp +1 energy available') - - if 'boosters' not in config: - config['boosters'] = parse_input('Should I use +50% dmg boosters') - - if 'travel_to_fight' not in config: - config['travel_to_fight'] = parse_input('Should I travel to fight') - - if 'epic_hunt' not in config: - config['epic_hunt'] = parse_input('Should I check for epic battles') - if not config['epic_hunt']: - config['epic_hunt_ebs'] = False - - if not config['epic_hunt']: - config['epic_hunt_ebs'] = False - elif 'epic_hunt_ebs' not in config: - config['epic_hunt_ebs'] = parse_input('Should I eat EBs when fighting in epic battle') - - if 'rw_def_side' not in config: - config['rw_def_side'] = parse_input('Should I fight on defenders side in RWs') - - if 'continuous_fighting' not in config: - config['continuous_fighting'] = parse_input('If already fought in any battle, \n' - 'should I continue to fight all FF in that battle') - else: - config['air'] = False - config['ground'] = False - config['all_in'] = False - config['next_energy'] = False - config['boosters'] = False - config['travel_to_fight'] = False - config['epic_hunt'] = False - config['epic_hunt_ebs'] = False - config['rw_def_side'] = False - config['continuous_fighting'] = False - - if 'debug' not in config: - config['debug'] = parse_input('Should I generate debug files') - - if 'random_sleep' not in config: - config['random_sleep'] = parse_input('Should I add random amount (0-120sec) to sleep time') - - if 'gold_buy' not in config: - config['gold_buy'] = parse_input('Should I auto buy 10g every day') - - if 'interactive' not in config: - config['interactive'] = parse_input('Should I print output to console?') - - return config - - def normalize_html_json(js: str) -> str: js = re.sub(r' \'(.*?)\'', lambda a: '"%s"' % a.group(1), js) js = re.sub(r'(\d\d):(\d\d):(\d\d)', r'\1\2\3', js)