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

bugfix

Browse Source
This commit is contained in:
Eriks Karls 2019-08-27 10:13:14 +03:00
parent fff17469e0
commit c8e90ca910
1 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
erepublik/citizen.py
View File

@ -395,55 +395,58 @@ class Citizen(classes.CitizenAPI):
self.eb_small = 0 self.eb_small = 0
j = self._get_economy_inventory_items().json() j = self._get_economy_inventory_items().json()
active_items = {} active_items = {}
for item in j.get("inventoryItems", {}).get("activeEnhancements", {}).get("items", {}).values(): if j.get("inventoryItems", {}).get("activeEnhancements", {}).get("items", {}):
active_items.update({item['name']: item['active']['time_left']}) for item in j.get("inventoryItems", {}).get("activeEnhancements", {}).get("items", {}).values():
active_items.update({item['name']: item['active']['time_left']})
final_items = {} final_items = {}
if j.get("inventoryItems", {}).get("finalProducts", {}).get("items", {}):
for item in j.get("inventoryItems", {}).get("finalProducts", {}).get("items", {}).values():
name = item['name']
if item.get('type') == 'damageBoosters':
if item['quality'] == 5:
self.boosters[50].update({item['duration']: item['amount']})
elif item['quality'] == 10:
self.boosters[100].update({item['duration']: item['amount']})
delta = item['duration']
if delta // 3600:
name += f" {delta // 3600}h"
if delta // 60 % 60:
name += f" {delta // 60 % 60}m"
if delta % 60:
name += f" {delta % 60}s"
elif item['industryId'] == 1:
amount = item['amount']
q = item['quality']
if 1 <= q <= 7:
self.food.update({f"q{q}": item['amount']})
else:
if q == 10:
self.eb_normal = amount
elif q == 11:
self.eb_double = amount
elif q == 13:
self.eb_small += amount
elif q == 14:
self.eb_small += amount
for item in j.get("inventoryItems", {}).get("finalProducts", {}).get("items", {}).values(): elif item['industryId'] == 3 and item['quality'] == 5:
name = item['name'] self.ot_points = item['amount']
if item.get('type') == 'damageBoosters':
if item['quality'] == 5:
self.boosters[50].update({item['duration']: item['amount']})
elif item['quality'] == 10:
self.boosters[100].update({item['duration']: item['amount']})
delta = item['duration']
if delta // 3600:
name += f" {delta // 3600}h"
if delta // 60 % 60:
name += f" {delta // 60 % 60}m"
if delta % 60:
name += f" {delta % 60}s"
elif item['industryId'] == 1:
amount = item['amount']
q = item['quality']
if 1 <= q <= 7:
self.food.update({f"q{q}": item['amount']})
else:
if q == 10:
self.eb_normal = amount
elif q == 11:
self.eb_double = amount
elif q == 13:
self.eb_small += amount
elif q == 14:
self.eb_small += amount
elif item['industryId'] == 3 and item['quality'] == 5: elif item['industryId'] == 4 and item['quality'] == 100:
self.ot_points = item['amount'] self.ot_points = item['amount']
elif item['industryId'] == 4 and item['quality'] == 100: if item['amount']:
self.ot_points = item['amount'] final_items.update({name: item['amount']})
if item['amount']:
final_items.update({name: item['amount']})
raw_materials = {} raw_materials = {}
for item in j.get("inventoryItems", {}).get("rawMaterials", {}).get("items", {}).values(): if j.get("inventoryItems", {}).get("rawMaterials", {}).get("items", {}):
name = item['name'] for item in j.get("inventoryItems", {}).get("rawMaterials", {}).get("items", {}).values():
if item['isPartial']: name = item['name']
continue if item['isPartial']:
if item['amount']: continue
raw_materials.update({name: item['amount']}) if item['amount']:
raw_materials.update({name: item['amount']})
self.inventory.update({"used": j.get("inventoryStatus").get("usedStorage"), self.inventory.update({"used": j.get("inventoryStatus").get("usedStorage"),
"total": j.get("inventoryStatus").get("totalStorage")}) "total": j.get("inventoryStatus").get("totalStorage")})