From b961ca814a817635540b1fc796f372b6b933189b Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Sat, 3 Apr 2021 10:35:35 +0100
Subject: [PATCH] Move edshipyard.py slot_map into data.py

---
 data.py       | 26 ++++++++++++++++++++++----
 edshipyard.py | 32 +-------------------------------
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/data.py b/data.py
index fd8adf84..ec64cd30 100644
--- a/data.py
+++ b/data.py
@@ -25,8 +25,26 @@ companion_category_map = {
 # Map Coriolis's names to names displayed in the in-game shipyard.
 coriolis_ship_map = {
     'Cobra Mk III': 'Cobra MkIII',
-    'Cobra Mk IV' : 'Cobra MkIV',
-    'Krait Mk II' : 'Krait MkII',
-    'Viper'       : 'Viper MkIII',
-    'Viper Mk IV' : 'Viper MkIV',
+    'Cobra Mk IV':  'Cobra MkIV',
+    'Krait Mk II':  'Krait MkII',
+    'Viper':        'Viper MkIII',
+    'Viper Mk IV':  'Viper MkIV',
+}
+
+# Map API slot names to E:D Shipyard slot names
+edshipyard_slot_map = {
+    'hugehardpoint':     'H',
+    'largehardpoint':    'L',
+    'mediumhardpoint':   'M',
+    'smallhardpoint':    'S',
+    'tinyhardpoint':     'U',
+    'armour':            'BH',
+    'powerplant':        'RB',
+    'mainengines':       'TM',
+    'frameshiftdrive':   'FH',
+    'lifesupport':       'EC',
+    'powerdistributor':  'PC',
+    'radar':             'SS',
+    'fueltank':          'FS',
+    'military':          'MC',
 }
diff --git a/edshipyard.py b/edshipyard.py
index 0cf13dac..0f29f7b6 100644
--- a/edshipyard.py
+++ b/edshipyard.py
@@ -8,43 +8,13 @@ import re
 import time
 
 from config import config
+from data import edshipyard_slot_map as slot_map
 import outfitting
 import util_ships
 
 from typing import Dict, Union, List
 __Module = Dict[str, Union[str, List[str]]]
 
-# Map API ship names to E:D Shipyard ship names
-ship_map = util_ships.ship_map.copy()
-
-ship_map.update(
-    {
-        'cobramkiii': 'Cobra Mk III',
-        'cobramkiv' : 'Cobra Mk IV',
-        'viper'     : 'Viper',
-        'viper_mkiv': 'Viper Mk IV',
-    }
-)
-
-
-# Map API slot names to E:D Shipyard slot names
-slot_map = {
-    'hugehardpoint'    : 'H',
-    'largehardpoint'   : 'L',
-    'mediumhardpoint'  : 'M',
-    'smallhardpoint'   : 'S',
-    'tinyhardpoint'    : 'U',
-    'armour'           : 'BH',
-    'powerplant'       : 'RB',
-    'mainengines'      : 'TM',
-    'frameshiftdrive'  : 'FH',
-    'lifesupport'      : 'EC',
-    'powerdistributor' : 'PC',
-    'radar'            : 'SS',
-    'fueltank'         : 'FS',
-    'military'         : 'MC',
-}
-
 
 # Ship masses
 # TODO: prefer something other than pickle for this storage (dev readability, security)