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

Company sorting for wam: Raw factories, food, weapon, house, air, q7...q1, Final factories, food, weapon, house, air, q7...q1

Browse Source
This commit is contained in:
Eriks Karls 2019-09-25 09:38:27 +03:00
parent acbf1590d7
commit 8db4ab1f0f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erepublik/classes.py
View File

@ -61,7 +61,7 @@ class MyCompanies:
production=0, base_production=0, wam_enabled=False, can_work_as_manager=False, production=0, base_production=0, wam_enabled=False, can_work_as_manager=False,
preset_own_work=0, already_worked=False, can_assign_employees=False, preset_works=0, preset_own_work=0, already_worked=False, can_assign_employees=False, preset_works=0,
todays_works=0, holding_company_id=None, is_assigned_to_holding=False, todays_works=0, holding_company_id=None, is_assigned_to_holding=False,
cannot_work_as_manager_reason=False) cannot_work_as_manager_reason=False, industry_id=0)
for c_id, company in companies.items(): for c_id, company in companies.items():
tmp = {} tmp = {}
@ -119,7 +119,10 @@ class MyCompanies:
raw = [] raw = []
factory = [] factory = []
if holding_id in self.holdings: if holding_id in self.holdings:
for company_id in self.holdings.get(holding_id, {}).get('companies', []): for company_id in sorted(self.holdings.get(holding_id, {}).get('companies', []),
key=lambda cid: (-self.companies[cid].get('is_raw'), # True, False
self.companies[cid].get('industry_id'), # F W H A
-self.companies[cid].get('quality'), )): # 7, 6, .. 2, 1
company = self.companies.get(company_id, {}) company = self.companies.get(company_id, {})
wam_enabled = bool(company.get('wam_enabled', {})) wam_enabled = bool(company.get('wam_enabled', {}))
already_worked = not company.get('already_worked', {}) already_worked = not company.get('already_worked', {})