diff --git a/erepublik/citizen.py b/erepublik/citizen.py index 321e783..ca50c1c 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -238,10 +238,7 @@ class BaseCitizen(access_points.CitizenAPI): def update_inventory(self): """ - Updates class properties and returns structured inventory. - Return structure: {status: {used: int, total: int}, items: {active/final/raw: {item_token:{quality: data}}} - If item kind is damageBoosters or aircraftDamageBoosters then kind is renamed to kind+quality and duration is - used as quality. + Updates citizen inventory """ self._update_inventory_data(self._get_economy_inventory_items().json()) @@ -1207,7 +1204,7 @@ class CitizenEconomy(CitizenTravel): items = (self.inventory.final if final_kind else self.inventory.raw).get(constants.INDUSTRIES[industry], {_inv_qlt: {'amount': 0}}) if items[_inv_qlt]['amount'] < amount: - self.get_inventory(True) + self.update_inventory() items = (self.inventory.final if final_kind else self.inventory.raw).get(constants.INDUSTRIES[industry], {_inv_qlt: {'amount': 0}}) if items[_inv_qlt]['amount'] < amount: @@ -2680,7 +2677,6 @@ class Citizen(CitizenAnniversary, CitizenCompanies, CitizenLeaderBoard, else: start_time = utils.good_timedelta(start_time.replace(minute=0), timedelta(hours=1)) while not self.stop_threads.is_set(): - self.update_citizen_info() start_time = utils.good_timedelta(start_time, timedelta(minutes=30)) self.send_state_update() self.send_inventory_update() @@ -2691,6 +2687,7 @@ class Citizen(CitizenAnniversary, CitizenCompanies, CitizenLeaderBoard, self.report_error("State updater crashed") def send_state_update(self): + self.update_all(True) data = dict(xp=self.details.xp, cc=self.details.cc, gold=self.details.gold, pp=self.details.pp, inv_total=self.inventory.total, inv=self.inventory.used, hp_limit=self.energy.limit,