Skip to content

Commit

Permalink
Merged kfsone/tradedangerous into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@orphu
orphu committed Jan 12, 2015
2 parents 1377bd6 + 115a374 commit 6e7d22a
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 7 deletions.
36 changes: 36 additions & 0 deletions data/ShipVendor.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,16 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_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'
Expand Down Expand Up @@ -394,6 +404,24 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_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'
Expand Down Expand Up @@ -530,6 +558,14 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_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'
Expand Down
25 changes: 18 additions & 7 deletions data/Station.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
'CORATHA','Gohar Gateway',0,'?','?'
'CORATHA','Korzun Ring',0,'?','?'
'CORDENET','Brom Hub',0,'?','M'
'CORDENET','Chernykh Station',0,'?','L'
'CORDENET','Chernykh Station',367,'N','L'
'CORDENET','Karachkina Vision',0,'?','M'
'CORICCHA','Beckman Station',521,'Y','L'
'CORICCHA','Cunningham',0,'?','?'
Expand Down Expand Up @@ -1073,6 +1073,7 @@ unq:[email protected]_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'
Expand All @@ -1087,8 +1088,8 @@ unq:[email protected]_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'
'ERIVIA','Cottenot Hub',0,'?','L'
'ERIVIA','Stevenson City',0,'?','M'
'ERIVIA','Cottenot Hub',299680,'?','L'
'ERIVIA','Stevenson City',299690,'?','M'
'ERLIK','Reynolds Terminal',0,'?','M'
'ESHU','Shajn Terminal',1742,'N','L'
'ESUMINDII','Nourse City',1800,'N','L'
Expand Down Expand Up @@ -1256,6 +1257,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
'GEAWETE','Fontana Enterprise',0,'?','M'
'GEAWETE','Sevastyanov Dock',0,'?','M'
'GENDALLA','Normand Platform',0,'?','?'
'GENDENWITHA','Filipchenko Gateway',1346,'N','L'
'GENDINI','Houtman Gateway',0,'?','?'
'GEORGE PANTAZIS','Banks Refinery',0,'?','?'
'GEORGE PANTAZIS','Melvin Hanger',0,'?','?'
Expand Down Expand Up @@ -1420,6 +1422,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
'HILL PA HSI','Reilly Terminal',33,'N','L'
'HILL PA HSI','Teng-Hui Gateway',53,'N','M'
'HILL PA HSI','Wisoff Terminal',106,'N','M'
'HIMANES','Ochoa Port',444,'N','L'
'HIP 10175','Lucretius Gateway',0,'?','L'
'HIP 10175','Stefanyshyn-Piper Station',0,'?','L'
'HIP 103620','Anderson Terminal',0,'?','L'
Expand Down Expand Up @@ -1581,7 +1584,10 @@ unq:[email protected]_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'
Expand Down Expand Up @@ -1650,7 +1656,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
'INDRAMASCI','Shepard Settlement',184119,'N','M'
'INOVAE','Clark Settlement',63,'N','M'
'INOVAE','Ryman Station',705,'N','L'
'INUPIATES','Ashman Station',0,'?','L'
'INUPIATES','Ashman Station',31,'N','L'
'INUPIATES','Rankin Terminal',0,'?','M'
'INUPIATES','Wolszczan Terminal',0,'?','M'
'IOTA HOROLOGII','Dirac Refinery',490,'N','M'
Expand Down Expand Up @@ -2508,7 +2514,7 @@ unq:[email protected]_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,'?','?'
Expand Down Expand Up @@ -2649,6 +2655,7 @@ unq:[email protected]_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,'?','?'
Expand Down Expand Up @@ -2923,7 +2930,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
'ONGKAMPAN','Ross Station',475,'?','?'
'ONGKAMPAN','Thompson Station',155,'?','?'
'ONGKAMPAN','Vercors Orbital',111,'?','?'
'ONGKUMA','Pickering Ring',444,'?','L'
'ONGKUMA','Pickering Ring',444,'N','L'
'ONURIS','Nielsen Horizons',0,'?','M'
'ONURIS','Stokes Dock',532,'Y','L'
'OPALA','Onizuka''s Hold',70,'N','L'
Expand Down Expand Up @@ -3067,6 +3074,7 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
'QA''WAKANA','Farrukh Terminal',2624,'?','?'
'QA''WAKANA','Tall Dock',371,'N','?'
'QARATO','Drexler Dock',20,'Y','M'
'QUAPA','Grabe Dock',808,'Y','L'
'QUATOR','Quator Station',141,'Y','L'
'QUECHE','Rutherford Works',0,'?','?'
'QUECHUA','Crown Ring',120,'N','L'
Expand Down Expand Up @@ -3795,7 +3803,7 @@ unq:[email protected]_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,'?','?'
Expand Down Expand Up @@ -3946,3 +3954,6 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size
'ZVAITHHOGG','Karachkina Orbital',22.1,'?','M'
'ZVAITHHOGG','Laming Vision',11.6,'?','L'
'ZVAIZGAN','Ellis Hub',59,'Y','M'
'Gongalungul','Andoyer Station',61,'N','L'
'Gongalungul','Van Der Riet Woolley Ring',0,'?','M'
'Gongalungul','Edmondson Port',0,'?','M'

0 comments on commit 6e7d22a

Please sign in to comment.