Merged kfsone/tradedangerous into master

CHANGES.txt

@@ -2,6 +2,26 @@
 TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 ==============================================================================
 
+v6.12.2 Feb 26 2015
+. (kfsone) "run" command:
+  - added "--direct" option:
+    - only allows 1 hop,
+    - --jumps and --ly-per are ignored entirely,
+    - ignores route/distance between stations,
+   e.g.
+     trade.py run --from achenar --to lave --cap 50 --cr 100000 --direct
+
+v6.12.1 Feb 26 2015
+. (kfsone) "buy" command:
+  - now accepts multiple arguments (e.g. explosives,clothing),
+  - new "--one-stop" (-1) option only shows stations that carry the full list,
+  - mixing ships and items is not allowed,
+   e.g.
+     trade.py buy food clothing fish
+     trade.py buy --near achenar fish,food,grain --one-stop
+     trade.py buy --near achenar --ly 100 type6,type7 --one-stop
+     trade.py buy --near achenar --ly 100 type6,type7 -1
+
 v6.12.0 Feb 23 2015
 . (kfsone) Added "market", "shipyard" and "modified" values to Station table
 . (kfsone) "submit-distances" now has proper argument parsing, see --help

README.txt

@@ -213,7 +213,7 @@ RUN sub-command:
        How many credits to start with
        e.g.
          --credits 20000
-
+       
      --ly-per N.NN
      --ly N.NN
        Maximum distance your ship can jump between systems at full capacity.
@@ -272,18 +272,6 @@ RUN sub-command:
        e.g.
          --from iBootis --to LiuBese
 
-     --start-jumps N
-     -s N
-       Considers stations from systems upto this many jumps from your
-       specified start location.
-         --from beagle2 --ly-per 7.56 --empty 10.56 -s 2
-
-     --end-jumps N
-     -e N
-       Considers stations from systems upto this many jumps from your
-       specified destination (--to).
-         --to lave -e 3      (find runs that end within 3 jumps of lave)
-
      --via <station or system>
        Lets you specify a station that must be between the second and final hop.
        Requires that hops be at least 2.
@@ -304,6 +292,24 @@ RUN sub-command:
        e.g.
          -jumps-per 5
 
+     --direct
+       Assumes a single hop and doesn't worry about travel between
+       source and destination.
+       e.g.
+         --from achenar --to lave --direct
+
+     --start-jumps N
+     -s N
+       Considers stations from systems upto this many jumps from your
+       specified start location.
+         --from beagle2 --ly-per 7.56 --empty 10.56 -s 2
+
+     --end-jumps N
+     -e N
+       Considers stations from systems upto this many jumps from your
+       specified destination (--to).
+         --to lave -e 3      (find runs that end within 3 jumps of lave)
+
 
    Filter options:
      --max-days-old N.NN
@@ -820,11 +826,15 @@ LOCAL sub-command:
 
 BUY sub-command:
 
-  Looks for stations selling the specified item or ship.
+  Finds stations that are selling / where you can buy, a named list of
+  items or ships.
 
-  For items, that means they have a non-zero asking price and a stock level other than "n/a".
-
-  trade.py buy [-q | -v] [--quantity Q] [--near N] [--ly-per N] item [-P | -S] [--limit]
+  trade.py buy 
+        [-q | -v] [--quantity Q] [--near N] [--ly-per N]
+        [-P | -S] [--limit]
+        [--one-stop | -1]
+        item [item item,item ...]
+        ship [ship ship,ship ...]
 
     --quantity Q
       Requires that the stock level be unknown or at least this value,
@@ -835,6 +845,11 @@ BUY sub-command:
       Only considers stations within reach of the specified system.
       --near chango
 
+    --one-stop
+    -1
+      When multiple items or ships are listed, only lists stations
+      which have all of them.
+
     --limit N
       Limit how many results re shown
       --limit 5
@@ -866,6 +881,12 @@ BUY sub-command:
     -S
       Sorts items by stock available first and then price
 
+  Example
+    trade.py buy --near achenar food
+    trade.py buy asp
+    trade.py buy --near achenar food,clothing,scrap --one-stop
+    trade.py buy --near achenar type6,type7 -1
+
 
 SELL sub-command:
 

cache.py

@@ -250,7 +250,8 @@
     \sH\sU\sB$ |
     \bC[O0]LCNY\b |
     \bOOCTE\b |
-    \bBULGAFIIN\b
+    \bBULGAFIIN\b |
+    \bWH\sIEEL
 )''', flags=re.X)