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

Removed unused CitizenMilitary.boosters property

Browse Source 
Explicitly updated all Citizen*.as_dict properties
This commit is contained in:
Eriks K 2021-01-18 15:22:53 +02:00
parent f89f91e969
commit da0276f9a6
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
erepublik/citizen.py
View File

@ -1542,7 +1542,13 @@ class CitizenMilitary(CitizenTravel):
__last_war_update_data = None __last_war_update_data = None
active_fs: bool = False active_fs: bool = False
boosters: Dict[int, Dict[int, int]] = {100: {}, 50: {}}
@property
def as_dict(self):
d = super().as_dict
d.pop('__last_war_update_data', None)
d.update(active_fs=self.active_fs)
return d
def update_war_info(self): def update_war_info(self):
if self.__last_war_update_data and self.__last_war_update_data.get('last_updated', if self.__last_war_update_data and self.__last_war_update_data.get('last_updated',
@ -2377,6 +2383,12 @@ class CitizenTasks(CitizenEconomy):
ot_points: int = 0 ot_points: int = 0
next_ot_time: datetime = None next_ot_time: datetime = None
@property
def as_dict(self):
d = super().as_dict
d.update(tg_contract=self.tg_contract, ot_points=self.ot_points, next_ot_time=self.next_ot_time)
return d
def eat(self): def eat(self):
""" Eat food """ """ Eat food """
self._eat("blue") self._eat("blue")
@ -3031,3 +3043,10 @@ class Citizen(_Citizen):
return super().buy_market_offer(offer, amount) return super().buy_market_offer(offer, amount)
finally: finally:
self._concurrency_lock.set() self._concurrency_lock.set()
@property
def as_dict(self):
d = super().as_dict
d.update(_concurrency_lock=self._concurrency_lock.is_set(), _update_lock=self._update_lock.is_set(),
_concurrency_timeout=self._concurrency_timeout, _update_timeout=self._update_timeout)
return d