Recognise Ultimate people

[ypp-sc-tools.db-test.git] / ypp-restock-rum

diff --git a/ypp-restock-rum b/ypp-restock-rum
index 96e6867f7ad0564cdc518a64dec2e8c5b3894eba..3d9eb21e25da7f6899d21e792143c625681ef8f9 100755 (executable)
--- a/ypp-restock-rum
+++ b/ypp-restock-rum
@@ -14,13 +14,20 @@ where <information> is
   price  <swill> <grog>  <fine> [<shot>]
 
 Each of which may appear only once, except \`have' which may appear
-more than once which case we calculate the differences and the profit
-for each one.
-
-If <shot> is not specified at all, relevant information about shot is
-not reported.  For have and want, missing entries count as zero.
+more than once which case we calculate the financial implications
+at each stage.
 
+Missing entries count as zero (and zeroes are not displayed in the output).
 In price, \`x' means the commodity is unavailable.
+
+The intended use is that at the start of the pillage you run:
+   ypp-restock-rum have ... want ...
+to check that stocks are sufficient, or perhaps:
+   ypp-restock-rum have ... want ... price ...
+if you want to stock up some more.  At the end of the pillage,
+run the same thing again with some extra parameters:
+   ypp-restock-rum have .. want ... have ... price ...
+and it will tell you how you did and what the restock should be like.
 END
 ;
 
@@ -77,7 +84,7 @@ sub parse_args () {
            parse_info(1,0,1, @{ $have[@have] }, 'have');
        } elsif (m/^want$/) {
            parse_info(1,0,0, @want, 'want');
-       } elsif (m/^price$/) {
+       } elsif (m/^prices?$|^costs?$/) {
            parse_info(0,1e7,0, @price, 'price');
        } else {
            badusage("unknown information argument \`$_'");
@@ -196,8 +203,9 @@ sub pr1s ($) {
 sub compute_stock_values() {
     return unless @have;
     print @have>1 ? <<END
-                 Rum      Rum     Shot    Shot     total      Profit    Profit
-                equiv.   value   stocks   value    value      this leg   total
+
+                _____Rum_____      ___Shot___      total      _____Profit___
+             fine equiv.  value   qty    value     value     per leg     total
 END
 : <<END
                              Rum      Rum             Shot    Shot     total
@@ -231,13 +239,7 @@ END
        $last_value= $total_value;
        print "\n";
     }
-    print @have>1 ? <<END
-                 fine      poe    units    poe       poe     delta-poe     poe
-END
-: <<END
-                             fine      poe            units    poe       poe
-END
-;
+    print "\n" if @have>1;
     print "\n";
 }