eriks/erepublik-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated WAM logic for cases when there are too many RAW factories

Browse Source
This commit is contained in:
Eriks K
2022-02-01 22:21:29 +02:00
parent 7e5312df18
commit d5ce52162a
5 changed files with 192 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
erepublik/citizen.py
View File

@ -1172,23 +1172,27 @@ 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
wam_list = raw_factories + fin_factories
wam_list = wam_list[: self.energy.food_fights]
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!")
if int(free_inventory * 0.75) < self.my_companies.get_needed_inventory_usage(wam_list):
self.update_inventory()
if int(free_inventory * 0.75) < self.my_companies.get_needed_inventory_usage(fin_factories + raw_factories):
free_inventory = self.inventory.total - self.inventory.used
while wam_list and free_inventory < self.my_companies.get_needed_inventory_usage(wam_list):
wam_list.pop(-1)
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!")
if wam_list:
if fin_factories + raw_factories:
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!")
@ -1199,7 +1203,7 @@ class CitizenCompanies(BaseCitizen):
employ_factories = {}
response = self._post_economy_work(
"production", wam=[c.id for c in wam_list], employ=employ_factories
"production", wam=[c.id for c in (fin_factories + raw_factories)], employ=employ_factories
).json()
return response
@ -2344,46 +2348,38 @@ class _Citizen(
return False
self.update_citizen_info()
self.update_companies()
# 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})
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
if self.details.current_region in regions:
self._wam(regions.pop(self.details.current_region))
self.update_companies()
# Check for current region
if self.details.current_region in regions:
self._wam(regions.pop(self.details.current_region))
self.update_companies()
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:
self._report_action("WAM_UNAVAILABLE", "Not enough storage!")
continue
self.travel_to_holding(holding)
self._wam(holding)
self.update_companies()
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:
self._report_action("WAM_UNAVAILABLE", "Not enough storage!")
continue
self.travel_to_holding(holding)
self._wam(holding)
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())
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)
class Citizen(_Citizen):
_concurrency_lock: Event
_update_lock: Event
_update_timeout: int = 10
_update_timeout: int = 30
_concurrency_timeout: int = 600
def __init__(self, *args, **kwargs):

44
erepublik/classes.py
View File

@ -22,6 +22,8 @@ __all__ = [
"Energy",
"ErepublikException",
"ErepublikNetworkException",
"CloudFlareSessionError",
"CaptchaSessionError",
"EnergyToFight",
"Holding",
"Inventory",
@ -296,6 +298,10 @@ 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)
@ -359,10 +365,46 @@ 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 += inv_raw.get(constants.INDUSTRIES[ids[1]], {}).get(0, {}).get("amount", 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.remove(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.remove(to_remove[0])
def get_raw_usage_for_companies(self, *companies: Company) -> Tuple[float, float, float, float]:
frm = wrm = hrm = arm = 0.0
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)

5
erepublik/constants.py
View File

@ -8,12 +8,15 @@ __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",
@ -131,7 +134,7 @@ class Industries:
28: "ARM q5",
}
def __getitem__(self, item) -> Optional[Union[int, str]]:
def __getitem__(self, item: Union[int, str]) -> Optional[Union[int, str]]:
if isinstance(item, int):
return self.__by_id.get(item, None)
elif isinstance(item, str):