tests/retreat: Improve group retreat coverage

This exposes more bugs.  They're marked "BUG:" in the test input.  A
few bugs get masked, but I'll unmask them again in the next commit.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/tests/retreat/01-retreat-1 b/tests/retreat/01-retreat-1
index b35471afcfe3ca1e018f7584236768a59ce5ec8e..25cb73c6f412831914eaebfb42d9a7c468f338ea 100644 (file)
--- a/tests/retreat/01-retreat-1
+++ b/tests/retreat/01-retreat-1
@@ -13,9 +13,11 @@ retr 2/3 bgyujnbgyujnbgyujn itshbdu
 retr 3 h c
 | group retreat order
 retr a ?uid=4 b h
 retr 3 h c
 | group retreat order
 retr a ?uid=4 b h

+fleet a 7
+__cmd added 1 0 0

 | show retreat orders
 retr
 | show retreat orders
 retr

-0/1/2/3/4
+0/1/2/3/4/7

 || lretreat command
 | garbage path
 lret 0 garbage i
 || lretreat command
 | garbage path
 lret 0 garbage i


@@ -30,22 +32,23 @@ lret 2/3 yujnbgyujnbgyujnbg ihb
 lret 3 h c
 | group retreat order
 lret a ?uid=4 b h
 lret 3 h c
 | group retreat order
 lret a ?uid=4 b h

+army a 7
+__cmd added 1 0 0

 | show retreat orders
 lret
 | show retreat orders
 lret

-0/1/2/3/4
+0/1/2/3/4/7

 ||| Ships
 || ships failing to retreat
 | sunk
 ||| Ships
 || ships failing to retreat
 | sunk

+| as group (fleet c): 30 sinks, 32 crewless, 35 no mobility

 fire se -2,2 30
 fire se -2,2 30

-__cmd added -1 -1 0
-| crewless
-fire se -2,2 32
+| BUG: group does not retreat
+__cmd added -2 -2 0

 | in construction zone 2,2
 fire se -2,2 33
 | landlocked in 3,1
 fire se -2,2 34
 | in construction zone 2,2
 fire se -2,2 33
 | landlocked in 3,1
 fire se -2,2 34

-| no mobility
-fire se -2,2 35
+__cmd added -1 -1 0

 || ships having difficulties during retreat
 | out of mobility after n
 fire se -2,2 40
 || ships having difficulties during retreat
 | out of mobility after n
 fire se -2,2 40


@@ -53,7 +56,8 @@ fire se -2,2 40
 fire se -2,2 41
 | into unfriendly -3,1 right away
 fire se -2,2 42
 fire se -2,2 41
 | into unfriendly -3,1 right away
 fire se -2,2 42

-| into minefield -6,4 with 43, sweep and hit mines, stop
+| into minefield -6,4, sweep and hit mines, stop
+| as group (fleet m): 44/43

 fire se -2,2 44
 || ships retreating fully
 | nh
 fire se -2,2 44
 || ships retreating fully
 | nh


@@ -70,6 +74,12 @@ fire se -2,2 2
 fire se -2,2 11
 | not helpless
 fire se -2,-2 20
 fire se -2,2 11
 | not helpless
 fire se -2,-2 20

+| crazy group retreat
+| as group (fleet g): 25 unremarkable, 24 foreign, 26 group retreat off,
+| 27 different path, 28 different triggers, 29 is elsewhere
+fire se -2,2 25
+| odd: 26/27/28/29 retreat
+__cmd added 1 1 0

 || ships retreating from depth charges
 | depth-charged
 fire sh 5 50
 || ships retreating from depth charges
 | depth-charged
 fire sh 5 50


@@ -128,25 +138,19 @@ board 130 5
 || land units failing to retreat
 | these bombing runs must hit; if they don't, use __cmd to make them
 | destroyed
 || land units failing to retreat
 | these bombing runs must hit; if they don't, use __cmd to make them
 | destroyed

+| as group (army c): 30 dies, 31 loaded on ship, 32 crewless,
+| 34 loaded on train, 35 no mobility

 bomb 30 . p -2,2 jh
 l
 30
 bomb 30 . p -2,2 jh
 l
 30

-| 31 is on a ship, but there's no way to trigger a retreat then
-| crewless
-bomb 30 . p -2,2 jh
-l
-32
-| BUG: retreats anyway
+| BUG: group does not retreat
+__cmd added -1 -2 0

 | kidnapped in -1,1
 bomb 30 . p -2,2 uh
 l
 33
 | BUG: retreats anyway
 | kidnapped in -1,1
 bomb 30 . p -2,2 uh
 l
 33
 | BUG: retreats anyway

-| 34 is on a land unit, but there's no way to trigger a retreat then
-| no mobility
-bomb 30 . p -2,2 jh
-l
-35
+__cmd added -1 -2 0

 || land units having difficulties during retreat
 | these bombing runs must hit; if they don't, use __cmd to make them
 | out of mobility after n
 || land units having difficulties during retreat
 | these bombing runs must hit; if they don't, use __cmd to make them
 | out of mobility after n


@@ -162,7 +166,8 @@ l
 bomb 30 . p -2,2 ujh
 l
 42
 bomb 30 . p -2,2 ujh
 l
 42

-| into minefield 0,0 with 43, sweep and hit mines, stop
+| into minefield 0,0, sweep and hit mines, stop
+| as group (army m): 44/43

 __cmd added -1 0 0
 bomb 30 . p -2,2 ujh
 l
 __cmd added -1 0 0
 bomb 30 . p -2,2 ujh
 l


@@ -187,6 +192,14 @@ l
 bomb 30 . p -3,1 h
 l
 2
 bomb 30 . p -3,1 h
 l
 2

+| crazy group retreat
+| as group (army g): 25 unremarkable, 24 foreign, 26 group retreat off,
+| 27 different path, 28 different triggers, 29 is elsewhere
+bomb 30 . p -2,2 ujjh
+l
+25
+| odd: 26/27/28/29 retreat
+__cmd added 1 2 0

 || land units retreating from bombs
 | only retreat on p-bombing is implemented
 | bombed covered above
 || land units retreating from bombs
 | only retreat on p-bombing is implemented
 | bombed covered above

diff --git a/tests/retreat/final.xdump b/tests/retreat/final.xdump
index ce05746841a898f76d936849730525ba8649adb0..e9ae7a9abded42959d31a635ebbabb2acec04026 100644 (file)
--- a/tests/retreat/final.xdump
+++ b/tests/retreat/final.xdump
@@ -6,18 +6,18 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 1 -4 0 15 100 127 0 0 0 0 0 0 0 -4 0 0 0 0 1 15 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 -2 0 5 100 127 0 0 0 0 0 0 0 -2 0 0 0 0 0 5 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 2 1 1 15 93 117 0 0 0 0 0 0 0 1 1 0 0 0 0 15 0 0 0 0 0 2 93 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 -4 0 15 100 127 0 0 0 0 0 0 0 -4 0 0 0 0 1 15 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 -2 0 5 100 127 0 0 0 0 0 0 0 -2 0 0 0 0 0 5 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 2 1 1 15 93 117 0 0 0 0 0 0 0 1 1 0 0 0 0 15 0 0 0 0 0 2 93 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0

-2 3 1 15 99 125 0 0 0 0 0 0 0 3 1 0 0 0 1 15 0 0 0 0 0 2 99 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
+2 3 1 15 97 122 0 0 0 0 0 0 0 3 1 0 0 0 1 15 0 0 0 0 0 2 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0

 1 -3 1 12 99 126 0 0 0 0 0 0 0 -3 1 0 0 0 1 12 0 0 0 0 0 1 99 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 -1 1 15 98 124 0 0 0 0 0 0 0 -1 1 0 0 0 0 15 0 0 0 0 0 1 98 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 -3 1 12 99 126 0 0 0 0 0 0 0 -3 1 0 0 0 1 12 0 0 0 0 0 1 99 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 -1 1 15 98 124 0 0 0 0 0 0 0 -1 1 0 0 0 0 15 0 0 0 0 0 1 98 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0

-2 0 2 12 95 119 0 0 0 0 0 0 0 0 2 0 0 0 1 12 0 0 0 0 0 2 94 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
+2 0 2 12 98 124 0 0 0 0 0 0 0 0 2 0 0 0 1 12 0 0 0 0 0 2 98 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0

 2 2 2 12 1 0 0 0 0 0 0 0 0 2 2 0 0 0 1 12 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 2 -6 2 12 81 102 0 0 0 0 0 0 0 -6 2 0 0 0 1 12 0 0 0 0 0 2 83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 2 2 2 12 1 0 0 0 0 0 0 0 0 2 2 0 0 0 1 12 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 2 -6 2 12 81 102 0 0 0 0 0 0 0 -6 2 0 0 0 1 12 0 0 0 0 0 2 83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0

-1 -2 2 19 100 127 0 0 0 0 0 0 0 -2 2 0 0 0 1 19 0 0 0 0 0 1 100 5 14 2 61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
+1 -2 2 19 100 127 0 0 0 0 0 0 0 -2 2 0 0 0 1 19 0 0 0 0 0 1 100 5 16 2 63 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0

 4 4 4 12 100 127 0 0 0 0 0 0 0 4 4 0 0 0 1 12 0 0 0 0 0 4 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 0 -6 4 0 0 0 0 0 0 0 0 0 0 -6 4 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 92 healthy 0 0 0 0 0 0 0 0
 2 0 -2 15 100 127 0 0 0 0 0 0 0 0 -2 0 0 0 1 15 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 3 2 -2 15 100 127 0 0 0 0 0 0 0 2 -2 0 0 0 1 15 0 0 0 0 0 3 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 4 4 4 12 100 127 0 0 0 0 0 0 0 4 4 0 0 0 1 12 0 0 0 0 0 4 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 0 -6 4 0 0 0 0 0 0 0 0 0 0 -6 4 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 92 healthy 0 0 0 0 0 0 0 0
 2 0 -2 15 100 127 0 0 0 0 0 0 0 0 -2 0 0 0 1 15 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 3 2 -2 15 100 127 0 0 0 0 0 0 0 2 -2 0 0 0 1 15 0 0 0 0 0 3 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0

-1 -2 -2 19 99 125 0 0 0 0 0 0 0 -2 -2 0 0 0 1 19 0 0 0 0 0 1 99 5 98 2 99 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
+1 -2 -2 19 99 126 0 0 0 0 0 0 0 -2 -2 0 0 0 1 19 0 0 0 0 0 1 99 5 98 2 99 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0

 2 1 -1 15 100 127 0 0 0 0 0 0 0 1 -1 0 0 0 0 15 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 3 3 -1 15 100 127 0 0 0 0 0 0 0 3 -1 0 0 0 1 15 0 0 0 0 0 3 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 -3 -1 15 100 127 0 0 0 0 0 0 0 -3 -1 0 0 0 1 15 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 2 1 -1 15 100 127 0 0 0 0 0 0 0 1 -1 0 0 0 0 15 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 3 3 -1 15 100 127 0 0 0 0 0 0 0 3 -1 0 0 0 1 15 0 0 0 0 0 3 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 -3 -1 15 100 127 0 0 0 0 0 0 0 -3 -1 0 0 0 1 15 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0


@@ -29,28 +29,35 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
 1 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 2 1 -3 1 2 91 115 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torped sonared helpless bombed depth-charged boarded) "bgyujnbgy"
 3 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 1 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 2 1 -3 1 2 91 115 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torped sonared helpless bombed depth-charged boarded) "bgyujnbgy"
 3 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""

-4 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group helpless) "b"
-5 1 -5 1 17 96 63 0 70 0 0 none 0 "a" 0 9 30 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-6 1 -1 3 18 100 97 0 165 0 0 none 0 "a" 0 10 21 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-9 2 -4 -2 17 60 127 0 70 0 0 none 0 "a" 0 10 38 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-10 2 4 4 2 82 53 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+4 1 -5 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group helpless) "b"
+5 1 -5 1 17 96 63 0 70 0 0 none 0 "" 0 9 31 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+6 1 -1 3 18 100 97 0 165 0 0 none 0 "" 0 10 21 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+7 1 -5 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group helpless) "b"
+9 2 -4 -2 17 60 127 0 70 0 0 none 0 "" 0 10 38 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+10 2 4 4 2 83 53 0 20 0 0 none 0 "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""

 11 2 1 3 2 91 99 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 11 2 1 3 2 91 99 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""

-20 2 -3 1 2 95 121 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (helpless) "u"
-30 0 0 2 2 0 117 0 20 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
+20 2 -3 1 2 95 120 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (helpless) "u"
+24 1 -4 2 2 100 127 0 20 0 0 none 0 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "ggg"
+25 2 -8 2 2 91 81 0 20 0 0 none 0 "g" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g"
+26 2 -4 4 2 100 97 0 20 0 0 none 0 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+27 2 -4 4 2 100 97 0 20 0 0 none 0 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+28 2 -8 2 2 100 97 0 20 0 0 none 0 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group bombed) "g"
+29 2 1 3 2 100 97 0 20 0 0 none 0 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g"
+30 0 0 2 2 0 117 0 20 0 0 none 0 "c" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "n"

 31 2 0 2 2 100 127 0 20 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
 31 2 0 2 2 100 127 0 20 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"

-32 2 0 2 2 94 120 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
-33 2 2 2 2 94 120 0 20 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
-34 2 3 1 2 92 116 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
-35 2 0 2 2 94 0 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
-40 2 1 3 10 91 -7 0 45 0 2 none 1 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "nnnh"
+32 2 0 2 2 100 127 0 20 0 0 none 0 "c" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "n"
+33 2 2 2 2 94 119 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
+34 2 3 1 2 92 117 0 20 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
+35 2 0 2 2 100 0 0 20 0 0 none 0 "c" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "n"
+40 2 1 3 10 91 -8 0 45 0 2 none 1 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "nnnh"

 41 2 1 3 10 96 109 0 45 0 2 none 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "uh"
 41 2 1 3 10 96 109 0 45 0 2 none 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "uh"

-42 2 -4 2 10 95 121 0 45 -4 2 interdiction 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "ugggh"
-43 2 -6 4 16 75 85 0 40 0 0 none 0 "m" 0 8 2 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g"
-44 2 -6 4 16 70 77 0 40 0 0 none 0 "m" 0 7 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g"
+42 2 -4 2 10 95 121 0 45 -4 2 interdiction 1 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "ugggh"
+43 2 -6 4 16 65 74 0 40 0 0 none 0 "m" 0 7 2 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g"
+44 2 -6 4 16 61 67 0 40 0 0 none 0 "m" 0 6 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g"

 50 2 -9 1 18 67 33 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 51 2 -9 1 18 64 27 0 60 0 0 none 0 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 50 2 -9 1 18 67 33 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 51 2 -9 1 18 64 27 0 60 0 0 none 0 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""

-52 2 -9 1 18 73 44 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-53 2 -4 -2 18 73 92 0 60 0 0 none 0 "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (helpless) "gg"
+52 2 -9 1 18 73 45 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+53 2 -4 -2 18 73 92 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (helpless) "gg"

 60 2 -6 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured helpless bombed) "nn"
 61 2 -4 4 17 73 65 0 70 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 62 2 -4 4 17 67 55 0 70 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 60 2 -6 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured helpless bombed) "nn"
 61 2 -4 4 17 73 65 0 70 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 62 2 -4 4 17 67 55 0 70 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""


@@ -92,7 +99,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range
 22 1 -2 2 7 100 117 0 400 0 0 none 0 "" 15 0 -1 -1 () 0 0.00000
 23 1 -2 2 7 100 117 0 400 0 0 none 0 "" 15 0 -1 -1 () 0 0.00000
 24 1 -2 2 7 100 117 0 400 0 0 none 0 "" 15 0 -1 -1 () 0 0.00000
 22 1 -2 2 7 100 117 0 400 0 0 none 0 "" 15 0 -1 -1 () 0 0.00000
 23 1 -2 2 7 100 117 0 400 0 0 none 0 "" 15 0 -1 -1 () 0 0.00000
 24 1 -2 2 7 100 117 0 400 0 0 none 0 "" 15 0 -1 -1 () 0 0.00000

-30 1 -2 2 17 99 25 0 400 0 0 none 0 "" 18 0 -1 -1 () 0 0.00000
+30 1 -2 2 17 99 27 0 400 0 0 none 0 "" 18 0 -1 -1 () 0 0.00000

 49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
 /config
 config land
 49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
 /config
 config land


@@ -101,22 +108,29 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
 1 1 -3 1 2 100 127 0 50 0 0 none 0 "a" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 2 1 -3 1 2 92 117 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "yujnbgyuj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 3 1 -3 1 2 100 127 0 50 0 0 none 0 "a" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 1 1 -3 1 2 100 127 0 50 0 0 none 0 "a" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 2 1 -3 1 2 92 117 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "yujnbgyuj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 3 1 -3 1 2 100 127 0 50 0 0 none 0 "a" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0

-4 1 -3 1 2 100 127 0 50 0 0 none 0 "a" -1 127 42 (group helpless) "b" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-9 2 0 2 7 97 123 0 50 0 0 none 0 "" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+4 1 -4 0 2 100 127 0 50 0 0 none 0 "a" -1 127 42 (group helpless) "b" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+7 1 -4 0 2 100 127 0 50 0 0 none 0 "a" -1 127 42 (group helpless) "b" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+9 2 0 2 7 99 126 0 50 0 0 none 0 "" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0

 10 2 4 0 0 70 69 0 50 0 0 none 0 "" -1 127 42 (bombed) "y" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 10 2 4 0 0 70 69 0 50 0 0 none 0 "" -1 127 42 (bombed) "y" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0

-30 0 0 2 0 0 105 0 50 0 0 none 0 "" -1 127 42 (bombed) "j" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-31 2 0 2 0 100 127 0 50 0 0 none 0 "" 35 127 42 (bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-32 2 2 2 0 85 88 0 50 0 0 none 0 "" -1 127 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+24 1 3 1 0 100 127 0 50 0 0 none 0 "g" -1 127 42 (group bombed) "bhg" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+25 2 2 2 0 86 89 0 50 0 0 none 0 "g" -1 127 42 (group bombed) "g" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+26 2 4 0 0 100 117 0 50 0 0 none 0 "g" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+27 2 4 0 0 100 117 0 50 0 0 none 0 "g" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+28 2 2 2 0 100 107 0 50 0 0 none 0 "g" -1 127 42 (group injured) "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+29 2 3 1 0 100 117 0 50 0 0 none 0 "g" -1 127 42 (group bombed) "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+30 0 0 2 0 0 105 0 50 0 0 none 0 "c" -1 127 42 (group bombed) "j" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+31 2 0 2 0 100 127 0 50 0 0 none 0 "c" 35 127 42 (group bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+32 2 0 2 0 100 127 0 50 0 0 none 0 "c" -1 127 42 (group bombed) "j" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0

 33 2 1 1 0 85 98 0 50 0 0 none 0 "" -1 127 42 () "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 33 2 1 1 0 85 98 0 50 0 0 none 0 "" -1 127 42 () "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0

-34 2 0 2 0 100 127 0 50 0 0 none 0 "" -1 127 42 (bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 9 0
-35 2 0 2 0 85 0 0 50 0 0 none 0 "" -1 127 42 (bombed) "j" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+34 2 0 2 0 100 127 0 50 0 0 none 0 "c" -1 127 42 (group bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 9 0
+35 2 0 2 0 100 0 0 50 0 0 none 0 "c" -1 127 42 (group bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0

 40 2 2 2 0 91 -14 0 50 1 1 none 3 "" -1 127 42 (bombed) "u" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 41 2 3 1 0 89 103 0 50 1 1 none 3 "" -1 127 42 (bombed) "y" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 42 2 1 1 0 86 109 0 50 1 1 reserve 3 "" -1 127 42 (bombed) "g" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 43 2 1 1 15 100 127 0 130 0 0 none 0 "m" -1 127 42 (group bombed) "yu" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 44 2 1 -1 15 90 88 0 130 0 0 none 0 "m" -1 127 42 () "" 0 9 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 60 2 0 0 0 100 127 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "nj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 40 2 2 2 0 91 -14 0 50 1 1 none 3 "" -1 127 42 (bombed) "u" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 41 2 3 1 0 89 103 0 50 1 1 none 3 "" -1 127 42 (bombed) "y" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 42 2 1 1 0 86 109 0 50 1 1 reserve 3 "" -1 127 42 (bombed) "g" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 43 2 1 1 15 100 127 0 130 0 0 none 0 "m" -1 127 42 (group bombed) "yu" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 44 2 1 -1 15 90 88 0 130 0 0 none 0 "m" -1 127 42 () "" 0 9 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 60 2 0 0 0 100 127 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "nj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0

-61 2 3 1 0 79 80 0 50 0 0 none 0 "" -1 127 42 () "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+61 2 3 1 0 79 79 0 50 0 0 none 0 "" -1 127 42 () "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0

 62 2 0 0 0 100 127 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "nj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 63 2 0 0 0 100 127 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "nj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 64 2 0 0 0 100 127 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "nj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 62 2 0 0 0 100 127 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "nj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 63 2 0 0 0 100 127 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "nj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 64 2 0 0 0 100 127 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "nj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0


@@ -127,7 +141,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile p
 /config
 config news
 actor action victim times duration time
 /config
 config news
 actor action victim times duration time

-1 11 2 14 0 0
+1 11 2 13 0 0

 2 25 0 2 0 0
 1 11 1 1 0 0
 2 14 1 2 0 0
 2 25 0 2 0 0
 1 11 1 1 0 0
 2 14 1 2 0 0


@@ -136,7 +150,7 @@ actor action victim times duration time
 1 48 2 1 0 0
 2 13 0 3 0 0
 1 19 2 1 0 0
 1 48 2 1 0 0
 2 13 0 3 0 0
 1 19 2 1 0 0

-1 55 2 12 0 0
+1 55 2 11 0 0

 1 55 1 1 0 0
 /config
 config trade
 1 55 1 1 0 0
 /config
 config trade

diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log
index 9adfc05e1348a6c1842ed3d4d86082a7b7a8ecf3..dee210a2f1995b2b0270b3bfca8d0105451d5036 100644 (file)
--- a/tests/retreat/journal.log
+++ b/tests/retreat/journal.log
@@ -65,20 +65,28 @@
     Play#1 input retr a ?uid=4 b h
     Play#1 command retreat
     Play#1 output Play#1 1 shp#     ship type       x,y   fl path       as flt?  flags
     Play#1 input retr a ?uid=4 b h
     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    4 cs   cargo ship    -3,1    a b          Yes      h
+    Play#1 output Play#1 1    4 cs   cargo ship    -5,1    a b          Yes      h

     Play#1 output Play#1 1 1 ship
     Play#1 output Play#1 6 0 636
     Play#1 output Play#1 1 1 ship
     Play#1 output Play#1 6 0 636

+    Play#1 input fleet a 7
+    Play#1 command fleetadd
+    Play#1 output Play#1 1 1 ship added to fleet `a'
+    Play#1 output Play#1 6 0 636
+    Play#1 input __cmd added 1 0 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 636

     Play#1 input retr
     Play#1 command retreat
     Play#1 output Play#1 4 ship(s)?
     Play#1 input retr
     Play#1 command retreat
     Play#1 output Play#1 4 ship(s)?

-    Play#1 input 0/1/2/3/4
+    Play#1 input 0/1/2/3/4/7

     Play#1 output Play#1 1 shp#     ship type       x,y   fl path       as flt?  flags
     Play#1 output Play#1 1    0 cs   cargo ship    -3,1    a
     Play#1 output Play#1 1    1 cs   cargo ship    -3,1    a
     Play#1 output Play#1 1    2 cs   cargo ship    -3,1      bgyujnbgy           itshbdu
     Play#1 output Play#1 1    3 cs   cargo ship    -3,1    a
     Play#1 output Play#1 1 shp#     ship type       x,y   fl path       as flt?  flags
     Play#1 output Play#1 1    0 cs   cargo ship    -3,1    a
     Play#1 output Play#1 1    1 cs   cargo ship    -3,1    a
     Play#1 output Play#1 1    2 cs   cargo ship    -3,1      bgyujnbgy           itshbdu
     Play#1 output Play#1 1    3 cs   cargo ship    -3,1    a

-    Play#1 output Play#1 1    4 cs   cargo ship    -3,1    a b          Yes      h
-    Play#1 output Play#1 1 5 ships
+    Play#1 output Play#1 1    4 cs   cargo ship    -5,1    a b          Yes      h
+    Play#1 output Play#1 1    7 cs   cargo ship    -5,1    a b          Yes      h
+    Play#1 output Play#1 1 6 ships

     Play#1 output Play#1 6 0 635
     Play#1 input lret 0 garbage i
     Play#1 command lretreat
     Play#1 output Play#1 6 0 635
     Play#1 input lret 0 garbage i
     Play#1 command lretreat


@@ -121,20 +129,28 @@
     Play#1 input lret a ?uid=4 b h
     Play#1 command lretreat
     Play#1 output Play#1 1 lnd#     unit type       x,y   ar path       as army? flags
     Play#1 input lret a ?uid=4 b h
     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    4 inf  infantry      -3,1    a b          Yes      h
+    Play#1 output Play#1 1    4 inf  infantry      -4,0    a b          Yes      h

     Play#1 output Play#1 1 1 unit
     Play#1 output Play#1 6 0 631
     Play#1 output Play#1 1 1 unit
     Play#1 output Play#1 6 0 631

+    Play#1 input army a 7
+    Play#1 command army
+    Play#1 output Play#1 1 1 unit added to army `a'
+    Play#1 output Play#1 6 0 631
+    Play#1 input __cmd added 1 0 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 631

     Play#1 input lret
     Play#1 command lretreat
     Play#1 output Play#1 4 land(s)?
     Play#1 input lret
     Play#1 command lretreat
     Play#1 output Play#1 4 land(s)?

-    Play#1 input 0/1/2/3/4
+    Play#1 input 0/1/2/3/4/7

     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
     Play#1 output Play#1 1    2 inf  infantry      -3,1      yujnbgyuj           ihb
     Play#1 output Play#1 1    3 inf  infantry      -3,1    a
     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
     Play#1 output Play#1 1    2 inf  infantry      -3,1      yujnbgyuj           ihb
     Play#1 output Play#1 1    3 inf  infantry      -3,1    a

-    Play#1 output Play#1 1    4 inf  infantry      -3,1    a b          Yes      h
-    Play#1 output Play#1 1 5 units
+    Play#1 output Play#1 1    4 inf  infantry      -4,0    a b          Yes      h
+    Play#1 output Play#1 1    7 inf  infantry      -4,0    a b          Yes      h
+    Play#1 output Play#1 1 6 units

     Play#1 output Play#1 6 0 630
     Play#1 input fire se -2,2 30
     Play#1 command fire
     Play#1 output Play#1 6 0 630
     Play#1 input fire se -2,2 30
     Play#1 command fire


@@ -144,15 +160,8 @@
     Play#1 output Play#1 1 Shells hit cs   cargo ship (#30) in 0,2 for 10 damage.
     Play#1 output Play#1 1 cs   cargo ship (#30) sunk!
     Play#1 output Play#1 6 0 629
     Play#1 output Play#1 1 Shells hit cs   cargo ship (#30) in 0,2 for 10 damage.
     Play#1 output Play#1 1 cs   cargo ship (#30) sunk!
     Play#1 output Play#1 6 0 629

-    Play#1 input __cmd added -1 -1 0
+    Play#1 input __cmd added -2 -2 0

     Play#1 command __cmd
     Play#1 command __cmd

-    Play#1 output Play#1 6 0 628
-    Play#1 input fire se -2,2 32
-    Play#1 command fire
-    Play#1 output Play#1 1 Sector -2,2 ready to fire
-    Play#1 output Play#1 1 range is 4.00 (4.50)
-    Play#1 output Play#1 1 \007Kaboom!!!
-    Play#1 output Play#1 1 Shells hit cs   cargo ship (#32) in 0,2 for 8 damage.

     Play#1 output Play#1 6 0 627
     Play#1 input fire se -2,2 33
     Play#1 command fire
     Play#1 output Play#1 6 0 627
     Play#1 input fire se -2,2 33
     Play#1 command fire


@@ -168,12 +177,8 @@
     Play#1 output Play#1 1 \007Kaboom!!!
     Play#1 output Play#1 1 Shells hit cs   cargo ship (#34) in 3,1 for 10 damage.
     Play#1 output Play#1 6 0 625
     Play#1 output Play#1 1 \007Kaboom!!!
     Play#1 output Play#1 1 Shells hit cs   cargo ship (#34) in 3,1 for 10 damage.
     Play#1 output Play#1 6 0 625

-    Play#1 input fire se -2,2 35
-    Play#1 command fire
-    Play#1 output Play#1 1 Sector -2,2 ready to fire
-    Play#1 output Play#1 1 range is 5.00 (4.50)
-    Play#1 output Play#1 1 \007Kaboom!!!
-    Play#1 output Play#1 1 Shells hit cs   cargo ship (#35) in 0,2 for 8 damage.
+    Play#1 input __cmd added -1 -1 0
+    Play#1 command __cmd

     Play#1 output Play#1 6 0 624
     Play#1 input fire se -2,2 40
     Play#1 command fire
     Play#1 output Play#1 6 0 624
     Play#1 input fire se -2,2 40
     Play#1 command fire


@@ -249,6 +254,16 @@
     Play#1 output Play#1 1 Defenders fire back!
     Play#1 output Play#1 1 Return fire hit sector -2,-2 for 8 damage.
     Play#1 output Play#1 6 0 614
     Play#1 output Play#1 1 Defenders fire back!
     Play#1 output Play#1 1 Return fire hit sector -2,-2 for 8 damage.
     Play#1 output Play#1 6 0 614

+    Play#1 input fire se -2,2 25
+    Play#1 command fire
+    Play#1 output Play#1 1 Sector -2,2 ready to fire
+    Play#1 output Play#1 1 range is 4.00 (4.50)
+    Play#1 output Play#1 1 \007Kaboom!!!
+    Play#1 output Play#1 1 Shells hit cs   cargo ship (#25) in -4,2 for 11 damage.
+    Play#1 output Play#1 6 0 613
+    Play#1 input __cmd added 1 1 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 614

     Play#1 input fire sh 5 50
     Play#1 command fire
     Play#1 output Play#1 1 dd   destroyer (#5) ready to fire
     Play#1 input fire sh 5 50
     Play#1 command fire
     Play#1 output Play#1 1 dd   destroyer (#5) ready to fire


@@ -673,33 +688,8 @@
     Play#1 input 30
     Play#1 output Play#1 1 83% hitchance...Blam
     Play#1 output Play#1 6 0 567
     Play#1 input 30
     Play#1 output Play#1 1 83% hitchance...Blam
     Play#1 output Play#1 6 0 567

-    Play#1 input bomb 30 . p -2,2 jh
-    Play#1 command bomb
-    Play#1 output Play#1 1 No escorts...
-    Play#1 output Play#1 1 target sector is 0,2
-    Play#1 output Play#1 1 range to target is 1
-    Play#1 output Play#1 1 ac   AH-64 Apache #30 standing by
-    Play#1 output Play#1 1 ac   AH-64 Apache #30 equipped
-    Play#1 output Play#1 1 flying over fortress at -2,2
-    Play#1 output Play#1 1 flying over harbor at 0,2
-    Play#1 output Play#1 1 Target sector is a completely constructed harbor
-    Play#1 output Play#1 1  #          owner           eff       type
-    Play#1 output Play#1 1 (# 31)          2    completely  cs   cargo ship (#31)
-    Play#1 output Play#1 1 (# 32)          2    completely  cs   cargo ship (#32)
-    Play#1 output Play#1 1 (# 35)          2    completely  cs   cargo ship (#35)
-    Play#1 output Play#1 1  #          owner           eff       type
-    Play#1 output Play#1 1 (#  9)          2    completely  tra  train #9
-    Play#1 output Play#1 1 (# 32)          2    completely  cav  cavalry #32
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
-    Play#1 output Play#1 4 Bomb what? (ship, plane, land unit, efficiency, commodities)
-    Play#1 input l
-    Play#1 output Play#1 1  #          owner           eff       type
-    Play#1 output Play#1 1 (#  9)          2    completely  tra  train #9
-    Play#1 output Play#1 1 (# 32)          2    completely  cav  cavalry #32
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
-    Play#1 output Play#1 4 ac   AH-64 Apache #30, 1 bombs.  Target ('~' to skip)?
-    Play#1 input 32
-    Play#1 output Play#1 1 72% hitchance...Blam
+    Play#1 input __cmd added -1 -2 0
+    Play#1 command __cmd

     Play#1 output Play#1 6 0 565
     Play#1 input bomb 30 . p -2,2 uh
     Play#1 command bomb
     Play#1 output Play#1 6 0 565
     Play#1 input bomb 30 . p -2,2 uh
     Play#1 command bomb


@@ -722,31 +712,8 @@
     Play#1 output Play#1 1 72% hitchance...Blam
     Play#1 output Play#1 1 -1,1 takes 4% collateral damage
     Play#1 output Play#1 6 0 563
     Play#1 output Play#1 1 72% hitchance...Blam
     Play#1 output Play#1 1 -1,1 takes 4% collateral damage
     Play#1 output Play#1 6 0 563

-    Play#1 input bomb 30 . p -2,2 jh
-    Play#1 command bomb
-    Play#1 output Play#1 1 No escorts...
-    Play#1 output Play#1 1 target sector is 0,2
-    Play#1 output Play#1 1 range to target is 1
-    Play#1 output Play#1 1 ac   AH-64 Apache #30 standing by
-    Play#1 output Play#1 1 ac   AH-64 Apache #30 equipped
-    Play#1 output Play#1 1 flying over fortress at -2,2
-    Play#1 output Play#1 1 flying over harbor at 0,2
-    Play#1 output Play#1 1 Target sector is a completely constructed harbor
-    Play#1 output Play#1 1  #          owner           eff       type
-    Play#1 output Play#1 1 (# 31)          2    completely  cs   cargo ship (#31)
-    Play#1 output Play#1 1 (# 32)          2    completely  cs   cargo ship (#32)
-    Play#1 output Play#1 1 (# 35)          2    completely  cs   cargo ship (#35)
-    Play#1 output Play#1 1  #          owner           eff       type
-    Play#1 output Play#1 1 (#  9)          2    completely  tra  train #9
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
-    Play#1 output Play#1 4 Bomb what? (ship, plane, land unit, efficiency, commodities)
-    Play#1 input l
-    Play#1 output Play#1 1  #          owner           eff       type
-    Play#1 output Play#1 1 (#  9)          2    completely  tra  train #9
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
-    Play#1 output Play#1 4 ac   AH-64 Apache #30, 1 bombs.  Target ('~' to skip)?
-    Play#1 input 35
-    Play#1 output Play#1 1 72% hitchance...Blam
+    Play#1 input __cmd added -1 -2 0
+    Play#1 command __cmd

     Play#1 output Play#1 6 0 561
     Play#1 input bomb 30 . p -2,2 ujh
     Play#1 command bomb
     Play#1 output Play#1 6 0 561
     Play#1 input bomb 30 . p -2,2 ujh
     Play#1 command bomb


@@ -920,11 +887,21 @@
     Play#1 output Play#1 1 (# 34)          2    completely  cs   cargo ship (#34)
     Play#1 output Play#1 1  #          owner           eff       type
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 34)          2    completely  cs   cargo ship (#34)
     Play#1 output Play#1 1  #          owner           eff       type
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10

+    Play#1 output Play#1 1 (# 24)          1    completely  cav  cavalry #24
+    Play#1 output Play#1 1 (# 25)          2    completely  cav  cavalry #25
+    Play#1 output Play#1 1 (# 26)          2    completely  cav  cavalry #26
+    Play#1 output Play#1 1 (# 27)          2    completely  cav  cavalry #27
+    Play#1 output Play#1 1 (# 28)          2    completely  cav  cavalry #28

     Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
     Play#1 output Play#1 4 Bomb what? (ship, plane, land unit, efficiency, commodities)
     Play#1 input l
     Play#1 output Play#1 1  #          owner           eff       type
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
     Play#1 output Play#1 4 Bomb what? (ship, plane, land unit, efficiency, commodities)
     Play#1 input l
     Play#1 output Play#1 1  #          owner           eff       type
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10

+    Play#1 output Play#1 1 (# 24)          1    completely  cav  cavalry #24
+    Play#1 output Play#1 1 (# 25)          2    completely  cav  cavalry #25
+    Play#1 output Play#1 1 (# 26)          2    completely  cav  cavalry #26
+    Play#1 output Play#1 1 (# 27)          2    completely  cav  cavalry #27
+    Play#1 output Play#1 1 (# 28)          2    completely  cav  cavalry #28

     Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
     Play#1 output Play#1 4 ac   AH-64 Apache #30, 1 bombs.  Target ('~' to skip)?
     Play#1 input 10
     Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
     Play#1 output Play#1 4 ac   AH-64 Apache #30, 1 bombs.  Target ('~' to skip)?
     Play#1 input 10


@@ -946,11 +923,21 @@
     Play#1 output Play#1 1 (# 34)          2    completely  cs   cargo ship (#34)
     Play#1 output Play#1 1  #          owner           eff       type
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 34)          2    completely  cs   cargo ship (#34)
     Play#1 output Play#1 1  #          owner           eff       type
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10

+    Play#1 output Play#1 1 (# 24)          1    completely  cav  cavalry #24
+    Play#1 output Play#1 1 (# 25)          2    completely  cav  cavalry #25
+    Play#1 output Play#1 1 (# 26)          2    completely  cav  cavalry #26
+    Play#1 output Play#1 1 (# 27)          2    completely  cav  cavalry #27
+    Play#1 output Play#1 1 (# 28)          2    completely  cav  cavalry #28

     Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
     Play#1 output Play#1 4 Bomb what? (ship, plane, land unit, efficiency, commodities)
     Play#1 input l
     Play#1 output Play#1 1  #          owner           eff       type
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
     Play#1 output Play#1 4 Bomb what? (ship, plane, land unit, efficiency, commodities)
     Play#1 input l
     Play#1 output Play#1 1  #          owner           eff       type
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10

+    Play#1 output Play#1 1 (# 24)          1    completely  cav  cavalry #24
+    Play#1 output Play#1 1 (# 25)          2    completely  cav  cavalry #25
+    Play#1 output Play#1 1 (# 26)          2    completely  cav  cavalry #26
+    Play#1 output Play#1 1 (# 27)          2    completely  cav  cavalry #27
+    Play#1 output Play#1 1 (# 28)          2    completely  cav  cavalry #28

     Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
     Play#1 output Play#1 4 ac   AH-64 Apache #30, 1 bombs.  Target ('~' to skip)?
     Play#1 input 10
     Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
     Play#1 output Play#1 4 ac   AH-64 Apache #30, 1 bombs.  Target ('~' to skip)?
     Play#1 input 10


@@ -972,7 +959,6 @@
     Play#1 output Play#1 1 (#  1)          1    completely  inf  infantry #1
     Play#1 output Play#1 1 (#  2)          1    completely  inf  infantry #2
     Play#1 output Play#1 1 (#  3)          1    completely  inf  infantry #3
     Play#1 output Play#1 1 (#  1)          1    completely  inf  infantry #1
     Play#1 output Play#1 1 (#  2)          1    completely  inf  infantry #2
     Play#1 output Play#1 1 (#  3)          1    completely  inf  infantry #3

-    Play#1 output Play#1 1 (#  4)          1    completely  inf  infantry #4

     Play#1 output Play#1 4 Bomb what? (ship, plane, land unit, efficiency, commodities)
     Play#1 input l
     Play#1 output Play#1 1  #          owner           eff       type
     Play#1 output Play#1 4 Bomb what? (ship, plane, land unit, efficiency, commodities)
     Play#1 input l
     Play#1 output Play#1 1  #          owner           eff       type


@@ -980,7 +966,6 @@
     Play#1 output Play#1 1 (#  1)          1    completely  inf  infantry #1
     Play#1 output Play#1 1 (#  2)          1    completely  inf  infantry #2
     Play#1 output Play#1 1 (#  3)          1    completely  inf  infantry #3
     Play#1 output Play#1 1 (#  1)          1    completely  inf  infantry #1
     Play#1 output Play#1 1 (#  2)          1    completely  inf  infantry #2
     Play#1 output Play#1 1 (#  3)          1    completely  inf  infantry #3

-    Play#1 output Play#1 1 (#  4)          1    completely  inf  infantry #4

     Play#1 output Play#1 4 ac   AH-64 Apache #30, 1 bombs.  Target ('~' to skip)?
     Play#1 input 2
     Play#1 output Play#1 1 73% hitchance...Blam
     Play#1 output Play#1 4 ac   AH-64 Apache #30, 1 bombs.  Target ('~' to skip)?
     Play#1 input 2
     Play#1 output Play#1 1 73% hitchance...Blam


@@ -988,6 +973,43 @@
     Play#1 output Play#1 1     inf  infantry #2 takes 8
     Play#1 output Play#1 1 -3,1 takes 3% collateral damage
     Play#1 output Play#1 6 0 545
     Play#1 output Play#1 1     inf  infantry #2 takes 8
     Play#1 output Play#1 1 -3,1 takes 3% collateral damage
     Play#1 output Play#1 6 0 545

+    Play#1 input bomb 30 . p -2,2 ujjh
+    Play#1 command bomb
+    Play#1 output Play#1 1 No escorts...
+    Play#1 output Play#1 1 target sector is 3,1
+    Play#1 output Play#1 1 range to target is 3
+    Play#1 output Play#1 1 ac   AH-64 Apache #30 standing by
+    Play#1 output Play#1 1 ac   AH-64 Apache #30 equipped
+    Play#1 output Play#1 1 flying over fortress at -2,2
+    Play#1 output Play#1 1 flying over agribusiness at -1,1
+    Play#1 output Play#1 1 flying over agribusiness at 1,1
+    Play#1 output Play#1 1 flying over agribusiness at 3,1
+    Play#1 output Play#1 1 Target sector is a completely constructed agribusiness
+    Play#1 output Play#1 1  #          owner           eff       type
+    Play#1 output Play#1 1 (# 34)          2    completely  cs   cargo ship (#34)
+    Play#1 output Play#1 1  #          owner           eff       type
+    Play#1 output Play#1 1 (# 24)          1    completely  cav  cavalry #24
+    Play#1 output Play#1 1 (# 25)          2    completely  cav  cavalry #25
+    Play#1 output Play#1 1 (# 26)          2    completely  cav  cavalry #26
+    Play#1 output Play#1 1 (# 27)          2    completely  cav  cavalry #27
+    Play#1 output Play#1 1 (# 28)          2    completely  cav  cavalry #28
+    Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
+    Play#1 output Play#1 4 Bomb what? (ship, plane, land unit, efficiency, commodities)
+    Play#1 input l
+    Play#1 output Play#1 1  #          owner           eff       type
+    Play#1 output Play#1 1 (# 24)          1    completely  cav  cavalry #24
+    Play#1 output Play#1 1 (# 25)          2    completely  cav  cavalry #25
+    Play#1 output Play#1 1 (# 26)          2    completely  cav  cavalry #26
+    Play#1 output Play#1 1 (# 27)          2    completely  cav  cavalry #27
+    Play#1 output Play#1 1 (# 28)          2    completely  cav  cavalry #28
+    Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
+    Play#1 output Play#1 4 ac   AH-64 Apache #30, 1 bombs.  Target ('~' to skip)?
+    Play#1 input 25
+    Play#1 output Play#1 1 71% hitchance...Blam
+    Play#1 output Play#1 6 0 543
+    Play#1 input __cmd added 1 2 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 545

     Play#1 input bomb 20/21/22/23/24 . p -2,2 uuh
     Play#1 command bomb
     Play#1 output Play#1 1 No escorts...
     Play#1 input bomb 20/21/22/23/24 . p -2,2 uuh
     Play#1 command bomb
     Play#1 output Play#1 1 No escorts...


@@ -1087,10 +1109,6 @@
     Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#30) in 0,2 for 10 damage.
     Play#0 output Play#0 1     cs   cargo ship (#30) takes 8
     Play#0 output Play#0 1     cs   cargo ship (#30) sunk!
     Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#30) in 0,2 for 10 damage.
     Play#0 output Play#0 1     cs   cargo ship (#30) takes 8
     Play#0 output Play#0 1     cs   cargo ship (#30) sunk!

-    Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#32) in 0,2 for 8 damage.
-    Play#0 output Play#0 1     cs   cargo ship (#32) takes 6
-    Play#0 output Play#0 1 cs   cargo ship (#32) was damaged,
-    Play#0 output Play#0 1 but had no crew, and couldn't retreat!

     Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#33) in 2,2 for 8 damage.
     Play#0 output Play#0 1     cs   cargo ship (#33) takes 6
     Play#0 output Play#0 1 cs   cargo ship (#33) was damaged,
     Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#33) in 2,2 for 8 damage.
     Play#0 output Play#0 1     cs   cargo ship (#33) takes 6
     Play#0 output Play#0 1 cs   cargo ship (#33) was damaged,


@@ -1099,10 +1117,6 @@
     Play#0 output Play#0 1     cs   cargo ship (#34) takes 8
     Play#0 output Play#0 1 cs   cargo ship (#34) was damaged,
     Play#0 output Play#0 1 but was landlocked, and couldn't retreat!
     Play#0 output Play#0 1     cs   cargo ship (#34) takes 8
     Play#0 output Play#0 1 cs   cargo ship (#34) was damaged,
     Play#0 output Play#0 1 but was landlocked, and couldn't retreat!

-    Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#35) in 0,2 for 8 damage.
-    Play#0 output Play#0 1     cs   cargo ship (#35) takes 6
-    Play#0 output Play#0 1 cs   cargo ship (#35) was damaged,
-    Play#0 output Play#0 1 but had no mobility, and couldn't retreat!

     Play#0 output Play#0 1 Country #1 shelled lc   light cruiser (#40) in 0,2 for 14 damage.
     Play#0 output Play#0 1     lc   light cruiser (#40) takes 9
     Play#0 output Play#0 1 lc   light cruiser (#40) was damaged,
     Play#0 output Play#0 1 Country #1 shelled lc   light cruiser (#40) in 0,2 for 14 damage.
     Play#0 output Play#0 1     lc   light cruiser (#40) takes 9
     Play#0 output Play#0 1 lc   light cruiser (#40) was damaged,


@@ -1120,11 +1134,11 @@
     Play#0 output Play#0 1 ms   minesweeper (#44) cleared 4 mines in -6,4 while retreating
     Play#0 output Play#0 1 ms   minesweeper (#44) was damaged,
     Play#0 output Play#0 1 and hit a mine in -6,4 while retreating!
     Play#0 output Play#0 1 ms   minesweeper (#44) cleared 4 mines in -6,4 while retreating
     Play#0 output Play#0 1 ms   minesweeper (#44) was damaged,
     Play#0 output Play#0 1 and hit a mine in -6,4 while retreating!

-    Play#0 output Play#0 1     ms   minesweeper (#44) takes 22
+    Play#0 output Play#0 1     ms   minesweeper (#44) takes 32

     Play#0 output Play#0 1 ms   minesweeper (#43) cleared 2 mines in -6,4 while retreating
     Play#0 output Play#0 1 ms   minesweeper (#43) retreated with a damaged friend,
     Play#0 output Play#0 1 and hit a mine in -6,4 while retreating!
     Play#0 output Play#0 1 ms   minesweeper (#43) cleared 2 mines in -6,4 while retreating
     Play#0 output Play#0 1 ms   minesweeper (#43) retreated with a damaged friend,
     Play#0 output Play#0 1 and hit a mine in -6,4 while retreating!

-    Play#0 output Play#0 1     ms   minesweeper (#43) takes 25
+    Play#0 output Play#0 1     ms   minesweeper (#43) takes 35

     Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#10) in 0,2 for 11 damage.
     Play#0 output Play#0 1     cs   cargo ship (#10) takes 9
     Play#0 output Play#0 1 cs   cargo ship (#10) was damaged, and retreated to 1,3
     Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#10) in 0,2 for 11 damage.
     Play#0 output Play#0 1     cs   cargo ship (#10) takes 9
     Play#0 output Play#0 1 cs   cargo ship (#10) was damaged, and retreated to 1,3


@@ -1140,6 +1154,13 @@
     Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#20) in -3,1 for 6 damage.
     Play#0 output Play#0 1     cs   cargo ship (#20) takes 5
     Play#0 output Play#0 1 Return fire hit sector -2,-2 for 8 damage.
     Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#20) in -3,1 for 6 damage.
     Play#0 output Play#0 1     cs   cargo ship (#20) takes 5
     Play#0 output Play#0 1 Return fire hit sector -2,-2 for 8 damage.

+    Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#25) in -4,2 for 11 damage.
+    Play#0 output Play#0 1     cs   cargo ship (#25) takes 9
+    Play#0 output Play#0 1 cs   cargo ship (#25) was damaged, and retreated to -8,2
+    Play#0 output Play#0 1 cs   cargo ship (#26) retreated with a damaged friend, and ended up at -4,4
+    Play#0 output Play#0 1 cs   cargo ship (#27) retreated with a damaged friend, and ended up at -4,4
+    Play#0 output Play#0 1 cs   cargo ship (#28) retreated with a damaged friend, and ended up at -8,2
+    Play#0 output Play#0 1 cs   cargo ship (#29) retreated with a damaged friend, and ended up at 1,3

     Play#0 output Play#0 1 Country #1 shelled sb   submarine (#50) in -5,1 for 42 damage.
     Play#0 output Play#0 1     sb   submarine (#50) takes 33
     Play#0 output Play#0 1 sb   submarine (#50) was damaged, and retreated to -9,1
     Play#0 output Play#0 1 Country #1 shelled sb   submarine (#50) in -5,1 for 42 damage.
     Play#0 output Play#0 1     sb   submarine (#50) takes 33
     Play#0 output Play#0 1 sb   submarine (#50) was damaged, and retreated to -9,1


@@ -1237,21 +1258,10 @@
     Play#0 output Play#0 1     cav  cavalry #30 takes 17
     Play#0 output Play#0 1 0,2 takes 4% collateral damage
     Play#0 output Play#0 1     tra  train #9 takes 1
     Play#0 output Play#0 1     cav  cavalry #30 takes 17
     Play#0 output Play#0 1 0,2 takes 4% collateral damage
     Play#0 output Play#0 1     tra  train #9 takes 1

-    Play#0 output Play#0 1 1 pinpoint bombing raid did 40 damage to cav  cavalry #32
-    Play#0 output Play#0 1     cav  cavalry #32 takes 15
-    Play#0 output Play#0 1 cav  cavalry #32 was bombed, and retreated to 2,2
-    Play#0 output Play#0 1 0,2 takes 4% collateral damage
-    Play#0 output Play#0 1     tra  train #9 takes 1

     Play#0 output Play#0 1 1 planes spotted over -1,1
     Play#0 output Play#0 1 1 pinpoint bombing raid did 40 damage to cav  cavalry #33
     Play#0 output Play#0 1     cav  cavalry #33 takes 15
     Play#0 output Play#0 1 cav  cavalry #33 was bombed, and retreated to 1,1
     Play#0 output Play#0 1 1 planes spotted over -1,1
     Play#0 output Play#0 1 1 pinpoint bombing raid did 40 damage to cav  cavalry #33
     Play#0 output Play#0 1     cav  cavalry #33 takes 15
     Play#0 output Play#0 1 cav  cavalry #33 was bombed, and retreated to 1,1

-    Play#0 output Play#0 1 1 pinpoint bombing raid did 40 damage to cav  cavalry #35
-    Play#0 output Play#0 1     cav  cavalry #35 takes 15
-    Play#0 output Play#0 1 cav  cavalry #35 was bombed,
-    Play#0 output Play#0 1 but had no mobility, and couldn't retreat!
-    Play#0 output Play#0 1 0,2 takes 4% collateral damage
-    Play#0 output Play#0 1     tra  train #9 takes 1

     Play#0 output Play#0 1 1 pinpoint bombing raid did 24 damage to cav  cavalry #40
     Play#0 output Play#0 1     cav  cavalry #40 takes 9
     Play#0 output Play#0 1 cav  cavalry #40 was bombed,
     Play#0 output Play#0 1 1 pinpoint bombing raid did 24 damage to cav  cavalry #40
     Play#0 output Play#0 1     cav  cavalry #40 takes 9
     Play#0 output Play#0 1 cav  cavalry #40 was bombed,


@@ -1290,6 +1300,14 @@
     Play#0 output Play#0 1 cav  cavalry #10 was bombed,
     Play#0 output Play#0 1 but could not retreat to 3,-1!
     Play#0 output Play#0 1 3,1 takes 2% collateral damage
     Play#0 output Play#0 1 cav  cavalry #10 was bombed,
     Play#0 output Play#0 1 but could not retreat to 3,-1!
     Play#0 output Play#0 1 3,1 takes 2% collateral damage

+    Play#0 output Play#0 1 1 pinpoint bombing raid did 36 damage to cav  cavalry #25
+    Play#0 output Play#0 1     cav  cavalry #25 takes 14
+    Play#0 output Play#0 1 cav  cavalry #25 was bombed, and retreated to 2,2
+    Play#0 output Play#0 1 cav  cavalry #26 retreated with a bombed friend, and ended up at 4,0
+    Play#0 output Play#0 1 cav  cavalry #27 retreated with a bombed friend, and ended up at 4,0
+    Play#0 output Play#0 1 cav  cavalry #28 retreated with a bombed friend, and ended up at 2,2
+    Play#0 output Play#0 1 cav  cavalry #29 retreated with a bombed friend, and ended up at 3,1
+    Play#0 output Play#0 1 3,1 takes 4% collateral damage

     Play#0 output Play#0 1 1 planes spotted over 0,0
     Play#0 output Play#0 1 0,0 takes 4% collateral damage
     Play#0 output Play#0 1 1 pinpoint bombing raid did 56 damage to cav  cavalry #61
     Play#0 output Play#0 1 1 planes spotted over 0,0
     Play#0 output Play#0 1 0,0 takes 4% collateral damage
     Play#0 output Play#0 1 1 pinpoint bombing raid did 56 damage to cav  cavalry #61


@@ -1307,27 +1325,34 @@
     Play#0 output Play#0 1   1    1 cs   cargo ship    -3,1    a  100%   0  10   0   0  0  0  0  0 127   20
     Play#0 output Play#0 1   1    2 cs   cargo ship    -3,1        91%   0   9   0   0  0  0  0  0 115   20
     Play#0 output Play#0 1   1    3 cs   cargo ship    -3,1    a  100%   0  10   0   0  0  0  0  0 127   20
     Play#0 output Play#0 1   1    1 cs   cargo ship    -3,1    a  100%   0  10   0   0  0  0  0  0 127   20
     Play#0 output Play#0 1   1    2 cs   cargo ship    -3,1        91%   0   9   0   0  0  0  0  0 115   20
     Play#0 output Play#0 1   1    3 cs   cargo ship    -3,1    a  100%   0  10   0   0  0  0  0  0 127   20

-    Play#0 output Play#0 1   1    4 cs   cargo ship    -3,1    a  100%   0  10   0   0  0  0  0  0 127   20
-    Play#0 output Play#0 1   1    5 dd   destroyer     -5,1    a   96%   0   9   0   0  0  0  0  0  63   70
-    Play#0 output Play#0 1   1    6 sb   submarine     -1,3    a  100%   0  10   0   0  0  0  0  0  97  165
-    Play#0 output Play#0 1   2    9 dd   destroyer     -4,-2   a   60%   0  10   0   0  0  0  0  0 127   70
-    Play#0 output Play#0 1   2   10 cs   cargo ship     4,4        82%   0   9   0   0  0  0  0  0  53   20
+    Play#0 output Play#0 1   1    4 cs   cargo ship    -5,1    a  100%   0  10   0   0  0  0  0  0 127   20
+    Play#0 output Play#0 1   1    5 dd   destroyer     -5,1        96%   0   9   0   0  0  0  0  0  63   70
+    Play#0 output Play#0 1   1    6 sb   submarine     -1,3       100%   0  10   0   0  0  0  0  0  97  165
+    Play#0 output Play#0 1   1    7 cs   cargo ship    -5,1    a  100%   0  10   0   0  0  0  0  0 127   20
+    Play#0 output Play#0 1   2    9 dd   destroyer     -4,-2       60%   0  10   0   0  0  0  0  0 127   70
+    Play#0 output Play#0 1   2   10 cs   cargo ship     4,4        83%   0   8   0   0  0  0  0  0  53   20

     Play#0 output Play#0 1   2   11 cs   cargo ship     1,3        91%   0   9   0   0  0  0  0  0  99   20
     Play#0 output Play#0 1   2   11 cs   cargo ship     1,3        91%   0   9   0   0  0  0  0  0  99   20

-    Play#0 output Play#0 1   2   20 cs   cargo ship    -3,1        95%   0   9   0   0  0  0  0  0 121   20
+    Play#0 output Play#0 1   2   20 cs   cargo ship    -3,1        95%   0   9   0   0  0  0  0  0 120   20
+    Play#0 output Play#0 1   1   24 cs   cargo ship    -4,2    g  100%   0  10   0   0  0  0  0  0 127   20
+    Play#0 output Play#0 1   2   25 cs   cargo ship    -8,2    g   91%   0   9   0   0  0  0  0  0  81   20
+    Play#0 output Play#0 1   2   26 cs   cargo ship    -4,4    g  100%   0  10   0   0  0  0  0  0  97   20
+    Play#0 output Play#0 1   2   27 cs   cargo ship    -4,4    g  100%   0  10   0   0  0  0  0  0  97   20
+    Play#0 output Play#0 1   2   28 cs   cargo ship    -8,2    g  100%   0  10   0   0  0  0  0  0  97   20
+    Play#0 output Play#0 1   2   29 cs   cargo ship     1,3    g  100%   0  10   0   0  0  0  0  0  97   20

     Play#0 output Play#0 1   2   31 cs   cargo ship     0,2       100%   0  10   0   0  0  0  0  0 127   20
     Play#0 output Play#0 1   2   31 cs   cargo ship     0,2       100%   0  10   0   0  0  0  0  0 127   20

-    Play#0 output Play#0 1   2   32 cs   cargo ship     0,2        94%   0   0   0   0  0  0  0  0 120   20
-    Play#0 output Play#0 1   2   33 cs   cargo ship     2,2        94%   0  10   0   0  0  0  0  0 120   20
-    Play#0 output Play#0 1   2   34 cs   cargo ship     3,1        92%   0   9   0   0  0  0  0  0 116   20
-    Play#0 output Play#0 1   2   35 cs   cargo ship     0,2        94%   0   9   0   0  0  0  0  1   0   20
-    Play#0 output Play#0 1   2   40 lc   light cruis    1,3        91%   0   9   0   0  0  0  0  0  -7   45
+    Play#0 output Play#0 1   2   32 cs   cargo ship     0,2    c  100%   0   0   0   0  0  0  0  0 127   20
+    Play#0 output Play#0 1   2   33 cs   cargo ship     2,2        94%   0   9   0   0  0  0  0  0 119   20
+    Play#0 output Play#0 1   2   34 cs   cargo ship     3,1        92%   0  10   0   0  0  0  0  0 117   20
+    Play#0 output Play#0 1   2   35 cs   cargo ship     0,2    c  100%   0  10   0   0  0  0  0  1   0   20
+    Play#0 output Play#0 1   2   40 lc   light cruis    1,3        91%   0   9   0   0  0  0  0  0  -8   45

     Play#0 output Play#0 1   2   41 lc   light cruis    1,3        96%   0  10   0   0  0  0  0  0 109   45
     Play#0 output Play#0 1   2   41 lc   light cruis    1,3        96%   0  10   0   0  0  0  0  0 109   45

-    Play#0 output Play#0 1   2   42 lc   light cruis   -4,2        95%   0  10   0   0  0  0  0  0 121   45
-    Play#0 output Play#0 1   2   43 ms   minesweeper   -6,4    m   75%   0   8   0   0  0  0  0  0  85   40
-    Play#0 output Play#0 1   2   44 ms   minesweeper   -6,4    m   70%   0   7   0   0  0  0  0  0  77   40
+    Play#0 output Play#0 1   2   42 lc   light cruis   -4,2        95%   0   9   0   0  0  0  0  0 121   45
+    Play#0 output Play#0 1   2   43 ms   minesweeper   -6,4    m   65%   0   7   0   0  0  0  0  0  74   40
+    Play#0 output Play#0 1   2   44 ms   minesweeper   -6,4    m   61%   0   6   0   0  0  0  0  0  67   40

     Play#0 output Play#0 1   2   50 sb   submarine     -9,1        67%   0   7   0   0  0  0  0  0  33   60
     Play#0 output Play#0 1   2   51 sb   submarine     -9,1        64%   0   6   0   0  0  0  0  0  27   60
     Play#0 output Play#0 1   2   50 sb   submarine     -9,1        67%   0   7   0   0  0  0  0  0  33   60
     Play#0 output Play#0 1   2   51 sb   submarine     -9,1        64%   0   6   0   0  0  0  0  0  27   60

-    Play#0 output Play#0 1   2   52 sb   submarine     -9,1        73%   0   7   0   0  0  0  0  0  44   60
-    Play#0 output Play#0 1   2   53 sb   submarine     -4,-2       73%   0   8   0   0  0  0  0  0  92   60
+    Play#0 output Play#0 1   2   52 sb   submarine     -9,1        73%   0   7   0   0  0  0  0  0  45   60
+    Play#0 output Play#0 1   2   53 sb   submarine     -4,-2       73%   0   7   0   0  0  0  0  0  92   60

     Play#0 output Play#0 1   2   60 dd   destroyer     -6,2       100%   0  10   0   0  0  0  0  0 127   70
     Play#0 output Play#0 1   2   61 dd   destroyer     -4,4        73%   0   7   0   0  0  0  0  0  65   70
     Play#0 output Play#0 1   2   62 dd   destroyer     -4,4        67%   0   7   0   0  0  0  0  0  55   70
     Play#0 output Play#0 1   2   60 dd   destroyer     -6,2       100%   0  10   0   0  0  0  0  0 127   70
     Play#0 output Play#0 1   2   61 dd   destroyer     -4,4        73%   0   7   0   0  0  0  0  0  65   70
     Play#0 output Play#0 1   2   62 dd   destroyer     -4,4        67%   0   7   0   0  0  0  0  0  55   70


@@ -1350,19 +1375,24 @@
     Play#0 output Play#0 1   2  104 cs   cargo ship     0,4       100%   0  10   0   0  0  0  0  0 127   20
     Play#0 output Play#0 1   2  120 sb   submarine     -9,1       100%   0  10   0   0  0  0  0  0  93   60
     Play#0 output Play#0 1   2  130 tt   troop trans   -9,1       100%   0  10   0   0  0  0  0  0  95   60
     Play#0 output Play#0 1   2  104 cs   cargo ship     0,4       100%   0  10   0   0  0  0  0  0 127   20
     Play#0 output Play#0 1   2  120 sb   submarine     -9,1       100%   0  10   0   0  0  0  0  0  93   60
     Play#0 output Play#0 1   2  130 tt   troop trans   -9,1       100%   0  10   0   0  0  0  0  0  95   60

-    Play#0 output Play#0 1 47 ships
+    Play#0 output Play#0 1 54 ships

     Play#0 output Play#0 6 0 640
     Play#0 input retr * ?rflags#0
     Play#0 command retreat
     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 cs   cargo ship    -3,1      bgyujnbgy           itshbdu
     Play#0 output Play#0 6 0 640
     Play#0 input retr * ?rflags#0
     Play#0 command retreat
     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 cs   cargo ship    -3,1      bgyujnbgy           itshbdu

-    Play#0 output Play#0 1   1    4 cs   cargo ship    -3,1    a b          Yes      h
+    Play#0 output Play#0 1   1    4 cs   cargo ship    -5,1    a b          Yes      h
+    Play#0 output Play#0 1   1    7 cs   cargo ship    -5,1    a b          Yes      h

     Play#0 output Play#0 1   2   20 cs   cargo ship    -3,1      u                   h
     Play#0 output Play#0 1   2   20 cs   cargo ship    -3,1      u                   h

+    Play#0 output Play#0 1   1   24 cs   cargo ship    -4,2    g ggg        Yes      i
+    Play#0 output Play#0 1   2   25 cs   cargo ship    -8,2    g g          Yes      i
+    Play#0 output Play#0 1   2   28 cs   cargo ship    -8,2    g g          Yes      b
+    Play#0 output Play#0 1   2   29 cs   cargo ship     1,3    g g          Yes      i

     Play#0 output Play#0 1   2   31 cs   cargo ship     0,2      n                   i
     Play#0 output Play#0 1   2   31 cs   cargo ship     0,2      n                   i

-    Play#0 output Play#0 1   2   32 cs   cargo ship     0,2      n                   i
+    Play#0 output Play#0 1   2   32 cs   cargo ship     0,2    c n          Yes      i

     Play#0 output Play#0 1   2   33 cs   cargo ship     2,2      n                   i
     Play#0 output Play#0 1   2   34 cs   cargo ship     3,1      n                   i
     Play#0 output Play#0 1   2   33 cs   cargo ship     2,2      n                   i
     Play#0 output Play#0 1   2   34 cs   cargo ship     3,1      n                   i

-    Play#0 output Play#0 1   2   35 cs   cargo ship     0,2      n                   i
+    Play#0 output Play#0 1   2   35 cs   cargo ship     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      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


@@ -1378,7 +1408,7 @@
     Play#0 output Play#0 1   2  101 cs   cargo ship     0,4      nn                  ith
     Play#0 output Play#0 1   2  103 cs   cargo ship     1,5      n                   ith
     Play#0 output Play#0 1   2  104 cs   cargo ship     0,4      nn                  ith
     Play#0 output Play#0 1   2  101 cs   cargo ship     0,4      nn                  ith
     Play#0 output Play#0 1   2  103 cs   cargo ship     1,5      n                   ith
     Play#0 output Play#0 1   2  104 cs   cargo ship     0,4      nn                  ith

-    Play#0 output Play#0 1 23 ships
+    Play#0 output Play#0 1 28 ships

     Play#0 output Play#0 6 0 639
     Play#0 input miss s * ?mission#0 q
     Play#0 command mission
     Play#0 output Play#0 6 0 639
     Play#0 input miss s * ?mission#0 q
     Play#0 command mission


@@ -1392,35 +1422,48 @@
     Play#0 output Play#0 1   1    1 inf  infantry     -3,1    a  100%  10 127 127   0  50  42%  0  0
     Play#0 output Play#0 1   1    2 inf  infantry     -3,1        92%  10 127 117   0  50  42%  0  0
     Play#0 output Play#0 1   1    3 inf  infantry     -3,1    a  100%  10 127 127   0  50  42%  0  0
     Play#0 output Play#0 1   1    1 inf  infantry     -3,1    a  100%  10 127 127   0  50  42%  0  0
     Play#0 output Play#0 1   1    2 inf  infantry     -3,1        92%  10 127 117   0  50  42%  0  0
     Play#0 output Play#0 1   1    3 inf  infantry     -3,1    a  100%  10 127 127   0  50  42%  0  0

-    Play#0 output Play#0 1   1    4 inf  infantry     -3,1    a  100%  10 127 127   0  50  42%  0  0
-    Play#0 output Play#0 1   2    9 tra  train         0,2        97%  10 127 123   0  50  42%  0  1
+    Play#0 output Play#0 1   1    4 inf  infantry     -4,0    a  100%  10 127 127   0  50  42%  0  0
+    Play#0 output Play#0 1   1    7 inf  infantry     -4,0    a  100%  10 127 127   0  50  42%  0  0
+    Play#0 output Play#0 1   2    9 tra  train         0,2        99%  10 127 126   0  50  42%  0  1

     Play#0 output Play#0 1   2   10 cav  cavalry       4,0        70%   7 127  69   0  50  42%  0  0
     Play#0 output Play#0 1   2   10 cav  cavalry       4,0        70%   7 127  69   0  50  42%  0  0

-    Play#0 output Play#0 1   2   31 cav  cavalry       0,2       100%  10 127 127   0  50  42%  0  0   35S
-    Play#0 output Play#0 1   2   32 cav  cavalry       2,2        85%   0 127  88   0  50  42%  0  0
+    Play#0 output Play#0 1   1   24 cav  cavalry       3,1    g  100%  10 127 127   0  50  42%  0  0
+    Play#0 output Play#0 1   2   25 cav  cavalry       2,2    g   86%   9 127  89   0  50  42%  0  0
+    Play#0 output Play#0 1   2   26 cav  cavalry       4,0    g  100%  10 127 117   0  50  42%  0  0
+    Play#0 output Play#0 1   2   27 cav  cavalry       4,0    g  100%  10 127 117   0  50  42%  0  0
+    Play#0 output Play#0 1   2   28 cav  cavalry       2,2    g  100%  10 127 107   0  50  42%  0  0
+    Play#0 output Play#0 1   2   29 cav  cavalry       3,1    g  100%  10 127 117   0  50  42%  0  0
+    Play#0 output Play#0 1   2   31 cav  cavalry       0,2    c  100%  10 127 127   0  50  42%  0  0   35S
+    Play#0 output Play#0 1   2   32 cav  cavalry       0,2    c  100%   0 127 127   0  50  42%  0  0

     Play#0 output Play#0 1   2   33 cav  cavalry       1,1        85%   9 127  98   0  50  42%  0  0
     Play#0 output Play#0 1   2   33 cav  cavalry       1,1        85%   9 127  98   0  50  42%  0  0

-    Play#0 output Play#0 1   2   34 cav  cavalry       0,2       100%  10 127 127   0  50  42%  0  0    9L
-    Play#0 output Play#0 1   2   35 cav  cavalry       0,2        85%   8 127   0   0  50  42%  0  0
+    Play#0 output Play#0 1   2   34 cav  cavalry       0,2    c  100%  10 127 127   0  50  42%  0  0    9L
+    Play#0 output Play#0 1   2   35 cav  cavalry       0,2    c  100%  10 127   0   0  50  42%  0  0

     Play#0 output Play#0 1   2   40 cav  cavalry       2,2        91%   9 127 -14   0  50  42%  0  0
     Play#0 output Play#0 1   2   41 cav  cavalry       3,1        89%   9 127 103   0  50  42%  0  0
     Play#0 output Play#0 1   2   42 cav  cavalry       1,1        86%   9 127 109   0  50  42%  0  0
     Play#0 output Play#0 1   2   43 eng  engineer      1,1    m  100%  10 127 127   0 130  42%  0  0
     Play#0 output Play#0 1   2   44 eng  engineer      1,-1   m   90%   9 127  88   0 130  42%  0  0
     Play#0 output Play#0 1   2   60 cav  cavalry       0,0       100%  10 127 127   0  50  42%  0  0
     Play#0 output Play#0 1   2   40 cav  cavalry       2,2        91%   9 127 -14   0  50  42%  0  0
     Play#0 output Play#0 1   2   41 cav  cavalry       3,1        89%   9 127 103   0  50  42%  0  0
     Play#0 output Play#0 1   2   42 cav  cavalry       1,1        86%   9 127 109   0  50  42%  0  0
     Play#0 output Play#0 1   2   43 eng  engineer      1,1    m  100%  10 127 127   0 130  42%  0  0
     Play#0 output Play#0 1   2   44 eng  engineer      1,-1   m   90%   9 127  88   0 130  42%  0  0
     Play#0 output Play#0 1   2   60 cav  cavalry       0,0       100%  10 127 127   0  50  42%  0  0

-    Play#0 output Play#0 1   2   61 cav  cavalry       3,1        79%   8 127  80   0  50  42%  0  0
+    Play#0 output Play#0 1   2   61 cav  cavalry       3,1        79%   8 127  79   0  50  42%  0  0

     Play#0 output Play#0 1   2   62 cav  cavalry       0,0       100%  10 127 127   0  50  42%  0  0
     Play#0 output Play#0 1   2   63 cav  cavalry       0,0       100%  10 127 127   0  50  42%  0  0
     Play#0 output Play#0 1   2   64 cav  cavalry       0,0       100%  10 127 127   0  50  42%  0  0
     Play#0 output Play#0 1   2   62 cav  cavalry       0,0       100%  10 127 127   0  50  42%  0  0
     Play#0 output Play#0 1   2   63 cav  cavalry       0,0       100%  10 127 127   0  50  42%  0  0
     Play#0 output Play#0 1   2   64 cav  cavalry       0,0       100%  10 127 127   0  50  42%  0  0

-    Play#0 output Play#0 1 22 units
+    Play#0 output Play#0 1 29 units

     Play#0 output Play#0 6 0 637
     Play#0 input lretr * ?rflags#0
     Play#0 command lretreat
     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 6 0 637
     Play#0 input lretr * ?rflags#0
     Play#0 command lretreat
     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      -3,1    a b          Yes      h
+    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   2   10 cav  cavalry        4,0      y                   b
     Play#0 output Play#0 1   2   10 cav  cavalry        4,0      y                   b

-    Play#0 output Play#0 1   2   31 cav  cavalry        0,2      j                   b
-    Play#0 output Play#0 1   2   34 cav  cavalry        0,2      j                   b
-    Play#0 output Play#0 1   2   35 cav  cavalry        0,2      j                   b
+    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   28 cav  cavalry        2,2    g g          Yes      i
+    Play#0 output Play#0 1   2   29 cav  cavalry        3,1    g g          Yes      b
+    Play#0 output Play#0 1   2   31 cav  cavalry        0,2    c j          Yes      b
+    Play#0 output Play#0 1   2   32 cav  cavalry        0,2    c j          Yes      b
+    Play#0 output Play#0 1   2   34 cav  cavalry        0,2    c j          Yes      b
+    Play#0 output Play#0 1   2   35 cav  cavalry        0,2    c j          Yes      b

     Play#0 output Play#0 1   2   40 cav  cavalry        2,2      u                   b
     Play#0 output Play#0 1   2   41 cav  cavalry        3,1      y                   b
     Play#0 output Play#0 1   2   42 cav  cavalry        1,1      g                   b
     Play#0 output Play#0 1   2   40 cav  cavalry        2,2      u                   b
     Play#0 output Play#0 1   2   41 cav  cavalry        3,1      y                   b
     Play#0 output Play#0 1   2   42 cav  cavalry        1,1      g                   b


@@ -1429,7 +1472,7 @@
     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
     Play#0 output Play#0 1   2   64 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
     Play#0 output Play#0 1   2   64 cav  cavalry        0,0      nj                  ihb

-    Play#0 output Play#0 1 14 units
+    Play#0 output Play#0 1 20 units

     Play#0 output Play#0 6 0 636
     Play#0 input miss l * ?mission#0 q
     Play#0 command mission
     Play#0 output Play#0 6 0 636
     Play#0 input miss l * ?mission#0 q
     Play#0 command mission

diff --git a/tests/retreat/setup-POGO b/tests/retreat/setup-POGO
index 535ec25a84d96e97108254ae41605328724693f9..6c87dd7aa942415e6cd71d1fa5efc4d34ff694f6 100644 (file)
--- a/tests/retreat/setup-POGO
+++ b/tests/retreat/setup-POGO
@@ -15,6 +15,8 @@ desi -2,-2 f
 desi -3,1 h
 | ships for testing retreat command
 build s -3,1 cs 5
 desi -3,1 h
 | ships for testing retreat command
 build s -3,1 cs 5

+edit s 4 L -5,1 U 7
+| fleet a defined below

 | ship to drop depth charges
 build s -3,1 dd
 edit s 5 g 1 s 40
 | ship to drop depth charges
 build s -3,1 dd
 edit s 5 g 1 s 40


@@ -35,6 +37,8 @@ edit p 0 U 30 T ac t 400
 edit p * ?own#0 e 100 m 127
 | land units for testing retreat command
 build l -3,1 inf 5
 edit p * ?own#0 e 100 m 127
 | land units for testing retreat command
 build l -3,1 inf 5

+edit u 4 L -4,0 U 7
+| army a defined below

 | complete the land units (fortify to reduce unwanted collateral damage)
 edit u * ?own#0 e 100 M 127 m 10 F 127
 || country#2
 | complete the land units (fortify to reduce unwanted collateral damage)
 edit u * ?own#0 e 100 M 127 m 10 F 127
 || country#2


@@ -55,6 +59,15 @@ edit s 0 U 20 O 2 U 10 L 0,2 U 11
 retr 10 nhhnj ih
 retr 11 n h
 retr 20 u h
 retr 10 nhhnj ih
 retr 11 n h
 retr 20 u h

+| crazy group retreat
+edit s 10 U 25 L -4,2 U 26 U 27 U 28 U 29 L 5,3
+edit s 25 U 24 O 1
+fleet g 24/25/26/27/28/29
+retr g ggg i
+retr 26 bn i
+retr g ?uid=27 bn i
+retr g ?uid=28 ggg b
+retr g ?uid=29 ggg i

 | target ships that want to retreat, but can't:
 | sunk
 edit s 10 U 30 E 20
 | target ships that want to retreat, but can't:
 | sunk
 edit s 10 U 30 E 20


@@ -68,7 +81,9 @@ edit s 10 U 33 L 2,2
 edit s 10 U 34 L 3,1
 | no mobility
 edit s 10 U 35 M 0
 edit s 10 U 34 L 3,1
 | no mobility
 edit s 10 U 35 M 0

-retr 30/31/32/33/34/35 n i
+fleet c 30/32/35
+retr c n i
+retr 31/33/34 n i

 | target ships having difficulties during retreat:
 edit s 10 U 40 t lc U 41 U 42
 | runs out of mobility
 | target ships having difficulties during retreat:
 edit s 10 U 40 t lc U 41 U 42
 | runs out of mobility


@@ -115,6 +130,15 @@ retr 130 gg u
 | target land units bombs: bombed
 edit u 9 U 10 T cav L 1,1
 lret 10 jhhuy b
 | target land units bombs: bombed
 edit u 9 U 10 T cav L 1,1
 lret 10 jhhuy b

+| crazy group retreat
+edit u 10 U 25 L 3,1 a g U 26 U 27 U 28 U 29 L 4,0
+edit u 25 U 24 O 1
+army g 24/25/26/27/28/29
+lret g bhg b
+lret 26 uh b
+lret g ?uid=27 uh b
+lret g ?uid=28 bhg i
+lret g ?uid=29 bhg b

 | target land units that want to retreat, but can't:
 | destroyed
 edit u 10 U 30 L 0,2 e 10
 | target land units that want to retreat, but can't:
 | destroyed
 edit u 10 U 30 L 0,2 e 10


@@ -128,7 +152,9 @@ edit u 10 U 33 L -1,1
 edit u 10 U 34 L 0,2 Y 9
 | no mobility
 edit u 10 U 35 L 0,2 M 0
 edit u 10 U 34 L 0,2 Y 9
 | no mobility
 edit u 10 U 35 L 0,2 M 0

-lret 30/31/32/33/34/35 j b
+army c 30/31/32/34/35
+lret c j b
+lret 33 j b

 | target land units having difficulties during retreat:
 | runs out of mobility
 edit u 10 U 40 M 5
 | target land units having difficulties during retreat:
 | runs out of mobility
 edit u 10 U 40 M 5


@@ -162,9 +188,8 @@ give g * ?des=f 2
 give s * ?des=f 100
 give p * ?des=f 100
 edit l * ?des#.&eff=0 e 100 m 127
 give s * ?des=f 100
 give p * ?des=f 100
 edit l * ?des#.&eff=0 e 100 m 127

-fleet a * ?own=1&uid#2
-fleet a 9
-army a * ?own=1&uid#2
+fleet a 0/1/3/4
+army a 0/1/3/4

 || relations
 decl w 1 2
 decl w 2 1
 || relations
 decl w 1 2
 decl w 2 1