ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-05-31 07:39:44 +03:00
Code Issues Projects Releases Wiki Activity

edshipyard.py: mypy lints

Browse Source 
That __Module type might be causing more trouble than its worth.
Changing the Union to 'Any' didn't help though.
This commit is contained in:
Athanasius 2021-04-07 15:40:31 +01:00
parent 35e13defb2
commit 11fa46163a
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
edshipyard.py
View File

@ -44,7 +44,7 @@ def export(data, filename=None) -> None: # noqa: C901, CCR001
mod_class = module['class'] mod_class = module['class']
mod_rating = module['rating'] mod_rating = module['rating']
mod_mount = module.get('mount') mod_mount = module.get('mount')
mod_guidance = module.get('guidance') mod_guidance: str = module.get('guidance') # type: ignore
ret = f'{mod_class}{mod_rating}' ret = f'{mod_class}{mod_rating}'
if 'guidance' in module: # Missiles if 'guidance' in module: # Missiles
@ -54,7 +54,7 @@ def export(data, filename=None) -> None: # noqa: C901, CCR001
else: else:
mount = 'F' mount = 'F'
guidance = mod_guidance[0], guidance = mod_guidance[0]
ret += f'/{mount}{guidance}' ret += f'/{mount}{guidance}'
elif 'mount' in module: # Hardpoints elif 'mount' in module: # Hardpoints
@ -88,22 +88,22 @@ def export(data, filename=None) -> None: # noqa: C901, CCR001
cr = class_rating(module) cr = class_rating(module)
mods = v.get('modifications') or v.get('WorkInProgress_modifications') or {} mods = v.get('modifications') or v.get('WorkInProgress_modifications') or {}
if mods.get('OutfittingFieldType_Mass'): if mods.get('OutfittingFieldType_Mass'):
mass += (module.get('mass', 0) * mods['OutfittingFieldType_Mass']['value']) mass += float(module.get('mass', 0.0) * mods['OutfittingFieldType_Mass']['value'])
else: else:
mass += module.get('mass', 0) mass += float(module.get('mass', 0.0)) # type: ignore
# Specials # Specials
if 'Fuel Tank' in module['name']: if 'Fuel Tank' in module['name']:
fuel += 2**int(module['class']) fuel += 2**int(module['class']) # type: ignore
name = f'{module["name"]} (Capacity: {2**int(module["class"])})' name = f'{module["name"]} (Capacity: {2**int(module["class"])})' # type: ignore
elif 'Cargo Rack' in module['name']: elif 'Cargo Rack' in module['name']:
cargo += 2**int(module['class']) cargo += 2**int(module['class']) # type: ignore
name = f'{module["name"]} (Capacity: {2**int(module["class"])})' name = f'{module["name"]} (Capacity: {2**int(module["class"])})' # type: ignore
else: else:
name = module['name'] name = module['name'] # type: ignore
if name == 'Frame Shift Drive': if name == 'Frame Shift Drive':
fsd = module # save for range calculation fsd = module # save for range calculation
@ -114,7 +114,7 @@ def export(data, filename=None) -> None: # noqa: C901, CCR001
if mods.get('OutfittingFieldType_MaxFuelPerJump'): if mods.get('OutfittingFieldType_MaxFuelPerJump'):
fsd['maxfuel'] *= mods['OutfittingFieldType_MaxFuelPerJump']['value'] fsd['maxfuel'] *= mods['OutfittingFieldType_MaxFuelPerJump']['value']
jumpboost += module.get('jumpboost', 0) jumpboost += module.get('jumpboost', 0) # type: ignore
for s in slot_map: for s in slot_map:
if slot.lower().startswith(s): if slot.lower().startswith(s):
@ -169,7 +169,8 @@ def export(data, filename=None) -> None: # noqa: C901, CCR001
mass += ships[ship_name_map[data['ship']['name'].lower()]]['hullMass'] mass += ships[ship_name_map[data['ship']['name'].lower()]]['hullMass']
string += f'Mass : {mass:.2f} T empty\n {mass + fuel + cargo:.2f} T full\n' string += f'Mass : {mass:.2f} T empty\n {mass + fuel + cargo:.2f} T full\n'
multiplier = pow(min(fuel, fsd['maxfuel']) / fsd['fuelmul'], 1.0 / fsd['fuelpower']) * fsd['optmass'] multiplier = pow(min(fuel, fsd['maxfuel']) / fsd['fuelmul'], 1.0 # type: ignore
/ fsd['fuelpower']) * fsd['optmass'] # type: ignore
range_unladen = multiplier / (mass + fuel) + jumpboost range_unladen = multiplier / (mass + fuel) + jumpboost
range_laden = multiplier / (mass + fuel + cargo) + jumpboost range_laden = multiplier / (mass + fuel + cargo) + jumpboost