1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 08:17:13 +03:00

Add E:D 1.4 ships - Federal Assault Ship, Federal Gunship, Imperial Eagle.

This commit is contained in:
Jonathan Harris 2015-09-15 22:09:48 +01:00
parent 4a9d947e6b
commit 08260fa591
2 changed files with 26 additions and 23 deletions

View File

@ -48,28 +48,31 @@ commodity_map= {
}
ship_map = {
'Adder' : 'Adder',
'Anaconda' : 'Anaconda',
'Asp' : 'Asp',
'CobraMkIII' : 'Cobra Mk III',
'DiamondBack' : 'Diamondback Scout',
'DiamondBackXL' : 'Diamondback Explorer',
'Eagle' : 'Eagle',
'Empire_Courier' : 'Imperial Courier',
'Empire_Fighter' : 'Imperial Fighter',
'Empire_Trader' : 'Imperial Clipper',
'Federation_Dropship' : 'Federal Dropship',
'Federation_Fighter' : 'F63 Condor',
'FerDeLance' : 'Fer-de-Lance',
'Hauler' : 'Hauler',
'Orca' : 'Orca',
'Python' : 'Python',
'SideWinder' : 'Sidewinder',
'Type6' : 'Type-6 Transporter',
'Type7' : 'Type-7 Transporter',
'Type9' : 'Type-9 Heavy',
'Viper' : 'Viper',
'Vulture' : 'Vulture',
'Adder' : 'Adder',
'Anaconda' : 'Anaconda',
'Asp' : 'Asp',
'CobraMkIII' : 'Cobra Mk III',
'DiamondBack' : 'Diamondback Scout',
'DiamondBackXL' : 'Diamondback Explorer',
'Eagle' : 'Eagle',
'Empire_Courier' : 'Imperial Courier',
'Empire_Eagle' : 'Imperial Eagle',
'Empire_Fighter' : 'Imperial Fighter',
'Empire_Trader' : 'Imperial Clipper',
'Federation_Dropship' : 'Federal Dropship',
'Federation_Dropship_MkII' : 'Federal Assault Ship',
'Federation_Gunship' : 'Federal Gunship',
'Federation_Fighter' : 'F63 Condor',
'FerDeLance' : 'Fer-de-Lance',
'Hauler' : 'Hauler',
'Orca' : 'Orca',
'Python' : 'Python',
'SideWinder' : 'Sidewinder',
'Type6' : 'Type-6 Transporter',
'Type7' : 'Type-7 Transporter',
'Type9' : 'Type-9 Heavy',
'Viper' : 'Viper',
'Vulture' : 'Vulture',
}

View File

@ -97,6 +97,6 @@ def export(data):
'systemName' : data['lastSystem']['name'].strip(),
'stationName' : data['lastStarport']['name'].strip(),
'timestamp' : time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(querytime)),
'ships' : [ship_map.get(ship['name'],ship['name']) for ship in (data['lastStarport']['ships'].get('shipyard_list') or {}).values() + data['lastStarport']['ships'].get('unavailable_list')],
'ships' : [ship_map[ship['name']] for ship in (data['lastStarport']['ships'].get('shipyard_list') or {}).values() + data['lastStarport']['ships'].get('unavailable_list') if ship['name'] in ship_map],
}
})