Merged in ShadowGar/tradedangerous (pull request #6)

More Beta 2 Stars Added.
eyeonus · Oct 7, 2014 · d9edcf8 · d9edcf8
2 parents e93a6bf + a220087
commit d9edcf8
Show file tree

Hide file tree

Showing 3 changed files with 227 additions and 159 deletions.
diff --git a/data/Sys-that-need-work.txt b/data/Sys-that-need-work.txt
@@ -2,106 +2,6 @@
 ---List of current systems that need stations added and markets data added. I will use this list to keep track of what needs done. When sys is added,remove line.
 ---------Shadowgar
 
-87,'HIP 110773',-120.375,46.375,-60.6875,'2014-10-02 14:21:15');
-88,'HIP 2453',-110.90625,16.5,-67.84375,'2014-10-02 14:21:15');
-89,'HIP 105906',-114.40625,51.40625,-56.125,'2014-10-02 14:21:15');
-90,'HR 158',-85.875,36.90625,-55.09375,'2014-10-02 14:21:15');
-91,'HIP 107457',-116.25,28.34375,-39.3125,'2014-10-02 14:21:15');
-92,'Loga',-79.78125,36.53125,-42.0625,'2014-10-02 14:21:15');
-93,'Chemetitana',-83.34375,8.84375,-27.875,'2014-10-02 14:21:15');
-94,'Killke',-108,8.5625,-31.15625,'2014-10-02 14:21:15');
-95,'Chapoyo',-72.0625,31.84375,-47.53125,'2014-10-02 14:21:15');
-96,'Balmus',-89,9.375,-52.0625,'2014-10-02 14:21:15');
-97,'LTT 16523',-72.65625,13.28125,-25.9375,'2014-10-02 14:21:15');
-98,'HIP 7338',-96.5,33.21875,-68.65625,'2014-10-02 14:21:15');
-99,'Lalande 37923',-84.125,38.9375,-28.15625,'2014-10-02 14:21:15');
-100,'LP 48-567',-67.0625,14.96875,-25.5625,'2014-10-02 14:21:15');
-101,'Jaoismonjin',-83.90625,33,-53.5625,'2014-10-02 14:21:15');
-102,'LTT 16979',-97.25,24.3125,-52.5625,'2014-10-02 14:21:15');
-103,'LHS 3631',-91.625,30.34375,-31.65625,'2014-10-02 14:21:15');
-104,'Hsini',-81.75,15.59375,-46.78125,'2014-10-02 14:21:15');
-105,'Tyr',-79.625,21.25,-25.0625,'2014-10-02 14:21:15');
-106,'47 Cassiopeiae',-83.03125,28.5625,-63.1875,'2014-10-02 14:21:15');
-107,'BD+67 1409',-89.4375,16.0625,-30.25,'2014-10-02 14:21:15');
-108,'LTT 17102',-73.84375,16.5625,-45.59375,'2014-10-02 14:21:15');
-109,'Maidubii',-115.4375,11.90625,-60.875,'2014-10-02 14:21:15');
-110,'Er Lo Wu Di',-83.03125,19.84375,-59.78125,'2014-10-02 14:21:15');
-111,'Pata Thewi',-108.46875,52.0625,-27.34375,'2014-10-02 14:21:15');
-112,'HR 7925',-104.53125,21.0625,-12.1875,'2014-10-02 14:21:15');
-113,'Baga',-107.3125,35.5,-58.84375,'2014-10-02 14:21:15');
-114,'HIP 113477',-121.40625,19.78125,-52.46875,'2014-10-02 14:21:15');
-115,'Tsetan',-102.625,19.65625,-41.125,'2014-10-02 14:21:15');
-116,'Kuunggati',-85.40625,18.375,-29.53125,'2014-10-02 14:21:15');
-117,'Cuages',-124.875,20.03125,-23.78125,'2014-10-02 14:21:15');
-118,'HIP 108110',-122.625,22,-37.34375,'2014-10-02 14:21:15');
-119,'Ross 210',-73.5,10.0625,-15.71875,'2014-10-02 14:21:15');
-120,'Macomaneleng Mu',-101,16.375,-30.65625,'2014-10-02 14:21:15');
-121,'Wikmeang',-123.59375,25.875,-33.25,'2014-10-02 14:21:15');
-122,'Taurawa',-98.125,21.84375,-13.09375,'2014-10-02 14:21:15');
-124,'Bhotepa',-134.625,33.21875,-38.0625,'2014-10-02 14:21:15');
-126,'Altais',-88.625,38.09375,-13.65625,'2014-10-02 14:21:15');
-128,'Pemede',-88.90625,22.28125,-21.40625,'2014-10-02 14:21:15');
-129,'Arabha',-120.75,43.78125,-22.125,'2014-10-02 14:21:15');
-130,'San Guaralaru',-124.34375,41.8125,-60.71875,'2014-10-02 14:21:15');
-131,'LHS 64',-76.6875,11.09375,-10.8125,'2014-10-02 14:21:15');
-132,'Lugiu Bezelana',-126.15625,44.5625,-33.1875,'2014-10-02 14:21:15');
-133,'Xi Wangkala',-133.0625,38.6875,-38.125,'2014-10-02 14:21:15');
-134,'Tai Qing',-70.90625,50.75,-4.09375,'2014-10-02 14:21:15');
-135,'Kamchaultultula',-101.09375,11,-24.09375,'2014-10-02 14:21:15');
-136,'Ba Bhumiang Ku',-104.28125,25.0625,-45.25,'2014-10-02 14:21:15');
-137,'Mistae',-72.34375,56.6875,-24.8125,'2014-10-02 14:21:15');
-138,'Ngoloki Anaten',-135.9375,33.5,-40.5,'2014-10-02 14:21:15');
-139,'Ross 211',-123.71875,17.3125,-30.21875,'2014-10-02 14:21:15');
-140,'NLTT 53889',-76.5,7.6875,-24.96875,'2014-10-02 14:21:15');
-142,'Njirika',-117.46875,36.28125,-15.40625,'2014-10-02 14:21:15');
-143,'Aladu Kuan Gon',-108.75,15.8125,-14.25,'2014-10-02 14:21:15');
-144,'Dharai',-70.9375,32.34375,-14.21875,'2014-10-02 14:21:15');
-145,'LP 27-9',-70.40625,25.4375,-32.40625,'2014-10-02 14:21:15');
-146,'Manamaya',-43.53125,35.03125,-19.15625,'2014-10-02 14:21:15');
-147,'Zhu Rong',-39.875,34.9375,-24.1875,'2014-10-02 14:21:15');
-148,'Sumi',-59.53125,16.4375,-37.6875,'2014-10-02 14:21:15');
-149,'Haras',-118.75,14.40625,-21.40625,'2014-10-02 14:21:15');
-150,'Ao Shun',-75.3125,22.59375,1.09375,'2014-10-02 14:21:15');
-151,'Medusa',-67.96875,42.5,-14.5,'2014-10-02 14:21:15');
-152,'Tapipinouphinien',-63.90625,19.84375,-49.1875,'2014-10-02 14:21:15');
-153,'Tatil',-77.84375,23.1875,-22.59375,'2014-10-02 14:21:15');
-154,'Merki',-81.625,50.625,-19.28125,'2014-10-02 14:21:15');
-155,'LHS 3586',-82.09375,25.96875,-23.15625,'2014-10-02 14:21:15');
-156,'Aurea',-88,23.53125,-8.28125,'2014-10-02 14:21:15');
-158,'Apishim',-62.71875,20.28125,-39.15625,'2014-10-02 14:21:15');
-159,'Alderamin',-47.5,7.84375,-9.46875,'2014-10-02 14:21:15');
-161,'BD+75 58',-43.5625,13.46875,-30.46875,'2014-10-02 14:21:15');
-162,'NLTT 49528',-72.625,18.5,-11.75,'2014-10-02 14:21:15');
-163,'Zosia',-62.625,25.5625,-30.09375,'2014-10-02 14:21:15');
-164,'Evergreen',-86.6875,25.34375,-3.3125,'2014-10-02 14:21:15');
-165,'21 Eta Ursae Minoris',-74.625,56.25,-26,'2014-10-02 14:21:15');
-166,'LHS 1101',-54.46875,9.375,-33.46875,'2014-10-02 14:21:15');
-168,'Jurua',-60.84375,23.84375,-50.75,'2014-10-02 14:21:15');
-169,'Men Samit',-120.375,55.6875,-40.6875,'2014-10-02 14:21:15');
-170,'Jaitu',-92.59375,15.1875,-9.15625,'2014-10-02 14:21:15');
-171,'Nimba',-71.5625,42.96875,-4.84375,'2014-10-02 14:21:15');
-172,'Kambalua',-62.90625,15.34375,-44.21875,'2014-10-02 14:21:15');
-173,'Jieguaje',-85.25,16.9375,-4,'2014-10-02 14:21:15');
-174,'Lakluit',-83.875,21.125,-10.0625,'2014-10-02 14:21:15');
-175,'LTT 10482',-61.1875,23.59375,-42,'2014-10-02 14:21:15');
-176,'Moscab Kutja',-75.75,25.40625,-23.78125,'2014-10-02 14:21:15');
-177,'Taleachishvakhrud',-96.5625,56.71875,-19.5,'2014-10-02 14:21:15');
-178,'BD+64 1452',-98.5625,25.6875,-17.40625,'2014-10-02 14:21:15');
-179,'BD+65 1846',-60.3125,7.125,-25.53125,'2014-10-02 14:21:15');
-180,'Korubu',-102,36.3125,-7.8125,'2014-10-02 14:21:15');
-181,'Reiene Maorai',-99.75,39.125,-16.84375,'2014-10-02 14:21:15');
-182,'LHS 250',-19.1875,24.34375,-29.53125,'2014-10-02 14:21:15');
-183,'HIP 93119',-113.5625,57.40625,-33.9375,'2014-10-02 14:21:15');
-184,'HIP 91906',-108.09375,57.1875,-33.59375,'2014-10-02 14:21:15');
-185,'Kwaraseti',-53.5,33.75,-39.875,'2014-10-02 14:21:15');
-186,'Keian Gu',-6,36.28125,-19.875,'2014-10-02 14:21:15');
-187,'Boro Kacharis',-27.125,18.90625,-25.875,'2014-10-02 14:21:15');
-189,'Huokang',-12.1875,35.46875,-25.28125,'2014-10-02 14:21:15');
-190,'LHS 246',-19,22.5625,-28.21875,'2014-10-02 14:21:15');
-191,'Exbeur',-35.15625,27.84375,-33.65625,'2014-10-02 14:21:15');
-192,'Darahk',-65,27,-37,'2014-10-02 14:21:15');
-194,'Theta Draconis',-48.9375,48.09375,0.03125,'2014-10-02 14:21:15');
-195,'Yoruba',-46,35.84375,-34.21875,'2014-10-02 14:21:15');
 197,'LP 45-128',-69.28125,32.25,-13.90625,'2014-10-02 14:21:15');
 198,'Sofagre',-54.21875,48.53125,-30.15625,'2014-10-02 14:21:15');
 199,'Miola',-64,24,-41,'2014-10-02 14:21:15');
@@ -134,9 +34,7 @@
 226,'72 Herculis',-32.875,24.6875,22.21875,'2014-10-02 14:21:15');
 227,'Hyperion',-51.1875,7.5,-16.71875,'2014-10-02 14:21:15');
 228,'Sigma Bootis',-14.46875,47.4375,14.40625,'2014-10-02 14:21:15');
-229,'44 chi Draconis',-22.5625,12.375,-5.40625,'2014-10-02 14:21:15');
 230,'Eta Coronae Borealis',-23.78125,48.4375,21.9375,'2014-10-02 14:21:15');
-231,'G 203-47',-18.34375,14.25,7.09375,'2014-10-02 14:21:15');
 232,'Lalande 30699',-64.34375,48.96875,-10.875,'2014-10-02 14:21:15');
 233,'Eta Cephei',-45.125,9.375,-6.4375,'2014-10-02 14:21:15');
 234,'21 Draco',-60.03125,45.65625,8.09375,'2014-10-02 14:21:15');
@@ -219,4 +117,22 @@
 311,'CE Bootis',-5.40625,29.375,16.46875,'2014-10-02 14:21:15');
 312,'LHS 2651',-22.84375,60.375,-13.8125,'2014-10-02 14:21:15');
 
---83,'GCRV 13292',-99.84375,27.5625,-28.1875,'2014-10-02 14:21:15');  This system has no market ?
+--83,'GCRV 13292',-99.84375,27.5625,-28.1875,'2014-10-02 14:21:15');  This system has no market ?
+--92,'Loga',-79.78125,36.53125,-42.0625,'2014-10-02 14:21:15'); This system has no market ?
+--96,'Balmus',-89,9.375,-52.0625,'2014-10-02 14:21:15'); This system has no market ?
+--97,'LTT 16523',-72.65625,13.28125,-25.9375,'2014-10-02 14:21:15'); This system has no market ?
+--98,'HIP 7338',-96.5,33.21875,-68.65625,'2014-10-02 14:21:15'); This system has no market ?
+--112,'HR 7925',-104.53125,21.0625,-12.1875,'2014-10-02 14:21:15'); This system has no market ?
+--118,'HIP 108110',-122.625,22,-37.34375,'2014-10-02 14:21:15'); This system has no market ?
+--119,'Ross 210',-73.5,10.0625,-15.71875,'2014-10-02 14:21:15'); This system has no market ?
+--126,'Altais',-88.625,38.09375,-13.65625,'2014-10-02 14:21:15'); This system has no market ?
+--142,'Njirika',-117.46875,36.28125,-15.40625,'2014-10-02 14:21:15'); This system has no market ?
+--146,'Manamaya',-43.53125,35.03125,-19.15625,'2014-10-02 14:21:15'); System is bugged, ticket sent.
+--151,'Medusa',-67.96875,42.5,-14.5,'2014-10-02 14:21:15'); This system has no market ?
+--154,'Merki',-81.625,50.625,-19.28125,'2014-10-02 14:21:15'); This system has no market ?
+--165,'21 Eta Ursae Minoris',-74.625,56.25,-26,'2014-10-02 14:21:15'); This system has no market ?
+--169,'Men Samit',-120.375,55.6875,-40.6875,'2014-10-02 14:21:15'); This system has no market ?
+--170,'Jaitu',-92.59375,15.1875,-9.15625,'2014-10-02 14:21:15'); This system has no market ?
+--174,'Lakluit',-83.875,21.125,-10.0625,'2014-10-02 14:21:15'); This system has no market ?
+--179,'BD+65 1846',-60.3125,7.125,-25.53125,'2014-10-02 14:21:15'); This system has no market ?
+--183,'HIP 93119',-113.5625,57.40625,-33.9375,'2014-10-02 14:21:15'); This system has no market ?
diff --git a/data/TradeDangerous.prices b/data/TradeDangerous.prices
@@ -2082,6 +2082,71 @@
       Reactive Armor           2273      0   2014-10-04 09:35:00 demand      -1L-1 stock      -1L-1
 
 
+@ DJEDET/Galois Retreat
+   + Chemicals
+      Explosives                354      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Hydrogen Fuels            168      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Mineral Oil               253      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+   + Consumer Items
+      Clothing                  391      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Consumer Tech            7064      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Dom. Appliances           628      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+   + Drugs
+      Beer                      234      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Liquor                    737      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Narcotics                 234      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Tobacco                  5112      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Wine                      320      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+   + Foods
+      Animal Meat              1462      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Coffee                   1464      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Fish                      788      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Food Cartridges           200      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Fruit and Vegetables      391      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Grain                     269      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Synthetic Meat            320      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Tea                      1650      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+   + Machinery
+      Hel-Static Furnaces       261      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Mineral Extractors        798      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+   + Medicines
+      Basic Medicines           392      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Performance Enhancers    7063      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Progenitor Cells         7065      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+   + Metals
+      Aluminium                 296    310   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Copper                    443    462   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Indium                   5948   6012   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Lithium                  1546   1565   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Palladium               12972  12973   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Silver                   4848   4901   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Titanium                 1011   1037   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Uranium                  2642   2672   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+   + Minerals
+      Bauxite                   203      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Bertrandite              2704      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Beryllium                8391   8392   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Coltan                   1553      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Gallium                  5191   6012   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Gallite                  2107      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Indite                   2372      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Lepidolite                692      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Rutile                    404      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Uraninite                1021      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+   + Technology
+      Advanced Catalysers      3066      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Bioreducing Lichen       1089      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      H.E. Suits                345      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Resonating Separators    6204      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+   + Waste
+      Biowaste                   21     27   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Scrap                      97      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+   + Weapons
+      Non-Lethal Wpns          1995      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Personal Weapons         4493      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+      Reactive Armor           2263      0   2014-10-05 08:29:05 demand      -1L-1 stock      -1L-1
+
+
 @ PARECO/Nicollier Exchange
    + Chemicals
       Hydrogen Fuels            167      0   2014-10-05 02:38:36 demand      -1L-1 stock      -1L-1