From 0f147e516ea817f18455d3c57868c6b4cf1d33ba Mon Sep 17 00:00:00 2001
From: Jonathan Harris <jonathan@marginal.org.uk>
Date: Tue, 31 Oct 2017 09:46:50 +0000
Subject: [PATCH] Add ship name to EDShipyard export
---
edshipyard.py | 5 +++--
outfitting.py | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/edshipyard.py b/edshipyard.py
index 1b693721..817aa31a 100644
--- a/edshipyard.py
+++ b/edshipyard.py
@@ -117,7 +117,8 @@ def export(data, filename=None):
if __debug__: raise
# Construct description
- string = '[%s]\n' % ship_map.get(data['ship']['name'].lower(), data['ship']['name'])
+ ship = ship_map.get(data['ship']['name'].lower(), data['ship']['name'])
+ string = '[%s]\n' % (data['ship'].get('shipName') and ', '.join([ship, data['ship']['shipName']]) or ship)
for slot in ['H', 'L', 'M', 'S', 'U', None, 'BH', 'RB', 'TM', 'FH', 'EC', 'PC', 'SS', 'FS', None, 'MC', None, '9', '8', '7', '6', '5', '4', '3', '2', '1']:
if not slot:
string += '\n'
@@ -132,7 +133,7 @@ def export(data, filename=None):
try:
# https://github.com/cmmcleod/coriolis/blob/master/app/js/shipyard/module-shipyard.js#L184
mass += ships[companion.ship_map[data['ship']['name'].lower()]]['hullMass']
- string += 'Mass : %.1f T empty\n %.1f T full\n' % (mass, mass + fuel + cargo)
+ string += 'Mass : %.2f T empty\n %.2f T full\n' % (mass, mass + fuel + cargo)
multiplier = pow(min(fuel, fsd['maxfuel']) / fsd['fuelmul'], 1.0 / fsd['fuelpower']) * fsd['optmass']
string += 'Range : %.2f LY unladen\n %.2f LY laden\n' % (
multiplier / (mass + fuel),
diff --git a/outfitting.py b/outfitting.py
index 7adbfd67..910b1049 100644
--- a/outfitting.py
+++ b/outfitting.py
@@ -49,6 +49,7 @@ weapon_map = {
missiletype_map = {
'advancedtorppylon' : 'Seeker',
+ 'atdumbfiremissile' : 'Dumbfire',
'basicmissilerack' : 'Seeker',
'drunkmissilerack' : 'Swarm',
'dumbfiremissilerack' : 'Dumbfire',