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

Unified Item namig from constants.INDUSTRIES

Browse Source
This commit is contained in:
Eriks K 2020-10-30 12:43:45 +02:00
parent 638373e452
commit 486f022f35
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
erepublik/citizen.py
View File

@ -264,6 +264,8 @@ class BaseCitizen(access_points.CitizenAPI):
kind = re.sub(r'_q\d\d*', "", item_data.get('token')) kind = re.sub(r'_q\d\d*', "", item_data.get('token'))
else: else:
kind = item_data.get('type') kind = item_data.get('type')
if constants.INDUSTRIES[kind]:
kind = constants.INDUSTRIES[constants.INDUSTRIES[kind]]
if kind not in active_items: if kind not in active_items:
active_items[kind] = {} active_items[kind] = {}
icon = item_data['icon'] if item_data[ icon = item_data['icon'] if item_data[
@ -316,11 +318,15 @@ class BaseCitizen(access_points.CitizenAPI):
self.eb_small += amount self.eb_small += amount
elif q == 15: elif q == 15:
self.eb_small += amount self.eb_small += amount
item_data.update(token='energy_bar')
kind = re.sub(r'_q\d\d*', "", item_data.get('token')) kind = re.sub(r'_q\d\d*', "", item_data.get('token'))
if item_data.get('token', "") == "house_q100": if item_data.get('token', "") == "house_q100":
self.ot_points = item_data['amount'] self.ot_points = item_data['amount']
if constants.INDUSTRIES[kind]:
kind = constants.INDUSTRIES[constants.INDUSTRIES[kind]]
if kind not in final_items: if kind not in final_items:
final_items[kind] = {} final_items[kind] = {}
@ -339,10 +345,10 @@ class BaseCitizen(access_points.CitizenAPI):
icon = "/images/modules/pvp/ghost_boosters/icon_booster_30_60.png" icon = "/images/modules/pvp/ghost_boosters/icon_booster_30_60.png"
else: else:
icon = "//www.erepublik.net/images/modules/manager/tab_storage.png" icon = "//www.erepublik.net/images/modules/manager/tab_storage.png"
item_data = dict(kind=kind, quality=item_data.get('quality', 0), amount=item_data.get('amount', 0), _item_data = dict(kind=kind, quality=item_data.get('quality', 0), amount=item_data.get('amount', 0),
durability=item_data.get('duration', 0), icon=icon, name=name) durability=item_data.get('duration', 0), icon=icon, name=name)
if item_data.get('type') in ('damageBoosters', "aircraftDamageBoosters"): if item_data.get('type') in ('damageBoosters', "aircraftDamageBoosters"):
item_data = {item_data['durability']: item_data} _item_data = {_item_data['durability']: item_data}
else: else:
if item_data.get('type') == 'bomb': if item_data.get('type') == 'bomb':
firepower = 0 firepower = 0
@ -351,9 +357,9 @@ class BaseCitizen(access_points.CitizenAPI):
except AttributeError: except AttributeError:
pass pass
finally: finally:
item_data.update(fire_power=firepower) _item_data.update(fire_power=firepower)
item_data = {item_data['quality']: item_data} _item_data = {_item_data['quality']: _item_data}
final_items[kind].update(item_data) final_items[kind].update(_item_data)
raw_materials: Dict[str, Dict[int, Dict[str, Union[str, int]]]] = {} raw_materials: Dict[str, Dict[int, Dict[str, Union[str, int]]]] = {}
if data.get("rawMaterials", {}).get("items", {}): if data.get("rawMaterials", {}).get("items", {}):
@ -908,6 +914,7 @@ class CitizenCompanies(BaseCitizen):
if int(free_inventory * 0.75) < self.my_companies.get_needed_inventory_usage(wam_list): if int(free_inventory * 0.75) < self.my_companies.get_needed_inventory_usage(wam_list):
self.update_inventory() self.update_inventory()
free_inventory = self.inventory_status["total"] - self.inventory_status["used"]
while wam_list and free_inventory < self.my_companies.get_needed_inventory_usage(wam_list): while wam_list and free_inventory < self.my_companies.get_needed_inventory_usage(wam_list):
wam_list.pop(-1) wam_list.pop(-1)
@ -985,7 +992,7 @@ class CitizenEconomy(CitizenTravel):
original_region = self.details.current_country, self.details.current_region original_region = self.details.current_country, self.details.current_region
ok_to_activate = False ok_to_activate = False
inv = self.get_inventory() inv = self.get_inventory()
if not inv['final'].get('house', {}).get(q, {}): if not inv['final'].get('House', {}).get(q, {}):
countries = [self.details.citizenship, ] countries = [self.details.citizenship, ]
if self.details.current_country != self.details.citizenship: if self.details.current_country != self.details.citizenship:
countries.append(self.details.current_country) countries.append(self.details.current_country)
@ -1085,7 +1092,7 @@ class CitizenEconomy(CitizenTravel):
offers = self.get_my_market_offers() offers = self.get_my_market_offers()
for offer in offers: for offer in offers:
if offer['id'] == offer_id: if offer['id'] == offer_id:
industry = constants.INDUSTRIES[offer['industry']] industry = constants.INDUSTRIES[offer['industryId']]
amount = offer['amount'] amount = offer['amount']
q = offer['quality'] q = offer['quality']
price = offer['price'] price = offer['price']
@ -1097,7 +1104,7 @@ class CitizenEconomy(CitizenTravel):
self._report_action("ECONOMY_DELETE_OFFER", self._report_action("ECONOMY_DELETE_OFFER",
f"Removed offer for {amount} x {industry} q{q} for {price}cc/each", f"Removed offer for {amount} x {industry} q{q} for {price}cc/each",
kwargs=offer) kwargs=offer)
return ret.get('error') return not ret.get('error')
else: else:
self._report_action("ECONOMY_DELETE_OFFER", f"Unable to find offer id{offer_id}", kwargs={'offers': offers}) self._report_action("ECONOMY_DELETE_OFFER", f"Unable to find offer id{offer_id}", kwargs={'offers': offers})
return False return False
@ -1128,7 +1135,7 @@ class CitizenEconomy(CitizenTravel):
message = (f"Posted market offer for {amount}q{quality} " message = (f"Posted market offer for {amount}q{quality} "
f"{constants.INDUSTRIES[industry]} for price {price}cc") f"{constants.INDUSTRIES[industry]} for price {price}cc")
self._report_action("ECONOMY_SELL_PRODUCTS", message, kwargs=ret) self._report_action("ECONOMY_SELL_PRODUCTS", message, kwargs=ret)
return bool(ret.get('error', True)) return not bool(ret.get('error', True))
def buy_from_market(self, offer: int, amount: int) -> dict: def buy_from_market(self, offer: int, amount: int) -> dict:
ret = self._post_economy_marketplace_actions('buy', offer=offer, amount=amount) ret = self._post_economy_marketplace_actions('buy', offer=offer, amount=amount)