GonnaHetzMe/blitz-tools
0
0 Fork 0
mirror of https://github.com/Jylpah/blitz-tools.git synced 2026-10-21 10:17:05 +02:00
Code Issues Projects Releases Wiki Activity

get_tank_type(), get_tank_id(): remove async

Browse Source
This commit is contained in:
Jylpah committed 2022-10-30 15:46:33 +02:00
1 parent 2eced2eda0
commit f5e67798b4
1 file changed
+6 -4
Download Patch File Download Diff File Expand all files Collapse all files
extract_tankopedia.py
+6 -4
View File
@@ -123,9 +123,9 @@ async def extract_tanks(blitz_app_base : str, nation: str):
tank = dict() tank = dict()
tank['is_premium'] = issubclass(type(tank_xml['price']), dict) tank['is_premium'] = issubclass(type(tank_xml['price']), dict)
tank['nation'] = nation tank['nation'] = nation
tank['tank_id'] = await get_tank_id(nation, int(tank_xml['id'])) tank['tank_id'] = get_tank_id(nation, int(tank_xml['id']))
tank['tier'] = int(tank_xml['level']) tank['tier'] = int(tank_xml['level'])
tank['type'] = await get_tank_type(tank_xml['tags']) tank['type'] = get_tank_type(tank_xml['tags'])
tank['userStr'] = tank_xml['userString'] tank['userStr'] = tank_xml['userString']
#bu.debug('Reading tank string: ' + tank['userStr'], force=True) #bu.debug('Reading tank string: ' + tank['userStr'], force=True)
tanks.append(tank) tanks.append(tank)
@@ -206,10 +206,12 @@ async def convert_tank_names(tanklist : list, tank_strs: dict) -> dict:
return tankopedia_sorted, userStrs_sorted return tankopedia_sorted, userStrs_sorted
async def get_tank_id(nation: str, tank_id : int) -> int:
def get_tank_id(nation: str, tank_id : int) -> int:
return (tank_id << 8) + (wg.NATION_ID[nation] << 4) + 1 return (tank_id << 8) + (wg.NATION_ID[nation] << 4) + 1
async def get_tank_type(tagstr : str):
def get_tank_type(tagstr : str):
tags = tagstr.split(' ') tags = tagstr.split(' ')
for t_type in wg.TANK_TYPE: for t_type in wg.TANK_TYPE:
if tags[0] == t_type: if tags[0] == t_type: