Merged kfsone/tradedangerous into master

CHANGES.txt

@@ -8,6 +8,10 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 . (kfsone) Removed "--system" from "station" command, use
        trade.py station -a "SYSTEM/Station"
        syntax instead.
+. (OpenSS) Added "Run To" option to trade.bat,
+. (chmarr) Fixed trade.py using the wrong argument list (#herp),
+. (kfsone) titleFixup will handle 'von', 'de' and 'du' correctly,
++ Station/Rare Data (RavenDT)
 
 v6.8.4 Feb 01 2015
 . (kfsone) Fixed tradecalculator not selecting most profitable trade sometimes

cache.py

@@ -99,6 +99,7 @@
     [O0][O0]CK |
     [O0]INEILL |
     AQUIRE[O0] |
+    [EF]NT[EF]RPRISF |
     [O0](UTT|ALT)[O0]N |
     8RA[DO0]LEY |
     BRA[O0]LEY |
@@ -188,7 +189,10 @@
     ^OEN |
     ^MCK(EF|FE)\b |
     \bCHAN\s+DLER |
-    \b[O0]UMONT
+    \b[O0]UMONT |
+    \bUN[0O]ER |
+    \bSDMM |
+    \bREA[O0]D
 )''', flags=re.X)
 
 

commands/station_cmd.py

@@ -46,8 +46,8 @@
     ParseArgument(
         '--ls-from-star',
         help='Number of light seconds between station and star.',
-        type=float,
-        default=0.0,
+        type=int,
+        default=0,
         dest='lsFromStar',
     ),
     ParseArgument(

corrections.py

@@ -69,6 +69,7 @@
     "GD 219/MCKEF RING":                    DELETED,
     "GD 219/MCKFE RING":                    DELETED,
     "GROOMBRIDGE 1618/FRANKUN RING":        "Franklin Ring",
+    "GROOMBRIDGE 1618/MARTI N EZ MAR KET":  DELETED,
     "HATMEHING/HEVEI.IUS TERMINAL":         DELETED,
     "HATMEHING/HEVEIIUS TERMINAL":          DELETED,
     "HDS 1879/HEDIN ORBITAL":               DELETED,
@@ -129,6 +130,7 @@
     "OPALA/ZAMK PLATFORM":                  "Zamka Platform",
     "ORERVE/WATSON SATION":                 "Watson Station",
     "OSSITO/STOART MINES":                  DELETED,
+    "PALETES/UNOERWOOD GATEWAY":            DELETED,
     "PANGLUYA/BRADBURYWORKS":               "Bradbury Works",
     "PERENDI/SHEPHERD INSTALLATION":        DELETED,
     "PHRYGIA/OEN BERG HUB":                 DELETED,
@@ -164,6 +166,7 @@
     "VEROANDI/VAROEMAN GATEWAY":            DELETED,
     "WADJALI/KIOMAN TERMINAL":              DELETED,
     "WOLF 1301/SAUNDER'S DIVE":             "Saunders's Dive",
+    "WOLF 424/REAODY GATEWAY":              DELETED,
     "WOLF 46/FISCHER CITY":                 "Fischer Station",
     "WW PISCIS AUSTRINI/INVINS VISION":     DELETED,
     "WW PISCIS AUSTRINI/IVINR VISION":      DELETED,