diff --git a/CHANGES.txt b/CHANGES.txt index 803a708b..7812657d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,7 +11,8 @@ v6.6.1 Jan 10 2015 trade.py run --from sol --to lave -e 3 will find runs from sol to somewhere within 3 jumps of lave. . (kfsone) "rares" now has a friendly error when no rares are found -+ Data: kfsone, maddavo, Dave Ryalls, EDStarQuery/kfsone ++ Data: kfsone, maddavo, Dave Ryalls, NeoTron, Tyler Lund, Jared Buntain, ++ Stars: EDStarQuery/kfsone [I'm adding several hundred new systems from EDStarQuery but I'm also manually vetting all of them!] diff --git a/data/ShipVendor.csv b/data/ShipVendor.csv index 2582ebb4..ffb0c9c0 100644 --- a/data/ShipVendor.csv +++ b/data/ShipVendor.csv @@ -187,6 +187,16 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id 'HIP 87369','Carey Port','Lakon Type 7' 'HIP 87369','Carey Port','Sidewinder' 'HIP 87369','Carey Port','Viper' +'HR 5451','Fraser Station','Asp Explorer' +'HR 5451','Fraser Station','Hauler' +'HR 5451','Fraser Station','Lakon Type 7' +'HR 5451','Fraser Station','Lakon Type 9' +'HR 5451','Fraser Station','Sidewinder' +'HR 5451','Macdonald Hub','Adder' +'HR 5451','Macdonald Hub','Cobra' +'HR 5451','Macdonald Hub','Eagle' +'HR 5451','Macdonald Hub','Lakon Type 6' +'HR 5451','Macdonald Hub','Sidewinder' 'HR 8170','Fiennes Vision','Adder' 'HR 8170','Fiennes Vision','Asp Explorer' 'HR 8170','Fiennes Vision','Cobra' @@ -394,6 +404,24 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id 'LTT 4131','Lorrah Terminal','Python' 'LTT 4131','Lorrah Terminal','Sidewinder' 'LTT 4131','Lorrah Terminal','Viper' +'LU VELORUM','Miletus Station','Anaconda' +'LU VELORUM','Miletus Station','Asp Explorer' +'LU VELORUM','Miletus Station','Cobra' +'LU VELORUM','Miletus Station','Hauler' +'LU VELORUM','Miletus Station','Lakon Type 7' +'LU VELORUM','Miletus Station','Lakon Type 9' +'LU VELORUM','Miletus Station','Python' +'LU VELORUM','Miletus Station','Sidewinder' +'LU VELORUM','Miletus Station','Viper' +'MEINJHALARA','Fremont Port','Adder' +'MEINJHALARA','Fremont Port','Anaconda' +'MEINJHALARA','Fremont Port','Asp Explorer' +'MEINJHALARA','Fremont Port','Cobra' +'MEINJHALARA','Fremont Port','Eagle' +'MEINJHALARA','Fremont Port','Hauler' +'MEINJHALARA','Fremont Port','Orca' +'MEINJHALARA','Fremont Port','Sidewinder' +'MEINJHALARA','Fremont Port','Viper' 'NETO','Ising Vision','Adder' 'NETO','Ising Vision','Anaconda' 'NETO','Ising Vision','Asp Explorer' @@ -530,6 +558,14 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id 'SOL','M.Gorbachev','Cobra' 'SOL','M.Gorbachev','Lakon Type 6' 'SOL','M.Gorbachev','Viper' +'SOLATI','Ising Refinery','Adder' +'SOLATI','Ising Refinery','Cobra' +'SOLATI','Ising Refinery','Eagle' +'SOLATI','Ising Refinery','Lakon Type 6' +'SOLATI','Ising Refinery','Sidewinder' +'SOLATI','Solati Reach','Eagle' +'SOLATI','Solati Reach','Hauler' +'SOLATI','Solati Reach','Sidewinder' 'TAU-1 HYDRAE','Priestley Port','Adder' 'TAU-1 HYDRAE','Priestley Port','Asp Explorer' 'TAU-1 HYDRAE','Priestley Port','Dropship' diff --git a/data/Station.csv b/data/Station.csv index 0466711f..6f0c67a0 100644 --- a/data/Station.csv +++ b/data/Station.csv @@ -1073,6 +1073,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'EPSILON FORNACIS','Gehry Port',0,'?','M' 'EPSILON FORNACIS','Wolszczan Port',0,'?','M' 'EPSILON INDI','Mansfield Orbiter',0,'?','?' +'EPSILON INDI','Perry Depot',192,'N','L' 'ER 8','Cockrell Prospect',2308,'Y','M' 'ERANIN','Azeban City',295,'Y','L' 'ERANIN','Azeban Orbital',295,'Y','M' @@ -1087,6 +1088,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'ERAVATE','McMahon Dock',148,'N','M' 'ERAVATE','Russell Ring',99,'N','L' 'ERAVATE','Sylvester City',495,'N','M' +'ERIO','Babakin Hub',30,'N','L' 'ERIVIA','Cottenot Hub',299680,'?','L' 'ERIVIA','Stevenson City',299690,'?','M' 'ERLIK','Reynolds Terminal',0,'?','M' @@ -1586,7 +1588,10 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'HR 3991','Greenland Exchange',0,'?','?' 'HR 4734','Hovell Station',1823,'Y','M' 'HR 4979','Iqbal Hub',2765,'N','M' +'HR 5451','Dantec City',1680,'Y','L' +'HR 5451','Fraser Station',0,'Y','L' 'HR 5451','MacDonald Hub',362,'Y','L' +'HR 5451','Mieville City',0,'Y','L' 'HR 5529','Chadwick Terminal',1354,'?','L' 'HR 5529','Poindexter Gateway',1940,'?','M' 'HR 5550','Wohler Gateway',740,'?','L' @@ -1853,6 +1858,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'KUAN TI','McCool Terminal',0,'?','M' 'KUAN TI','Niemeyer Hub',764,'N','L' 'KUAN TI','Truly Terminal',0,'?','M' +'KUANG','Frazetta Platform',95.3,'?','M' +'KUANG','Korolev Mines',53.5,'?','L' 'KUI XENAB','D''Allonville City',150,'N','M' 'KUK','Eudoxus Dock',12421,'?','?' 'KUK','Evans Station',12461,'?','?' @@ -2513,7 +2520,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'LU PAH','Rothfuss Mines',0,'?','?' 'LU VELORUM','Alten Gateway',28,'N','M' 'LU VELORUM','Card Enterprise',14,'?','M' -'LU VELORUM','Miletus Station',8,'?','L' +'LU VELORUM','Miletus Station',8,'N','L' 'LU YUPIK','Bagian Survey',0,'?','?' 'LU YUPIK','Edison Settlement',0,'?','?' 'LUCAB KU','Potter Station',0,'?','?' @@ -2654,6 +2661,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'MEIDUBI','Leavitt Hub',35384,'?','M' 'MEIDUBI','Metcalf City',35436,'?','M' 'MEIDUBI','Sullivan Dock',35436,'?','L' +'MEINJHALARA','Fremont Port',1411,'N','L' 'MELCIOR','Goddard Dock',0,'?','?' 'MELI','Haise Beacon',359,'?','M' 'MELIAE','Shawl Beacon',0,'?','?' @@ -3385,6 +3393,10 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'SOWIIO','Shaw Port',85,'?','L' 'SOWIIO','Wegener Orbital',2556,'?','L' 'SPOCS 208','Thomas Hub',141,'N','L' +'SPOCS 900','Bacon Enterprise',72.4,'?','M' +'SPOCS 900','Celsius Market',590,'?','L' +'SPOCS 900','Murdoch Enterprise',1281,'?','M' +'SPOCS 900','Ricardo Station',119,'?','L' 'STEIN 2051','Boming Station',1798,'N','M' 'STEIN 2051','Rennie Landing',168,'N','M' 'STF 1774','Brackett Station',110205,'?','?' @@ -3511,6 +3523,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'THELMASCI','Bauschinger Terminal',8,'N','L' 'THEOTOKOS','Meikle Settlement',5000,'Y','M' 'THEOTOKOS','Spring Hanger',9000,'N','M' +'THEREILA','Gann Dock',22,'Y','L' 'THETA INDI','Cooper Hub',13555,'Y','L' 'THETA INDI','Kornbluth Orbital',0,'?','M' 'THETA INDI','Strzelecki Port',0,'?','L' @@ -3527,6 +3540,13 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'THIIN','Euler Orbital',0,'?','?' 'THIIN','Kotov Terminal',0,'?','?' 'THRASKIAS','Herreshoff Station',0,'?','?' +'THRITE','Bracewell Vision',72,'?','L' +'THRITE','Dean Station',1177,'?','M' +'THRITE','Israel Terminal',226,'?','L' +'THRITE','Lynden-Bell Dock',2255,'?','M' +'THRITE','Nadiradze Station',1180,'?','M' +'THRITE','Pritchard Station',129,'?','L' +'THRITE','Thomas Dock',43,'?','L' 'THRUTI','Inoda Platform',0,'N','?' 'THRUTI','Von Biela Holdings',0,'N','?' 'THRUTIS','Kingsbury Dock',0,'?','L' @@ -3802,7 +3822,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'WOLF 1414','Robinson Port',1160,'N','M' 'WOLF 1458','Townshend Vision',0,'?','?' 'WOLF 1478','Franklin Orbital',0,'?','?' -'WOLF 1481','Velazquez Gateway',627,'?','?' +'WOLF 1481','Velazquez Gateway',627,'Y','L' 'WOLF 1509','Bolotov Dock',37856,'?','M' 'WOLF 1509','Maclean Port',721,'N','M' 'WOLF 248','Hencke Centre',0,'?','?'