Compare commits
No commits in common. "master" and "v0.28.1" have entirely different histories.
@ -21,7 +21,7 @@ insert_final_newline = false
|
||||
indent_style = tab
|
||||
|
||||
[*.py]
|
||||
max_line_length = 120
|
||||
max_line_length = 240
|
||||
line_length=120
|
||||
multi_line_output=0
|
||||
balanced_wrapping=True
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
__author__ = """Eriks Karls"""
|
||||
__email__ = "eriks@72.lv"
|
||||
__version__ = "0.29.2.3"
|
||||
__version__ = "0.28.1"
|
||||
|
||||
from erepublik.citizen import Citizen
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ class SlowRequests(Session):
|
||||
if proxies:
|
||||
self.proxies = proxies
|
||||
if user_agent is None:
|
||||
user_agent = self.get_random_user_agent()
|
||||
user_agent = random.choice(self.get_random_user_agent())
|
||||
self.request_log_name = utils.get_file(utils.now().strftime("debug/requests_%Y-%m-%d.log"))
|
||||
self.last_time = utils.now()
|
||||
self.headers.update({"User-Agent": user_agent})
|
||||
|
||||
@ -327,7 +327,7 @@ class BaseCitizen(access_points.CitizenAPI):
|
||||
r"((?P<amount>\d+) item\(s\) )?[eE]xpires? on Day (?P<eday>\d,\d{3}), (?P<time>\d\d:\d\d)",
|
||||
_expire_value,
|
||||
).groupdict()
|
||||
eday = utils.date_from_eday(int(_data["eday"].replace(",", ""))).date()
|
||||
eday = utils.date_from_eday(int(_data["eday"].replace(",", "")))
|
||||
dt = constants.erep_tz.localize(datetime.combine(eday, time(*[int(_) for _ in _data["time"].split(":")])))
|
||||
return {"amount": _data.get("amount"), "expiration": dt}
|
||||
|
||||
@ -1172,27 +1172,23 @@ class CitizenCompanies(BaseCitizen):
|
||||
if self.restricted_ip:
|
||||
return None
|
||||
self.update_companies()
|
||||
self.update_inventory()
|
||||
data = {"action_type": "production"}
|
||||
extra = {}
|
||||
raw_factories = wam_holding.get_wam_companies(raw_factory=True)
|
||||
fin_factories = wam_holding.get_wam_companies(raw_factory=False)
|
||||
|
||||
free_inventory = self.inventory.total - self.inventory.used
|
||||
for _ in range(len(fin_factories + raw_factories) - self.energy.food_fights):
|
||||
if not self.my_companies.remove_factory_from_wam_list(raw_factories, fin_factories):
|
||||
raise classes.ErepublikException("Nothing removed from WAM list!")
|
||||
wam_list = raw_factories + fin_factories
|
||||
wam_list = wam_list[: self.energy.food_fights]
|
||||
|
||||
if int(free_inventory * 0.75) < self.my_companies.get_needed_inventory_usage(fin_factories + raw_factories):
|
||||
if int(free_inventory * 0.75) < self.my_companies.get_needed_inventory_usage(wam_list):
|
||||
self.update_inventory()
|
||||
free_inventory = self.inventory.total - self.inventory.used
|
||||
|
||||
while (fin_factories + raw_factories) and free_inventory < self.my_companies.get_needed_inventory_usage(
|
||||
fin_factories + raw_factories
|
||||
):
|
||||
if not self.my_companies.remove_factory_from_wam_list(raw_factories, fin_factories):
|
||||
raise classes.ErepublikException("Nothing removed from WAM list!")
|
||||
while wam_list and free_inventory < self.my_companies.get_needed_inventory_usage(wam_list):
|
||||
wam_list.pop(-1)
|
||||
|
||||
if fin_factories + raw_factories:
|
||||
if wam_list:
|
||||
data.update(extra)
|
||||
if not self.details.current_region == wam_holding.region:
|
||||
self.write_warning("Unable to work as manager because of location - please travel!")
|
||||
@ -1203,7 +1199,7 @@ class CitizenCompanies(BaseCitizen):
|
||||
employ_factories = {}
|
||||
|
||||
response = self._post_economy_work(
|
||||
"production", wam=[c.id for c in (fin_factories + raw_factories)], employ=employ_factories
|
||||
"production", wam=[c.id for c in wam_list], employ=employ_factories
|
||||
).json()
|
||||
return response
|
||||
|
||||
@ -1961,7 +1957,7 @@ class CitizenTasks(CitizenEconomy):
|
||||
else:
|
||||
self.reporter.report_action("WORK", json_val=js)
|
||||
else:
|
||||
seconds = 360 - self.now.timestamp() % 360
|
||||
seconds = self.now.timestamp() % 360
|
||||
self.write_warning(f"I don't have energy to work. Will sleep for {seconds}s")
|
||||
self.sleep(seconds)
|
||||
self.work()
|
||||
@ -2007,7 +2003,7 @@ class CitizenTasks(CitizenEconomy):
|
||||
self.buy_food(120)
|
||||
self.reporter.report_action("WORK_OT", r.json())
|
||||
elif self.energy.food_fights < 1 and self.ot_points >= 24:
|
||||
seconds = 360 - self.now.timestamp() % 360
|
||||
seconds = self.now.timestamp() % 360
|
||||
self.write_warning(f"I don't have energy to work OT. Will sleep for {seconds}s")
|
||||
self.sleep(seconds)
|
||||
self.work_ot()
|
||||
@ -2281,9 +2277,9 @@ class _Citizen(
|
||||
if data and kind in self.config.auto_sell:
|
||||
if kind in ["food", "weapon", "house", "airplane"]:
|
||||
for quality, amount in data.items():
|
||||
self.sell_produced_product(kind, quality, int(data))
|
||||
self.sell_produced_product(kind, quality)
|
||||
elif kind.endswith("Raw"):
|
||||
self.sell_produced_product(kind, 1, int(data))
|
||||
self.sell_produced_product(kind, 1)
|
||||
else:
|
||||
raise classes.ErepublikException(f"Unknown kind produced '{kind}'")
|
||||
elif self.config.auto_buy_raw and re.search(r"not_enough_[^_]*_raw", response.get("message")):
|
||||
@ -2340,7 +2336,7 @@ class _Citizen(
|
||||
def work_as_manager(self) -> bool:
|
||||
"""Does Work as Manager in all holdings with wam. If employees assigned - work them also
|
||||
|
||||
:return: if there is more wam work to do
|
||||
:return: if has more wam work to do
|
||||
:rtype: bool
|
||||
"""
|
||||
if self.restricted_ip:
|
||||
@ -2348,23 +2344,19 @@ class _Citizen(
|
||||
return False
|
||||
self.update_citizen_info()
|
||||
self.update_companies()
|
||||
wam_holdings: List[classes.Holding] = [
|
||||
holding for holding in self.my_companies.get_wam_holdings() if holding.wam_count
|
||||
]
|
||||
# Prevent messing up levelup with wam
|
||||
if True:
|
||||
regions: Dict[int, classes.Holding] = {}
|
||||
for holding in self.my_companies.holdings.values():
|
||||
if holding.wam_count:
|
||||
regions.update({holding.region: holding})
|
||||
|
||||
# Check for current region
|
||||
for holding in wam_holdings:
|
||||
if holding.region == self.details.current_region:
|
||||
self._wam(holding)
|
||||
if self.details.current_region in regions:
|
||||
self._wam(regions.pop(self.details.current_region))
|
||||
self.update_companies()
|
||||
wam_holdings: List[classes.Holding] = [
|
||||
holding for holding in wam_holdings if not holding.region == self.details.current_region
|
||||
]
|
||||
|
||||
for holding in wam_holdings:
|
||||
# Don't travel if not enough energy (either work in all holding factories or 2h energy worth)
|
||||
if self.energy.energy < 2 * self.energy.interval * 10 < holding.wam_count * 10:
|
||||
break
|
||||
for holding in regions.values():
|
||||
raw_usage = holding.get_wam_raw_usage()
|
||||
free_storage = self.inventory.total - self.inventory.used
|
||||
if (raw_usage["frm"] + raw_usage["wrm"]) * 100 > free_storage:
|
||||
@ -2375,14 +2367,23 @@ class _Citizen(
|
||||
self.update_companies()
|
||||
|
||||
wam_count = self.my_companies.get_total_wam_count()
|
||||
if wam_count:
|
||||
self.logger.debug(f"Wam ff lockdown is now {wam_count}, was {self.my_companies.ff_lockdown}")
|
||||
self.my_companies.ff_lockdown = wam_count
|
||||
self.travel_to_residence()
|
||||
return bool(wam_count)
|
||||
else:
|
||||
self.write_warning("Did not WAM because I would mess up levelup!")
|
||||
self.my_companies.ff_lockdown = 0
|
||||
|
||||
self.update_companies()
|
||||
return bool(self.my_companies.get_total_wam_count())
|
||||
|
||||
|
||||
class Citizen(_Citizen):
|
||||
_concurrency_lock: Event
|
||||
_update_lock: Event
|
||||
_update_timeout: int = 30
|
||||
_update_timeout: int = 10
|
||||
_concurrency_timeout: int = 600
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
|
||||
@ -22,8 +22,6 @@ __all__ = [
|
||||
"Energy",
|
||||
"ErepublikException",
|
||||
"ErepublikNetworkException",
|
||||
"CloudFlareSessionError",
|
||||
"CaptchaSessionError",
|
||||
"EnergyToFight",
|
||||
"Holding",
|
||||
"Inventory",
|
||||
@ -298,10 +296,6 @@ class MyCompanies:
|
||||
_companies: weakref.WeakSet
|
||||
_citizen: weakref.ReferenceType
|
||||
companies: Generator[Company, None, None]
|
||||
_frm_fab_ids = (1, 7, 8, 9, 10, 11)
|
||||
_wrm_fab_ids = (2, 12, 13, 14, 15, 16)
|
||||
_hrm_fab_ids = (4, 18, 19, 20, 21, 22)
|
||||
_arm_fab_ids = (23, 24, 25, 26, 27, 28)
|
||||
|
||||
def __init__(self, citizen):
|
||||
self._citizen = weakref.ref(citizen)
|
||||
@ -365,58 +359,14 @@ class MyCompanies:
|
||||
@staticmethod
|
||||
def get_needed_inventory_usage(companies: Union[Company, Iterable[Company]]) -> Decimal:
|
||||
if isinstance(companies, list):
|
||||
return sum(company.products_made * (100 if company.is_raw else 1) for company in companies)
|
||||
return sum(company.products_made * 100 if company.is_raw else 1 for company in companies)
|
||||
else:
|
||||
return companies.products_made
|
||||
|
||||
def remove_factory_from_wam_list(self, raw_factories, final_factories):
|
||||
frm, wrm, *_ = self.get_raw_usage_for_companies(*final_factories, *raw_factories)
|
||||
inv_raw = self.citizen.inventory.raw
|
||||
for raw, ids, exc in [(frm, self._frm_fab_ids, False), (wrm, self._wrm_fab_ids, False), (None, None, True)]:
|
||||
if exc:
|
||||
if final_factories:
|
||||
final_factories.sort(key=lambda c: c.raw_usage)
|
||||
return final_factories.pop(-1)
|
||||
elif raw_factories:
|
||||
raw_factories.sort(key=lambda c: c.raw_usage)
|
||||
return raw_factories.pop(-1)
|
||||
else:
|
||||
if raw:
|
||||
raw += Decimal(
|
||||
inv_raw.get(constants.INDUSTRIES[ids[1]], {}).get(0, {}).get("amount", Decimal("0.0"))
|
||||
)
|
||||
if raw > 0:
|
||||
to_remove = sorted(raw_factories, key=lambda c: (c.industry not in ids, c.raw_usage))
|
||||
if to_remove:
|
||||
return raw_factories.pop(raw_factories.index(to_remove[0]))
|
||||
else:
|
||||
to_remove = sorted(final_factories, key=lambda c: (c.industry != ids[0], c.raw_usage))
|
||||
if to_remove:
|
||||
return final_factories.pop(final_factories.index(to_remove[0]))
|
||||
|
||||
def get_raw_usage_for_companies(self, *companies: Company) -> Tuple[Decimal, Decimal, Decimal, Decimal]:
|
||||
frm = wrm = hrm = arm = Decimal("0.00")
|
||||
for company in companies:
|
||||
if company.industry in self._frm_fab_ids:
|
||||
frm += company.raw_usage
|
||||
elif company.industry in self._wrm_fab_ids:
|
||||
wrm += company.raw_usage
|
||||
elif company.industry in self._hrm_fab_ids:
|
||||
hrm += company.raw_usage
|
||||
elif company.industry in self._arm_fab_ids:
|
||||
arm += company.raw_usage
|
||||
return frm, wrm, hrm, arm
|
||||
|
||||
@property
|
||||
def companies(self) -> Generator[Company, None, None]:
|
||||
return (c for c in self._companies)
|
||||
|
||||
def get_wam_holdings(self) -> Generator[Holding, None, None]:
|
||||
for holding in sorted(
|
||||
self.holdings.values(), key=lambda h: (-len(h.get_wam_companies(False)), -len(h.get_wam_companies()))
|
||||
):
|
||||
yield holding
|
||||
|
||||
def __str__(self):
|
||||
return f"MyCompanies: {sum(1 for _ in self.companies)} companies in {len(self.holdings)} holdings"
|
||||
|
||||
|
||||
@ -8,15 +8,12 @@ __all__ = [
|
||||
"min_datetime",
|
||||
"max_datetime",
|
||||
"Country",
|
||||
"Industries",
|
||||
"Rank",
|
||||
"AIR_RANKS",
|
||||
"AIR_RANK_NAMES",
|
||||
"AIR_RANK_POINTS",
|
||||
"COUNTRIES",
|
||||
"FOOD_ENERGY",
|
||||
"GROUND_RANKS",
|
||||
"GROUND_RANK_NAMES",
|
||||
"GROUND_RANK_POINTS",
|
||||
"INDUSTRIES",
|
||||
"TERRAINS",
|
||||
@ -121,6 +118,7 @@ class Industries:
|
||||
14: "WRM q3",
|
||||
15: "WRM q4",
|
||||
16: "WRM q5",
|
||||
17: "houseRaw",
|
||||
18: "houseRaw",
|
||||
19: "HRM q2",
|
||||
20: "HRM q3",
|
||||
@ -133,7 +131,7 @@ class Industries:
|
||||
28: "ARM q5",
|
||||
}
|
||||
|
||||
def __getitem__(self, item: Union[int, str]) -> Optional[Union[int, str]]:
|
||||
def __getitem__(self, item) -> Optional[Union[int, str]]:
|
||||
if isinstance(item, int):
|
||||
return self.__by_id.get(item, None)
|
||||
elif isinstance(item, str):
|
||||
|
||||
@ -93,7 +93,7 @@ def eday_from_date(date: Union[datetime.date, datetime.datetime] = None) -> int:
|
||||
return (date - datetime.datetime(2007, 11, 20, 0, 0, 0)).days
|
||||
|
||||
|
||||
def date_from_eday(eday: int) -> datetime.datetime:
|
||||
def date_from_eday(eday: int) -> datetime.date:
|
||||
return localize_dt(datetime.date(2007, 11, 20)) + datetime.timedelta(days=eday)
|
||||
|
||||
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
-r requirements.txt
|
||||
-r requirements-tests.txt
|
||||
bump2version==1.0.1
|
||||
coverage==6.3.2
|
||||
coverage==6.1.1
|
||||
edx-sphinx-theme==3.0.0
|
||||
flake8==4.0.1
|
||||
ipython>=8.1.1
|
||||
ipython>=7.29.0
|
||||
jedi!=0.18.0
|
||||
isort==5.10.1
|
||||
pre-commit==2.17.0
|
||||
pur==6.0.1
|
||||
responses==0.18.0
|
||||
Sphinx==4.4.0
|
||||
twine==3.8.0
|
||||
wheel==0.37.1
|
||||
black==22.1.0
|
||||
isort==5.9.3
|
||||
pre-commit==2.15.0
|
||||
pur==5.4.2
|
||||
responses==0.15.0
|
||||
Sphinx==4.2.0
|
||||
twine==3.4.2
|
||||
wheel==0.37.0
|
||||
black==21.7b0
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
-r requirements.txt
|
||||
pytest==7.0.1
|
||||
pytest==6.2.5
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
PySocks==1.7.1
|
||||
pytz>2021.0
|
||||
requests>2.25.0,!=2.27.0
|
||||
pytz==2021.3
|
||||
requests==2.27.0
|
||||
requests-toolbelt==0.9.1
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
[bumpversion]
|
||||
current_version = 0.29.2.3
|
||||
current_version = 0.28.1
|
||||
commit = True
|
||||
tag = True
|
||||
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?
|
||||
@ -19,8 +19,8 @@ universal = 1
|
||||
|
||||
[flake8]
|
||||
exclude = docs,.git,log,debug,venv
|
||||
line_length = 120
|
||||
max-line-length = 120
|
||||
line_length = 140
|
||||
max-line-length = 140
|
||||
ignore = D100,D101,D102,D103,E203
|
||||
|
||||
[pycodestyle]
|
||||
@ -38,4 +38,4 @@ warn_unused_configs = True
|
||||
|
||||
[isort]
|
||||
multi_line_output = 2
|
||||
line_length = 120
|
||||
line_length = 140
|
||||
|
||||
2
setup.py
2
setup.py
@ -49,6 +49,6 @@ setup(
|
||||
test_suite="tests",
|
||||
tests_require=test_requirements,
|
||||
url="https://github.com/eeriks/erepublik/",
|
||||
version="0.29.2.3",
|
||||
version="0.28.1",
|
||||
zip_safe=False,
|
||||
)
|
||||
|
||||
@ -26,114 +26,111 @@ class TestErepublik(unittest.TestCase):
|
||||
self.citizen.energy.energy = 1000
|
||||
self.assertFalse(self.citizen.should_do_levelup)
|
||||
|
||||
# def deprecated_test_should_travel_to_fight(self):
|
||||
# self.citizen.config.always_travel = True
|
||||
# self.assertTrue(self.citizen.should_travel_to_fight())
|
||||
# self.citizen.config.always_travel = False
|
||||
# self.assertFalse(self.citizen.should_travel_to_fight())
|
||||
#
|
||||
# self.citizen.energy.energy = 5960
|
||||
# self.citizen.energy.interval = 30
|
||||
# self.citizen.energy.limit = 6000
|
||||
# self.citizen.details.xp = 14850
|
||||
# self.assertTrue(self.citizen.should_travel_to_fight())
|
||||
# self.citizen.details.xp = 15000
|
||||
# self.citizen.energy.energy = 5000
|
||||
# self.assertFalse(self.citizen.should_travel_to_fight())
|
||||
#
|
||||
# self.citizen.energy.energy = 5910
|
||||
# self.assertTrue(self.citizen.should_travel_to_fight())
|
||||
# self.citizen.energy.energy = 5900
|
||||
# self.assertFalse(self.citizen.should_travel_to_fight())
|
||||
#
|
||||
# # self.citizen.next_reachable_energy and self.citizen.config.next_energy
|
||||
# self.citizen.config.next_energy = True
|
||||
# self.citizen.energy.limit = 10000
|
||||
# self.citizen.details.next_pp = [5000, 5250, 5750, 6250, 6750]
|
||||
# self.citizen.details.pp = 4900
|
||||
# self.citizen.energy.energy = 8510
|
||||
# self.assertEqual(self.citizen.next_reachable_energy, 850)
|
||||
# self.citizen.energy.energy = 8490
|
||||
# self.assertTrue(self.citizen.should_travel_to_fight())
|
||||
# self.assertEqual(self.citizen.next_reachable_energy, 350)
|
||||
# self.citizen.energy.energy = 250
|
||||
# self.assertFalse(self.citizen.should_travel_to_fight())
|
||||
# self.assertEqual(self.citizen.next_reachable_energy, 0)
|
||||
#
|
||||
# def deprecated_test_should_fight(self):
|
||||
# def is_wc_close():
|
||||
# return self.citizen.max_time_till_full_ff > self.citizen.time_till_week_change
|
||||
#
|
||||
# self.citizen.config.fight = False
|
||||
# self.assertEqual(self.citizen.should_fight(), (0, "Fighting not allowed!", False))
|
||||
#
|
||||
# self.citizen.config.fight = True
|
||||
#
|
||||
# # Level up
|
||||
# self.citizen.energy.limit = 3000
|
||||
# self.citizen.details.xp = 24705
|
||||
# if not is_wc_close:
|
||||
# self.assertEqual(self.citizen.should_fight(), (0, "Level up", False))
|
||||
#
|
||||
# self.citizen.energy.energy = 5950
|
||||
# self.citizen.energy.interval = 30
|
||||
# self.assertEqual(self.citizen.should_fight(), (900, "Level up", True))
|
||||
# self.citizen.my_companies.ff_lockdown = 160
|
||||
# self.assertEqual(self.citizen.should_fight(), (900, "Level up", True))
|
||||
# self.citizen.my_companies.ff_lockdown = 0
|
||||
#
|
||||
# # Level up reachable
|
||||
# self.citizen.details.xp = 24400
|
||||
# self.assertEqual(self.citizen.should_fight(), (305, "Fighting for close Levelup. Doing 305 hits", True))
|
||||
# self.citizen.my_companies.ff_lockdown = 160
|
||||
# self.assertEqual(self.citizen.should_fight(), (305, "Fighting for close Levelup. Doing 305 hits", True))
|
||||
# self.citizen.my_companies.ff_lockdown = 0
|
||||
#
|
||||
# self.citizen.details.xp = 21000
|
||||
# self.assertEqual(self.citizen.should_fight(), (75, "Obligatory fighting for at least 75pp", True))
|
||||
# self.citizen.my_companies.ff_lockdown = 160
|
||||
# self.assertEqual(self.citizen.should_fight(), (75, "Obligatory fighting for at least 75pp", True))
|
||||
# self.citizen.my_companies.ff_lockdown = 0
|
||||
# self.citizen.details.pp = 80
|
||||
#
|
||||
# # All-in (type = all-in and full ff)
|
||||
# self.citizen.config.all_in = True
|
||||
# self.assertEqual(self.citizen.should_fight(), (595, "Fighting all-in. Doing 595 hits", False))
|
||||
# self.citizen.my_companies.ff_lockdown = 160
|
||||
# self.assertEqual(
|
||||
# self.citizen.should_fight(),
|
||||
# (435, "Fight count modified (old count: 595 | FF: 595
|
||||
# | WAM ff_lockdown: 160 | New count: 435)", False),
|
||||
# )
|
||||
# self.citizen.my_companies.ff_lockdown = 0
|
||||
#
|
||||
# self.citizen.config.air = True
|
||||
# self.citizen.energy.energy = 4000
|
||||
# self.assertEqual(self.citizen.should_fight(), (400, "Fighting all-in in AIR. Doing 400 hits", False))
|
||||
# self.citizen.my_companies.ff_lockdown = 160
|
||||
# self.assertEqual(
|
||||
# self.citizen.should_fight(),
|
||||
# (240, "Fight count modified (old count: 400 | FF: 400
|
||||
# | WAM ff_lockdown: 160 | New count: 240)", False),
|
||||
# )
|
||||
# self.citizen.my_companies.ff_lockdown = 0
|
||||
# self.citizen.config.all_in = False
|
||||
#
|
||||
# self.citizen.config.next_energy = True
|
||||
# self.citizen.energy.limit = 10000
|
||||
# self.citizen.details.next_pp = [100, 150, 250, 400, 500]
|
||||
# self.assertEqual(self.citizen.should_fight(), (320, "Fighting for +1 energy. Doing 320 hits", False))
|
||||
# self.citizen.my_companies.ff_lockdown = 160
|
||||
# self.assertEqual(
|
||||
# self.citizen.should_fight(),
|
||||
# (160, "Fight count modified (old count: 320 | FF: 400
|
||||
# | WAM ff_lockdown: 160 | New count: 160)", False),
|
||||
# )
|
||||
# self.citizen.my_companies.ff_lockdown = 0
|
||||
# self.citizen.energy.limit = 3000
|
||||
# self.citizen.details.next_pp = [19250, 20000]
|
||||
# self.citizen.config.next_energy = False
|
||||
#
|
||||
# # 1h worth of energy
|
||||
# self.citizen.energy.energy = 5910
|
||||
# self.assertEqual(self.citizen.should_fight(), (30, "Fighting for 1h energy. Doing 30 hits", True))
|
||||
def test_should_travel_to_fight(self):
|
||||
self.citizen.config.always_travel = True
|
||||
self.assertTrue(self.citizen.should_travel_to_fight())
|
||||
self.citizen.config.always_travel = False
|
||||
self.assertFalse(self.citizen.should_travel_to_fight())
|
||||
|
||||
self.citizen.energy.energy = 5960
|
||||
self.citizen.energy.interval = 30
|
||||
self.citizen.energy.limit = 6000
|
||||
self.citizen.details.xp = 14850
|
||||
self.assertTrue(self.citizen.should_travel_to_fight())
|
||||
self.citizen.details.xp = 15000
|
||||
self.citizen.energy.energy = 5000
|
||||
self.assertFalse(self.citizen.should_travel_to_fight())
|
||||
|
||||
self.citizen.energy.energy = 5910
|
||||
self.assertTrue(self.citizen.should_travel_to_fight())
|
||||
self.citizen.energy.energy = 5900
|
||||
self.assertFalse(self.citizen.should_travel_to_fight())
|
||||
|
||||
# self.citizen.next_reachable_energy and self.citizen.config.next_energy
|
||||
self.citizen.config.next_energy = True
|
||||
self.citizen.energy.limit = 10000
|
||||
self.citizen.details.next_pp = [5000, 5250, 5750, 6250, 6750]
|
||||
self.citizen.details.pp = 4900
|
||||
self.citizen.energy.energy = 8510
|
||||
self.assertEqual(self.citizen.next_reachable_energy, 850)
|
||||
self.citizen.energy.energy = 8490
|
||||
self.assertTrue(self.citizen.should_travel_to_fight())
|
||||
self.assertEqual(self.citizen.next_reachable_energy, 350)
|
||||
self.citizen.energy.energy = 250
|
||||
self.assertFalse(self.citizen.should_travel_to_fight())
|
||||
self.assertEqual(self.citizen.next_reachable_energy, 0)
|
||||
|
||||
def test_should_fight(self):
|
||||
def is_wc_close():
|
||||
return self.citizen.max_time_till_full_ff > self.citizen.time_till_week_change
|
||||
|
||||
self.citizen.config.fight = False
|
||||
self.assertEqual(self.citizen.should_fight(), (0, "Fighting not allowed!", False))
|
||||
|
||||
self.citizen.config.fight = True
|
||||
|
||||
# Level up
|
||||
self.citizen.energy.limit = 3000
|
||||
self.citizen.details.xp = 24705
|
||||
if not is_wc_close:
|
||||
self.assertEqual(self.citizen.should_fight(), (0, "Level up", False))
|
||||
|
||||
self.citizen.energy.energy = 5950
|
||||
self.citizen.energy.interval = 30
|
||||
self.assertEqual(self.citizen.should_fight(), (900, "Level up", True))
|
||||
self.citizen.my_companies.ff_lockdown = 160
|
||||
self.assertEqual(self.citizen.should_fight(), (900, "Level up", True))
|
||||
self.citizen.my_companies.ff_lockdown = 0
|
||||
|
||||
# Level up reachable
|
||||
self.citizen.details.xp = 24400
|
||||
self.assertEqual(self.citizen.should_fight(), (305, "Fighting for close Levelup. Doing 305 hits", True))
|
||||
self.citizen.my_companies.ff_lockdown = 160
|
||||
self.assertEqual(self.citizen.should_fight(), (305, "Fighting for close Levelup. Doing 305 hits", True))
|
||||
self.citizen.my_companies.ff_lockdown = 0
|
||||
|
||||
self.citizen.details.xp = 21000
|
||||
self.assertEqual(self.citizen.should_fight(), (75, "Obligatory fighting for at least 75pp", True))
|
||||
self.citizen.my_companies.ff_lockdown = 160
|
||||
self.assertEqual(self.citizen.should_fight(), (75, "Obligatory fighting for at least 75pp", True))
|
||||
self.citizen.my_companies.ff_lockdown = 0
|
||||
self.citizen.details.pp = 80
|
||||
|
||||
# All-in (type = all-in and full ff)
|
||||
self.citizen.config.all_in = True
|
||||
self.assertEqual(self.citizen.should_fight(), (595, "Fighting all-in. Doing 595 hits", False))
|
||||
self.citizen.my_companies.ff_lockdown = 160
|
||||
self.assertEqual(
|
||||
self.citizen.should_fight(),
|
||||
(435, "Fight count modified (old count: 595 | FF: 595 | WAM ff_lockdown: 160 | New count: 435)", False),
|
||||
)
|
||||
self.citizen.my_companies.ff_lockdown = 0
|
||||
|
||||
self.citizen.config.air = True
|
||||
self.citizen.energy.energy = 4000
|
||||
self.assertEqual(self.citizen.should_fight(), (400, "Fighting all-in in AIR. Doing 400 hits", False))
|
||||
self.citizen.my_companies.ff_lockdown = 160
|
||||
self.assertEqual(
|
||||
self.citizen.should_fight(),
|
||||
(240, "Fight count modified (old count: 400 | FF: 400 | WAM ff_lockdown: 160 | New count: 240)", False),
|
||||
)
|
||||
self.citizen.my_companies.ff_lockdown = 0
|
||||
self.citizen.config.all_in = False
|
||||
|
||||
self.citizen.config.next_energy = True
|
||||
self.citizen.energy.limit = 10000
|
||||
self.citizen.details.next_pp = [100, 150, 250, 400, 500]
|
||||
self.assertEqual(self.citizen.should_fight(), (320, "Fighting for +1 energy. Doing 320 hits", False))
|
||||
self.citizen.my_companies.ff_lockdown = 160
|
||||
self.assertEqual(
|
||||
self.citizen.should_fight(),
|
||||
(160, "Fight count modified (old count: 320 | FF: 400 | WAM ff_lockdown: 160 | New count: 160)", False),
|
||||
)
|
||||
self.citizen.my_companies.ff_lockdown = 0
|
||||
self.citizen.energy.limit = 3000
|
||||
self.citizen.details.next_pp = [19250, 20000]
|
||||
self.citizen.config.next_energy = False
|
||||
|
||||
# 1h worth of energy
|
||||
self.citizen.energy.energy = 5910
|
||||
self.assertEqual(self.citizen.should_fight(), (30, "Fighting for 1h energy. Doing 30 hits", True))
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user