Merged kfsone/tradedangerous into master

eyeonus · Jun 13, 2015 · f709544 · f709544
2 parents fde6578 + b1128a8
commit f709544
Show file tree

Hide file tree

Showing 7 changed files with 25,100 additions and 2,829 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,6 +2,11 @@
 TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 ==============================================================================
 
+v7.1.2 Jun 6 2015:
+. (Dry411s) Diamondback prices
+. (Orphu) Imperial courier price
+. (kfsone) Maddavo Data import/refresh
+
 v7.1.1 May 25 2015
 . (kfsone) Added "--distance" option to "edscupdate" which shows the 10
       closest candidates.

diff --git a/corrections.py b/corrections.py
@@ -7,15 +7,6 @@
 DELETED = -111
 
 systems = {
-    "22 LYNCIS": "PEPPER",
-    "ALANI": DELETED,
-    "DJALI": "HERCULIS SECTOR QD-T B3-4",
-    "PANTAA CEZISA": "GEORGE PANTAZIS",
-    "TAVYTERE": "ALRAI SECTOR ON-T B3-2",
-    "BODB DJEDI": "BODEDI",
-    "HIP 101110": "NEW YEMBO",
-    "ICV HR-V B2-0": "ICZ HR-V B2-0",
-    "FLECHS": "ICZ IR-W C1-13",
     "PANDAMONIUM": "PANDEMONIUM",
     "ARGETLÁMH": "ARGETLAMH",
     "LíFTHRUTI": "LIFTHRUTI",
@@ -26,110 +17,12 @@
 }
 
 stations = {
-    "ADLIVUN/ABL SURVEY":                   DELETED,
-    "AKHENATEN/WANG PLATFORM":              DELETED,
-    "ALPHA FORNACIS/BENNET PORT":           DELETED,
-    "AO QIN/CHAPMAN HUB":                   DELETED,
-    "BALDUR/DUTTON STATION":                DELETED,
-    "BALTAH'SINE/BALTAH''SINE STATION":     DELETED,
-    "BALTAH'SINE/BALTAH'SINE STATION":      DELETED,
-    "BALTAH'SINE/BALTHAISINE STATION":      DELETED,
-    "BD+65 1846/SHARGIN BEACON":            DELETED,
-    "COCIJO/HARRY MOORE 6 CO":              DELETED,
-    "COSI/JU LIAN CITY":                    DELETED,
-    "CPD-28 332/WI N N E GATEWAY":          DELETED,
-    "DAJOAR/MACQUORN TERMINAL":             DELETED,
-    "DITAE/DITAE":                          DELETED,
-    "DORIS/ISHERWOOD DOCK":                 DELETED,
-    "ERAVATE/ERAVATE":                      DELETED,
-    "GABIETYE/GABIETYE":                    DELETED,
-    "HDS 1879/HEDIN ORBITAL":               DELETED,
-    "HIP 4907/EDISON PLATFORM":             DELETED,
-    "HIP 69913/KONORATYEV OUTPOST":         DELETED,
-    "KANOS/LEE STATION":                    DELETED,
-    "LFT 1446/BOSCH SETTLEMENT":            DELETED,
-    "LHS 1101/BONDAR CITY":                 DELETED,
-    "LHS 1453/SAAVEORA PORT":               DELETED,
-    "LOVEDU/OIVIS PLATFORM":                DELETED,
-    "LP 322-836/BOLOTOV PORT":              DELETED,
-    "LP 51-17/ARCHAMBAULT HORIZONS":        DELETED,
-    "LP 811-17/STJEPAN SELJAN PORT":        DELETED,
-    "LTT 1349/NORIFRA PORT":                DELETED,
-    "OLWAIN/J. G. BALLARD TERMINAL":        DELETED,
-    "RAHU/LEBEDEV BEACON":                  DELETED,
-    "ROSMERTA/DHN ORBITAL":                 DELETED,
-    "ROSMERTA/RHN ORBITAL":                 DELETED,
-    "TANMARK/CASSI E-L-PEIA":               DELETED,
-    "THUNDERBIRD/QUIMPY PORT":              DELETED,
-    "ZETA AQUILAE/JULIAN GATEWAY":          DELETED,
-    "ZETA AQUILAE/MOHMAND HOLOINGS":        DELETED,
-    "ZETA AQUILAE/MOHMANO HOLDINGS":        DELETED,
-
-#ADD_STATIONS_HERE
-    "FK5 2550/WU INDT GATEWAY":             DELETED,
-    "BRANI/ARMSTRONG STATION":              DELETED,
-    "BRANI/BRAHE HUB":                      DELETED,
-    "BRANI/DIRAC ENTERPRISE":               DELETED,
-    "BRANI/NADDODDUR TERMINAL":             DELETED,
-    "BRANI/RIDE RING":                      DELETED,
-    "BRANI/WALLACE DOCK":                   DELETED,
-    "BETA HYDRI/EOMONDSON HIGH M'''":       DELETED,
-    "BETA HYDRI/EOMONDSON HIGH M''":        DELETED,
-    "BETA HYDRI/EOMONDSON HIGH M'":         DELETED,
-    "BETA HYDRI/FRANKLIN RINGX":            DELETED,
-    "GEORGE PANTAZIS/ZAM IKA PLATFORM":     DELETED,
-    "GEORGE PANTAZIS/ZAM R PLATFORM":       DELETED,
-    "HIP 80364/STASHEFF 'LONY":             DELETED,
-    "LALANDE 4141/4A5O4D":                  DELETED,
-    "LALANDE 4141/4A5 -O4D":                DELETED,
-    "LALANDE 4141/4A5040":                  DELETED,
-    "LTT 537/G 1RSHTEIN H 1B":              DELETED,
-    "LTT 537/RI ERRHTFIN HI BR":            DELETED,
-    "MORTEN/VE .LAZQU IEZ STATION":         DELETED,
-    "NUKURU/HALLE R PO RT":                 DELETED,
-    "PANDAMONIUM/RIEDRICH PETERS RING":     DELETED,
-    "PANDAMONIUM/.RILDRICH PLTERS RING":    DELETED,
-    "PANDAMONIUM/RILDRICH PLTERS RING":     DELETED,
-    "WOLF 1481/VE .LAZQU IEZ GATEWAY":      DELETED,
-    "BALMUNG/RU IPPE .LT STATION":          DELETED,
-    "VOLOWAHKU/WATI' MINE":                 DELETED,
-    "GLIESE 868/ALVARADO RING":             DELETED,
-    "GLIESE 868/FEYNMAN TERMINAL":          DELETED,
-    "TOXANDJI/TSU NENAGA ORBITAL":          DELETED,
-    "AMAHU/ALEDNDRIA GATEWAY":              DELETED,
-    "LTT 7548/ALEDNDRIA RING":              DELETED,
-    "DJINAJERI/MESSERSCHMID LANDING":       DELETED,
-    "SAMBURITJA/PTEYN LANDING":             DELETED,
-    "SAMBURITJA/RPTEYN LANDING":            DELETED,
-    "CHICK EK/WH IEELOCK GATEWAY":          DELETED,
-    "LHS 3006/WCM TRANSFER ORBITAL":        "Leonard Nimoy Station",
-    "LALANDE 4141/4A5O4O":                  "4A5O4D",
-    "NEW YEMBO/UNDER CONSTRUCTION":         DELETED,
-    "GENDINI/HOUTMAN GATEWAY":              DELETED,
-    "QUECHE/RUTHERFORD WORKS":              DELETED,
-    "SALARHUL/LAVOISIER OUTPOST":           DELETED,
-    "TELIU YUAN/BUCHLI STATION":            DELETED,
-    "WUNJO/BAUDIN HANGER":                  "Baudin Hangar",
-    "APALA/FODA PORT":                      DELETED,
-    "BD+47 2112/OLIVAS SETTLEMENT":         DELETED,
 }
 
 categories = {
-    'DRUGS':            'Legal Drugs',
-    'SLAVES':           'Slavery',
 }
 
 items = {
-    'CONSUMER TECH': 'Consumer Technology',
-    'DOM. APPLIANCES': 'Domestic Appliances',
-    'FRUIT AND VEGETABLES': 'Fruit And Vegetables',
-    'HEL-STATIC FURNACES': 'Microbial Furnaces',
-    'HYDROGEN FUELS':   'Hydrogen Fuel',
-    'MARINE SUPPLIES':  'Marine Equipment',
-    'NON-LETHAL WPNS': 'Non-Lethal Weapons',
-    'REACTIVE ARMOR': 'Reactive Armour',
-    'TERRAIN ENRICH SYS': 'Land Enrichment Systems',
-
 }
 
 def correctSystem(oldName):
@@ -157,4 +50,4 @@ def correctItem(oldName):
     try:
         return items[oldName.upper()]
     except KeyError:
-        return oldName
+        return oldName
diff --git a/data/Item.csv b/data/Item.csv
@@ -43,12 +43,13 @@ unq:[email protected]_id,unq:name,ui_order
 'Metals','Gold',6
 'Metals','Indium',7
 'Metals','Lithium',8
-'Metals','Palladium',9
-'Metals','Platinum',10
-'Metals','Silver',11
-'Metals','Tantalum',12
-'Metals','Titanium',13
-'Metals','Uranium',14
+'Metals','Osmium',9
+'Metals','Palladium',10
+'Metals','Platinum',11
+'Metals','Silver',12
+'Metals','Tantalum',13
+'Metals','Titanium',14
+'Metals','Uranium',15
 'Minerals','Bauxite',1
 'Minerals','Bertrandite',2
 'Minerals','Coltan',3
@@ -60,6 +61,7 @@ unq:[email protected]_id,unq:name,ui_order
 'Minerals','Uraninite',9
 'Salvage','AI Relics',1
 'Salvage','Antiquities',2
+'Salvage','SAP 8 Core Container',3
 'Slavery','Imperial Slaves',1
 'Slavery','Slaves',2
 'Technology','Advanced Catalysers',1

diff --git a/data/Ship.csv b/data/Ship.csv
@@ -4,10 +4,13 @@ unq:name,cost
 'Asp',6661153
 'Clipper',22295860
 'Cobra',379718
+'Diamondback Explorer',1894760
+'Diamondback Scout',564329
 'Dropship',19814205
 'Eagle',44800
 'Fer-de-Lance',51567040
 'Hauler',52720
+'Imperial Courier',2542930
 'Orca',48539887
 'Python',56978179
 'Sidewinder',32000