From 0a4cb864d1676d47755823d6b8e4b01ecd5df9e4 Mon Sep 17 00:00:00 2001
From: Jonathan Harris <jonathan@marginal.org.uk>
Date: Tue, 15 Dec 2015 19:01:26 +0000
Subject: [PATCH] Add new ships in E:D 1.5/2.0.

---
 companion.py | 6 ++++++
 coriolis.py  | 6 ++++--
 loadout.py   | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/companion.py b/companion.py
index 6a5e77fe..950928d3 100644
--- a/companion.py
+++ b/companion.py
@@ -57,7 +57,10 @@ ship_map = {
     'adder'                       : 'Adder',
     'anaconda'                    : 'Anaconda',
     'asp'                         : 'Asp Explorer',
+    'asp_scout'                   : 'Asp Scout',
     'cobramkiii'                  : 'Cobra MkIII',
+    'cobramkiv'                   : 'Cobra MkIV',
+    'cutter'                      : 'Imperial Cutter',
     'diamondback'                 : 'Diamondback Scout',
     'diamondbackxl'               : 'Diamondback Explorer',
     'eagle'                       : 'Eagle',
@@ -65,12 +68,14 @@ ship_map = {
     'empire_eagle'                : 'Imperial Eagle',
     'empire_fighter'              : 'Imperial Fighter',
     'empire_trader'               : 'Imperial Clipper',
+    'federation_corvette'         : 'Federal Corvette',
     'federation_dropship'         : 'Federal Dropship',
     'federation_dropship_mkii'    : 'Federal Assault Ship',
     'federation_gunship'          : 'Federal Gunship',
     'federation_fighter'          : 'F63 Condor',
     'ferdelance'                  : 'Fer-de-Lance',
     'hauler'                      : 'Hauler',
+    'independant_trader'          : 'Keelback',
     'orca'                        : 'Orca',
     'python'                      : 'Python',
     'sidewinder'                  : 'Sidewinder',
@@ -78,6 +83,7 @@ ship_map = {
     'type7'                       : 'Type-7 Transporter',
     'type9'                       : 'Type-9 Heavy',
     'viper'                       : 'Viper MkIII',
+    'viper_mkiv'                  : 'Viper MkIV',
     'vulture'                     : 'Vulture',
 }
 
diff --git a/coriolis.py b/coriolis.py
index 5cbd68a5..b65721b5 100644
--- a/coriolis.py
+++ b/coriolis.py
@@ -36,7 +36,9 @@ slot_map = {
 # Map API ship names to Coriolis names
 ship_map = dict(companion.ship_map)
 ship_map['cobramkiii'] = 'Cobra Mk III'
-ship_map['viper'] = 'Viper'
+ship_map['cobramkiv']  = 'Cobra Mk IV',
+ship_map['viper']      = 'Viper'
+ship_map['viper_mkiv'] = 'Viper Mk IV'
 
 
 # Map EDDN outfitting schema / in-game names to Coriolis names
@@ -70,12 +72,12 @@ fixup_map = {
     'Cytoscrambler Burst Laser'     : ('Burst Laser', 'Cytoscrambler'),
     'Enforcer Cannon'               : ('Multi-cannon', 'Enforcer'),
     'Imperial Hammer Rail Gun'      : ('Rail Gun', 'Imperial Hammer'),
-    'Impulse Mine Launcher'         : ('Mine Launcher', 'Impulse'),
     'Mining Lance Beam Laser'       : ('Mining Laser', 'Mining Lance'),
     'Multi-Cannon'                  : ('Multi-cannon', None),
     'Pacifier Frag-Cannon'          : ('Fragment Cannon', 'Pacifier'),
     'Pack-Hound Missile Rack'       : ('Missile Rack', 'Pack-Hound'),
     'Pulse Disruptor Laser'         : ('Pulse Laser', 'Distruptor'),	# Note sp
+    'Shock Mine Launcher'           : ('Mine Launcher', 'Shock Mine Launcher'),		# XXX
     'Standard Docking Computer'     : ('Docking Computer', 'Standard Docking Computer'),
 }
 
diff --git a/loadout.py b/loadout.py
index 8afdc4d2..e3b27427 100644
--- a/loadout.py
+++ b/loadout.py
@@ -14,7 +14,9 @@ import companion
 # Map API ship names to E:D Shipyard ship names
 ship_map = dict(companion.ship_map)
 ship_map['cobramkiii'] = 'Cobra Mk III'
-ship_map['viper'] = 'Viper'
+ship_map['cobramkiv']  = 'Cobra Mk IV',
+ship_map['viper']      = 'Viper'
+ship_map['viper_mkiv'] = 'Viper Mk IV'
 
 
 # Map API slot names to E:D Shipyard slot names