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

Update

Browse Source
This commit is contained in:
KEriks 2022-03-11 11:44:29 +02:00
parent 03c435bf7e
commit 273e98c8d1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erepublik/citizen.py
View File

@ -2349,7 +2349,7 @@ class _Citizen(
self.update_citizen_info() self.update_citizen_info()
self.update_companies() self.update_companies()
wam_holdings: List[classes.Holding] = [ wam_holdings: List[classes.Holding] = [
holding for holding in self.my_companies.holdings.values() if holding.wam_count holding for holding in self.my_companies.get_wam_holdings() if holding.wam_count
] ]
# Check for current region # Check for current region
@ -2361,10 +2361,9 @@ class _Citizen(
holding for holding in wam_holdings if not holding.region == self.details.current_region holding for holding in wam_holdings if not holding.region == self.details.current_region
] ]
wam_holdings.sort(key=lambda h: -len(h.get_wam_companies(False)))
for holding in wam_holdings: for holding in wam_holdings:
# Don't travel if not enough energy # 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: if self.energy.energy < 2 * self.energy.interval * 10 < holding.wam_count * 10:
break break
raw_usage = holding.get_wam_raw_usage() raw_usage = holding.get_wam_raw_usage()
free_storage = self.inventory.total - self.inventory.used free_storage = self.inventory.total - self.inventory.used
@ -2376,9 +2375,6 @@ class _Citizen(
self.update_companies() self.update_companies()
wam_count = 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() self.travel_to_residence()
return bool(wam_count) return bool(wam_count)

4
erepublik/classes.py
View File

@ -411,6 +411,10 @@ class MyCompanies:
def companies(self) -> Generator[Company, None, None]: def companies(self) -> Generator[Company, None, None]:
return (c for c in self._companies) 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()))):
def __str__(self): def __str__(self):
return f"MyCompanies: {sum(1 for _ in self.companies)} companies in {len(self.holdings)} holdings" return f"MyCompanies: {sum(1 for _ in self.companies)} companies in {len(self.holdings)} holdings"