diff --git a/coriolis.py b/coriolis.py index 7f6d9c0a..36a61afe 100755 --- a/coriolis.py +++ b/coriolis.py @@ -16,6 +16,7 @@ from config import config import outfitting import companion import util_ships +from data import coriolis_ship_map if __name__ == "__main__": @@ -30,15 +31,6 @@ if __name__ == "__main__": data = json.load(open('coriolis-data/dist/index.json')) - # 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', - } - # Symbolic name from in-game name reverse_ship_map = {v: k for k, v in list(util_ships.ship_map.items())} diff --git a/data.py b/data.py index 3688f8c9..fd8adf84 100644 --- a/data.py +++ b/data.py @@ -21,3 +21,12 @@ companion_category_map = { 'Waste ': 'Waste', 'NonMarketable': False, # Don't appear in the in-game market so don't report } + +# 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', +}