From 85929bccd9e649abfd1bbdebdcfec4d627b896d9 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 14 Dec 2014 13:37:21 -0800 Subject: [PATCH 1/3] Fixup --- CHANGES.txt | 4 ++++ data/Ship.csv | 2 +- data/Station.csv | 31 ++++++++++++++++++++++++++++--- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 06848b66..0023a271 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,10 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014 ============================================================================== v6.2.1 [wip] +. (kfsone) Stations +. (gazelle) Stations +. (mseven) Stations +. (gulasch) Stations and distances . (kfsone) "run" (with -vv) will now show data age . (kfsone) Gamma 2.0.5 renamed "Slaves" category to "Slavery" . (gazelle) Stations, distances, ship data diff --git a/data/Ship.csv b/data/Ship.csv index c24a8187..fafe256a 100644 --- a/data/Ship.csv +++ b/data/Ship.csv @@ -11,6 +11,6 @@ unq:name,capacity,mass,drive_rating,max_ly_empty,max_ly_full,max_speed,boost_spe 'Lakon Type 7',104,420,0.0,0.0,0.0,180,300 'Lakon Type 9',220,1000,0.0,17.72,0.0,130,200 'Orca',72,580,0.0,7.5,0.0,300,380 -'Phyton',82,350,0.0,13.24,0.0,250,280 +'Python',82,350,0.0,13.24,0.0,250,280 'Sidewinder',4,25,0.0,7.56,0.0,220,320 'Viper',4,60,0.0,6.92,0.0,320,400 diff --git a/data/Station.csv b/data/Station.csv index bfe479fc..8b5f1994 100644 --- a/data/Station.csv +++ b/data/Station.csv @@ -77,6 +77,8 @@ unq:name@System.system_id,unq:name,ls_from_star 'Aknango','Banks Station',0.0 'Al Mina','Dana Port',0.0 'Alacagui','Husband Refinery',0.0 +'Alacarakmo','Julian Survey',0.0 +'Alacarakmo','Vlamingh Port',0.0 'Alacarakmo','Weyl Gateway',0.0 'Alcor','Macdonald Settlement',0.0 'Alit','Albitzky Market',0.0 @@ -304,6 +306,15 @@ unq:name@System.system_id,unq:name,ls_from_star 'Crowfor','Ewald Station',0.0 'CT Tucanae','Arantilae',0.0 'Dagaz','Wakata Refinery',0.0 +'Daha','Al-Khalili Dock',0.0 +'Daha','Bagian Orbital',0.0 +'Daha','Burbank Orbital',0.0 +'Daha','Jacquard City',0.0 +'Daha','Jun Dock',0.0 +'Daha','Leibniz Station',0.0 +'Daha','Mukai Orbital',0.0 +'Daha','Tereshkova Hub',0.0 +'Daha','Tombaugh City',0.0 'Dahan','Dahan Gateway',0.0 'Daikulcandi','Chretien Oudemans Hanger',0.0 'Damna','Nemere Market',0.0 @@ -380,13 +391,16 @@ unq:name@System.system_id,unq:name,ls_from_star 'G 121-8','Brosnan Gateway',0.0 'G 123-49','JET-GANG',0.0 'G 139-50','Filipchenko City',0.0 +'G 14-6','Yamazaki Orbital',0.0 'G 141-21','Andreas Orbital',0.0 +'G 141-21','Birdseye Dock',0.0 +'G 141-21','Clement Terminal',0.0 +'G 141-21','Collins Enterprise',0.0 'G 141-21','Feoktistov Enterprise',0.0 'G 141-21','Kimbrough Enterprise',0.0 'G 141-21','Ray Orbital',0.0 'G 141-21','Tognini Terminal',0.0 'G 141-21','Wolf Enterprise',0.0 -'G 14-6','Yamazaki Orbital',0.0 'G 180-18','Alexandria Gateway',0.0 'G 181-6','Thomas Installation',0.0 'G 203-47','Michelson Terminal',0.0 @@ -600,6 +614,7 @@ unq:name@System.system_id,unq:name,ls_from_star 'LFT 820','Bailey Landing',0.0 'LFT 859','Stross City',0.0 'LFT 880','Baker Platform',0.0 +'LFT 90','Gregory Ring',0.0 'LFT 90','Teller Ring',0.0 'LFT 926','Meredith City',369.0 'LFT 945','Hahn Base',0.0 @@ -711,10 +726,15 @@ unq:name@System.system_id,unq:name,ls_from_star 'LHS 5287','McArthur''s Reach',0.0 'LHS 531','Nelson Terminal',0.0 'LHS 6282','Kendrick Base',0.0 +'LHS 6309','Beliaev Port',0.0 'LHS 6309','Bester Terminal',0.0 +'LHS 6309','Bruce Terminal',0.0 +'LHS 6309','Caidin Hub',0.0 +'LHS 6309','Forsskal Port',0.0 'LHS 6309','Jones Station',0.0 'LHS 6309','Noether City',0.0 -'LHS 6309','Smeaton Port',0.0 +'LHS 6309','Pierce Station',0.0 +'LHS 6309','Starzl Station',0.0 'LHS 64','McArthur Colony',0.0 'LHS 64','Wiberg Hangar',0.0 'LHS 64','Wiberg Hanger',0.0 @@ -893,6 +913,9 @@ unq:name@System.system_id,unq:name,ls_from_star 'Mu Nora','Virts Port',0.0 'Mufrid','Hardwick Base',0.0 'Mullag','Kelly City',0.0 +'Nagnatae','Cartwright City',0.0 +'Nagnatae','Howard City',0.0 +'Nagnatae','Kondakova Port',0.0 'Naiti','Deluc Settlement',0.0 'Nakuma','Nelder Mines',0.0 'Nandh','Nemere Terminal',0.0 @@ -950,7 +973,7 @@ unq:name@System.system_id,unq:name,ls_from_star 'Opala','Romanenko Estate',0.0 'Opala','Zamka Platform',0.0 'Opila','Temple Dock',0.0 -'Orerve','Watson Sation',0.0 +'Orerve','Watson Station',0.0 'Ori','Alexeyev Depot',0.0 'Orrere','Sharon Lee Free Market',0.0 'OT Serpentis','Serebrov Port',0.0 @@ -1152,7 +1175,9 @@ unq:name@System.system_id,unq:name,ls_from_star 'Uluri','McDivitt Settlement',0.0 'Uluri','Parker Beacon',0.0 'Uoluskas','Moisuc Dock',0.0 +'Uszaa','Clauss Dock',0.0 'Uszaa','Guest Installation',0.0 +'Uszaa','Patterson Dock',0.0 'V2151 Cygni','Eyharts Hub',0.0 'V2689 Orionis','Capek Ring',0.0 'V2689 Orionis','Hodgson Dock',0.0 From 09d87edbacddc3537aaa0a2adb7c5edf88c750b6 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 14 Dec 2014 13:30:20 -0800 Subject: [PATCH 2/3] Stations --- data/ShipVendor.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/ShipVendor.csv b/data/ShipVendor.csv index 2583df95..6ce05bcd 100644 --- a/data/ShipVendor.csv +++ b/data/ShipVendor.csv @@ -57,8 +57,8 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id,cos 'Wolf 562','Hopkins Port','Lakon Type 9',76555842 'Wolf 562','Hopkins Port','Orca',48539887 'Wolf 562','Hopkins Port','Python',56978179 -'Wolf 562','Hopkins Port','Viper',142931 'Wolf 562','Hopkins Port','Sidewinder',32000 +'Wolf 562','Hopkins Port','Viper',142931 'Yakabugai','Serebrov Station','Anaconda',146969451 'Yakabugai','Serebrov Station','Asp Explorer',6661153 'Yakabugai','Serebrov Station','Dropship',37814205 From ebbb956c68e973136efb8f728e2c2141172ea9e1 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 14 Dec 2014 13:30:39 -0800 Subject: [PATCH 3/3] Correction for Watson Station --- corrections.py | 1 + 1 file changed, 1 insertion(+) diff --git a/corrections.py b/corrections.py index c826e7ae..eb9d538e 100644 --- a/corrections.py +++ b/corrections.py @@ -29,6 +29,7 @@ "APOYOTA/HAHNRELAY": "Hahn Relay", "EKONIR/MOREYVISION": "Morey Vision", "TRELLA/TITTO COLONY": "Tito Colony", + "ORERVE/WATSON SATION": "Watson Station", #ADD_STATIONS_HERE }