diff --git a/data/TradeDangerous.prices b/data/TradeDangerous.prices index fa2b2035..0842e5b6 100644 --- a/data/TradeDangerous.prices +++ b/data/TradeDangerous.prices @@ -372,48 +372,48 @@ Explosives 291 0 2014-09-01 16:20:21 Hydrogen Fuels 81 82 2014-09-01 16:20:21 + Consumer Items - Clothing 308 0 2014-09-01 16:20:21 - Consumer Tech 6588 0 2014-09-01 16:20:21 - Dom. Appliances 469 0 2014-09-01 16:20:21 + Clothing 280 0 2014-09-01 16:20:21 + Consumer Tech 6874 0 2014-09-01 16:20:21 + Dom. Appliances 511 0 2014-09-01 16:20:21 + Drugs - Tobacco 4706 0 2014-09-01 16:20:21 + Tobacco 4930 0 2014-09-01 16:20:21 Beer 143 0 2014-09-01 16:20:21 Narcotics 143 0 2014-09-01 16:20:21 - Wine 236 0 2014-09-01 16:20:21 + Wine 235 0 2014-09-01 16:20:21 Liquor 664 0 2014-09-01 16:20:21 + Foods - Fruit and Vegetables 254 0 2014-09-01 16:20:21 + Fruit and Vegetables 280 0 2014-09-01 16:20:21 Grain 182 0 2014-09-01 16:20:21 - Coffee 1409 0 2014-09-01 16:20:21 - Tea 1414 0 2014-09-01 16:20:21 - Synthetic Meat 217 0 2014-09-01 16:20:21 + Coffee 1323 0 2014-09-01 16:20:21 + Tea 1507 0 2014-09-01 16:20:21 + Synthetic Meat 221 0 2014-09-01 16:20:21 Food Cartridges 103 0 2014-09-01 16:20:21 - Fish 650 0 2014-09-01 16:20:21 - Animal Meat 1239 0 2014-09-01 16:20:21 + Fish 713 0 2014-09-01 16:20:21 + Animal Meat 1323 0 2014-09-01 16:20:21 + Machinery - Mineral Extractors 616 0 2014-09-01 16:20:21 + Mineral Extractors 532 0 2014-09-01 16:20:21 + Medicines - Performance Enhancers 7161 0 2014-09-01 16:20:21 - Basic Medicines 309 0 2014-09-01 16:20:21 + Performance Enhancers 6984 0 2014-09-01 16:20:21 + Basic Medicines 308 0 2014-09-01 16:20:21 + Metals - Silver 4131 4181 2014-09-01 16:20:21 - Cobalt 387 413 2014-09-01 16:20:21 - Palladium 12284 12284 2014-09-01 16:20:21 + Silver 4410 4463 2014-09-01 16:20:21 + Cobalt 409 437 2014-09-01 16:20:21 + Palladium 13369 13370 2014-09-01 16:20:21 + Minerals - Uraninite 685 717 2014-09-01 16:20:21 + Uraninite 686 719 2014-09-01 16:20:21 Bauxite 30 39 2014-09-01 16:20:21 Rutile 133 147 2014-09-01 16:20:21 - Indite 1923 1974 2014-09-01 16:20:21 + Indite 1924 1975 2014-09-01 16:20:21 Coltan 1139 1188 2014-09-01 16:20:21 + Technology Bioreducing Lichen 1026 0 2014-09-01 16:20:21 H.E. Suits 261 0 2014-09-01 16:20:21 + Waste - Biowaste 11 18 2014-09-01 16:20:21 + Biowaste 10 17 2014-09-01 16:20:21 + Weapons Non-Lethal Wpns 1942 0 2014-09-01 16:20:21 - Personal Weapons 4523 0 2014-09-01 16:20:21 - Reactive Armor 2210 0 2014-09-01 16:20:21 + Personal Weapons 4318 0 2014-09-01 16:20:21 + Reactive Armor 2209 0 2014-09-01 16:20:21 @ DAHAN/Gateway @@ -906,48 +906,48 @@ @ LHS 2884/Abnett Platform + Chemicals - Explosives 290 0 2014-09-02 11:06:29 - Hydrogen Fuels 47 48 2014-09-02 11:06:29 + Explosives 290 0 2014-09-03 01:34:10 + Hydrogen Fuels 47 48 2014-09-03 01:34:10 + Consumer Items - Consumer Tech 6559 0 2014-09-02 11:06:29 - Dom. Appliances 467 0 2014-09-02 11:06:29 - Clothing 253 0 2014-09-02 11:06:29 + Consumer Tech 6559 0 2014-09-03 01:34:10 + Dom. Appliances 467 0 2014-09-03 01:34:10 + Clothing 253 0 2014-09-03 01:34:10 + Drugs - Wine 234 0 2014-09-02 11:06:29 - Beer 143 0 2014-09-02 11:06:29 + Wine 234 0 2014-09-03 01:34:10 + Beer 143 0 2014-09-03 01:34:10 + Foods - Synthetic Meat 234 0 2014-09-02 11:06:29 - Coffee 1275 0 2014-09-02 11:06:29 - Tea 1501 0 2014-09-02 11:06:29 - Animal Meat 1346 0 2014-09-02 11:06:29 - Food Cartridges 102 0 2014-09-02 11:06:29 - Fish 647 0 2014-09-02 11:06:29 - Grain 181 0 2014-09-02 11:06:29 - Fruit and Vegetables 307 0 2014-09-02 11:06:29 + Synthetic Meat 234 0 2014-09-03 01:34:10 + Coffee 1329 0 2014-09-03 01:34:10 + Tea 1501 0 2014-09-03 01:34:10 + Animal Meat 1337 0 2014-09-03 01:34:10 + Food Cartridges 102 0 2014-09-03 01:34:10 + Fish 647 0 2014-09-03 01:34:10 + Grain 181 0 2014-09-03 01:34:10 + Fruit and Vegetables 301 0 2014-09-03 01:34:10 + Machinery - Mineral Extractors 554 0 2014-09-02 11:06:29 + Mineral Extractors 530 0 2014-09-03 01:34:10 + Medicines - Progenitor Cells 6896 0 2014-09-02 11:06:29 - Performance Enhancers 7115 0 2014-09-02 11:06:29 - Basic Medicines 307 0 2014-09-02 11:06:29 + Progenitor Cells 6970 0 2014-09-03 01:34:10 + Performance Enhancers 7129 0 2014-09-03 01:34:10 + Basic Medicines 307 0 2014-09-03 01:34:10 + Metals - Silver 4623 4678 2014-09-02 11:06:29 - Gold 8268 8360 2014-09-02 11:06:29 - Cobalt 501 535 2014-09-02 11:06:29 + Silver 4623 4678 2014-09-03 01:34:10 + Gold 8268 8360 2014-09-03 01:34:10 + Cobalt 501 535 2014-09-03 01:34:10 + Minerals - Bauxite 19 25 2014-09-02 11:06:29 - Indite 1671 1715 2014-09-02 11:06:29 - Uraninite 533 558 2014-09-02 11:06:29 - Rutile 126 140 2014-09-02 11:06:29 + Bauxite 19 25 2014-09-03 01:34:10 + Indite 1736 1783 2014-09-03 01:34:10 + Uraninite 533 558 2014-09-03 01:34:10 + Rutile 126 140 2014-09-03 01:34:10 + Technology - H.E. Suits 259 0 2014-09-02 11:06:29 - Bioreducing Lichen 1021 0 2014-09-02 11:06:29 + H.E. Suits 252 0 2014-09-03 01:34:10 + Bioreducing Lichen 1021 0 2014-09-03 01:34:10 + Waste - Biowaste 11 18 2014-09-02 11:06:29 + Biowaste 11 18 2014-09-03 01:34:10 + Weapons - Non-Lethal Wpns 1839 0 2014-09-02 11:06:29 - Reactive Armor 2080 0 2014-09-02 11:06:29 - Personal Weapons 4467 0 2014-09-02 11:06:29 + Non-Lethal Wpns 1910 0 2014-09-03 01:34:10 + Reactive Armor 2080 0 2014-09-03 01:34:10 + Personal Weapons 4457 0 2014-09-03 01:34:10 @ LHS 2887/Massimino Dock @@ -1354,8 +1354,8 @@ + Chemicals Hydrogen Fuels 62 0 2014-09-01 16:20:21 + Consumer Items - Consumer Tech 6956 0 2014-09-01 16:20:21 - Dom. Appliances 345 369 2014-09-01 16:20:21 + Consumer Tech 6550 0 2014-09-01 16:20:21 + Dom. Appliances 347 371 2014-09-01 16:20:21 Clothing 307 0 2014-09-01 16:20:21 + Drugs Beer 143 0 2014-09-01 16:20:21 @@ -1363,35 +1363,35 @@ + Foods Grain 180 0 2014-09-01 16:20:21 Synthetic Meat 233 0 2014-09-01 16:20:21 - Fish 773 0 2014-09-01 16:20:21 - Animal Meat 1401 0 2014-09-01 16:20:21 + Fish 752 0 2014-09-01 16:20:21 + Animal Meat 1232 0 2014-09-01 16:20:21 Food Cartridges 102 0 2014-09-01 16:20:21 Fruit and Vegetables 307 0 2014-09-01 16:20:21 Algae 95 0 2014-09-01 16:20:21 - Coffee 1401 0 2014-09-01 16:20:21 - Tea 1592 0 2014-09-01 16:20:21 + Coffee 1384 0 2014-09-01 16:20:21 + Tea 1406 0 2014-09-01 16:20:21 + Industrial Materials Polymers 115 0 2014-09-01 16:20:21 Semiconductors 958 0 2014-09-01 16:20:21 Superconductors 7120 0 2014-09-01 16:20:21 + Machinery - Mineral Extractors 398 426 2014-09-01 16:20:21 - Crop Harvesters 1912 1963 2014-09-01 16:20:21 + Mineral Extractors 404 426 2014-09-01 16:20:21 + Crop Harvesters 1943 1963 2014-09-01 16:20:21 + Medicines - Progenitor Cells 7120 0 2014-09-01 16:20:21 + Progenitor Cells 6969 0 2014-09-01 16:20:21 Basic Medicines 307 0 2014-09-01 16:20:21 Performance Enhancers 7120 0 2014-09-01 16:20:21 + Metals Indium 6242 0 2014-09-01 16:20:21 Tantalum 4210 0 2014-09-01 16:20:21 Uranium 2846 0 2014-09-01 16:20:21 - Lithium 1697 0 2014-09-01 16:20:21 + Lithium 1504 0 2014-09-01 16:20:21 Titanium 1087 0 2014-09-01 16:20:21 Copper 487 0 2014-09-01 16:20:21 - Gold 9745 0 2014-09-01 16:20:21 + Gold 9417 0 2014-09-01 16:20:21 Aluminium 324 0 2014-09-01 16:20:21 + Minerals - Beryllium 8668 0 2014-09-01 16:20:21 + Beryllium 8527 0 2014-09-01 16:20:21 Gallium 5473 0 2014-09-01 16:20:21 + Technology H.E. Suits 259 0 2014-09-01 16:20:21 @@ -1405,7 +1405,7 @@ Biowaste 11 18 2014-09-01 16:20:21 Scrap 30 37 2014-09-01 16:20:21 + Weapons - Personal Weapons 3832 3927 2014-09-01 16:20:21 + Personal Weapons 3968 3927 2014-09-01 16:20:21 @ NARAKA/Novitski Oasis @@ -1479,60 +1479,60 @@ @ OVID/Bradfield Orbital + Chemicals - Hydrogen Fuels 62 0 2014-09-02 11:23:02 + Hydrogen Fuels 62 0 2014-09-02 23:02:37 + Consumer Items - Consumer Tech 7098 0 2014-09-02 11:23:02 - Clothing 306 0 2014-09-02 11:23:02 - Dom. Appliances 550 0 2014-09-02 11:23:02 + Consumer Tech 7043 0 2014-09-02 23:02:37 + Clothing 299 0 2014-09-02 23:02:37 + Dom. Appliances 550 0 2014-09-02 23:02:37 + Drugs - Beer 143 0 2014-09-02 11:23:02 + Beer 143 0 2014-09-02 23:02:37 + Foods - Fish 645 0 2014-09-02 11:23:02 - Synthetic Meat 233 0 2014-09-02 11:23:02 - Food Cartridges 102 0 2014-09-02 11:23:02 - Grain 180 0 2014-09-02 11:23:02 - Tea 1587 0 2014-09-02 11:23:02 - Animal Meat 1231 0 2014-09-02 11:23:02 - Coffee 1390 0 2014-09-02 11:23:02 - Fruit and Vegetables 306 0 2014-09-02 11:23:02 - Algae 95 0 2014-09-02 11:23:02 + Fish 645 0 2014-09-02 23:02:37 + Synthetic Meat 233 0 2014-09-02 23:02:37 + Food Cartridges 102 0 2014-09-02 23:02:37 + Grain 180 0 2014-09-02 23:02:37 + Tea 1581 0 2014-09-02 23:02:37 + Animal Meat 1231 0 2014-09-02 23:02:37 + Coffee 1396 0 2014-09-02 23:02:37 + Fruit and Vegetables 306 0 2014-09-02 23:02:37 + Algae 94 0 2014-09-02 23:02:37 + Industrial Materials - Semiconductors 958 0 2014-09-02 11:23:02 - Superconductors 7116 0 2014-09-02 11:23:02 - Polymers 115 0 2014-09-02 11:23:02 + Semiconductors 958 0 2014-09-02 23:02:37 + Superconductors 7116 0 2014-09-02 23:02:37 + Polymers 115 0 2014-09-02 23:02:37 + Machinery - Hel-Static Furnaces 45 53 2014-09-02 11:23:02 - Mineral Extractors 301 323 2014-09-02 11:23:02 - Crop Harvesters 1911 1962 2014-09-02 11:23:02 - Marine Supplies 3911 4008 2014-09-02 11:23:02 + Hel-Static Furnaces 45 53 2014-09-02 23:02:37 + Mineral Extractors 301 323 2014-09-02 23:02:37 + Crop Harvesters 1912 1963 2014-09-02 23:02:37 + Marine Supplies 3912 4008 2014-09-02 23:02:37 + Medicines - Progenitor Cells 7116 0 2014-09-02 11:23:02 - Basic Medicines 306 0 2014-09-02 11:23:02 - Performance Enhancers 7116 0 2014-09-02 11:23:02 + Progenitor Cells 7116 0 2014-09-02 23:02:37 + Basic Medicines 306 0 2014-09-02 23:02:37 + Performance Enhancers 7116 0 2014-09-02 23:02:37 + Metals - Titanium 1086 0 2014-09-02 11:23:02 - Lithium 1696 0 2014-09-02 11:23:02 - Copper 487 0 2014-09-02 11:23:02 - Aluminium 324 0 2014-09-02 11:23:02 - Uranium 2845 0 2014-09-02 11:23:02 - Tantalum 4175 0 2014-09-02 11:23:02 - Indium 6164 0 2014-09-02 11:23:02 - Gold 9402 0 2014-09-02 11:23:02 + Titanium 1086 0 2014-09-02 23:02:37 + Lithium 1696 0 2014-09-02 23:02:37 + Copper 487 0 2014-09-02 23:02:37 + Aluminium 324 0 2014-09-02 23:02:37 + Uranium 2845 0 2014-09-02 23:02:37 + Tantalum 4129 0 2014-09-02 23:02:37 + Indium 6165 0 2014-09-02 23:02:37 + Gold 9273 0 2014-09-02 23:02:37 + Minerals - Beryllium 8673 0 2014-09-02 11:23:02 - Gallium 5470 0 2014-09-02 11:23:02 + Beryllium 8673 0 2014-09-02 23:02:37 + Gallium 5470 0 2014-09-02 23:02:37 + Technology - Computer Components 261 280 2014-09-02 11:23:02 - H.E. Suits 259 0 2014-09-02 11:23:02 - Robotics 1929 0 2014-09-02 11:23:02 - Auto-Fabricators 3941 0 2014-09-02 11:23:02 + Computer Components 261 280 2014-09-02 23:02:37 + H.E. Suits 259 0 2014-09-02 23:02:37 + Robotics 1929 0 2014-09-02 23:02:37 + Auto-Fabricators 3941 0 2014-09-02 23:02:37 + Textiles - Leather 143 0 2014-09-02 11:23:02 - Natural Fabrics 408 0 2014-09-02 11:23:02 - Synthetic Fabrics 156 0 2014-09-02 11:23:02 + Leather 143 0 2014-09-02 23:02:37 + Natural Fabrics 408 0 2014-09-02 23:02:37 + Synthetic Fabrics 156 0 2014-09-02 23:02:37 + Waste - Biowaste 11 18 2014-09-02 11:23:02 - Scrap 20 24 2014-09-02 11:23:02 + Biowaste 11 18 2014-09-02 23:02:37 + Scrap 20 24 2014-09-02 23:02:37 @ PI-FANG/Brooks diff --git a/data/TradeDangerous.sql b/data/TradeDangerous.sql index 9bb7c189..bf302819 100644 --- a/data/TradeDangerous.sql +++ b/data/TradeDangerous.sql @@ -134,7 +134,7 @@ INSERT INTO "Station" VALUES(34,'Baker Platform',25,0.0); INSERT INTO "Station" VALUES(35,'Longyear Survey',37,0.0); INSERT INTO "Station" VALUES(36,'Tasaki Freeport',27,0.0); INSERT INTO "Station" VALUES(37,'Abetti Platform',49,0.0); -INSERT INTO "Station" VALUES(38,'Anderson Escape',11,0.0); +INSERT INTO "Station" VALUES(38,'Anderson Escape',11,2090000.0); INSERT INTO "Station" VALUES(39,'Brislington',18,0.0); CREATE TABLE Ship ( diff --git a/data/ships.py b/data/ships.py index 105e4782..0c8ce00d 100644 --- a/data/ships.py +++ b/data/ships.py @@ -7,10 +7,10 @@ class Ship(namedtuple('Ship', [ 'name', 'capacity', 'mass', 'driveRating', 'maxJ pass ships = [ - Ship('Eagle', 6, 52, 348, 6.59, 6.00, 240, 350, [ 'Aulin Enterprise', 'Beagle2' ]), - Ship('Sidewinder', 4, 47, 348, 8.13, 7.25, 220, 293, [ 'Aulin Enterprise', 'Beagle2' ]), - Ship('Hauler', 16, 39, 348, 8.74, 6.10, 200, 246, [ 'Aulin Enterprise', 'Beagle2' ]), - Ship('Viper', 8, 40, 348, 13.49, 9.16, 320, 500, [ 'Aulin Enterprise', 'Beagle2', 'Chango Dock' ]), + Ship('Eagle', 6, 52, 348, 6.59, 6.00, 240, 350, [ 'Abnett', 'Aulin Enterprise', 'Beagle2', 'Bradfield', 'Hay Point' ]), + Ship('Sidewinder', 4, 47, 348, 8.13, 7.25, 220, 293, [ 'Abnett', 'Aulin Enterprise', 'Beagle2', 'Bradfield', 'Hay Point' ]), + Ship('Hauler', 16, 39, 348, 8.74, 6.10, 200, 246, [ 'Aulin Enterprise', 'Beagle2', 'Bradfield', 'Hay Point' ]), + Ship('Viper', 8, 40, 348, 13.49, 9.16, 320, 500, [ 'Aulin Enterprise', 'Beagle2', 'Bradfield', 'Chango Dock', 'Hay Point' ]), Ship('Cobra', 36, 114, 1155, 9.94, 7.30, 280, 400, [ 'Aulin Enterprise', 'Chango Dock' ]), Ship('Lakon Type 6', 100, 113, 3455, 29.36, 15.64, 220, 329, [ 'Aulin Enterprise', 'Chango Dock', 'Vonarburg Co-op' ]), Ship('Lakon Type 9', 440, 1275, 23720, 18.22, 13.34, 130, 200, [ 'Chango Dock' ]),