retreat lretreat: Deprecate pseudo-condition 'c'

[empserver] / tests / retreat / journal.log

diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log
index f588fbeb5ac71ff8f91f67d49094aef7f2d9ced8..f084bbe125008535f67c01f311a3c62360b45a9e 100644 (file)
--- a/tests/retreat/journal.log
+++ b/tests/retreat/journal.log
@@ -27,7 +27,7 @@
     Play#1 output Play#1 1  y u
     Play#1 output Play#1 1 g   j
     Play#1 output Play#1 1  b n
-    Play#1 output Play#1 1 Usage: retreat <SHIPS|FLEET> [<PATH> <i|t|s|h|b|d|u|c>]
+    Play#1 output Play#1 1 Usage: retreat <SHIPS|FLEET> [q | <PATH> <i|t|s|h|b|d|u|c>]
     Play#1 output Play#1 6 0 640
     Play#1 input __cmd added 0 -1 0
     Play#1 command __cmd
@@ -37,17 +37,16 @@
     Play#1 output Play#1 4 Retreat conditions ('?' to list available ones)?
     Play#1 input ?
     Play#1 output Play#1 1 i   retreat when injured
-    Play#1 output Play#1 1 t   retreat when torped
+    Play#1 output Play#1 1 t   retreat when torpedoed
     Play#1 output Play#1 1 s   retreat when sonared
     Play#1 output Play#1 1 h   retreat when helpless
     Play#1 output Play#1 1 b   retreat when bombed
     Play#1 output Play#1 1 d   retreat when depth-charged
     Play#1 output Play#1 1 u   retreat when boarded
-    Play#1 output Play#1 1 c   cancel retreat order
     Play#1 output Play#1 4 Retreat conditions ('?' to list available ones)?
     Play#1 input junk
     Play#1 output Play#1 1 Bad retreat condition 'j'
-    Play#1 output Play#1 1 Usage: retreat <SHIPS|FLEET> [<PATH> <i|t|s|h|b|d|u|c>]
+    Play#1 output Play#1 1 Usage: retreat <SHIPS|FLEET> [q | <PATH> <i|t|s|h|b|d|u|c>]
     Play#1 output Play#1 6 0 639
     Play#1 input retr 2/3 bgyujnbgyujnbgyujn itshbdu
     Play#1 command retreat
@@ -79,6 +78,8 @@
     Play#1 command retreat
     Play#1 output Play#1 4 ship(s)?
     Play#1 input 0/1/2/3/4/7
+    Play#1 output Play#1 4 Retreat path, or q to query?
+    Play#1 input q
     Play#1 output Play#1 1 shp#     ship type       x,y   fl path       as flt?  flags
     Play#1 output Play#1 1    0 lc   light cruis   -3,1    a
     Play#1 output Play#1 1    1 lc   light cruis   -3,1    a
@@ -95,7 +96,7 @@
     Play#1 output Play#1 1  y u
     Play#1 output Play#1 1 g   j
     Play#1 output Play#1 1  b n
-    Play#1 output Play#1 1 Usage: lretreat <UNITS|ARMY> [<PATH> <i|h|b|c>]
+    Play#1 output Play#1 1 Usage: lretreat <UNITS|ARMY> [q | <PATH> <i|h|b|c>]
     Play#1 output Play#1 6 0 635
     Play#1 input __cmd added 0 -1 0
     Play#1 command __cmd
@@ -107,11 +108,10 @@
     Play#1 output Play#1 1 i   retreat when injured
     Play#1 output Play#1 1 h   retreat when helpless
     Play#1 output Play#1 1 b   retreat when bombed
-    Play#1 output Play#1 1 c   cancel retreat order
     Play#1 output Play#1 4 Retreat conditions ('?' to list available ones)?
     Play#1 input junk
     Play#1 output Play#1 1 Bad retreat condition 'j'
-    Play#1 output Play#1 1 Usage: lretreat <UNITS|ARMY> [<PATH> <i|h|b|c>]
+    Play#1 output Play#1 1 Usage: lretreat <UNITS|ARMY> [q | <PATH> <i|h|b|c>]
     Play#1 output Play#1 6 0 634
     Play#1 input lret 2/3 yujnbgyujnbgyujnbg ihb
     Play#1 command lretreat
@@ -143,6 +143,8 @@
     Play#1 command lretreat
     Play#1 output Play#1 4 land(s)?
     Play#1 input 0/1/2/3/4/7
+    Play#1 output Play#1 4 Retreat path, or q to query?
+    Play#1 input q
     Play#1 output Play#1 1 lnd#     unit type       x,y   ar path       as army? flags
     Play#1 output Play#1 1    0 inf  infantry      -3,1    a
     Play#1 output Play#1 1    1 inf  infantry      -3,1    a
@@ -604,7 +606,7 @@
     Play#1 output Play#1 6 0 590
     Play#1 input torp 6 100
     Play#1 command torpedo
-    Play#1 output Play#1 1 1 ships are eligible to torp
+    Play#1 output Play#1 1 1 ships are eligible to torpedo
     Play#1 output Play#1 1 Effective torpedo range is 2.0
     Play#1 output Play#1 1 Whooosh... Hitchance = 51%
     Play#1 output Play#1 1 BOOM!...
@@ -612,14 +614,14 @@
     Play#1 output Play#1 6 0 587
     Play#1 input torp 6 101
     Play#1 command torpedo
-    Play#1 output Play#1 1 1 ships are eligible to torp
+    Play#1 output Play#1 1 1 ships are eligible to torpedo
     Play#1 output Play#1 1 Effective torpedo range is 2.0
     Play#1 output Play#1 1 Whooosh... Hitchance = 51%
     Play#1 output Play#1 1 Missed
     Play#1 output Play#1 6 0 584
     Play#1 input torp 6 102
     Play#1 command torpedo
-    Play#1 output Play#1 1 1 ships are eligible to torp
+    Play#1 output Play#1 1 1 ships are eligible to torpedo
     Play#1 output Play#1 1 Effective torpedo range is 2.0
     Play#1 output Play#1 1 Whooosh... Hitchance = 51%
     Play#1 output Play#1 1 BOOM!...
@@ -627,7 +629,7 @@
     Play#1 output Play#1 6 0 581
     Play#1 input torp 6 103
     Play#1 command torpedo
-    Play#1 output Play#1 1 1 ships are eligible to torp
+    Play#1 output Play#1 1 1 ships are eligible to torpedo
     Play#1 output Play#1 1 Effective torpedo range is 2.0
     Play#1 output Play#1 1 Whooosh... Hitchance = 51%
     Play#1 output Play#1 1 BOOM!...
@@ -635,7 +637,7 @@
     Play#1 output Play#1 6 0 578
     Play#1 input torp 6 104
     Play#1 command torpedo
-    Play#1 output Play#1 1 1 ships are eligible to torp
+    Play#1 output Play#1 1 1 ships are eligible to torpedo
     Play#1 output Play#1 1 Effective torpedo range is 2.0
     Play#1 output Play#1 1 Whooosh... Hitchance = 51%
     Play#1 output Play#1 1 Missed
@@ -1483,7 +1485,7 @@
     Play#0 output Play#0 1 1 planes spotted over 1,-1
     Play#0 output Play#0 1 1 pinpoint bombing raid did 24 damage to cav  cavalry #47
     Play#0 output Play#0 1     cav  cavalry #47 takes 9
-    Play#0 output Play#0 1 cav  cavalry #47 retreats along path gh
+    Play#0 output Play#0 1 cav  cavalry #47 retreats along path g
     Play#0 output Play#0 1 spy  infiltrator #48 retreats with them
     Play#0 output Play#0 1 cav  cavalry #47 can't go to -1,-1 & stays in 1,-1
     Play#0 output Play#0 1 spy  infiltrator #48 stopped at -1,-1
@@ -1596,6 +1598,9 @@
     Play#0 output Play#0 6 0 640
     Play#0 input retr * ?rflags#0
     Play#0 command retreat
+    Play#0 output Play#0 1 Omitting the second argument is deprecated and will cease to work in a
+    Play#0 output Play#0 1 future release.  Please use 'retr * ?rflags#0 q' to query retreat orders.
+    Play#0 output Play#0 1
     Play#0 output Play#0 1 own shp#     ship type       x,y   fl path       as flt?  flags
     Play#0 output Play#0 1   1    2 lc   light cruis   -3,1      bgyujnbgy           itshbdu
     Play#0 output Play#0 1   1    4 lc   light cruis   -5,1    a b          Yes      h
@@ -1613,9 +1618,9 @@
     Play#0 output Play#0 1   2   34 lc   light cruis    3,1      n                   i
     Play#0 output Play#0 1   2   35 lc   light cruis    0,2    c n          Yes      i
     Play#0 output Play#0 1   2   36 lc   light cruis    0,2    c n          Yes      i
-    Play#0 output Play#0 1   2   40 lc   light cruis    1,3      nnnh                i
-    Play#0 output Play#0 1   2   41 lc   light cruis    1,3      uh                  i
-    Play#0 output Play#0 1   2   42 lc   light cruis   -4,2      ugggh               i
+    Play#0 output Play#0 1   2   40 lc   light cruis    1,3      nnn                 i
+    Play#0 output Play#0 1   2   41 lc   light cruis    1,3      u                   i
+    Play#0 output Play#0 1   2   42 lc   light cruis   -4,2      uggg                i
     Play#0 output Play#0 1   2   43 ms   minesweeper   -6,4    m g          Yes      i
     Play#0 output Play#0 1   2   44 ms   minesweeper   -6,4    m g          Yes      i
     Play#0 output Play#0 1   2   46 lc   light cruis    5,1    n y          Yes      i
@@ -1697,14 +1702,17 @@
     Play#0 output Play#0 6 0 637
     Play#0 input lretr * ?rflags#0
     Play#0 command lretreat
+    Play#0 output Play#0 1 Omitting the second argument is deprecated and will cease to work in a
+    Play#0 output Play#0 1 future release.  Please use 'lretr * ?rflags#0 q' to query retreat orders.
+    Play#0 output Play#0 1
     Play#0 output Play#0 1 own lnd#     unit type       x,y   ar path       as army? flags
     Play#0 output Play#0 1   1    2 inf  infantry      -3,1      yujnbgyuj           ihb
     Play#0 output Play#0 1   1    4 inf  infantry      -4,0    a b          Yes      h
     Play#0 output Play#0 1   1    7 inf  infantry      -4,0    a b          Yes      h
     Play#0 output Play#0 1   1   24 cav  cavalry        3,1    g bhg        Yes      b
     Play#0 output Play#0 1   2   25 cav  cavalry        2,2    g g          Yes      b
-    Play#0 output Play#0 1   2   26 cav  cavalry        3,1    g uh                  b
-    Play#0 output Play#0 1   2   27 cav  cavalry        3,1    g uh         Yes      b
+    Play#0 output Play#0 1   2   26 cav  cavalry        3,1    g u                   b
+    Play#0 output Play#0 1   2   27 cav  cavalry        3,1    g u          Yes      b
     Play#0 output Play#0 1   2   28 cav  cavalry        2,2    g g          Yes      i
     Play#0 output Play#0 1   2   29 cav  cavalry        4,0    g bhg        Yes      b
     Play#0 output Play#0 1   2   31 cav  cavalry        0,2    c j          Yes      b
@@ -1718,7 +1726,7 @@
     Play#0 output Play#0 1   2   42 cav  cavalry        1,1      g                   b
     Play#0 output Play#0 1   2   45 tra  train          1,-1   t b          Yes      b
     Play#0 output Play#0 1   2   46 cav  cavalry        0,-2   t nb         Yes      b
-    Play#0 output Play#0 1   2   47 cav  cavalry        1,-1   s gh         Yes      b
+    Play#0 output Play#0 1   2   47 cav  cavalry        1,-1   s g          Yes      b
     Play#0 output Play#0 1   2   61 cav  cavalry        0,0      nj                  ihb
     Play#0 output Play#0 1   2   62 cav  cavalry        0,0      nj                  ihb
     Play#0 output Play#0 1   2   63 cav  cavalry        0,0      nj                  ihb