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

Inventory usage bugfixes

Browse Source
This commit is contained in:
Eriks Karls 2019-08-24 10:48:04 +03:00
parent 324db2c136
commit 1285e95cec
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erepublik/citizen.py
View File

@ -724,8 +724,7 @@ class Citizen(classes.CitizenAPI):
def fight(self, battle_id: int, side_id: int, is_air: bool = False, count: int = None): def fight(self, battle_id: int, side_id: int, is_air: bool = False, count: int = None):
if not is_air and self.config.boosters: if not is_air and self.config.boosters:
inventory = self.update_inventory() self.activate_dmg_booster()
self.activate_dmg_booster(battle_id)
data = dict(sideId=side_id, battleId=battle_id) data = dict(sideId=side_id, battleId=battle_id)
error_count = 0 error_count = 0
ok_to_fight = True ok_to_fight = True
@ -822,10 +821,9 @@ class Citizen(classes.CitizenAPI):
else: else:
self._eat("blue") self._eat("blue")
if self.energy.food_fights < 1: if self.energy.food_fights < 1:
large = max(self.energy.reference_time, self.now) seconds = (self.energy.reference_time - self.now).total_seconds()
small = min(self.energy.reference_time, self.now) self.write_log("I don't have energy to work. Will sleep for {}s".format(seconds))
self.write_log("I don't have energy to work. Will sleep for {}s".format((large - small).seconds)) self.sleep(seconds)
self.sleep(int((large - small).total_seconds()))
self._eat("blue") self._eat("blue")
self.work() self.work()
@ -991,7 +989,7 @@ class Citizen(classes.CitizenAPI):
def sell_produced_product(self, kind: str, quality: int = 1, amount: int = 0): def sell_produced_product(self, kind: str, quality: int = 1, amount: int = 0):
if not amount: if not amount:
inv_resp = self.update_inventory() inv_resp = self._get_economy_inventory_items().json()
category = "rawMaterials" if kind.endswith("Raw") else "finalProducts" category = "rawMaterials" if kind.endswith("Raw") else "finalProducts"
item = "{}_{}".format(self.available_industries[kind], quality) item = "{}_{}".format(self.available_industries[kind], quality)
amount = inv_resp.get("inventoryItems").get(category).get("items").get(item).get("amount", 0) amount = inv_resp.get("inventoryItems").get(category).get("items").get(item).get("amount", 0)
@ -1761,19 +1759,17 @@ class Citizen(classes.CitizenAPI):
def check_house_durability(self) -> Dict[int, datetime.datetime]: def check_house_durability(self) -> Dict[int, datetime.datetime]:
ret = {} ret = {}
inv = self.update_inventory() inv = self.update_inventory()
if "activeEnhancements" in inv.get("inventoryItems", {}): active = inv["items"]['active']
active = inv.get("inventoryItems", {}).get("activeEnhancements", {}).get("items", {})
for q in range(1, 6): for q in range(1, 6):
if "4_%i_active" % q in active: if f"House Q{q}" in active:
till = utils.good_timedelta(self.now, datetime.timedelta( till = utils.good_timedelta(self.now, datetime.timedelta(seconds=active[f"House Q{q}"]))
seconds=active["4_%i_active" % q]["active"]["time_left"]))
ret.update({q: till}) ret.update({q: till})
return ret return ret
def buy_and_activate_house(self, q: int) -> Dict[int, datetime.datetime]: def buy_and_activate_house(self, q: int) -> Dict[int, datetime.datetime]:
inventory = self.update_inventory() inventory = self.update_inventory()
ok_to_activate = False ok_to_activate = False
if not inventory.get("inventoryItems").get("finalProducts", {}).get("items", {}).get("4_{}".format(q)): if not inventory["items"]["final"].get("House Q{}".format(q)):
offers = [] offers = []
countries = [self.details.citizenship, ] countries = [self.details.citizenship, ]
if self.details.current_country != self.details.citizenship: if self.details.current_country != self.details.citizenship: