Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| dc106cc87d | |||
| bb2c13d63a | |||
| ea48fbe7e1 | |||
| 65a3a9f678 | |||
| 0757345e17 | |||
| 6f4b32b12c | |||
| 69265a35e8 | |||
| f12bd0ed57 | |||
| 2d246cbf4b |
@ -2,10 +2,8 @@
|
||||
|
||||
language: python
|
||||
python:
|
||||
- 3.7
|
||||
- 3.6
|
||||
- 3.5
|
||||
- 3.4
|
||||
- 2.7
|
||||
|
||||
# Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
|
||||
install: pip install -U tox-travis
|
||||
|
||||
11
README.rst
11
README.rst
@ -6,21 +6,12 @@ eRepublik script
|
||||
.. image:: https://img.shields.io/pypi/v/erepublik_script.svg
|
||||
:target: https://pypi.python.org/pypi/erepublik_script
|
||||
|
||||
.. image:: https://img.shields.io/travis/eeriks/erepublik_script.svg
|
||||
:target: https://travis-ci.org/eeriks/erepublik_script
|
||||
|
||||
.. image:: https://readthedocs.org/projects/erepublik-script/badge/?version=latest
|
||||
:target: https://erepublik-script.readthedocs.io/en/latest/?badge=latest
|
||||
:alt: Documentation Status
|
||||
|
||||
|
||||
.. image:: https://pyup.io/repos/github/eeriks/erepublik_script/shield.svg
|
||||
:target: https://pyup.io/repos/github/eeriks/erepublik_script/
|
||||
:alt: Updates
|
||||
|
||||
|
||||
|
||||
Python package for eRepublik automated playing
|
||||
Python package for automated eRepublik playing
|
||||
|
||||
|
||||
* Free software: MIT license
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +0,0 @@
|
||||
<html><head><meta http-equiv="refresh" content="0;url=https://www.erepublik.com/en"/></head></html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +0,0 @@
|
||||
{"error":false,"enabled":true,"type":{"anniversary":false,"flavorPacks":false,"springChallenge":false,"summerChallenge":false,"halloweenChallenge":false},"timeLeft":346765,"nextReward":{"maxReward":false,"type":"icon_energy_booster","text":"+1 Energy recovery until the end of Day 4,262"},"maxRewardId":0,"player":{"avatar":"//cdnt.erepublik.net/7efiav4XZ4SMvXAtgEk1NciUmAg=/55x55/smart/avatars/Citizens/2009/07/08/4b57b9ebb0232f0d6c3f6f2c21b8ab95.jpg?c022b6df6f643263dba839cb35b7a9ab","name":"inpoc1","prestigePoints":14170},"progress":0.9141935483871,"rewards":{"normal":[{"id":59,"collectedBefore":58,"percent":0.74193548387097,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_bars"},{"id":60,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_booster"},{"id":61,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_bars"},{"id":62,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_booster"},{"id":63,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_bars"},{"id":64,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_booster"},{"id":65,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_bars"},{"id":66,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_booster"},{"id":67,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_bars"},{"id":68,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_booster"},{"id":69,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_bars"},{"id":70,"collectedBefore":0,"percent":0.016129032258065,"label":"Reach 14,250 Prestige Points to unlock the following reward: +1 Energy recovery until the end of Day 4,262","tooltip":"Reach 14250 Prestige Points to unlock the following reward: +1 Energy recovery until the end of Day 4,262","status":"","icon":"energy_booster"},{"id":71,"collectedBefore":0,"percent":0.016129032258065,"label":"Reach 14,500 Prestige Points to unlock the following reward: 10 Energy Bars","tooltip":"Reach 14500 Prestige Points to unlock the following reward: 10 Energy Bars","status":"","icon":"energy_bars"},{"id":72,"collectedBefore":0,"percent":0.032258064516129,"label":"Reach 15,000 Prestige Points to unlock the following reward: +1 Energy recovery until the end of Day 4,262","tooltip":"Reach 15000 Prestige Points to unlock the following reward: +1 Energy recovery until the end of Day 4,262","status":"","icon":"energy_booster"},{"id":73,"collectedBefore":0,"percent":0.016129032258065,"label":"Reach 15,250 Prestige Points to unlock the following reward: +1 Energy recovery until the end of Day 4,262","tooltip":"Reach 15250 Prestige Points to unlock the following reward: +1 Energy recovery until the end of Day 4,262","status":"","icon":"energy_booster"},{"id":74,"collectedBefore":0,"percent":0.016129032258065,"label":"Reach 15,500 Prestige Points to unlock the following reward: 15 Energy Bars","tooltip":"Reach 15500 Prestige Points to unlock the following reward: 15 Energy Bars","status":"","icon":"energy_bars"}],"extra":[]}}
|
||||
File diff suppressed because one or more lines are too long
@ -4,8 +4,7 @@
|
||||
|
||||
__author__ = """Eriks Karls"""
|
||||
__email__ = 'eriks@72.lv'
|
||||
__version__ = '0.1.2'
|
||||
__all__ = ["Citizen"]
|
||||
__version__ = '0.14.4'
|
||||
|
||||
from erepublik_script import classes, utils
|
||||
from erepublik_script.citizen import Citizen
|
||||
|
||||
@ -94,6 +94,8 @@ class Citizen(classes.CitizenAPI):
|
||||
ret = super().__dict__.copy()
|
||||
ret.pop('reporter', None)
|
||||
ret.pop('stop_threads', None)
|
||||
ret.pop('_Citizen__last_war_update_data', None)
|
||||
ret.update(all_battles=self.all_battles)
|
||||
|
||||
return ret
|
||||
|
||||
@ -440,6 +442,7 @@ class Citizen(classes.CitizenAPI):
|
||||
self.update_citizen_info()
|
||||
|
||||
resp_json = self.get_military_campaigns().json()
|
||||
self.all_battles = {}
|
||||
if resp_json.get("countries"):
|
||||
for c_id, c_data in resp_json.get("countries").items():
|
||||
if int(c_id) not in self.countries:
|
||||
@ -1285,12 +1288,12 @@ class Citizen(classes.CitizenAPI):
|
||||
|
||||
if count > 0 and not force_fight:
|
||||
if self.my_companies.ff_lockdown and self.details.pp > 75:
|
||||
if self.energy.food_fights - self.my_companies.ff_lockdown > 0:
|
||||
if count - self.my_companies.ff_lockdown > 0:
|
||||
log_msg = ("Fight count modified (old count: {} | FF: {} | "
|
||||
"WAM ff_lockdown: {} | New count: {})").format(
|
||||
count, self.energy.food_fights, self.my_companies.ff_lockdown,
|
||||
self.energy.food_fights - self.my_companies.ff_lockdown)
|
||||
count = self.energy.food_fights - self.my_companies.ff_lockdown
|
||||
count - self.my_companies.ff_lockdown)
|
||||
count -= self.my_companies.ff_lockdown
|
||||
else:
|
||||
count = 0
|
||||
if count <= 0:
|
||||
|
||||
@ -358,6 +358,7 @@ class Energy:
|
||||
def available(self):
|
||||
return self.recovered + self.recoverable
|
||||
|
||||
@property
|
||||
def __dict__(self):
|
||||
return dict(
|
||||
limit=self.limit,
|
||||
@ -778,57 +779,73 @@ class CitizenAPI:
|
||||
|
||||
def post_country_comment_retrieve(self, token: str, post_id: int):
|
||||
data = {"_token": token, "postId": post_id}
|
||||
return self.post("{}/main/country-comment/retrieve/".format(self.url), data=data)
|
||||
return self.post("{}/main/country-comment/retrieve/json".format(self.url), data=data)
|
||||
|
||||
def post_country_comment_create(self, token: str, post_id: int, comment_message: str):
|
||||
data = {"_token": token, "postId": post_id, 'comment_message': comment_message}
|
||||
return self.post("{}/main/country-comment/create/json".format(self.url), data=data)
|
||||
|
||||
def post_country_post_create(self, token: str, body: str, post_as: int):
|
||||
data = {"_token": token, "post_message": body, "post_as": post_as}
|
||||
return self.post("{}/main/country-post/create/".format(self.url), data=data)
|
||||
return self.post("{}/main/country-post/create/json".format(self.url), data=data)
|
||||
|
||||
def post_country_post_retrieve(self, token: str):
|
||||
data = {"_token": token, "page": 1, "switchedFrom": False}
|
||||
return self.post("{}/main/country-post/retrieve/".format(self.url), data=data)
|
||||
return self.post("{}/main/country-post/retrieve/json".format(self.url), data=data)
|
||||
|
||||
# ## Military Unit
|
||||
|
||||
def post_military_unit_comment_retrieve(self, token: str, post_id: int):
|
||||
data = {"_token": token, "postId": post_id}
|
||||
return self.post("{}/main/military-unit-comment/retrieve/".format(self.url), data=data)
|
||||
return self.post("{}/main/military-unit-comment/retrieve/json".format(self.url), data=data)
|
||||
|
||||
def post_military_unit_comment_create(self, token: str, post_id: int, comment_message: str):
|
||||
data = {"_token": token, "postId": post_id, 'comment_message': comment_message}
|
||||
return self.post("{}/main/military-unit-comment/create/json".format(self.url), data=data)
|
||||
|
||||
def post_military_unit_post_create(self, token: str, body: str, post_as: int):
|
||||
data = {"_token": token, "post_message": body, "post_as": post_as}
|
||||
return self.post("{}/main/military-unit-post/create/".format(self.url), data=data)
|
||||
return self.post("{}/main/military-unit-post/create/json".format(self.url), data=data)
|
||||
|
||||
def post_military_unit_post_retrieve(self, token: str):
|
||||
data = {"_token": token, "page": 1, "switchedFrom": False}
|
||||
return self.post("{}/main/military-unit-post/retrieve/".format(self.url), data=data)
|
||||
return self.post("{}/main/military-unit-post/retrieve/json".format(self.url), data=data)
|
||||
|
||||
# ## Party
|
||||
|
||||
def post_party_comment_retrieve(self, token: str, post_id: int):
|
||||
data = {"_token": token, "postId": post_id}
|
||||
return self.post("{}/main/party-comment/retrieve/".format(self.url), data=data)
|
||||
return self.post("{}/main/party-comment/retrieve/json".format(self.url), data=data)
|
||||
|
||||
def post_party_comment_create(self, token: str, post_id: int, comment_message: str):
|
||||
data = {"_token": token, "postId": post_id, 'comment_message': comment_message}
|
||||
return self.post("{}/main/party-comment/create/json".format(self.url), data=data)
|
||||
|
||||
def post_party_post_create(self, token: str, body: str):
|
||||
data = {"_token": token, "post_message": body}
|
||||
return self.post("{}/main/party-post/create/".format(self.url), data=data)
|
||||
return self.post("{}/main/party-post/create/json".format(self.url), data=data)
|
||||
|
||||
def post_party_post_retrieve(self, token: str):
|
||||
data = {"_token": token, "page": 1, "switchedFrom": False}
|
||||
return self.post("{}/main/party-post/retrieve/".format(self.url), data=data)
|
||||
return self.post("{}/main/party-post/retrieve/json".format(self.url), data=data)
|
||||
|
||||
# ## Friend's Wall
|
||||
|
||||
def post_wall_comment_retrieve(self, token: str, post_id: int):
|
||||
data = {"_token": token, "postId": post_id}
|
||||
return self.post("{}/main/wall-comment/retrieve/".format(self.url), data=data)
|
||||
return self.post("{}/main/wall-comment/retrieve/json".format(self.url), data=data)
|
||||
|
||||
def post_wall_comment_create(self, token: str, post_id: int, comment_message: str):
|
||||
data = {"_token": token, "postId": post_id, 'comment_message': comment_message}
|
||||
return self.post("{}/main/wall-comment/create/json".format(self.url), data=data)
|
||||
|
||||
def post_wall_post_create(self, token: str, body: str):
|
||||
data = {"_token": token, "post_message": body}
|
||||
return self.post("{}/main/wall-post/create/".format(self.url), data=data)
|
||||
return self.post("{}/main/wall-post/create/json".format(self.url), data=data)
|
||||
|
||||
def post_wall_post_retrieve(self, token: str):
|
||||
data = {"_token": token, "page": 1, "switchedFrom": False}
|
||||
return self.post("{}/main/wall-post/retrieve/".format(self.url), data=data)
|
||||
return self.post("{}/main/wall-post/retrieve/json".format(self.url), data=data)
|
||||
|
||||
|
||||
class Reporter:
|
||||
@ -998,21 +1015,24 @@ class Battle(object):
|
||||
else:
|
||||
end = datetime.datetime.max
|
||||
|
||||
self.div.update({div: BattleDivision(end, data.get('epic_type') in [1, 5],
|
||||
data.get('dom_pts').get("inv"), data.get('dom_pts').get("def"),
|
||||
data.get('wall').get("for"), data.get('wall').get("dom"))})
|
||||
battle_div = BattleDivision(
|
||||
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")
|
||||
)
|
||||
|
||||
self.div.update({div: battle_div})
|
||||
|
||||
def __repr__(self):
|
||||
now = utils.now()
|
||||
is_started = self.start < utils.now()
|
||||
if is_started:
|
||||
timepart = "{}".format(now - self.start)
|
||||
time_part = "{}".format(now - self.start)
|
||||
else:
|
||||
timepart = "- {}".format(self.start - now)
|
||||
return "Battle {} | {:>21.21}:{:<21.21} | Round {:2} | Start {}".format(self.id,
|
||||
utils.COUNTRIES[self.invader.id],
|
||||
utils.COUNTRIES[self.defender.id],
|
||||
self.zone_id, timepart)
|
||||
time_part = "- {}".format(self.start - now)
|
||||
return "Battle {} | {:>21.21}:{:<21.21} | Round {:2} | Start {}".format(
|
||||
self.id, utils.COUNTRIES[self.invader.id], utils.COUNTRIES[self.defender.id], self.zone_id, time_part
|
||||
)
|
||||
|
||||
|
||||
class EnergyToFight:
|
||||
|
||||
@ -1,422 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""Console script for erepublik_script."""
|
||||
|
||||
import json
|
||||
import os
|
||||
import random
|
||||
import sys
|
||||
import threading
|
||||
from collections import defaultdict
|
||||
from datetime import timedelta
|
||||
from typing import List, Tuple
|
||||
|
||||
import click
|
||||
|
||||
from erepublik_script import classes, utils
|
||||
from erepublik_script.citizen import Citizen
|
||||
|
||||
|
||||
__all__ = ["Citizen"]
|
||||
|
||||
CONFIG = defaultdict(bool)
|
||||
|
||||
|
||||
@click.command()
|
||||
@click.option('--silent', help='Run silently', type=bool, is_flag=True)
|
||||
def main(silent):
|
||||
global CONFIG
|
||||
assert sys.version_info >= (3, 7, 1)
|
||||
if silent:
|
||||
write_log = utils.write_silent_log
|
||||
else:
|
||||
write_log = utils.write_interactive_log
|
||||
|
||||
try:
|
||||
with open('config.json', 'r') as f:
|
||||
CONFIG = json.load(f)
|
||||
|
||||
write_log('Config file found. Checking...')
|
||||
CONFIG = utils.parse_config(CONFIG)
|
||||
except:
|
||||
CONFIG = utils.parse_config()
|
||||
|
||||
with open('config.json', 'w') as f:
|
||||
json.dump(CONFIG, f, indent=True, sort_keys=True)
|
||||
if CONFIG['interactive']:
|
||||
write_log = utils.write_interactive_log
|
||||
else:
|
||||
write_log = utils.write_silent_log
|
||||
write_log('\nTo quit press [ctrl] + [c]', False)
|
||||
os.chdir(os.path.dirname(os.path.realpath(__file__)))
|
||||
write_log('Version: ' + utils.VERSION)
|
||||
player = None
|
||||
try: # If errors before player is initialized
|
||||
while True:
|
||||
player = Citizen(email=CONFIG['email'], password=CONFIG['password'])
|
||||
if player.logged_in:
|
||||
break
|
||||
utils.silent_sleep(2)
|
||||
player.config.work = CONFIG['work']
|
||||
player.config.train = CONFIG['train']
|
||||
player.config.ot = CONFIG['ot']
|
||||
player.config.wam = bool(CONFIG['wam'])
|
||||
player.config.employees = bool(CONFIG['employ'])
|
||||
player.config.auto_sell = CONFIG.get('auto_sell', [])
|
||||
player.config.auto_sell_all = CONFIG.get('auto_sell_all', False)
|
||||
player.config.auto_buy_raw = CONFIG.get('auto_buy_raw', False)
|
||||
player.config.force_wam = CONFIG.get('force_wam', False)
|
||||
player.config.fight = CONFIG['fight']
|
||||
player.config.air = CONFIG['air']
|
||||
player.config.ground = CONFIG['ground']
|
||||
player.config.all_in = CONFIG['all_in']
|
||||
player.config.next_energy = CONFIG['next_energy']
|
||||
player.config.boosters = CONFIG['boosters']
|
||||
player.config.travel_to_fight = CONFIG['travel_to_fight']
|
||||
player.config.always_travel = CONFIG.get('always_travel', False)
|
||||
player.config.epic_hunt = CONFIG['epic_hunt']
|
||||
player.config.epic_hunt_ebs = CONFIG['epic_hunt_ebs']
|
||||
player.config.rw_def_side = CONFIG['rw_def_side']
|
||||
player.config.random_sleep = CONFIG['random_sleep']
|
||||
player.config.continuous_fighting = CONFIG['continuous_fighting']
|
||||
player.config.interactive = CONFIG['interactive']
|
||||
player.reporter.allowed = not CONFIG.get('reporting_is_not_allowed')
|
||||
|
||||
player.set_debug(CONFIG.get('debug', False))
|
||||
while True:
|
||||
try:
|
||||
player.update_all()
|
||||
break
|
||||
except:
|
||||
utils.silent_sleep(2)
|
||||
|
||||
now = utils.now()
|
||||
dt_max = now.replace(year=9999)
|
||||
tasks = {
|
||||
'eat': now,
|
||||
}
|
||||
wam_hour = employ_hour = 14
|
||||
if player.config.work:
|
||||
tasks.update({'work': now})
|
||||
if player.config.train:
|
||||
tasks.update({'train': now})
|
||||
if player.config.ot:
|
||||
tasks.update({'ot': now})
|
||||
if player.config.fight:
|
||||
tasks.update({'fight': now})
|
||||
if player.config.wam:
|
||||
wam_hour = 14
|
||||
if not isinstance(CONFIG['wam'], bool):
|
||||
try:
|
||||
wam_hour = abs(int(CONFIG['wam'])) % 24
|
||||
except ValueError:
|
||||
pass
|
||||
tasks.update({'wam': now.replace(hour=wam_hour, minute=0, second=0, microsecond=0)})
|
||||
if player.config.employees:
|
||||
employ_hour = 8
|
||||
if not isinstance(CONFIG['employ'], bool):
|
||||
try:
|
||||
employ_hour = abs(int(CONFIG['employ'])) % 24
|
||||
except ValueError:
|
||||
pass
|
||||
tasks.update({'employ': now.replace(hour=employ_hour, minute=0, second=0, microsecond=0)})
|
||||
|
||||
if player.config.epic_hunt:
|
||||
tasks['epic_hunt'] = now
|
||||
|
||||
if CONFIG.get("renew_houses", True):
|
||||
tasks['renew_houses'] = now
|
||||
|
||||
if CONFIG.get('start_battles'):
|
||||
""" {'start_battle': {war_id: {'regions': [region_id, ],
|
||||
'timing': ['at', 'hh:mm' | 'before', 'hh:mm' (before autoattack) |
|
||||
'auto' (after round for citizenship country's oldest battle or at 00:00)
|
||||
'rw', (after first round of RW if you are occupying)]}} """
|
||||
player.allowed_battles = CONFIG.get('start_battles', dict())
|
||||
raise classes.ErepublikException("Battle starting is not implemented")
|
||||
|
||||
if player.reporter.allowed:
|
||||
report = dict(CONFIG)
|
||||
report.pop("email", None)
|
||||
report.pop("password", None)
|
||||
report.update(
|
||||
VERSION=utils.VERSION,
|
||||
COMMIT_ID=utils.COMMIT_ID
|
||||
)
|
||||
player.reporter.report_action("ACTIVE_CONFIG", json_val=report)
|
||||
# -1 because main thread is counted in
|
||||
name = "{}-state_updater-{}".format(player.name, threading.active_count() - 1)
|
||||
state_thread = threading.Thread(target=player.state_update_repeater, name=name)
|
||||
state_thread.start()
|
||||
|
||||
if CONFIG.get("congress", True):
|
||||
tasks['congress'] = now.replace(hour=1, minute=30, second=0)
|
||||
|
||||
if CONFIG.get("party_president", False):
|
||||
tasks['party_president'] = now.replace(hour=1, minute=30, second=0)
|
||||
|
||||
contribute_cc = int(CONFIG.get("contribute_cc", 0))
|
||||
if contribute_cc:
|
||||
tasks['contribute_cc'] = now.replace(hour=2, minute=0, second=0)
|
||||
|
||||
if CONFIG.get("gold_buy"):
|
||||
tasks['gold_buy'] = now.replace(hour=23, minute=57, second=0, microsecond=0)
|
||||
|
||||
error_count = 0
|
||||
while error_count < 3:
|
||||
try:
|
||||
now = utils.now()
|
||||
player.update_all()
|
||||
if tasks.get('work', dt_max) <= now:
|
||||
player.write_log("Doing task: work")
|
||||
player.update_citizen_info()
|
||||
player.work()
|
||||
if player.config.ot:
|
||||
tasks['ot'] = now
|
||||
player.collect_daily_task()
|
||||
next_time = now.replace(hour=0, minute=0, second=0) + timedelta(days=1)
|
||||
tasks.update({'work': next_time})
|
||||
|
||||
if tasks.get('train', dt_max) <= now:
|
||||
player.write_log("Doing task: train")
|
||||
player.update_citizen_info()
|
||||
player.train()
|
||||
player.collect_daily_task()
|
||||
next_time = now.replace(hour=0, minute=0, second=0) + timedelta(days=1)
|
||||
tasks.update({'train': next_time})
|
||||
|
||||
if tasks.get('wam', dt_max) <= now:
|
||||
player.write_log("Doing task: Work as manager")
|
||||
success = player.work_wam()
|
||||
player.eat()
|
||||
if success:
|
||||
next_time = now.replace(hour=wam_hour, minute=0, second=0, microsecond=0) + timedelta(days=1)
|
||||
else:
|
||||
next_time = now.replace(second=0, microsecond=0) + timedelta(minutes=30)
|
||||
|
||||
tasks.update({'wam': next_time})
|
||||
|
||||
if tasks.get('eat', dt_max) <= now:
|
||||
player.write_log("Doing task: eat")
|
||||
player.eat()
|
||||
|
||||
if player.energy.food_fights > player.energy.limit // 10:
|
||||
next_minutes = 12
|
||||
else:
|
||||
next_minutes = (player.energy.limit - 5 * player.energy.interval) // player.energy.interval * 6
|
||||
|
||||
next_time = player.energy.reference_time + timedelta(minutes=next_minutes)
|
||||
tasks.update({'eat': next_time})
|
||||
|
||||
if tasks.get('fight', dt_max) <= now or player.energy.is_energy_full:
|
||||
fight_energy_debug_log: List[Tuple[int, str]] = []
|
||||
player.write_log("Doing task: fight")
|
||||
player.write_log(player.health_info)
|
||||
|
||||
if player.should_fight():
|
||||
player.find_battle_and_fight()
|
||||
else:
|
||||
player.collect_weekly_reward()
|
||||
energy = classes.EnergyToFight(player.details.xp_till_level_up * 10 - player.energy.limit + 50)
|
||||
fight_energy_debug_log.append((
|
||||
energy.i,
|
||||
f"Levelup reachable {player.details.xp_till_level_up} * 10 - {player.energy.limit} + 50"
|
||||
))
|
||||
|
||||
# Do levelup
|
||||
energy.check(player.details.xp_till_level_up * 10 + 50)
|
||||
fight_energy_debug_log.append((
|
||||
energy.i, f"Levelup {player.details.xp_till_level_up} * 10 + 50"
|
||||
))
|
||||
|
||||
# if levelup is close stop queueing other fighting
|
||||
if not player.is_levelup_close:
|
||||
|
||||
# Obligatory need 75pp
|
||||
if player.details.pp < 75:
|
||||
energy.check(75 - player.details.pp)
|
||||
fight_energy_debug_log.append((energy.i, f"Obligatory need 75pp: 75 - {player.details.pp}"))
|
||||
|
||||
if player.config.continuous_fighting and player.has_battle_contribution:
|
||||
energy.check(player.energy.interval)
|
||||
fight_energy_debug_log.append((energy.i, f"continuous_fighting: {player.energy.interval}"))
|
||||
|
||||
# All-in
|
||||
if player.config.all_in:
|
||||
energy.check(player.energy.limit * 2 - 3 * player.energy.interval)
|
||||
fight_energy_debug_log.append((
|
||||
energy.i, f"All-in: {player.energy.limit} * 2 - 3 * {player.energy.interval}"
|
||||
))
|
||||
elif player.energy.limit * 2 - 3 * player.energy.interval >= player.energy.recovered:
|
||||
# 1h worth of energy
|
||||
energy.check(player.energy.limit * 2 - 3 * player.energy.interval)
|
||||
fight_energy_debug_log.append(
|
||||
(energy.i, f"1h worth of energy: {player.energy.interval} * 10"
|
||||
))
|
||||
|
||||
# All-in for AIR battles
|
||||
if all([player.config.air, player.config.all_in,
|
||||
player.energy.available >= player.energy.limit]):
|
||||
energy.check(player.energy.limit)
|
||||
fight_energy_debug_log.append((
|
||||
energy.i, f"All-in for AIR battles: {player.energy.limit}"
|
||||
))
|
||||
|
||||
# Get to next Energy +1
|
||||
if player.next_reachable_energy and player.config.next_energy:
|
||||
energy.check(player.next_reachable_energy * 10)
|
||||
fight_energy_debug_log.append((
|
||||
energy.i, f"Get to next Energy +1: {player.next_reachable_energy} * 10"
|
||||
))
|
||||
|
||||
energy = energy.i - player.energy.available
|
||||
next_minutes = max([6, abs(energy) // player.energy.interval * 6])
|
||||
# utils.write_silent_log("\n".join([f"{energy} {info}" for energy, info in fight_energy_debug_log]))
|
||||
next_time = player.energy.reference_time + timedelta(minutes=next_minutes)
|
||||
tasks.update({'fight': next_time})
|
||||
|
||||
if tasks.get('ot', dt_max) <= now:
|
||||
player.write_log("Doing task: ot")
|
||||
if now > player.my_companies.next_ot_time:
|
||||
player.work_ot()
|
||||
next_time = now + timedelta(minutes=60)
|
||||
else:
|
||||
next_time = player.my_companies.next_ot_time
|
||||
tasks.update({'ot': next_time})
|
||||
|
||||
if tasks.get('employ', dt_max) <= now:
|
||||
player.write_log("Doing task: Employee work")
|
||||
next_time = utils.now().replace(hour=employ_hour, minute=0, second=0) + timedelta(days=1)
|
||||
next_time = next_time if player.work_employees() else tasks.get('employ') + timedelta(minutes=30)
|
||||
tasks.update({'employ': next_time})
|
||||
|
||||
if tasks.get('epic_hunt', dt_max) <= now:
|
||||
player.write_log("Doing task: EPIC check")
|
||||
player.check_epic_battles()
|
||||
if player.active_fs:
|
||||
next_time = now + timedelta(minutes=1)
|
||||
else:
|
||||
next_time = tasks.get('eat')
|
||||
tasks.update({'epic_hunt': next_time})
|
||||
|
||||
if tasks.get('gold_buy', dt_max) <= now:
|
||||
player.write_log("Doing task: auto buy 10g")
|
||||
for offer in player.get_monetary_offers():
|
||||
if offer['amount'] >= 10 and player.details.cc >= 20 * offer["price"]:
|
||||
# TODO: check allowed amount to buy
|
||||
if player.buy_monetary_market_offer(offer=offer['offer_id'], amount=10, currency=62):
|
||||
break
|
||||
|
||||
next_time = tasks.get('gold_buy') + timedelta(days=1)
|
||||
tasks.update({'gold_buy': next_time})
|
||||
|
||||
if tasks.get('congress', dt_max) <= now:
|
||||
if 1 <= now.day < 16:
|
||||
next_time = now.replace(day=16)
|
||||
elif 16 <= now.day < 24:
|
||||
player.write_log("Doing task: candidate for congress")
|
||||
player.candidate_for_congress()
|
||||
if not now.month == 12:
|
||||
next_time = now.replace(month=now.month + 1, day=16)
|
||||
else:
|
||||
next_time = now.replace(year=now.year + 1, month=1, day=16)
|
||||
else:
|
||||
if not now.month == 12:
|
||||
next_time = now.replace(month=now.month + 1, day=16)
|
||||
else:
|
||||
next_time = now.replace(year=now.year + 1, month=1, day=16)
|
||||
tasks.update({'congress': next_time.replace(hour=1, minute=30, second=0, microsecond=0)})
|
||||
|
||||
if tasks.get('party_president', dt_max) <= now:
|
||||
if not now.day == 15:
|
||||
player.write_log("Doing task: candidate for party president")
|
||||
player.candidate_for_party_presidency()
|
||||
if not now.month == 12:
|
||||
next_time = now.replace(month=now.month + 1)
|
||||
else:
|
||||
next_time = now.replace(year=now.year + 1, month=1)
|
||||
else:
|
||||
if not now.month == 12:
|
||||
next_time = now.replace(month=now.month + 1)
|
||||
else:
|
||||
next_time = now.replace(year=now.year + 1, month=1)
|
||||
tasks.update(party_president=next_time.replace(day=16, hour=0, minute=0, second=0, microsecond=0))
|
||||
|
||||
if tasks.get('contribute_cc', dt_max) <= now:
|
||||
if not now.weekday():
|
||||
player.update_money()
|
||||
cc = (player.details.cc // contribute_cc) * contribute_cc
|
||||
player.write_log("Doing task: Contribute {}cc to Latvia".format(cc))
|
||||
player.contribute_cc_to_country(cc)
|
||||
next_time = now + timedelta(days=7 - now.weekday())
|
||||
next_time = next_time.replace(hour=2, minute=0, second=0)
|
||||
tasks.update({'contribute_cc': next_time})
|
||||
|
||||
if tasks.get('renew_houses', dt_max) <= now:
|
||||
player.write_log("Doing task: Renew houses")
|
||||
end_times = player.renew_houses()
|
||||
if end_times:
|
||||
tasks.update(renew_houses=min(end_times.values()) - timedelta(hours=24))
|
||||
else:
|
||||
player.write_log("No houses found! Forcing q1 usage...")
|
||||
end_times = player.buy_and_activate_house(1)
|
||||
if not end_times:
|
||||
tasks.update(renew_houses=now + timedelta(hours=6))
|
||||
else:
|
||||
tasks.update(renew_houses=min(end_times.values()) - timedelta(hours=24))
|
||||
|
||||
closest_next_time = dt_max
|
||||
next_tasks = []
|
||||
for task, next_time in sorted(tasks.items(), key=lambda s: s[1]):
|
||||
next_tasks.append("{}: {}".format(next_time.strftime('%F %T'), task))
|
||||
if next_time < closest_next_time:
|
||||
closest_next_time = next_time
|
||||
random_seconds = random.randint(0, 121) if player.config.random_sleep else 0
|
||||
sleep_seconds = int(utils.get_sleep_seconds(closest_next_time))
|
||||
if sleep_seconds <= 0:
|
||||
raise classes.ErepublikException(f"Loop detected! Offending task: '{next_tasks[0]}'")
|
||||
closest_next_time += timedelta(seconds=random_seconds)
|
||||
player.write_log("My next Tasks and there time:\n" + "\n".join(sorted(next_tasks)))
|
||||
player.write_log("Sleeping until (eRep): {} (sleeping for {}s + random {}s)".format(
|
||||
closest_next_time.strftime("%F %T"), sleep_seconds, random_seconds))
|
||||
seconds_to_sleep = sleep_seconds + random_seconds if sleep_seconds > 0 else 0
|
||||
player.sleep(seconds_to_sleep)
|
||||
|
||||
except classes.ErepublikNetworkException:
|
||||
player.write_log('Network ERROR detected. Sleeping for 1min...')
|
||||
player.sleep(60)
|
||||
except (KeyboardInterrupt, SystemExit):
|
||||
sys.exit(1)
|
||||
except classes.ErepublikException as e:
|
||||
utils.process_error(f"Known error detected! {e}", player.name, sys.exc_info(), player, utils.COMMIT_ID)
|
||||
except:
|
||||
utils.process_error("Unknown error!", player.name, sys.exc_info(), player, utils.COMMIT_ID)
|
||||
error_count += 1
|
||||
if error_count < 3:
|
||||
player.sleep(60)
|
||||
finally:
|
||||
if error_count >= 3:
|
||||
player.stop_threads.set()
|
||||
player.stop_threads.set()
|
||||
player.write_log('Too many errors.')
|
||||
except (KeyboardInterrupt, SystemExit):
|
||||
sys.exit(1)
|
||||
except classes.ErepublikException:
|
||||
utils.process_error("[{}] To many errors.".format(utils.COMMIT_ID), player.name, sys.exc_info(), player,
|
||||
utils.COMMIT_ID)
|
||||
except:
|
||||
if isinstance(player, Citizen):
|
||||
name = player.name
|
||||
elif CONFIG.get('email', None):
|
||||
name = CONFIG['email']
|
||||
else:
|
||||
name = "Uninitialized"
|
||||
utils.process_error("[{}] Fatal error.".format(utils.COMMIT_ID), name, sys.exc_info(), player, utils.COMMIT_ID)
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
while True:
|
||||
main()
|
||||
utils.write_interactive_log("Restarting after 1h")
|
||||
utils.interactive_sleep(60 * 60)
|
||||
@ -18,7 +18,7 @@ from requests import Response
|
||||
from slugify import slugify
|
||||
|
||||
|
||||
__all__ = ["FOOD_ENERGY", "VERSION", "COMMIT_ID", "COUNTRIES", "erep_tz",
|
||||
__all__ = ["FOOD_ENERGY", "COMMIT_ID", "COUNTRIES", "erep_tz",
|
||||
"now", "localize_dt", "localize_timestamp", "good_timedelta", "eday_from_date", "date_from_eday",
|
||||
"get_sleep_seconds", "interactive_sleep", "silent_sleep",
|
||||
"write_silent_log", "write_interactive_log", "get_file", "write_file",
|
||||
@ -26,7 +26,6 @@ __all__ = ["FOOD_ENERGY", "VERSION", "COMMIT_ID", "COUNTRIES", "erep_tz",
|
||||
|
||||
|
||||
FOOD_ENERGY = dict(q1=2, q2=4, q3=6, q4=8, q5=10, q6=12, q7=20)
|
||||
VERSION = "v0.14.1"
|
||||
COMMIT_ID = "7b92e19"
|
||||
|
||||
erep_tz = pytz.timezone('US/Pacific')
|
||||
@ -285,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)
|
||||
@ -464,267 +313,3 @@ def process_error(log_info: str, name: str, exc_info: tuple, citizen=None, commi
|
||||
else:
|
||||
write_silent_log(log_info)
|
||||
send_email(name, bugtrace, citizen, local_vars=inspect.trace()[-1][0].f_locals)
|
||||
|
||||
|
||||
def aviator_support(citizen, send_food=False, free_food=None):
|
||||
forbidden_ids = []
|
||||
if free_food is None:
|
||||
free_food = {} # {"q1": 0, "q2": 1000, ...}
|
||||
context = {'PLAYER_COUNT': 0, 'TABLE': "",
|
||||
'STARTING_ENERGY': sum([amount * FOOD_ENERGY[q] for q, amount in free_food.items()]),
|
||||
'TOTAL_CC': 0, 'TOTAL_ENERGY': 0, 'END_ENERGY': 0}
|
||||
from erepublik_script import Citizen
|
||||
if not isinstance(citizen, Citizen):
|
||||
from .classes import ErepublikException
|
||||
raise ErepublikException("\"citizen\" must be instance of erepublik.Citizen")
|
||||
citizen.config.interactive = True
|
||||
aviators = dict()
|
||||
time_string = "%Y-%m-%d %H:%M:%S"
|
||||
latest_article = requests.get('https://erep.lv/aviator/latest_article/').json()
|
||||
for quality, amount in latest_article.get('free_food', {}).items():
|
||||
free_food[quality] = free_food.get(quality, 0) + amount
|
||||
|
||||
if not latest_article.get('status'):
|
||||
from .classes import ErepublikException
|
||||
raise ErepublikException('Article ID and week problem')
|
||||
context.update(WEEK=latest_article.get('week', 0) + 1)
|
||||
comments = citizen.post_article_comments(citizen.token, latest_article.get('article_id'), 1).json()
|
||||
ranking = citizen.get_leaderboards_kills_aircraft_rankings(71, 1, 0).json()
|
||||
|
||||
if not comments.get("comments", {}):
|
||||
from .classes import ErepublikException
|
||||
raise ErepublikException("No comments found")
|
||||
for comment_data in comments.get("comments", {}).values():
|
||||
if comment_data.get('authorId') == 1954361:
|
||||
start_dt = localize_dt(datetime.datetime.strptime(comment_data.get('createdAt'), time_string))
|
||||
days_ahead = 1 - start_dt.weekday()
|
||||
if days_ahead <= 0:
|
||||
days_ahead += 7
|
||||
end_dt = (good_timedelta(start_dt, datetime.timedelta(days_ahead))).replace(hour=0, minute=0, second=0)
|
||||
if not comment_data.get('replies', {}):
|
||||
from .classes import ErepublikException
|
||||
raise ErepublikException("No replies found")
|
||||
|
||||
for reply_data in comment_data.get('replies').values():
|
||||
if localize_dt(datetime.datetime.strptime(reply_data.get('createdAt'), time_string)) > end_dt:
|
||||
continue
|
||||
if re.search(r'piesakos', reply_data.get('message'), re.I):
|
||||
aviators.update({int(reply_data.get('authorId')): dict(
|
||||
id=reply_data.get('authorId'), name="", kills=0, rank=0, residency=None, health=0, extra=[],
|
||||
factories=0
|
||||
)})
|
||||
|
||||
context['PLAYER_COUNT'] = len(aviators)
|
||||
write_interactive_log("{:^9} | {:<28} | {:4} | {:26} | {:6} | {}".format(
|
||||
"ID", "Vārds", "Kili", "Gaisa rangs", "Energy", "Aktivizētās mājas"
|
||||
))
|
||||
|
||||
for player_top_data in ranking.get('top'):
|
||||
player_id = int(player_top_data.get('id'))
|
||||
if player_id in aviators:
|
||||
aviators[player_id]["kills"] = int(player_top_data['values'])
|
||||
|
||||
for aviator_id, aviator_data in aviators.items():
|
||||
aviator_info = citizen.get_citizen_profile(aviator_id).json()
|
||||
aviator_data.update({
|
||||
'rank': aviator_info['military']['militaryData']['aircraft']['rankNumber'],
|
||||
'name': aviator_info['citizen']['name'],
|
||||
'residency': aviator_info['city']['residenceCityId']
|
||||
})
|
||||
|
||||
if aviator_info.get("isBanned"):
|
||||
aviator_data.update({'health': 0, 'extra': ["BANNED", ]})
|
||||
else:
|
||||
if aviator_data['rank'] < 44:
|
||||
if aviator_data['rank'] < 38:
|
||||
health = aviator_data['kills'] * 30
|
||||
else:
|
||||
health = aviator_data['kills'] * 20
|
||||
has_pp = False
|
||||
if aviator_info.get("activePacks"):
|
||||
has_pp = bool(aviator_info.get("activePacks").get("power_pack"))
|
||||
max_health = 7 * 24 * (500 if has_pp else 300)
|
||||
if health < max_health:
|
||||
aviator_data['health'] = health
|
||||
else:
|
||||
aviator_data['health'] = max_health
|
||||
|
||||
if not aviator_data["residency"]:
|
||||
aviator_data['health'] = 0
|
||||
aviator_data['extra'].append("No residency set")
|
||||
else:
|
||||
residency = citizen.get_city_data_residents(
|
||||
aviator_data["residency"], params={"search": aviator_data['name']}
|
||||
).json()
|
||||
|
||||
for resident in residency.get('widgets', {}).get('residents', {}).get('residents'):
|
||||
if int(resident.get('citizenId')) == aviator_id:
|
||||
if resident['numFactories']:
|
||||
aviator_data['factories'] = resident['numFactories']
|
||||
else:
|
||||
aviator_data['factories'] = 0
|
||||
if not resident.get('activeHouses'):
|
||||
aviator_data['health'] = 0
|
||||
if resident['numHouses']:
|
||||
aviator_data['extra'].append(", ".join(resident['activeHouses']))
|
||||
else:
|
||||
aviator_data['extra'].append("Nav māja")
|
||||
aviator_data['health'] = 0
|
||||
|
||||
else:
|
||||
aviator_data['extra'].append("Rank")
|
||||
|
||||
write_interactive_log("{id:>9} | {name:<28} | {kills:4} | {:26} | {health:6} | {}".format(
|
||||
AIR_RANKS[aviator_data['rank']],
|
||||
", ".join(aviator_data["extra"]),
|
||||
**aviator_data)
|
||||
)
|
||||
|
||||
db_post_data = []
|
||||
for aviator_id, aviator_data in aviators.items():
|
||||
db_post_data.append(dict(id=aviator_id, name=aviator_data['name'],
|
||||
rank=aviator_data['rank'], factory_count=aviator_data['factories']))
|
||||
requests.post('https://erep.lv/aviator/set/', json=db_post_data)
|
||||
|
||||
for aviator_id, new in aviators.items():
|
||||
resp = requests.get('https://erep.lv/aviator/check/{}/'.format(aviator_id))
|
||||
if not resp.json()['status']:
|
||||
aviators[aviator_id]['health'] = 0
|
||||
aviators[aviator_id]['extra'] = ["Nav izmaiņas fabriku skaitā", ]
|
||||
|
||||
for player_id in forbidden_ids:
|
||||
if player_id in aviators:
|
||||
aviators[player_id]['health'] = 0
|
||||
if "BANNED" not in aviators[player_id]['extra']:
|
||||
aviators[player_id]['extra'] = ["Aizliegta pieteikšanās", ]
|
||||
|
||||
sent_data = []
|
||||
if send_food:
|
||||
for aviator_data in sorted(aviators.values(), key=lambda t: (-t["health"], -t['kills'])):
|
||||
remaining = aviator_data['health']
|
||||
if not remaining:
|
||||
sent_data.append({
|
||||
"player_id": aviator_data['id'], "name": aviator_data['name'], "quality": 0,
|
||||
"amount": 0, "energy": 0, "price": 0, "cost": 0,
|
||||
})
|
||||
while remaining > 0:
|
||||
o = []
|
||||
if free_food:
|
||||
# Reversed because need to start with higher qualities so that q1 stays available
|
||||
for quality in reversed(list(free_food.keys())):
|
||||
if free_food[quality]:
|
||||
o.append((quality, {'price': 0., 'amount': free_food[quality]}))
|
||||
else:
|
||||
free_food.pop(quality)
|
||||
if not free_food:
|
||||
offers = citizen.get_market_offers(71, product="food")
|
||||
o += sorted(offers.items(), key=lambda v: (v[1]['price'] / FOOD_ENERGY[v[0]],
|
||||
-v[1]['amount'] * FOOD_ENERGY[v[0]]))
|
||||
|
||||
for _o in o:
|
||||
q, q_data = _o
|
||||
if FOOD_ENERGY[q] <= remaining:
|
||||
break
|
||||
else:
|
||||
write_interactive_log(
|
||||
"{name} needs to receive extra {remaining}hp".format(name=aviator_data['name'],
|
||||
remaining=remaining))
|
||||
break
|
||||
|
||||
if q_data['amount'] * FOOD_ENERGY[q] <= remaining:
|
||||
amount = q_data['amount']
|
||||
else:
|
||||
amount = remaining // FOOD_ENERGY[q]
|
||||
|
||||
if q_data['price']:
|
||||
# print(f"citizen._buy_market_offer(offer={q_data['offer_id']}, amount={amount})")
|
||||
citizen.post_economy_marketplace_actions(citizen.token, amount=amount, buy=True,
|
||||
offer=q_data["offer_id"])
|
||||
else:
|
||||
free_food[q] -= amount
|
||||
|
||||
# print(f"citizen.donate_items(citizen_id={aviator_data['id']},
|
||||
# amount={amount}, industry_id=1, quality={int(q[1])})")
|
||||
citizen.donate_items(citizen_id=aviator_data['id'], amount=amount, industry_id=1, quality=int(q[1]))
|
||||
remaining -= amount * FOOD_ENERGY[q]
|
||||
context['TOTAL_CC'] += q_data['price'] * amount
|
||||
context['TOTAL_ENERGY'] += amount * FOOD_ENERGY[q]
|
||||
sent_data.append(
|
||||
{"player_id": aviator_data['id'], "name": aviator_data['name'], "quality": q, "amount": amount,
|
||||
"energy": amount * FOOD_ENERGY[q], "price": q_data['price'],
|
||||
"cost": q_data['price'] * amount, })
|
||||
|
||||
with open(get_file("{eday}.csv".format(eday=eday_from_date(now()))), 'a') as f:
|
||||
f.write('PlayerID, Quality, Amount, Energy, Price, Cost\n')
|
||||
for player_data in sent_data:
|
||||
f.write('{player_id}, {quality}, {amount}, {energy}, {price}, {cost}\n'.format(**player_data))
|
||||
|
||||
columns = ('[columns][b]Spēlētajs[/b]\n'
|
||||
'{players}[nextcol][b]Kili[/b]\n'
|
||||
'{kills}\n'
|
||||
'[nextcol][right][b]Enerģija[/b]\n'
|
||||
'{health}\n'
|
||||
'[/right][/columns]')
|
||||
player_template = '[b][url=https://www.erepublik.com/en/citizen/profile/{id}]{name}[/url][/b]'
|
||||
players = []
|
||||
kills = []
|
||||
health = []
|
||||
write_interactive_log("\n".join(["{}: {}".format(q, a) for q, a in free_food.items()]))
|
||||
context['TOTAL_CC'] = round(context['TOTAL_CC'], 2)
|
||||
context["END_ENERGY"] = sum([amount * FOOD_ENERGY[q] for q, amount in free_food.items()])
|
||||
data = {}
|
||||
for row in sent_data:
|
||||
pid = int(row['player_id'])
|
||||
if pid not in data:
|
||||
data.update({pid: dict(id=pid, name=row['name'], energy=0, cost=0, kills=aviators[pid]['kills'])})
|
||||
|
||||
data[pid]["energy"] += row['energy']
|
||||
data[pid]["cost"] += row['cost']
|
||||
|
||||
for pid, player_data in sorted(aviators.items(), key=lambda t: (-t[1]["health"], -t[1]['kills'])):
|
||||
players.append(player_template.format(id=pid, name=player_data['name']))
|
||||
kills.append(str(player_data['kills']))
|
||||
health.append(str(player_data['health'] or ", ".join(player_data['extra'])))
|
||||
else:
|
||||
context['TABLE'] = columns.format(
|
||||
players="\n".join(players),
|
||||
kills="\n".join(kills),
|
||||
health="\n".join(health)
|
||||
)
|
||||
|
||||
if os.path.isfile("scripts/KM_piloti.txt"):
|
||||
with open("scripts/KM_piloti.txt") as f:
|
||||
template = f.read()
|
||||
article = template.format(**context)
|
||||
with open(get_file("{eday}.txt".format(eday=eday_from_date(now()))), "w") as f:
|
||||
f.write(article)
|
||||
if send_food:
|
||||
article_data = dict(
|
||||
title="[KM] Gaisa maizītes [d{} {}]".format(citizen.eday, citizen.now.strftime("%H:%M")),
|
||||
content=article,
|
||||
kind=3
|
||||
)
|
||||
from_eday = eday_from_date(good_timedelta(now(), - datetime.timedelta(days=now().weekday() + 6)))
|
||||
till_eday = eday_from_date(good_timedelta(now(), - datetime.timedelta(days=now().weekday())))
|
||||
comment_data = dict(
|
||||
message="★★★★ MAIZE PAR NEDĒĻU [DAY {}-{}] IZDALĪTA ★★★★\n★ Apgādei piesakāmies šī komentāra reply "
|
||||
"komentāros ar saucienu - piesakos! ★".format(from_eday, till_eday))
|
||||
total_cc = int(round(context['TOTAL_CC']))
|
||||
wall_body = ("★★★ [ KONGRESA BALSOJUMS ] ★★★\n\nDotācija pilotiem par d{}-{} {}cc apmērā.\n\n"
|
||||
"Balsot ar Par/Pret\nBalsošanas laiks 24h līdz d{} {}").format(
|
||||
from_eday, till_eday, total_cc, citizen.eday + 1, citizen.now.strftime("%H:%M"))
|
||||
|
||||
citizen.write_log("Publishing info:\n\n### Article ###\n{}\n\n{}\n\n### Wall ###\n{}".format(
|
||||
article_data['title'], comment_data['message'], wall_body
|
||||
))
|
||||
|
||||
KM_account: Citizen = Citizen("kara-ministrija@erep.lv", "KMPar0le")
|
||||
KM_account.set_debug(True)
|
||||
KM_account.update_citizen_info()
|
||||
resp = KM_account.publish_article(**article_data)
|
||||
article_id = resp.history[1].url.split("/")[-3]
|
||||
comment_data.update({"article_id": article_id})
|
||||
KM_account.write_article_comment(**comment_data)
|
||||
citizen.write_on_country_wall(wall_body)
|
||||
requests.post('https://erep.lv/aviator/latest_article/',
|
||||
data=dict(week=context["WEEK"], article_id=article_id))
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
ipython==7.3.0
|
||||
pycryptodome==3.7.3
|
||||
PyInstaller==3.4
|
||||
python-slugify==2.0.1
|
||||
pytz==2018.9
|
||||
requests==2.21.0
|
||||
Click>=6.0
|
||||
@ -1,10 +1,15 @@
|
||||
pip==19.1.1
|
||||
bumpversion==0.5.3
|
||||
wheel==0.32.1
|
||||
wheel==0.33.4
|
||||
watchdog==0.9.0
|
||||
flake8==3.5.0
|
||||
tox==3.5.2
|
||||
coverage==4.5.1
|
||||
Sphinx==1.8.1
|
||||
twine==1.12.1
|
||||
ipython==7.3.0
|
||||
flake8==3.7.8
|
||||
tox==3.13.2
|
||||
coverage==4.5.3
|
||||
Sphinx==2.1.2
|
||||
twine==1.13.0
|
||||
ipython==7.6.1
|
||||
PyInstaller==3.5
|
||||
pytz==2019.1
|
||||
requests==2.22.0
|
||||
pycryptodome==3.8.2
|
||||
python-slugify==2.0.1
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
[bumpversion]
|
||||
current_version = 0.1.2
|
||||
current_version = 0.14.4
|
||||
commit = True
|
||||
tag = True
|
||||
|
||||
|
||||
10
setup.py
10
setup.py
@ -11,7 +11,7 @@ with open('README.rst') as readme_file:
|
||||
with open('HISTORY.rst') as history_file:
|
||||
history = history_file.read()
|
||||
|
||||
requirements = ['Click>=6.0', 'pytz==2018.9', 'requests==2.21.0', 'python-slugify==2.0.1']
|
||||
requirements = ['pytz==2019.1', 'requests==2.22.0', 'python-slugify<3.0.0']
|
||||
|
||||
setup_requirements = [ ]
|
||||
|
||||
@ -29,11 +29,7 @@ setup(
|
||||
'Programming Language :: Python :: 3.7',
|
||||
],
|
||||
description="Python package for eRepublik automated playing",
|
||||
entry_points={
|
||||
'console_scripts': [
|
||||
'erepublik_script=erepublik_script.cli:main',
|
||||
],
|
||||
},
|
||||
entry_points={},
|
||||
install_requires=requirements,
|
||||
license="MIT license",
|
||||
long_description=readme + '\n\n' + history,
|
||||
@ -45,6 +41,6 @@ setup(
|
||||
test_suite='tests',
|
||||
tests_require=test_requirements,
|
||||
url='https://github.com/eeriks/erepublik_script',
|
||||
version='0.1.2',
|
||||
version='0.14.4',
|
||||
zip_safe=False,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user