Merge branch 'master' into devel

CHANGES.txt

@@ -5,7 +5,7 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 v6.3.1 [wip]
 . (kfsone) Added "--ls-penalty" ("--lsp") for biasing "run" calculations
    in favor of shorter supercruise times.
-+ Stations, data: kfsone
++ Stations, Systems, data: kfsone, maddavo
 
 v6.3.0 Dec 23 2014
 . (OpenSS) Script for Windows users (see scripts/README.txt)!

corrections.py

@@ -7,6 +7,7 @@
 DELETED = -111
 
 systems = {
+    "ARGETLAMH": "Argetlámh",
 
 #ADD_SYSTEMS_HERE
 }

data/Station.csv

@@ -129,6 +129,8 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Amait','Oramus Legacy',0,'?','?'
 'Amarak','Vela Port',1160,'?','?'
 'Amarak','Werner Von Siemens Vision',0,'?','?'
+'Amber','Felice Plant',0,'?','?'
+'Amber','Smith Landing',0,'?','?'
 'Ambiliates','Hanke-Woods Terminal',0,'?','?'
 'Ammapa','Bamford Enterprise',0,'?','?'
 'Anapos','Herschel Plant',0,'?','?'
@@ -178,7 +180,6 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Arexe','Janes Horizons',0,'?','?'
 'Ariameni','Landsteiner City',0,'?','?'
 'Ariameni','Patrick Enterprise',0,'?','?'
-'Arin','Kettle Landing',0,'?','?'
 'Aritimi','Armstrong Dock',2100,'?','?'
 'Aritimi','Griggs Hub',0,'?','?'
 'Aritimi','Huygens Port',2100,'?','?'
@@ -476,13 +477,12 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Duberdicus','Bond Park',0,'?','?'
 'Duberdicus','Foster Hub',0,'?','?'
 'DX 799','Shargin Plant',0,'?','?'
-'DX Cancri','Horowitz Landing',0,'?','?'
-'Dyaushis','Helmholtz Station',0,'?','?'
 'Egovae','Endate Market',0,'?','?'
 'Egovae','Van Den Bergh Orbital',0,'?','?'
 'Ekonir','Kubasov Orbital',160,'N','?'
 'Ekonir','Morey Vision',108,'N','?'
-'Ekuru','Dana Platform',0,'?','?'
+'Ekuru','Dana Platform',67,'?','?'
+'Ekuru','Knight Plant',89,'?','?'
 'El','Titov Station',0,'?','?'
 'El Tio','Kludze Dock',0,'?','?'
 'Eleu','Bao Orbital',0,'?','?'
@@ -511,7 +511,6 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Farowalan','Bamford City',0,'?','?'
 'FAUST 3566','Murphy Gateway',0,'?','?'
 'FAUST 3566','Perry Dock',0,'?','?'
-'Feng Huang','Murdoch Plant',0,'?','?'
 'Finteno','Kolmogorov Station',0,'?','?'
 'FK5 2550','Jemison Dock',0,'?','?'
 'FK5 2550','Wundt Gateway',0,'?','?'
@@ -667,7 +666,10 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'HIP 20978','Humbolt City',0,'?','?'
 'HIP 21053','Abbott Orbital',0,'?','?'
 'HIP 21280','Shepard Terminal',0,'?','?'
+'HIP 24046','Baird Dock',0,'?','?'
+'HIP 24046','Brand Hub',0,'?','?'
 'HIP 2422','Shargin Port',0,'?','?'
+'HIP 24655','Hogan Dock',0,'?','?'
 'HIP 4907','Edison Platform',0,'?','?'
 'HIP 62536','Onnes Orbital',0,'?','?'
 'HIP 72353','Caidin Station',0,'?','?'
@@ -771,14 +773,11 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Kanitisa','Witt Ring',0,'?','?'
 'Kanos','Lee Station',0,'?','?'
 'Kappa Fornacis','Harvestport',0,'?','?'
-'Kassi Hua','Clauss Platform',0,'?','?'
-'Katae','Coulomb Survey',0,'?','?'
 'Katta','Serre Point',0,'?','?'
 'Kaurawish','Kooi Hub',0,'?','?'
 'Kebel Yeh','Ohm Orbital',0,'?','?'
 'Keiadjara','Brown Hub',0,'?','?'
 'Keian Gu','Zhigang Platform',0,'?','?'
-'Keling','Lopez De Villalobos',0,'?','?'
 'Keries','Derrickson''s Escape',0,'?','?'
 'Khanci','Bloomfield Colony',0,'?','?'
 'Khanci','Tani Colony',0,'?','?'
@@ -799,7 +798,6 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Kotilem','Lunney Port',0,'?','?'
 'Kremainn','Volta Station',0,'?','?'
 'Kremainn','Wohler Terminal',0,'?','?'
-'Kuikian Batji','ALI INSTALLATION',0,'?','?'
 'Kuk','Eudoxus Dock',0,'?','?'
 'Kuk','Evans Station',0,'?','?'
 'Kuk','Harrison Enterprise',0,'?','?'
@@ -843,6 +841,8 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'LFT 1072','Forsskal Vision',0,'?','?'
 'LFT 1073','Cook Landing',0,'?','?'
 'LFT 1073','Galois Installation',0,'?','?'
+'LFT 133','Garn Terminal',0,'?','?'
+'LFT 133','Sullivan Dock',0,'?','?'
 'LFT 140','Ford Orbital',0,'?','?'
 'LFT 1425','Hirase Market',0,'?','?'
 'LFT 1446','Bosch Settlement',0,'?','?'
@@ -906,6 +906,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'LHS 2310','Macleod Station',0,'?','?'
 'LHS 2310','Waldrop Gateway',0,'?','?'
 'LHS 2363','Kennan Platform',0,'?','?'
+'LHS 2459','Robinson Prospect',0,'?','?'
 'LHS 246','Ellis Laboratory',0,'?','?'
 'LHS 2471','Artsebarsky Enterprise',0,'?','?'
 'LHS 2471','Baird City',0,'?','?'
@@ -1120,6 +1121,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'LTT 15574','Yaping Dock',1297,'N','?'
 'LTT 1572','Young Dock',0,'?','?'
 'LTT 1582','Pimi Ring',0,'?','?'
+'LTT 15899','Kekule Orbital',0,'?','?'
 'LTT 1598','Covington Dock',0,'?','?'
 'LTT 1598','Qushji Gateway',0,'?','?'
 'LTT 16016','Lee Station',0,'?','?'
@@ -1182,7 +1184,6 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Mafdetela','Vinge Beacon',0,'?','?'
 'Mafdetela','Wallin Settlement',0,'?','?'
 'Magec','Xiaoguan Hub',0,'?','?'
-'Maitaokona','Gresley Gateway',0,'?','?'
 'Makah','Jacquard Works',0,'?','?'
 'Malannher','Brash Terminal',0,'?','?'
 'Malannher','Khan City',0,'?','?'
@@ -1197,7 +1198,6 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Maorsi','Karachkina City',0,'?','?'
 'Maramovoy','Melnick Gateway',0,'?','?'
 'Marasing','Thiele Enterprise',0,'?','?'
-'Markanomovoy','Compton Dock',0,'?','?'
 'Matyar','Shatner Terminal',0,'?','?'
 'Matyar','Stillman Station',0,'?','?'
 'Matyar','Witt Station',0,'?','?'
@@ -1271,10 +1271,12 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Nandjabinja','Brand City',0,'?','?'
 'Nang Ta-khian','Hay Point',0,'?','?'
 'Nangkano','Sarafanov Hub',0,'?','?'
+'Narim','Hamuy Colony',0,'?','?'
+'Narim','Pond Vision',0,'?','?'
 'Neganhot','Gardner Settlement',0,'?','?'
 'Neganhot','He Landing',0,'?','?'
-'Nener','Popov Dock',0,'?','?'
 'Neto','Citroen Hub',0,'?','?'
+'Neto','Ising Vision',666,'?','L'
 'Ngadandari','Consolmagno Horizons',0,'?','?'
 'Ngadandari','Delsanti Hub',0,'?','?'
 'Ngadjal','Lundmark',0,'?','?'
@@ -1320,7 +1322,6 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Nuenets','Ryazanski Dock',0,'?','?'
 'Nuenets','Shriver Hub',0,'?','?'
 'Nuitati','Eisenstein Settlement',0,'?','?'
-'Nuwang','Schade Outpost',0,'?','?'
 'Nyal','Chadwick Colony',0,'?','?'
 'Nzambassee','Broderick Orbital',0,'?','?'
 'Nzambassee','Garriott Stop',0,'?','?'
@@ -1329,6 +1330,8 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Obambivas','Kennan Orbital',431,'Y','?'
 'Okinoukhe','Stableford Ring',0,'?','?'
 'Okuapang','Pribylov Park',0,'?','?'
+'Olwain','Cabot Hub',0,'?','?'
+'Olwain','Hovell Orbital',0,'?','?'
 'Ongerinja','Vogel Platform',0,'?','?'
 'Ongkampan','Abernathy Gateway',111,'?','?'
 'Ongkampan','Carstensz Dock',197,'?','?'
@@ -1476,7 +1479,6 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Seditya','Zamyatin Landing',17919,'N','?'
 'Shakapa','Gibson Dock',0,'?','?'
 'Shakapa','Ore Horizons',0,'?','?'
-'Shama','Clairaut Port',0,'?','?'
 'Shebayeb','Volta Landing',0,'?','?'
 'Sheela Na Gig','Birkhoff Terminal',0,'?','?'
 'Shibboleth','Elgin''s Reach',0,'?','?'
@@ -1496,6 +1498,8 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Sinann','Phillips Arena',0,'?','?'
 'Siren','Brash Dock',0,'?','?'
 'Siren','Conrad Port',0,'?','?'
+'Sireo','Dann Port',0,'?','?'
+'Sireo','Turtledove Prospect',0,'?','?'
 'Skeggiko O','Kuo Terminal',0,'?','?'
 'Slatus','Hoffman Orbital',0,'?','?'
 'Slavanibo','Irwin Mines',1854,'N','?'
@@ -1547,6 +1551,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Tabassapisi','Parise Camp',0,'?','?'
 'Tabit','Haber City',0,'?','?'
 'Tago','Kregel Dock',193,'?','?'
+'Takak','Filipchenko Vision',0,'?','L'
 'Talitha','Ross Platform',0,'?','?'
 'Tamor','Seven Holm',0,'?','?'
 'Tangaroa','Asylum',0,'?','?'
@@ -1589,6 +1594,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Tiethay','Santos Plant1',0,'?','?'
 'Tiguai','Pippin Port',0,'?','?'
 'Tilian','Maunder''s Hope',0,'?','?'
+'Timbalderis','McKay Terminal',0,'?','?'
 'Timocani','Pennington Terminal',0,'?','?'
 'Timocani','Seega Port',0,'?','?'
 'Tionisla','Brett High',0,'?','?'
@@ -1687,7 +1693,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Wolf 1478','Franklin Orbital',0,'?','?'
 'Wolf 1481','Velazquez Gateway',627,'?','?'
 'Wolf 1509','Bolotov Dock',37856,'?','?'
-'Wolf 1509','Maclean Port',721,'?','?'
+'Wolf 1509','Maclean Port',721,'N','?'
 'Wolf 248','Hencke Centre',0,'?','?'
 'Wolf 279','Bresnik Settlement',0,'?','?'
 'Wolf 287','Boas Terminal',0,'?','?'
@@ -1727,7 +1733,6 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'Wong Sher','Lawrence Holdings',0,'?','?'
 'Wosyra Pao','Kaku Terminal',0,'?','?'
 'Wunian','Sellers Landing',0,'?','?'
-'WX Ursa Majoris','Teng-Hui Terminal',0,'?','?'
 'Wyrd','Vonarburg Co-Operative',0,'?','?'
 'Xi Ursae Majoris','Joule Settlement',0,'?','?'
 'Xi Wangkala','Ross Colony',0,'?','?'