Merged kfsone/tradedangerous into master

corrections.py

@@ -7,30 +7,27 @@
 DELETED = -111
 
 systems = {
-    'MANTOAC': "Mantóac",
-    "NANTOAC": "Nantóac",
-    "LIFTHRUTI": "Lífthruti",
-    "SETING": DELETED,
 
 #ADD_SYSTEMS_HERE
 }
 
 stations = {
-    "CHEMAKU/BARTOE PLATFORM": DELETED,
-    "ERAVATE/ASKERMAN MARKET": "Ackerman Market",
-    "YAKABUGAI/SEREBOV STATION": "Serebrov Station",
-    "HALAI/GENKER STATION": "Cenker Station",
-    "LFT 926/MEREDITH STATION": "Meredith City",
-    "OPALA/ZAMK PLATFORM": "Zamka Platform",
-    "G 139-50/FILIPCHENKO": "Filipchenko City",
     "AMARAK/WERNER VON SIEMENS VISON": "Werner Von Siemens Vision",
-    "SETING/COX LANDING": DELETED,
     "APOYOTA/FLINTSTATION": "Flint Station",
     "APOYOTA/HAHNRELAY": "Hahn Relay",
     "EKONIR/MOREYVISION": "Morey Vision",
     "TRELLA/TITTO COLONY": "Tito Colony",
     "ORERVE/WATSON SATION": "Watson Station",
     "MCC 467/ROB HUBBARD RING": "Ron Hubbard Ring",
+    "GCRV 4654/HERZEFELD LANDING": DELETED,
+    "LHS 220/CULPEPERCOLONY": DELETED,
+    "LHS 64/WIBERG HANGAR": DELETED,    # "Hanger",
+    "LP 862-184/MAYR HANGAR": "Mayr Hanger",
+    "TYR/GLASHOW": DELETED,
+    "EGOVAE/ENOATE MARKET": "Endate Market",
+    "WOLF 1301/SAUNDER'S DIVE": "Saunders's Dive",
+    "VEQUESS/AGNEWS FOLLY": "Agnews' Folly",
+    "ONGKAMPAN/PATTERSON STATION:274": DELETED,
 
 #ADD_STATIONS_HERE
 }

data/Added.csv

@@ -26,6 +26,7 @@ unq:name
 'Gamma1 (unverified)'
 'Gamma1 (unverified)-Inferred'
 'Gamma1-Inferred'
+'Local'
 'Not Present'
 'Premium Beta1'
 'Premium Beta2'

data/Ship.csv

@@ -1,16 +1,16 @@
-unq:name,capacity,mass,drive_rating,max_ly_empty,max_ly_full,max_speed,boost_speed
-'Adder',6,35,0.0,9.12,0.0,220,320
-'Anaconda',114,400,0.0,19.5,0.0,180,240
-'Asp Explorer',38,280,0.0,13.2,0.0,250,340
-'Clipper',100,400,0.0,7.75,0.0,300,380
-'Cobra',18,180,0.0,10.46,0.0,280,400
-'Dropship',56,580,0.0,8.21,0.0,180,300
-'Eagle',6,50,0.0,8.47,0.0,240,350
-'Hauler',12,14,0.0,10.46,0.0,200,300
-'Lakon Type 6',50,155,0.0,12.39,0.0,220,350
-'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
-'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
+unq:name,cost
+'Adder',87808
+'Anaconda',146969451
+'Asp Explorer',6661153
+'Clipper',0
+'Cobra',379718
+'Dropship',37814205
+'Eagle',44800
+'Hauler',52720
+'Lakon Type 6',1045945
+'Lakon Type 7',17472252
+'Lakon Type 9',76555842
+'Orca',48539887
+'Python',56978179
+'Sidewinder',32000
+'Viper',142931