tests: Wean off deprecated retreat syntax

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-10 14:25:52 +01:00
parent 148af51ab3
commit c702dc9e94
6 changed files with 14 additions and 26 deletions

View file

@ -6,9 +6,9 @@ read 5
read 6 read 6
ship * ship *
carg * ?shell#0 carg * ?shell#0
retr * ?rflags#0 retr * ?rflags#0 q
miss s * ?mission#0 q miss s * ?mission#0 q
land * land *
lcar * ?shell#0 lcar * ?shell#0
lret * ?rflags#0 lret * ?rflags#0 q
miss l * ?mission#0 q miss l * ?mission#0 q

View file

@ -1489,11 +1489,8 @@
Play#0 output Play#0 1 131 ms 11,-5 66% 0 3 0 14 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 131 ms 11,-5 66% 0 3 0 14 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 8 ships Play#0 output Play#0 1 8 ships
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input retr * ?rflags#0 Play#0 input retr * ?rflags#0 q
Play#0 command retreat 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 own shp# ship type x,y fl path as flt? flags
Play#0 output Play#0 1 1 4 oe oil explora 1,1 hhhhn b Play#0 output Play#0 1 1 4 oe oil explora 1,1 hhhhn b
Play#0 output Play#0 1 2 11 pt patrol boat 0,0 hhhhn b Play#0 output Play#0 1 2 11 pt patrol boat 0,0 hhhhn b
@ -1599,11 +1596,8 @@
Play#0 output Play#0 1 131 eng 8,6 96% 0 5 0 3 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 131 eng 8,6 96% 0 5 0 3 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 4 units Play#0 output Play#0 1 4 units
Play#0 output Play#0 6 0 637 Play#0 output Play#0 6 0 637
Play#0 input lret * ?rflags#0 Play#0 input lret * ?rflags#0 q
Play#0 command lretreat 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 'lret * ?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 own lnd# unit type x,y ar path as army? flags
Play#0 output Play#0 1 1 1 tra train 1,1 hhhhn b Play#0 output Play#0 1 1 1 tra train 1,1 hhhhn b
Play#0 output Play#0 1 1 4 eng engineer 1,1 hhhhn b Play#0 output Play#0 1 1 4 eng engineer 1,1 hhhhn b

View file

@ -10,7 +10,7 @@ junk
| long path, all conditions | long path, all conditions
retr 2/3 bgyujnbgyujnbgyujn itshbdu retr 2/3 bgyujnbgyujnbgyujn itshbdu
| clear retreat order | clear retreat order
retr 3 h c retr 3 h
| group retreat order | group retreat order
retr a ?uid=4 b h retr a ?uid=4 b h
fleet a 7 fleet a 7
@ -30,7 +30,7 @@ junk
| long path, all conditions | long path, all conditions
lret 2/3 yujnbgyujnbgyujnbg ihb lret 2/3 yujnbgyujnbgyujnbg ihb
| clear retreat order | clear retreat order
lret 3 h c lret 3 h
| group retreat order | group retreat order
lret a ?uid=4 b h lret a ?uid=4 b h
army a 7 army a 7

View file

@ -1,8 +1,8 @@
read 1 read 1
read 2 read 2
ship * ship *
retr * ?rflags#0 retr * ?rflags#0 q
miss s * ?mission#0 q miss s * ?mission#0 q
land * land *
lretr * ?rflags#0 lretr * ?rflags#0 q
miss l * ?mission#0 q miss l * ?mission#0 q

View file

@ -55,7 +55,7 @@
Play#1 output Play#1 1 3 lc light cruis -3,1 a bgyujnbgy itshbdu Play#1 output Play#1 1 3 lc light cruis -3,1 a bgyujnbgy itshbdu
Play#1 output Play#1 1 2 ships Play#1 output Play#1 1 2 ships
Play#1 output Play#1 6 0 638 Play#1 output Play#1 6 0 638
Play#1 input retr 3 h c Play#1 input retr 3 h
Play#1 command retreat Play#1 command retreat
Play#1 output Play#1 1 shp# ship type x,y fl path as flt? flags Play#1 output Play#1 1 shp# ship type x,y fl path as flt? flags
Play#1 output Play#1 1 3 lc light cruis -3,1 a Play#1 output Play#1 1 3 lc light cruis -3,1 a
@ -120,7 +120,7 @@
Play#1 output Play#1 1 3 inf infantry -3,1 a yujnbgyuj ihb Play#1 output Play#1 1 3 inf infantry -3,1 a yujnbgyuj ihb
Play#1 output Play#1 1 2 units Play#1 output Play#1 1 2 units
Play#1 output Play#1 6 0 633 Play#1 output Play#1 6 0 633
Play#1 input lret 3 h c Play#1 input lret 3 h
Play#1 command lretreat Play#1 command lretreat
Play#1 output Play#1 1 lnd# unit type x,y ar path as army? flags Play#1 output Play#1 1 lnd# unit type x,y ar path as army? flags
Play#1 output Play#1 1 3 inf infantry -3,1 a Play#1 output Play#1 1 3 inf infantry -3,1 a
@ -1596,11 +1596,8 @@
Play#0 output Play#0 1 2 130 tt troop trans -9,1 100% 0 10 0 0 0 0 0 0 96 60 Play#0 output Play#0 1 2 130 tt troop trans -9,1 100% 0 10 0 0 0 0 0 0 96 60
Play#0 output Play#0 1 57 ships Play#0 output Play#0 1 57 ships
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input retr * ?rflags#0 Play#0 input retr * ?rflags#0 q
Play#0 command retreat 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 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 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 Play#0 output Play#0 1 1 4 lc light cruis -5,1 a b Yes h
@ -1700,11 +1697,8 @@
Play#0 output Play#0 1 2 64 cav cavalry 3,1 74% 7 0 73 0 50 42% 0 0 Play#0 output Play#0 1 2 64 cav cavalry 3,1 74% 7 0 73 0 50 42% 0 0
Play#0 output Play#0 1 35 units Play#0 output Play#0 1 35 units
Play#0 output Play#0 6 0 637 Play#0 output Play#0 6 0 637
Play#0 input lretr * ?rflags#0 Play#0 input lretr * ?rflags#0 q
Play#0 command lretreat 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 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 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 4 inf infantry -4,0 a b Yes h

View file

@ -228,7 +228,7 @@ decl f 2 4
map * map *
cens * ?des#. cens * ?des#.
ship * ship *
retr * retr * q
land * land *
lretr * lret * q
plane * plane *