tests/retreat: Put some targets in separate locations

To reduce coupling between test cases.

Lucky dice expose another bug.  It's marked "BUG:" in the test input.

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

diff --git a/tests/retreat/01-retreat-1 b/tests/retreat/01-retreat-1
index 63f65d35bdab24b893d416c622a7094152d538d0..b35471afcfe3ca1e018f7584236768a59ce5ec8e 100644 (file)
--- a/tests/retreat/01-retreat-1
+++ b/tests/retreat/01-retreat-1
@@ -81,7 +81,7 @@ navi 5 gyuh
 fire sh 5 53
 || ships retreating from bombs
 | injured
-bomb 0/1/2/3/4 . p -2,2 jh
+bomb 0/1/2/3/4 . p -2,2 ggh
 s
 60
 61
@@ -89,7 +89,7 @@ s
 63
 64
 | bombed
-bomb 0/1/2/3/4 . p -2,2 jh
+bomb 0/1/2/3/4 . p -2,2 ggh
 s
 65
 66
@@ -128,13 +128,12 @@ board 130 5
 || land units failing to retreat
 | these bombing runs must hit; if they don't, use __cmd to make them
 | destroyed
-bomb 30 . p -2,2 ujh
+bomb 30 . p -2,2 jh
 l
 30
 | 31 is on a ship, but there's no way to trigger a retreat then
 | crewless
-__cmd added -1 0 0
-bomb 30 . p -2,2 ujh
+bomb 30 . p -2,2 jh
 l
 32
 | BUG: retreats anyway
@@ -145,22 +144,21 @@ l
 | 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 ujh
+bomb 30 . p -2,2 jh
 l
 35
 || 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
-__cmd added -1 0 0
 bomb 30 . p -2,2 ujh
 l
 40
 | into mountain 2,0 after j
+__cmd added -1 0 0
 bomb 30 . p -2,2 ujh
 l
 41
 | into foreign -1,1 right away
-__cmd added -1 0 0
 bomb 30 . p -2,2 ujh
 l
 42
@@ -170,18 +168,17 @@ bomb 30 . p -2,2 ujh
 l
 44
 | BUG: sweeps silently
+| BUG: 43 doesn't retreat when 44 retreats fully
 || land units retreating fully
 | jh
 bomb 30 . p -2,2 ujh
 l
 10
 | h
-__cmd added -1 0 0
 bomb 30 . p -2,2 ujjh
 l
 10
 | uy into allied 3,-1
-__cmd added -1 0 0
 bomb 30 . p -2,2 ujjh
 l
 10

diff --git a/tests/retreat/final.xdump b/tests/retreat/final.xdump
index dacaeef127ac289bec427312ce1002b3f04bac97..ce05746841a898f76d936849730525ba8649adb0 100644 (file)
--- a/tests/retreat/final.xdump
+++ b/tests/retreat/final.xdump
@@ -1,22 +1,23 @@
 config sect
 owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist ydist avail elev work coastal newdes min gold fert ocontent uran oldown civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad c_dist m_dist s_dist g_dist p_dist i_dist d_dist b_dist f_dist o_dist l_dist h_dist u_dist r_dist c_del m_del s_del g_del p_del i_del d_del b_del f_del o_del l_del h_del u_del r_del mines pstage ptime che che_target fallout access road rail dfense
-2 0 0 15 88 112 0 0 0 0 0 0 0 0 0 0 0 0 0 15 0 0 0 0 0 1 87 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 91 healthy 0 0 0 0 0 0 0 0
+2 0 0 15 91 117 0 0 0 0 0 0 0 0 0 0 0 0 0 15 0 0 0 0 0 1 91 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 95 healthy 0 0 0 0 0 0 0 0
 2 2 0 1 100 127 0 0 0 0 0 0 0 2 0 0 0 0 0 1 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 4 0 15 100 127 0 0 0 0 0 0 0 4 0 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
 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 89 112 0 0 0 0 0 0 0 1 1 0 0 0 0 15 0 0 0 0 0 2 89 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 96 122 0 0 0 0 0 0 0 3 1 0 0 0 1 15 0 0 0 0 0 2 96 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 98 125 0 0 0 0 0 0 0 -3 1 0 0 0 1 12 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 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
+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 79 103 0 0 0 0 0 0 0 0 2 0 0 0 1 12 0 0 0 0 0 2 81 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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
 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 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
+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
 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,58 +30,58 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
 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 31 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+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 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 () ""
+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 () ""
 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 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
+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"
 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 119 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 9 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"
-41 2 1 3 10 96 108 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 120 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 76 86 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"
-44 2 -6 4 16 63 70 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"
+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"
 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 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (helpless) "gg"
-60 2 0 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 2 4 17 84 83 0 70 0 0 none 0 "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-62 2 0 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"
-63 2 0 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"
-64 2 2 4 17 51 26 0 70 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-65 2 2 4 17 87 89 0 70 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-66 2 2 4 17 65 53 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 () ""
-67 2 0 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 (helpless bombed) "nn"
-68 2 2 4 17 62 46 0 70 0 0 none 0 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-69 2 2 4 17 48 21 0 70 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-80 2 0 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"
-81 2 0 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"
-82 2 0 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"
-83 2 2 4 17 29 -28 0 70 0 0 none 0 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-84 2 0 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"
-100 2 2 4 2 38 -29 0 20 0 0 none 0 "" 0 4 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-101 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 torped helpless) "nn"
-102 2 2 4 2 64 35 0 20 0 0 none 0 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-103 2 1 3 2 21 -42 0 20 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torped helpless) "n"
-104 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 torped helpless) "nn"
+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"
+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 () ""
+63 2 -4 4 17 56 37 0 70 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+64 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 () ""
+65 2 -4 4 17 59 40 0 70 0 0 none 0 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+66 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 () ""
+67 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 (helpless bombed) "nn"
+68 2 -4 4 17 70 61 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 () ""
+69 2 -4 4 17 65 53 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 () ""
+80 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"
+81 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"
+82 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"
+83 2 -4 4 17 29 -28 0 70 0 0 none 0 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+84 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"
+100 2 2 -6 2 38 -29 0 20 0 0 none 0 "" 0 4 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+101 2 0 4 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 torped helpless) "nn"
+102 2 2 -6 2 64 35 0 20 0 0 none 0 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
+103 2 1 5 2 21 -42 0 20 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torped helpless) "n"
+104 2 0 4 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 torped helpless) "nn"
 120 2 -9 1 18 100 93 0 60 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 130 2 -9 1 12 100 95 0 60 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 149 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
 /config
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta
-0 1 -2 2 7 100 105 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
-1 1 -2 2 7 100 105 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
-2 1 -2 2 7 100 105 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
-3 1 -2 2 7 100 105 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
-4 1 -2 2 7 100 105 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
+0 1 -2 2 7 100 95 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
+1 1 -2 2 7 100 95 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
+2 1 -2 2 7 100 95 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
+3 1 -2 2 7 100 95 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
+4 1 -2 2 7 100 95 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
 10 0 -2 2 26 0 127 0 160 0 0 none 0 "" 6 0 -1 -1 (launched) 0 0.00000
 11 0 -2 2 26 0 127 0 160 0 0 none 0 "" 6 0 -1 -1 (launched) 0 0.00000
 12 0 -2 2 26 0 127 0 160 0 0 none 0 "" 6 0 -1 -1 (launched) 0 0.00000
@@ -91,34 +92,34 @@ 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
-30 1 -2 2 17 100 19 0 400 0 0 none 0 "" 18 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
 49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
 /config
 config land
 uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship harden retreat rflags rpath civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime land access
 0 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 89 113 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "yujnbgyuj" 0 9 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 1 1 7 93 119 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 61 61 0 50 0 0 none 0 "" -1 127 42 (bombed) "y" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-30 0 1 1 2 0 111 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 99 126 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 3 1 0 83 96 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
-33 2 1 1 0 85 97 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
-34 2 1 1 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 1 1 0 91 0 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
-40 2 2 2 0 89 -15 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 86 99 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 83 105 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 0 0 15 96 110 0 130 0 0 none 0 "m" -1 127 42 (group bombed) "u" 0 10 2 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-44 2 0 0 15 90 103 0 130 0 0 none 0 "m" -1 127 42 (group bombed) "u" 0 10 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-60 2 3 1 0 73 71 0 50 0 0 none 0 "" -1 127 42 () "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-61 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
+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
+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
+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
+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
 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 3 1 0 74 72 0 50 0 0 none 0 "" -1 127 42 () "" 0 7 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
 99 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 /config
 config nuke
@@ -130,13 +131,12 @@ actor action victim times duration time
 2 25 0 2 0 0
 1 11 1 1 0 0
 2 14 1 2 0 0
-1 9 2 8 0 0
-1 17 2 6 0 0
+1 9 2 9 0 0
+1 17 2 8 0 0
 1 48 2 1 0 0
 2 13 0 3 0 0
 1 19 2 1 0 0
-1 55 2 13 0 0
-2 56 0 2 0 0
+1 55 2 12 0 0
 1 55 1 1 0 0
 /config
 config trade
@@ -164,7 +164,7 @@ timestamp owner type id x y
 0 1 2 12 -2 2
 0 1 2 13 -2 2
 0 1 2 14 -2 2
-0 2 3 30 1 1
+0 2 3 30 0 2
 /config
 config realm
 cnum realm xl xh yl yh

diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log
index b7646b390f402d468f3b8b860f24d4f86efe3e3f..9adfc05e1348a6c1842ed3d4d86082a7b7a8ecf3 100644 (file)
--- a/tests/retreat/journal.log
+++ b/tests/retreat/journal.log
@@ -286,11 +286,11 @@
     Play#1 output Play#1 1 Return fire hit dd   destroyer (#5) in -5,-1 for 6 damage.
     Play#1 output Play#1 1     dd   destroyer (#5) takes 4
     Play#1 output Play#1 6 0 609
-    Play#1 input bomb 0/1/2/3/4 . p -2,2 jh
+    Play#1 input bomb 0/1/2/3/4 . p -2,2 ggh
     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 target sector is -6,2
+    Play#1 output Play#1 1 range to target is 2
     Play#1 output Play#1 1 lb   TBD-1 Devastator #0 standing by
     Play#1 output Play#1 1 lb   TBD-1 Devastator #1 standing by
     Play#1 output Play#1 1 lb   TBD-1 Devastator #2 standing by
@@ -302,12 +302,10 @@
     Play#1 output Play#1 1 lb   TBD-1 Devastator #1 equipped
     Play#1 output Play#1 1 lb   TBD-1 Devastator #0 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 flying over sea at -4,2
+    Play#1 output Play#1 1 flying over harbor at -6,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 (# 60)          2    completely  dd   destroyer (#60)
     Play#1 output Play#1 1 (# 61)          2    completely  dd   destroyer (#61)
     Play#1 output Play#1 1 (# 62)          2    completely  dd   destroyer (#62)
@@ -323,17 +321,9 @@
     Play#1 output Play#1 1 (# 82)          2    completely  dd   destroyer (#82)
     Play#1 output Play#1 1 (# 83)          2    completely  dd   destroyer (#83)
     Play#1 output Play#1 1 (# 84)          2    completely  dd   destroyer (#84)
-    Play#1 output Play#1 1 (#100)          2    completely  cs   cargo ship (#100)
-    Play#1 output Play#1 1 (#101)          2    completely  cs   cargo ship (#101)
-    Play#1 output Play#1 1 (#102)          2    completely  cs   cargo ship (#102)
-    Play#1 output Play#1 1 (#103)          2    completely  cs   cargo ship (#103)
-    Play#1 output Play#1 1 (#104)          2    completely  cs   cargo ship (#104)
     Play#1 output Play#1 4 Bomb what? (ship, plane, land unit, efficiency, commodities)
     Play#1 input s
     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 (# 60)          2    completely  dd   destroyer (#60)
     Play#1 output Play#1 1 (# 61)          2    completely  dd   destroyer (#61)
     Play#1 output Play#1 1 (# 62)          2    completely  dd   destroyer (#62)
@@ -349,18 +339,10 @@
     Play#1 output Play#1 1 (# 82)          2    completely  dd   destroyer (#82)
     Play#1 output Play#1 1 (# 83)          2    completely  dd   destroyer (#83)
     Play#1 output Play#1 1 (# 84)          2    completely  dd   destroyer (#84)
-    Play#1 output Play#1 1 (#100)          2    completely  cs   cargo ship (#100)
-    Play#1 output Play#1 1 (#101)          2    completely  cs   cargo ship (#101)
-    Play#1 output Play#1 1 (#102)          2    completely  cs   cargo ship (#102)
-    Play#1 output Play#1 1 (#103)          2    completely  cs   cargo ship (#103)
-    Play#1 output Play#1 1 (#104)          2    completely  cs   cargo ship (#104)
     Play#1 output Play#1 4 lb   TBD-1 Devastator #4, 2 bombs.  Target ('~' to skip)?
     Play#1 input 60
     Play#1 output Play#1 1 50% hitchance...splash
     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 (# 60)          2    completely  dd   destroyer (#60)
     Play#1 output Play#1 1 (# 61)          2    completely  dd   destroyer (#61)
     Play#1 output Play#1 1 (# 62)          2    completely  dd   destroyer (#62)
@@ -376,19 +358,11 @@
     Play#1 output Play#1 1 (# 82)          2    completely  dd   destroyer (#82)
     Play#1 output Play#1 1 (# 83)          2    completely  dd   destroyer (#83)
     Play#1 output Play#1 1 (# 84)          2    completely  dd   destroyer (#84)
-    Play#1 output Play#1 1 (#100)          2    completely  cs   cargo ship (#100)
-    Play#1 output Play#1 1 (#101)          2    completely  cs   cargo ship (#101)
-    Play#1 output Play#1 1 (#102)          2    completely  cs   cargo ship (#102)
-    Play#1 output Play#1 1 (#103)          2    completely  cs   cargo ship (#103)
-    Play#1 output Play#1 1 (#104)          2    completely  cs   cargo ship (#104)
     Play#1 output Play#1 4 lb   TBD-1 Devastator #3, 2 bombs.  Target ('~' to skip)?
     Play#1 input 61
     Play#1 output Play#1 1 50% hitchance...blam-blam
     Play#1 output Play#1 1
     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 (# 60)          2    completely  dd   destroyer (#60)
     Play#1 output Play#1 1 (# 62)          2    completely  dd   destroyer (#62)
     Play#1 output Play#1 1 (# 63)          2    completely  dd   destroyer (#63)
@@ -403,20 +377,12 @@
     Play#1 output Play#1 1 (# 82)          2    completely  dd   destroyer (#82)
     Play#1 output Play#1 1 (# 83)          2    completely  dd   destroyer (#83)
     Play#1 output Play#1 1 (# 84)          2    completely  dd   destroyer (#84)
-    Play#1 output Play#1 1 (#100)          2    completely  cs   cargo ship (#100)
-    Play#1 output Play#1 1 (#101)          2    completely  cs   cargo ship (#101)
-    Play#1 output Play#1 1 (#102)          2    completely  cs   cargo ship (#102)
-    Play#1 output Play#1 1 (#103)          2    completely  cs   cargo ship (#103)
-    Play#1 output Play#1 1 (#104)          2    completely  cs   cargo ship (#104)
     Play#1 output Play#1 4 lb   TBD-1 Devastator #2, 2 bombs.  Target ('~' to skip)?
     Play#1 input 62
-    Play#1 output Play#1 1 50% hitchance...splash
+    Play#1 output Play#1 1 50% hitchance...Blam-blam
+    Play#1 output Play#1 1
     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 (# 60)          2    completely  dd   destroyer (#60)
-    Play#1 output Play#1 1 (# 62)          2    completely  dd   destroyer (#62)
     Play#1 output Play#1 1 (# 63)          2    completely  dd   destroyer (#63)
     Play#1 output Play#1 1 (# 64)          2    completely  dd   destroyer (#64)
     Play#1 output Play#1 1 (# 65)          2    completely  dd   destroyer (#65)
@@ -429,21 +395,12 @@
     Play#1 output Play#1 1 (# 82)          2    completely  dd   destroyer (#82)
     Play#1 output Play#1 1 (# 83)          2    completely  dd   destroyer (#83)
     Play#1 output Play#1 1 (# 84)          2    completely  dd   destroyer (#84)
-    Play#1 output Play#1 1 (#100)          2    completely  cs   cargo ship (#100)
-    Play#1 output Play#1 1 (#101)          2    completely  cs   cargo ship (#101)
-    Play#1 output Play#1 1 (#102)          2    completely  cs   cargo ship (#102)
-    Play#1 output Play#1 1 (#103)          2    completely  cs   cargo ship (#103)
-    Play#1 output Play#1 1 (#104)          2    completely  cs   cargo ship (#104)
     Play#1 output Play#1 4 lb   TBD-1 Devastator #1, 2 bombs.  Target ('~' to skip)?
     Play#1 input 63
-    Play#1 output Play#1 1 50% hitchance...splash
+    Play#1 output Play#1 1 50% hitchance...BLAM-Blam
+    Play#1 output Play#1 1
     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 (# 60)          2    completely  dd   destroyer (#60)
-    Play#1 output Play#1 1 (# 62)          2    completely  dd   destroyer (#62)
-    Play#1 output Play#1 1 (# 63)          2    completely  dd   destroyer (#63)
     Play#1 output Play#1 1 (# 64)          2    completely  dd   destroyer (#64)
     Play#1 output Play#1 1 (# 65)          2    completely  dd   destroyer (#65)
     Play#1 output Play#1 1 (# 66)          2    completely  dd   destroyer (#66)
@@ -455,21 +412,16 @@
     Play#1 output Play#1 1 (# 82)          2    completely  dd   destroyer (#82)
     Play#1 output Play#1 1 (# 83)          2    completely  dd   destroyer (#83)
     Play#1 output Play#1 1 (# 84)          2    completely  dd   destroyer (#84)
-    Play#1 output Play#1 1 (#100)          2    completely  cs   cargo ship (#100)
-    Play#1 output Play#1 1 (#101)          2    completely  cs   cargo ship (#101)
-    Play#1 output Play#1 1 (#102)          2    completely  cs   cargo ship (#102)
-    Play#1 output Play#1 1 (#103)          2    completely  cs   cargo ship (#103)
-    Play#1 output Play#1 1 (#104)          2    completely  cs   cargo ship (#104)
     Play#1 output Play#1 4 lb   TBD-1 Devastator #0, 2 bombs.  Target ('~' to skip)?
     Play#1 input 64
-    Play#1 output Play#1 1 50% hitchance...Blam-Blam
+    Play#1 output Play#1 1 50% hitchance...BLAM-blam
     Play#1 output Play#1 1
     Play#1 output Play#1 6 0 607
-    Play#1 input bomb 0/1/2/3/4 . p -2,2 jh
+    Play#1 input bomb 0/1/2/3/4 . p -2,2 ggh
     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 target sector is -6,2
+    Play#1 output Play#1 1 range to target is 2
     Play#1 output Play#1 1 lb   TBD-1 Devastator #0 standing by
     Play#1 output Play#1 1 lb   TBD-1 Devastator #1 standing by
     Play#1 output Play#1 1 lb   TBD-1 Devastator #2 standing by
@@ -481,15 +433,11 @@
     Play#1 output Play#1 1 lb   TBD-1 Devastator #1 equipped
     Play#1 output Play#1 1 lb   TBD-1 Devastator #0 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 flying over sea at -4,2
+    Play#1 output Play#1 1 flying over harbor at -6,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 (# 60)          2    completely  dd   destroyer (#60)
-    Play#1 output Play#1 1 (# 62)          2    completely  dd   destroyer (#62)
-    Play#1 output Play#1 1 (# 63)          2    completely  dd   destroyer (#63)
     Play#1 output Play#1 1 (# 65)          2    completely  dd   destroyer (#65)
     Play#1 output Play#1 1 (# 66)          2    completely  dd   destroyer (#66)
     Play#1 output Play#1 1 (# 67)          2    completely  dd   destroyer (#67)
@@ -500,20 +448,10 @@
     Play#1 output Play#1 1 (# 82)          2    completely  dd   destroyer (#82)
     Play#1 output Play#1 1 (# 83)          2    completely  dd   destroyer (#83)
     Play#1 output Play#1 1 (# 84)          2    completely  dd   destroyer (#84)
-    Play#1 output Play#1 1 (#100)          2    completely  cs   cargo ship (#100)
-    Play#1 output Play#1 1 (#101)          2    completely  cs   cargo ship (#101)
-    Play#1 output Play#1 1 (#102)          2    completely  cs   cargo ship (#102)
-    Play#1 output Play#1 1 (#103)          2    completely  cs   cargo ship (#103)
-    Play#1 output Play#1 1 (#104)          2    completely  cs   cargo ship (#104)
     Play#1 output Play#1 4 Bomb what? (ship, plane, land unit, efficiency, commodities)
     Play#1 input s
     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 (# 60)          2    completely  dd   destroyer (#60)
-    Play#1 output Play#1 1 (# 62)          2    completely  dd   destroyer (#62)
-    Play#1 output Play#1 1 (# 63)          2    completely  dd   destroyer (#63)
     Play#1 output Play#1 1 (# 65)          2    completely  dd   destroyer (#65)
     Play#1 output Play#1 1 (# 66)          2    completely  dd   destroyer (#66)
     Play#1 output Play#1 1 (# 67)          2    completely  dd   destroyer (#67)
@@ -524,22 +462,12 @@
     Play#1 output Play#1 1 (# 82)          2    completely  dd   destroyer (#82)
     Play#1 output Play#1 1 (# 83)          2    completely  dd   destroyer (#83)
     Play#1 output Play#1 1 (# 84)          2    completely  dd   destroyer (#84)
-    Play#1 output Play#1 1 (#100)          2    completely  cs   cargo ship (#100)
-    Play#1 output Play#1 1 (#101)          2    completely  cs   cargo ship (#101)
-    Play#1 output Play#1 1 (#102)          2    completely  cs   cargo ship (#102)
-    Play#1 output Play#1 1 (#103)          2    completely  cs   cargo ship (#103)
-    Play#1 output Play#1 1 (#104)          2    completely  cs   cargo ship (#104)
     Play#1 output Play#1 4 lb   TBD-1 Devastator #4, 2 bombs.  Target ('~' to skip)?
     Play#1 input 65
-    Play#1 output Play#1 1 50% hitchance...blam-blam
+    Play#1 output Play#1 1 50% hitchance...blam-BLAM
     Play#1 output Play#1 1
     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 (# 60)          2    completely  dd   destroyer (#60)
-    Play#1 output Play#1 1 (# 62)          2    completely  dd   destroyer (#62)
-    Play#1 output Play#1 1 (# 63)          2    completely  dd   destroyer (#63)
     Play#1 output Play#1 1 (# 66)          2    completely  dd   destroyer (#66)
     Play#1 output Play#1 1 (# 67)          2    completely  dd   destroyer (#67)
     Play#1 output Play#1 1 (# 68)          2    completely  dd   destroyer (#68)
@@ -549,22 +477,12 @@
     Play#1 output Play#1 1 (# 82)          2    completely  dd   destroyer (#82)
     Play#1 output Play#1 1 (# 83)          2    completely  dd   destroyer (#83)
     Play#1 output Play#1 1 (# 84)          2    completely  dd   destroyer (#84)
-    Play#1 output Play#1 1 (#100)          2    completely  cs   cargo ship (#100)
-    Play#1 output Play#1 1 (#101)          2    completely  cs   cargo ship (#101)
-    Play#1 output Play#1 1 (#102)          2    completely  cs   cargo ship (#102)
-    Play#1 output Play#1 1 (#103)          2    completely  cs   cargo ship (#103)
-    Play#1 output Play#1 1 (#104)          2    completely  cs   cargo ship (#104)
     Play#1 output Play#1 4 lb   TBD-1 Devastator #3, 2 bombs.  Target ('~' to skip)?
     Play#1 input 66
-    Play#1 output Play#1 1 50% hitchance...Blam-blam
+    Play#1 output Play#1 1 50% hitchance...blam-blam
     Play#1 output Play#1 1
     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 (# 60)          2    completely  dd   destroyer (#60)
-    Play#1 output Play#1 1 (# 62)          2    completely  dd   destroyer (#62)
-    Play#1 output Play#1 1 (# 63)          2    completely  dd   destroyer (#63)
     Play#1 output Play#1 1 (# 67)          2    completely  dd   destroyer (#67)
     Play#1 output Play#1 1 (# 68)          2    completely  dd   destroyer (#68)
     Play#1 output Play#1 1 (# 69)          2    completely  dd   destroyer (#69)
@@ -573,21 +491,11 @@
     Play#1 output Play#1 1 (# 82)          2    completely  dd   destroyer (#82)
     Play#1 output Play#1 1 (# 83)          2    completely  dd   destroyer (#83)
     Play#1 output Play#1 1 (# 84)          2    completely  dd   destroyer (#84)
-    Play#1 output Play#1 1 (#100)          2    completely  cs   cargo ship (#100)
-    Play#1 output Play#1 1 (#101)          2    completely  cs   cargo ship (#101)
-    Play#1 output Play#1 1 (#102)          2    completely  cs   cargo ship (#102)
-    Play#1 output Play#1 1 (#103)          2    completely  cs   cargo ship (#103)
-    Play#1 output Play#1 1 (#104)          2    completely  cs   cargo ship (#104)
     Play#1 output Play#1 4 lb   TBD-1 Devastator #2, 2 bombs.  Target ('~' to skip)?
     Play#1 input 67
     Play#1 output Play#1 1 50% hitchance...splash
     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 (# 60)          2    completely  dd   destroyer (#60)
-    Play#1 output Play#1 1 (# 62)          2    completely  dd   destroyer (#62)
-    Play#1 output Play#1 1 (# 63)          2    completely  dd   destroyer (#63)
     Play#1 output Play#1 1 (# 67)          2    completely  dd   destroyer (#67)
     Play#1 output Play#1 1 (# 68)          2    completely  dd   destroyer (#68)
     Play#1 output Play#1 1 (# 69)          2    completely  dd   destroyer (#69)
@@ -596,22 +504,12 @@
     Play#1 output Play#1 1 (# 82)          2    completely  dd   destroyer (#82)
     Play#1 output Play#1 1 (# 83)          2    completely  dd   destroyer (#83)
     Play#1 output Play#1 1 (# 84)          2    completely  dd   destroyer (#84)
-    Play#1 output Play#1 1 (#100)          2    completely  cs   cargo ship (#100)
-    Play#1 output Play#1 1 (#101)          2    completely  cs   cargo ship (#101)
-    Play#1 output Play#1 1 (#102)          2    completely  cs   cargo ship (#102)
-    Play#1 output Play#1 1 (#103)          2    completely  cs   cargo ship (#103)
-    Play#1 output Play#1 1 (#104)          2    completely  cs   cargo ship (#104)
     Play#1 output Play#1 4 lb   TBD-1 Devastator #1, 2 bombs.  Target ('~' to skip)?
     Play#1 input 68
     Play#1 output Play#1 1 50% hitchance...blam-Blam
     Play#1 output Play#1 1
     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 (# 60)          2    completely  dd   destroyer (#60)
-    Play#1 output Play#1 1 (# 62)          2    completely  dd   destroyer (#62)
-    Play#1 output Play#1 1 (# 63)          2    completely  dd   destroyer (#63)
     Play#1 output Play#1 1 (# 67)          2    completely  dd   destroyer (#67)
     Play#1 output Play#1 1 (# 69)          2    completely  dd   destroyer (#69)
     Play#1 output Play#1 1 (# 80)          2    completely  dd   destroyer (#80)
@@ -619,20 +517,15 @@
     Play#1 output Play#1 1 (# 82)          2    completely  dd   destroyer (#82)
     Play#1 output Play#1 1 (# 83)          2    completely  dd   destroyer (#83)
     Play#1 output Play#1 1 (# 84)          2    completely  dd   destroyer (#84)
-    Play#1 output Play#1 1 (#100)          2    completely  cs   cargo ship (#100)
-    Play#1 output Play#1 1 (#101)          2    completely  cs   cargo ship (#101)
-    Play#1 output Play#1 1 (#102)          2    completely  cs   cargo ship (#102)
-    Play#1 output Play#1 1 (#103)          2    completely  cs   cargo ship (#103)
-    Play#1 output Play#1 1 (#104)          2    completely  cs   cargo ship (#104)
     Play#1 output Play#1 4 lb   TBD-1 Devastator #0, 2 bombs.  Target ('~' to skip)?
     Play#1 input 69
-    Play#1 output Play#1 1 50% hitchance...Blam-BLAM
+    Play#1 output Play#1 1 50% hitchance...blam-Blam
     Play#1 output Play#1 1
     Play#1 output Play#1 6 0 605
     Play#1 input launch 10 80
     Play#1 command launch
     Play#1 output Play#1 1 mi   Harpoon #10 at -2,2; range 6, eff 100%
-    Play#1 output Play#1 1 Preparing to launch mi   Harpoon #10 at 2 dd   destroyer (#80) in 0,2
+    Play#1 output Play#1 1 Preparing to launch mi   Harpoon #10 at 2 dd   destroyer (#80) in -6,2
     Play#1 output Play#1 1     Launching from -2,2
     Play#1 output Play#1 1     SHWOOOOOSH!  Missile launched!
     Play#1 output Play#1 1     50% hitchance...miss
@@ -641,7 +534,7 @@
     Play#1 input launch 11 81
     Play#1 command launch
     Play#1 output Play#1 1 mi   Harpoon #11 at -2,2; range 6, eff 100%
-    Play#1 output Play#1 1 Preparing to launch mi   Harpoon #11 at 2 dd   destroyer (#81) in 0,2
+    Play#1 output Play#1 1 Preparing to launch mi   Harpoon #11 at 2 dd   destroyer (#81) in -6,2
     Play#1 output Play#1 1     Launching from -2,2
     Play#1 output Play#1 1     SHWOOOOOSH!  Missile launched!
     Play#1 output Play#1 1     50% hitchance...miss
@@ -650,7 +543,7 @@
     Play#1 input launch 12 82
     Play#1 command launch
     Play#1 output Play#1 1 mi   Harpoon #12 at -2,2; range 6, eff 100%
-    Play#1 output Play#1 1 Preparing to launch mi   Harpoon #12 at 2 dd   destroyer (#82) in 0,2
+    Play#1 output Play#1 1 Preparing to launch mi   Harpoon #12 at 2 dd   destroyer (#82) in -6,2
     Play#1 output Play#1 1     Launching from -2,2
     Play#1 output Play#1 1     SHWOOOOOSH!  Missile launched!
     Play#1 output Play#1 1     50% hitchance...miss
@@ -659,7 +552,7 @@
     Play#1 input launch 13 83
     Play#1 command launch
     Play#1 output Play#1 1 mi   Harpoon #13 at -2,2; range 6, eff 100%
-    Play#1 output Play#1 1 Preparing to launch mi   Harpoon #13 at 2 dd   destroyer (#83) in 0,2
+    Play#1 output Play#1 1 Preparing to launch mi   Harpoon #13 at 2 dd   destroyer (#83) in -6,2
     Play#1 output Play#1 1     Launching from -2,2
     Play#1 output Play#1 1     SHWOOOOOSH!  Missile launched!
     Play#1 output Play#1 1     50% hitchance...HIT!
@@ -668,7 +561,7 @@
     Play#1 input launch 14 84
     Play#1 command launch
     Play#1 output Play#1 1 mi   Harpoon #14 at -2,2; range 6, eff 100%
-    Play#1 output Play#1 1 Preparing to launch mi   Harpoon #14 at 2 dd   destroyer (#84) in 0,2
+    Play#1 output Play#1 1 Preparing to launch mi   Harpoon #14 at 2 dd   destroyer (#84) in -6,2
     Play#1 output Play#1 1     Launching from -2,2
     Play#1 output Play#1 1     SHWOOOOOSH!  Missile launched!
     Play#1 output Play#1 1     50% hitchance...miss
@@ -722,8 +615,8 @@
     Play#1 output Play#1 1  . . . . a
     Play#1 output Play#1 1 . . . 0 a
     Play#1 output Play#1 1  . . . T
-    Play#1 output Play#1 1   . . . .
-    Play#1 output Play#1 1    . . . .
+    Play#1 output Play#1 1   . . ? .
+    Play#1 output Play#1 1    .     .
     Play#1 output Play#1 1
     Play#1 output Play#1 1 dd   destroyer (#5) stopped at -6,0
     Play#1 output Play#1 6 0 573
@@ -750,81 +643,60 @@
     Play#1 output Play#1 1 Papershuffling ... 0.1 B.T.U
     Play#1 output Play#1 1 You have been repelled
     Play#1 output Play#1 6 0 569
-    Play#1 input bomb 30 . p -2,2 ujh
+    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 1,1
-    Play#1 output Play#1 1 range to target is 2
+    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 agribusiness at -1,1
-    Play#1 output Play#1 1 flying over agribusiness at 1,1
-    Play#1 output Play#1 1 Target sector is a completely constructed agribusiness
+    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 (# 10)          2    completely  cav  cavalry #10
-    Play#1 output Play#1 1 (# 30)          2     minimally  inf  infantry #30
+    Play#1 output Play#1 1 (# 30)          2     minimally  cav  cavalry #30
     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 1 (# 40)          2    completely  cav  cavalry #40
-    Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
-    Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
-    Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
-    Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
     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 (# 10)          2    completely  cav  cavalry #10
-    Play#1 output Play#1 1 (# 30)          2     minimally  inf  infantry #30
+    Play#1 output Play#1 1 (# 30)          2     minimally  cav  cavalry #30
     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 1 (# 40)          2    completely  cav  cavalry #40
-    Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
-    Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
-    Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
-    Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
     Play#1 output Play#1 4 ac   AH-64 Apache #30, 1 bombs.  Target ('~' to skip)?
     Play#1 input 30
     Play#1 output Play#1 1 83% hitchance...Blam
     Play#1 output Play#1 6 0 567
-    Play#1 input __cmd added -1 0 0
-    Play#1 command __cmd
-    Play#1 output Play#1 6 0 567
-    Play#1 input bomb 30 . p -2,2 ujh
+    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 1,1
-    Play#1 output Play#1 1 range to target is 2
+    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 agribusiness at -1,1
-    Play#1 output Play#1 1 flying over agribusiness at 1,1
-    Play#1 output Play#1 1 Target sector is a completely constructed agribusiness
+    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 (# 10)          2    completely  cav  cavalry #10
     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 1 (# 40)          2    completely  cav  cavalry #40
-    Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
-    Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
-    Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
-    Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
     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 (# 10)          2    completely  cav  cavalry #10
     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 1 (# 40)          2    completely  cav  cavalry #40
-    Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
-    Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
-    Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
-    Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
     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
@@ -850,46 +722,32 @@
     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 ujh
+    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 1,1
-    Play#1 output Play#1 1 range to target is 2
+    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 agribusiness at -1,1
-    Play#1 output Play#1 1 flying over agribusiness at 1,1
-    Play#1 output Play#1 1 Target sector is a completely constructed agribusiness
+    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 (# 10)          2    completely  cav  cavalry #10
-    Play#1 output Play#1 1 (# 33)          2    completely  cav  cavalry #33
     Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
-    Play#1 output Play#1 1 (# 40)          2    completely  cav  cavalry #40
-    Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
-    Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
-    Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
-    Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
     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 (# 10)          2    completely  cav  cavalry #10
-    Play#1 output Play#1 1 (# 33)          2    completely  cav  cavalry #33
     Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
-    Play#1 output Play#1 1 (# 40)          2    completely  cav  cavalry #40
-    Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
-    Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
-    Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
-    Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
     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 output Play#1 6 0 561
-    Play#1 input __cmd added -1 0 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 1 No escorts...
@@ -902,10 +760,8 @@
     Play#1 output Play#1 1 flying over agribusiness at 1,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 (#  9)          2    completely  tra  train #9
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 33)          2    completely  cav  cavalry #33
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
     Play#1 output Play#1 1 (# 40)          2    completely  cav  cavalry #40
     Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
     Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
@@ -914,10 +770,8 @@
     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 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 33)          2    completely  cav  cavalry #33
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
     Play#1 output Play#1 1 (# 40)          2    completely  cav  cavalry #40
     Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
     Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
@@ -927,6 +781,9 @@
     Play#1 input 40
     Play#1 output Play#1 1 72% hitchance...Blam
     Play#1 output Play#1 6 0 559
+    Play#1 input __cmd added -1 0 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 559
     Play#1 input bomb 30 . p -2,2 ujh
     Play#1 command bomb
     Play#1 output Play#1 1 No escorts...
@@ -939,10 +796,8 @@
     Play#1 output Play#1 1 flying over agribusiness at 1,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 (#  9)          2    completely  tra  train #9
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 33)          2    completely  cav  cavalry #33
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
     Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
     Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
     Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
@@ -950,10 +805,8 @@
     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 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 33)          2    completely  cav  cavalry #33
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
     Play#1 output Play#1 1 (# 41)          2    completely  cav  cavalry #41
     Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
     Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
@@ -962,9 +815,6 @@
     Play#1 input 41
     Play#1 output Play#1 1 72% hitchance...Blam
     Play#1 output Play#1 6 0 557
-    Play#1 input __cmd added -1 0 0
-    Play#1 command __cmd
-    Play#1 output Play#1 6 0 557
     Play#1 input bomb 30 . p -2,2 ujh
     Play#1 command bomb
     Play#1 output Play#1 1 No escorts...
@@ -977,20 +827,16 @@
     Play#1 output Play#1 1 flying over agribusiness at 1,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 (#  9)          2    completely  tra  train #9
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 33)          2    completely  cav  cavalry #33
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
     Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
     Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
     Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
     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 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 33)          2    completely  cav  cavalry #33
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
     Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
     Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
     Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
@@ -1013,26 +859,23 @@
     Play#1 output Play#1 1 flying over agribusiness at 1,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 (#  9)          2    completely  tra  train #9
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 33)          2    completely  cav  cavalry #33
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
     Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
     Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
     Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
     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 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 33)          2    completely  cav  cavalry #33
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
     Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
     Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
     Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
     Play#1 output Play#1 4 ac   AH-64 Apache #30, 1 bombs.  Target ('~' to skip)?
     Play#1 input 44
-    Play#1 output Play#1 1 73% hitchance...Blam
+    Play#1 output Play#1 1     Flak! ac   AH-64 Apache #30 takes 1.
+    Play#1 output Play#1 1 72% hitchance...Blam
     Play#1 output Play#1 6 0 553
     Play#1 input bomb 30 . p -2,2 ujh
     Play#1 command bomb
@@ -1046,25 +889,20 @@
     Play#1 output Play#1 1 flying over agribusiness at 1,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 (#  9)          2    completely  tra  train #9
     Play#1 output Play#1 1 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 33)          2    completely  cav  cavalry #33
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
     Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
+    Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
     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 (# 10)          2    completely  cav  cavalry #10
     Play#1 output Play#1 1 (# 33)          2    completely  cav  cavalry #33
-    Play#1 output Play#1 1 (# 35)          2    completely  cav  cavalry #35
     Play#1 output Play#1 1 (# 42)          2    completely  cav  cavalry #42
+    Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
     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 72% hitchance...Blam
-    Play#1 output Play#1 6 0 551
-    Play#1 input __cmd added -1 0 0
-    Play#1 command __cmd
+    Play#1 output Play#1 1 71% hitchance...Blam
     Play#1 output Play#1 6 0 551
     Play#1 input bomb 30 . p -2,2 ujjh
     Play#1 command bomb
@@ -1082,20 +920,15 @@
     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 (# 32)          2    completely  cav  cavalry #32
     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 (# 32)          2    completely  cav  cavalry #32
     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 74% hitchance...Blam
-    Play#1 output Play#1 6 0 549
-    Play#1 input __cmd added -1 0 0
-    Play#1 command __cmd
+    Play#1 output Play#1 1 73% hitchance...Blam
     Play#1 output Play#1 6 0 549
     Play#1 input bomb 30 . p -2,2 ujjh
     Play#1 command bomb
@@ -1112,18 +945,16 @@
     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 (# 10)          2    moderately  cav  cavalry #10
-    Play#1 output Play#1 1 (# 32)          2    completely  cav  cavalry #32
+    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    moderately  cav  cavalry #10
-    Play#1 output Play#1 1 (# 32)          2    completely  cav  cavalry #32
+    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 ac   AH-64 Apache #30, 1 bombs.  Target ('~' to skip)?
     Play#1 input 10
-    Play#1 output Play#1 1 76% hitchance...BLAM
+    Play#1 output Play#1 1 74% hitchance...Blam
     Play#1 output Play#1 6 0 547
     Play#1 input bomb 30 . p -3,1 h
     Play#1 command bomb
@@ -1152,10 +983,10 @@
     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 74% hitchance...Blam
-    Play#1 output Play#1 1 1 pinpoint bombing raid did 36 damage to inf  infantry #2
-    Play#1 output Play#1 1     inf  infantry #2 takes 11
-    Play#1 output Play#1 1 -3,1 takes 4% collateral damage
+    Play#1 output Play#1 1 73% hitchance...Blam
+    Play#1 output Play#1 1 1 pinpoint bombing raid did 28 damage to inf  infantry #2
+    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 20/21/22/23/24 . p -2,2 uuh
     Play#1 command bomb
@@ -1177,8 +1008,6 @@
     Play#1 output Play#1 1 flying over agribusiness at 0,0
     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 (# 43)          2    completely  eng  engineer #43
-    Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
     Play#1 output Play#1 1 (# 60)          2    completely  cav  cavalry #60
     Play#1 output Play#1 1 (# 61)          2    completely  cav  cavalry #61
     Play#1 output Play#1 1 (# 62)          2    completely  cav  cavalry #62
@@ -1187,8 +1016,6 @@
     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 (# 43)          2    completely  eng  engineer #43
-    Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
     Play#1 output Play#1 1 (# 60)          2    completely  cav  cavalry #60
     Play#1 output Play#1 1 (# 61)          2    completely  cav  cavalry #61
     Play#1 output Play#1 1 (# 62)          2    completely  cav  cavalry #62
@@ -1196,21 +1023,18 @@
     Play#1 output Play#1 1 (# 64)          2    completely  cav  cavalry #64
     Play#1 output Play#1 4 lb   TBD-1 Devastator #24, 2 bombs.  Target ('~' to skip)?
     Play#1 input 60
-    Play#1 output Play#1 1 50% hitchance...Blam-BLAM
+    Play#1 output Play#1 1 50% hitchance...thud
     Play#1 output Play#1 1  #          owner           eff       type
-    Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
-    Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
+    Play#1 output Play#1 1 (# 60)          2    completely  cav  cavalry #60
     Play#1 output Play#1 1 (# 61)          2    completely  cav  cavalry #61
     Play#1 output Play#1 1 (# 62)          2    completely  cav  cavalry #62
     Play#1 output Play#1 1 (# 63)          2    completely  cav  cavalry #63
     Play#1 output Play#1 1 (# 64)          2    completely  cav  cavalry #64
     Play#1 output Play#1 4 lb   TBD-1 Devastator #23, 2 bombs.  Target ('~' to skip)?
     Play#1 input 61
-    Play#1 output Play#1 1 50% hitchance...thud
+    Play#1 output Play#1 1 50% hitchance...Blam-blam
     Play#1 output Play#1 1  #          owner           eff       type
-    Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
-    Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
-    Play#1 output Play#1 1 (# 61)          2    completely  cav  cavalry #61
+    Play#1 output Play#1 1 (# 60)          2    completely  cav  cavalry #60
     Play#1 output Play#1 1 (# 62)          2    completely  cav  cavalry #62
     Play#1 output Play#1 1 (# 63)          2    completely  cav  cavalry #63
     Play#1 output Play#1 1 (# 64)          2    completely  cav  cavalry #64
@@ -1218,9 +1042,7 @@
     Play#1 input 62
     Play#1 output Play#1 1 50% hitchance...thud
     Play#1 output Play#1 1  #          owner           eff       type
-    Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
-    Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
-    Play#1 output Play#1 1 (# 61)          2    completely  cav  cavalry #61
+    Play#1 output Play#1 1 (# 60)          2    completely  cav  cavalry #60
     Play#1 output Play#1 1 (# 62)          2    completely  cav  cavalry #62
     Play#1 output Play#1 1 (# 63)          2    completely  cav  cavalry #63
     Play#1 output Play#1 1 (# 64)          2    completely  cav  cavalry #64
@@ -1228,15 +1050,13 @@
     Play#1 input 63
     Play#1 output Play#1 1 50% hitchance...thud
     Play#1 output Play#1 1  #          owner           eff       type
-    Play#1 output Play#1 1 (# 43)          2    completely  eng  engineer #43
-    Play#1 output Play#1 1 (# 44)          2    completely  eng  engineer #44
-    Play#1 output Play#1 1 (# 61)          2    completely  cav  cavalry #61
+    Play#1 output Play#1 1 (# 60)          2    completely  cav  cavalry #60
     Play#1 output Play#1 1 (# 62)          2    completely  cav  cavalry #62
     Play#1 output Play#1 1 (# 63)          2    completely  cav  cavalry #63
     Play#1 output Play#1 1 (# 64)          2    completely  cav  cavalry #64
     Play#1 output Play#1 4 lb   TBD-1 Devastator #20, 2 bombs.  Target ('~' to skip)?
     Play#1 input 64
-    Play#1 output Play#1 1 50% hitchance...Blam-Blam
+    Play#1 output Play#1 1 50% hitchance...thud
     Play#1 output Play#1 6 0 543
     Play#1 input ctld
     Play#1 output Play#1 1 Bye-bye
@@ -1297,14 +1117,14 @@
     Play#0 output Play#0 1 but could not retreat to -3,1!
     Play#0 output Play#0 1 Country #1 shelled ms   minesweeper (#44) in -4,4 for 11 damage.
     Play#0 output Play#0 1     ms   minesweeper (#44) takes 10
-    Play#0 output Play#0 1 ms   minesweeper (#44) cleared 3 mines 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 29
-    Play#0 output Play#0 1 ms   minesweeper (#43) cleared 3 mines in -6,4 while retreating
+    Play#0 output Play#0 1     ms   minesweeper (#44) takes 22
+    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 24
+    Play#0 output Play#0 1     ms   minesweeper (#43) takes 25
     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
@@ -1329,68 +1149,77 @@
     Play#0 output Play#0 1 Country #1 shelled sb   submarine (#52) in -5,1 for 34 damage.
     Play#0 output Play#0 1     sb   submarine (#52) takes 27
     Play#0 output Play#0 1 sb   submarine (#52) was fired upon with no one able to defend it, and retreated to -9,1
+    Play#0 output Play#0 1 1 dd   destroyer (#5) sighted at -5,1
+    Play#0 output Play#0 1 1 dd   destroyer (#5) sighted at -6,0
     Play#0 output Play#0 1 Country #1 shelled sb   submarine (#53) in -4,-2 for 34 damage.
     Play#0 output Play#0 1     sb   submarine (#53) takes 27
     Play#0 output Play#0 1 Return fire hit dd   destroyer (#5) in -5,-1 for 6 damage.
-    Play#0 output Play#0 1 1 planes spotted over 0,2
-    Play#0 output Play#0 1 0,2 takes 3% collateral damage
-    Play#0 output Play#0 1 1 bombs did 24 damage to dd   destroyer (#61) at 0,2
-    Play#0 output Play#0 1     dd   destroyer (#61) takes 16
-    Play#0 output Play#0 1 dd   destroyer (#61) was damaged, and retreated to 2,4
-    Play#0 output Play#0 1 0,2 takes 1% collateral damage
-    Play#0 output Play#0 1 0,2 takes 3% collateral damage
-    Play#0 output Play#0 1 0,2 takes 3% collateral damage
-    Play#0 output Play#0 1 1 bombs did 72 damage to dd   destroyer (#64) at 0,2
-    Play#0 output Play#0 1     dd   destroyer (#64) takes 49
-    Play#0 output Play#0 1 dd   destroyer (#64) was damaged, and retreated to 2,4
-    Play#0 output Play#0 1 0,2 takes 4% collateral damage
-    Play#0 output Play#0 1 1 planes spotted over 0,2
-    Play#0 output Play#0 1 1 bombs did 20 damage to dd   destroyer (#65) at 0,2
-    Play#0 output Play#0 1     dd   destroyer (#65) takes 13
-    Play#0 output Play#0 1 dd   destroyer (#65) was bombed, and retreated to 2,4
-    Play#0 output Play#0 1 0,2 takes 1% collateral damage
-    Play#0 output Play#0 1 1 bombs did 52 damage to dd   destroyer (#66) at 0,2
-    Play#0 output Play#0 1     dd   destroyer (#66) takes 35
-    Play#0 output Play#0 1 dd   destroyer (#66) was bombed, and retreated to 2,4
-    Play#0 output Play#0 1 0,2 takes 3% collateral damage
-    Play#0 output Play#0 1 0,2 takes 2% collateral damage
-    Play#0 output Play#0 1 1 bombs did 56 damage to dd   destroyer (#68) at 0,2
-    Play#0 output Play#0 1     dd   destroyer (#68) takes 38
-    Play#0 output Play#0 1 dd   destroyer (#68) was bombed, and retreated to 2,4
-    Play#0 output Play#0 1 0,2 takes 3% collateral damage
-    Play#0 output Play#0 1 1 bombs did 76 damage to dd   destroyer (#69) at 0,2
-    Play#0 output Play#0 1     dd   destroyer (#69) takes 52
-    Play#0 output Play#0 1 dd   destroyer (#69) was bombed, and retreated to 2,4
-    Play#0 output Play#0 1 0,2 takes 4% collateral damage
-    Play#0 output Play#0 1 Incoming 1 missile sighted at 0,2...
+    Play#0 output Play#0 1 1 planes spotted over -4,2
+    Play#0 output Play#0 1 1 planes spotted over -6,2
+    Play#0 output Play#0 1 -6,2 takes 3% collateral damage
+    Play#0 output Play#0 1 1 bombs did 40 damage to dd   destroyer (#61) at -6,2
+    Play#0 output Play#0 1     dd   destroyer (#61) takes 27
+    Play#0 output Play#0 1 dd   destroyer (#61) was damaged, and retreated to -4,4
+    Play#0 output Play#0 1 -6,2 takes 2% collateral damage
+    Play#0 output Play#0 1 1 bombs did 48 damage to dd   destroyer (#62) at -6,2
+    Play#0 output Play#0 1     dd   destroyer (#62) takes 33
+    Play#0 output Play#0 1 dd   destroyer (#62) was damaged, and retreated to -4,4
+    Play#0 output Play#0 1 -6,2 takes 2% collateral damage
+    Play#0 output Play#0 1 1 bombs did 64 damage to dd   destroyer (#63) at -6,2
+    Play#0 output Play#0 1     dd   destroyer (#63) takes 44
+    Play#0 output Play#0 1 dd   destroyer (#63) was damaged, and retreated to -4,4
+    Play#0 output Play#0 1 -6,2 takes 3% collateral damage
+    Play#0 output Play#0 1 1 bombs did 48 damage to dd   destroyer (#64) at -6,2
+    Play#0 output Play#0 1     dd   destroyer (#64) takes 33
+    Play#0 output Play#0 1 dd   destroyer (#64) was damaged, and retreated to -4,4
+    Play#0 output Play#0 1 -6,2 takes 2% collateral damage
+    Play#0 output Play#0 1 1 planes spotted over -4,2
+    Play#0 output Play#0 1 1 planes spotted over -6,2
+    Play#0 output Play#0 1 1 bombs did 60 damage to dd   destroyer (#65) at -6,2
+    Play#0 output Play#0 1     dd   destroyer (#65) takes 41
+    Play#0 output Play#0 1 dd   destroyer (#65) was bombed, and retreated to -4,4
+    Play#0 output Play#0 1 -6,2 takes 3% collateral damage
+    Play#0 output Play#0 1 1 bombs did 48 damage to dd   destroyer (#66) at -6,2
+    Play#0 output Play#0 1     dd   destroyer (#66) takes 33
+    Play#0 output Play#0 1 dd   destroyer (#66) was bombed, and retreated to -4,4
+    Play#0 output Play#0 1 -6,2 takes 2% collateral damage
+    Play#0 output Play#0 1 -6,2 takes 4% collateral damage
+    Play#0 output Play#0 1 1 bombs did 44 damage to dd   destroyer (#68) at -6,2
+    Play#0 output Play#0 1     dd   destroyer (#68) takes 30
+    Play#0 output Play#0 1 dd   destroyer (#68) was bombed, and retreated to -4,4
+    Play#0 output Play#0 1 -6,2 takes 2% collateral damage
+    Play#0 output Play#0 1 1 bombs did 52 damage to dd   destroyer (#69) at -6,2
+    Play#0 output Play#0 1     dd   destroyer (#69) takes 35
+    Play#0 output Play#0 1 dd   destroyer (#69) was bombed, and retreated to -4,4
+    Play#0 output Play#0 1 -6,2 takes 3% collateral damage
+    Play#0 output Play#0 1 Incoming 1 missile sighted at -6,2...
     Play#0 output Play#0 1 ...Incoming 1 missile missed
     Play#0 output Play#0 1
-    Play#0 output Play#0 1 0,2 takes 4% collateral damage
-    Play#0 output Play#0 1 Incoming 1 missile sighted at 0,2...
+    Play#0 output Play#0 1 -6,2 takes 4% collateral damage
+    Play#0 output Play#0 1 Incoming 1 missile sighted at -6,2...
     Play#0 output Play#0 1 ...Incoming 1 missile missed
     Play#0 output Play#0 1
-    Play#0 output Play#0 1 0,2 takes 6% collateral damage
-    Play#0 output Play#0 1 Incoming 1 missile sighted at 0,2...
+    Play#0 output Play#0 1 -6,2 takes 6% collateral damage
+    Play#0 output Play#0 1 Incoming 1 missile sighted at -6,2...
     Play#0 output Play#0 1 ...Incoming 1 missile missed
     Play#0 output Play#0 1
-    Play#0 output Play#0 1 0,2 takes 9% collateral damage
-    Play#0 output Play#0 1     cav  cavalry #31 takes 1
-    Play#0 output Play#0 1 Incoming 1 missile sighted at 0,2...
+    Play#0 output Play#0 1 -6,2 takes 9% collateral damage
+    Play#0 output Play#0 1 Incoming 1 missile sighted at -6,2...
     Play#0 output Play#0 1 ...Incoming 1 missile HIT!
     Play#0 output Play#0 1
     Play#0 output Play#0 1     dd   destroyer (#83) takes 71
-    Play#0 output Play#0 1 dd   destroyer (#83) was damaged, and retreated to 2,4
-    Play#0 output Play#0 1 Incoming 1 missile sighted at 0,2...
+    Play#0 output Play#0 1 dd   destroyer (#83) was damaged, and retreated to -4,4
+    Play#0 output Play#0 1 Incoming 1 missile sighted at -6,2...
     Play#0 output Play#0 1 ...Incoming 1 missile missed
     Play#0 output Play#0 1
-    Play#0 output Play#0 1 0,2 takes 6% collateral damage
+    Play#0 output Play#0 1 -6,2 takes 6% collateral damage
     Play#0 output Play#0 1 sub in -1,3 torpedoed cs   cargo ship (#100) for 75 damage.
     Play#0 output Play#0 1     cs   cargo ship (#100) takes 62
-    Play#0 output Play#0 1 cs   cargo ship (#100) was hit by a torpedo, and retreated to 2,4
+    Play#0 output Play#0 1 cs   cargo ship (#100) was hit by a torpedo, and retreated to 2,-6
     Play#0 output Play#0 1 Torpedo sighted @ -1,3 by cs   cargo ship (#101)
     Play#0 output Play#0 1 sub in -1,3 torpedoed cs   cargo ship (#102) for 44 damage.
     Play#0 output Play#0 1     cs   cargo ship (#102) takes 36
-    Play#0 output Play#0 1 cs   cargo ship (#102) was hit by a torpedo, and retreated to 2,4
+    Play#0 output Play#0 1 cs   cargo ship (#102) was hit by a torpedo, and retreated to 2,-6
     Play#0 output Play#0 1 sub in -1,3 torpedoed cs   cargo ship (#103) for 95 damage.
     Play#0 output Play#0 1     cs   cargo ship (#103) takes 79
     Play#0 output Play#0 1 cs   cargo ship (#103) was hit by a torpedo,
@@ -1398,89 +1227,78 @@
     Play#0 output Play#0 1 Torpedo sighted @ -1,3 by cs   cargo ship (#104)
     Play#0 output Play#0 1 Sonar ping from -6,0 detected by sb   submarine (#120)!
     Play#0 output Play#0 1 sb   submarine (#120) detected a sonar ping, and retreated to -9,1
+    Play#0 output Play#0 1 1 dd   destroyer (#5) sighted at -5,1
     Play#0 output Play#0 1 tt   troop transport (#130) is being approached by dd   destroyer (#5)...
     Play#0 output Play#0 1 1 (#1) lost 1 troops trying to board tt   troop transport (#130)
     Play#0 output Play#0 1 We lost 0 troops defending
     Play#0 output Play#0 1 tt   troop transport (#130) was boarded, and retreated to -9,1
-    Play#0 output Play#0 1 1 planes spotted over -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 inf  infantry #30
-    Play#0 output Play#0 1     inf  infantry #30 takes 12
-    Play#0 output Play#0 1 1,1 takes 4% collateral damage
+    Play#0 output Play#0 1 1 planes spotted over 0,2
+    Play#0 output Play#0 1 1 pinpoint bombing raid did 44 damage to cav  cavalry #30
+    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 planes spotted over -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 44 damage to cav  cavalry #32
-    Play#0 output Play#0 1     cav  cavalry #32 takes 17
-    Play#0 output Play#0 1 cav  cavalry #32 was bombed, and retreated to 3,1
-    Play#0 output Play#0 1 1,1 takes 4% collateral damage
+    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 pinpoint bombing raid did 24 damage to cav  cavalry #35
-    Play#0 output Play#0 1     cav  cavalry #35 takes 9
+    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 1,1 takes 2% collateral damage
-    Play#0 output Play#0 1 1 planes spotted over 1,1
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 28 damage to cav  cavalry #40
-    Play#0 output Play#0 1     cav  cavalry #40 takes 11
+    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 but ran out of mobility, and couldn't retreat fully!
-    Play#0 output Play#0 1 1,1 takes 3% collateral damage
-    Play#0 output Play#0 1     tra  train #9 takes 1
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 36 damage to cav  cavalry #41
-    Play#0 output Play#0 1     cav  cavalry #41 takes 14
+    Play#0 output Play#0 1 1,1 takes 2% collateral damage
+    Play#0 output Play#0 1 1 planes spotted over 1,1
+    Play#0 output Play#0 1 1 pinpoint bombing raid did 28 damage to cav  cavalry #41
+    Play#0 output Play#0 1     cav  cavalry #41 takes 11
     Play#0 output Play#0 1 cav  cavalry #41 was bombed,
     Play#0 output Play#0 1 but could not retreat to 2,0!
-    Play#0 output Play#0 1 1,1 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 44 damage to cav  cavalry #42
-    Play#0 output Play#0 1     cav  cavalry #42 takes 17
+    Play#0 output Play#0 1 1,1 takes 3% collateral damage
+    Play#0 output Play#0 1 1 pinpoint bombing raid did 36 damage to cav  cavalry #42
+    Play#0 output Play#0 1     cav  cavalry #42 takes 14
     Play#0 output Play#0 1 cav  cavalry #42 was bombed,
     Play#0 output Play#0 1 but could not retreat to -1,1!
     Play#0 output Play#0 1 1,1 takes 4% collateral damage
-    Play#0 output Play#0 1     tra  train #9 takes 1
-    Play#0 output Play#0 1 Flak! Firing flak guns from unit eng  engineer #44 (aa rating 1)
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 28 damage to eng  engineer #44
-    Play#0 output Play#0 1     eng  engineer #44 takes 7
-    Play#0 output Play#0 1 eng  engineer #44 was bombed,
-    Play#0 output Play#0 1 and hit a mine in 0,0 while retreating!
-    Play#0 output Play#0 1     eng  engineer #44 takes 3
-    Play#0 output Play#0 1 eng  engineer #43 retreated with a bombed friend,
-    Play#0 output Play#0 1 and hit a mine in 0,0 while retreating!
-    Play#0 output Play#0 1     eng  engineer #43 takes 4
-    Play#0 output Play#0 1 1,1 takes 3% 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 44 damage to cav  cavalry #10
-    Play#0 output Play#0 1     cav  cavalry #10 takes 17
-    Play#0 output Play#0 1 cav  cavalry #10 was bombed, and retreated to 3,1
+    Play#0 output Play#0 1 Flak! Firing flak guns from unit eng  engineer #44 (aa rating 1)
+    Play#0 output Play#0 1 1 pinpoint bombing raid did 40 damage to eng  engineer #44
+    Play#0 output Play#0 1     eng  engineer #44 takes 10
+    Play#0 output Play#0 1 eng  engineer #44 was bombed, and retreated to 1,-1
     Play#0 output Play#0 1 1,1 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 36 damage to cav  cavalry #10
     Play#0 output Play#0 1     cav  cavalry #10 takes 14
     Play#0 output Play#0 1 cav  cavalry #10 was bombed, and retreated to 3,1
-    Play#0 output Play#0 1 3,1 takes 4% collateral damage
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 40 damage to cav  cavalry #10
-    Play#0 output Play#0 1     cav  cavalry #10 takes 15
+    Play#0 output Play#0 1 1,1 takes 4% collateral damage
+    Play#0 output Play#0 1 1 planes spotted over 3,1
+    Play#0 output Play#0 1 1 pinpoint bombing raid did 32 damage to cav  cavalry #10
+    Play#0 output Play#0 1     cav  cavalry #10 takes 12
+    Play#0 output Play#0 1 cav  cavalry #10 was bombed, and retreated to 3,1
+    Play#0 output Play#0 1 3,1 takes 3% collateral damage
+    Play#0 output Play#0 1 1 planes spotted over 1,1
+    Play#0 output Play#0 1 1 planes spotted over 3,1
+    Play#0 output Play#0 1 1 pinpoint bombing raid did 24 damage to cav  cavalry #10
+    Play#0 output Play#0 1     cav  cavalry #10 takes 9
     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 4% collateral damage
+    Play#0 output Play#0 1 3,1 takes 2% collateral damage
     Play#0 output Play#0 1 1 planes spotted over 0,0
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 72 damage to cav  cavalry #60
-    Play#0 output Play#0 1     cav  cavalry #60 takes 27
-    Play#0 output Play#0 1 cav  cavalry #60 was damaged, and retreated to 3,1
-    Play#0 output Play#0 1 0,0 takes 7% collateral damage
     Play#0 output Play#0 1 0,0 takes 4% collateral damage
-    Play#0 output Play#0 1 0,0 takes 3% 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     cav  cavalry #61 takes 21
+    Play#0 output Play#0 1 cav  cavalry #61 was damaged, and retreated to 3,1
+    Play#0 output Play#0 1 0,0 takes 6% collateral damage
     Play#0 output Play#0 1 0,0 takes 4% collateral damage
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 68 damage to cav  cavalry #64
-    Play#0 output Play#0 1     cav  cavalry #64 takes 26
-    Play#0 output Play#0 1 cav  cavalry #64 was damaged, and retreated to 3,1
-    Play#0 output Play#0 1 0,0 takes 7% collateral damage
+    Play#0 output Play#0 1 0,0 takes 3% collateral damage
+    Play#0 output Play#0 1 0,0 takes 3% collateral damage
     Play#0 output Play#0 6 0 640
     Play#0 input ship *
     Play#0 command ship
@@ -1493,43 +1311,43 @@
     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        83%   0   8   0   0  0  0  0  0  53   20
+    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   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   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 119   20
-    Play#0 output Play#0 1   2   33 cs   cargo ship     2,2        94%   0   9   0   0  0  0  0  0 120   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   41 lc   light cruis    1,3        96%   0  10   0   0  0  0  0  0 108   45
-    Play#0 output Play#0 1   2   42 lc   light cruis   -4,2        95%   0  10   0   0  0  0  0  0 120   45
-    Play#0 output Play#0 1   2   43 ms   minesweeper   -6,4    m   76%   0   7   0   0  0  0  0  0  86   40
-    Play#0 output Play#0 1   2   44 ms   minesweeper   -6,4    m   63%   0   7   0   0  0  0  0  0  70   40
+    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   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   7   0   0  0  0  0  0  92   60
-    Play#0 output Play#0 1   2   60 dd   destroyer      0,2       100%   0  10   0   0  0  0  0  0 127   70
-    Play#0 output Play#0 1   2   61 dd   destroyer      2,4        84%   0   8   0   0  0  0  0  0  83   70
-    Play#0 output Play#0 1   2   62 dd   destroyer      0,2       100%   0  10   0   0  0  0  0  0 127   70
-    Play#0 output Play#0 1   2   63 dd   destroyer      0,2       100%   0  10   0   0  0  0  0  0 127   70
-    Play#0 output Play#0 1   2   64 dd   destroyer      2,4        51%   0   5   0   0  0  0  0  0  26   70
-    Play#0 output Play#0 1   2   65 dd   destroyer      2,4        87%   0   9   0   0  0  0  0  0  89   70
-    Play#0 output Play#0 1   2   66 dd   destroyer      2,4        65%   0   7   0   0  0  0  0  0  53   70
-    Play#0 output Play#0 1   2   67 dd   destroyer      0,2       100%   0  10   0   0  0  0  0  0 127   70
-    Play#0 output Play#0 1   2   68 dd   destroyer      2,4        62%   0   6   0   0  0  0  0  0  46   70
-    Play#0 output Play#0 1   2   69 dd   destroyer      2,4        48%   0   5   0   0  0  0  0  0  21   70
-    Play#0 output Play#0 1   2   80 dd   destroyer      0,2       100%   0  10   0   0  0  0  0  0 127   70
-    Play#0 output Play#0 1   2   81 dd   destroyer      0,2       100%   0  10   0   0  0  0  0  0 127   70
-    Play#0 output Play#0 1   2   82 dd   destroyer      0,2       100%   0  10   0   0  0  0  0  0 127   70
-    Play#0 output Play#0 1   2   83 dd   destroyer      2,4        29%   0   3   0   0  0  0  0  0 -28   70
-    Play#0 output Play#0 1   2   84 dd   destroyer      0,2       100%   0  10   0   0  0  0  0  0 127   70
-    Play#0 output Play#0 1   2  100 cs   cargo ship     2,4        38%   0   4   0   0  0  0  0  0 -29   20
-    Play#0 output Play#0 1   2  101 cs   cargo ship     0,2       100%   0  10   0   0  0  0  0  0 127   20
-    Play#0 output Play#0 1   2  102 cs   cargo ship     2,4        64%   0   6   0   0  0  0  0  0  35   20
-    Play#0 output Play#0 1   2  103 cs   cargo ship     1,3        21%   0   2   0   0  0  0  0  0 -42   20
-    Play#0 output Play#0 1   2  104 cs   cargo ship     0,2       100%   0  10   0   0  0  0  0  0 127   20
+    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   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   63 dd   destroyer     -4,4        56%   0   5   0   0  0  0  0  0  37   70
+    Play#0 output Play#0 1   2   64 dd   destroyer     -4,4        67%   0   7   0   0  0  0  0  0  55   70
+    Play#0 output Play#0 1   2   65 dd   destroyer     -4,4        59%   0   6   0   0  0  0  0  0  40   70
+    Play#0 output Play#0 1   2   66 dd   destroyer     -4,4        67%   0   7   0   0  0  0  0  0  55   70
+    Play#0 output Play#0 1   2   67 dd   destroyer     -6,2       100%   0  10   0   0  0  0  0  0 127   70
+    Play#0 output Play#0 1   2   68 dd   destroyer     -4,4        70%   0   7   0   0  0  0  0  0  61   70
+    Play#0 output Play#0 1   2   69 dd   destroyer     -4,4        65%   0   7   0   0  0  0  0  0  53   70
+    Play#0 output Play#0 1   2   80 dd   destroyer     -6,2       100%   0  10   0   0  0  0  0  0 127   70
+    Play#0 output Play#0 1   2   81 dd   destroyer     -6,2       100%   0  10   0   0  0  0  0  0 127   70
+    Play#0 output Play#0 1   2   82 dd   destroyer     -6,2       100%   0  10   0   0  0  0  0  0 127   70
+    Play#0 output Play#0 1   2   83 dd   destroyer     -4,4        29%   0   3   0   0  0  0  0  0 -28   70
+    Play#0 output Play#0 1   2   84 dd   destroyer     -6,2       100%   0  10   0   0  0  0  0  0 127   70
+    Play#0 output Play#0 1   2  100 cs   cargo ship     2,-6       38%   0   4   0   0  0  0  0  0 -29   20
+    Play#0 output Play#0 1   2  101 cs   cargo ship     0,4       100%   0  10   0   0  0  0  0  0 127   20
+    Play#0 output Play#0 1   2  102 cs   cargo ship     2,-6       64%   0   6   0   0  0  0  0  0  35   20
+    Play#0 output Play#0 1   2  103 cs   cargo ship     1,5        21%   0   2   0   0  0  0  0  0 -42   20
+    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
@@ -1551,18 +1369,16 @@
     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   53 sb   submarine     -4,-2     gg                  h
-    Play#0 output Play#0 1   2   60 dd   destroyer      0,2      nn                  ihb
-    Play#0 output Play#0 1   2   62 dd   destroyer      0,2      nn                  ihb
-    Play#0 output Play#0 1   2   63 dd   destroyer      0,2      nn                  ihb
-    Play#0 output Play#0 1   2   67 dd   destroyer      0,2      nn                  hb
-    Play#0 output Play#0 1   2   80 dd   destroyer      0,2      nn                  ihb
-    Play#0 output Play#0 1   2   81 dd   destroyer      0,2      nn                  ihb
-    Play#0 output Play#0 1   2   82 dd   destroyer      0,2      nn                  ihb
-    Play#0 output Play#0 1   2   84 dd   destroyer      0,2      nn                  ihb
-    Play#0 output Play#0 1   2  101 cs   cargo ship     0,2      nn                  ith
-    Play#0 output Play#0 1   2  103 cs   cargo ship     1,3      n                   ith
-    Play#0 output Play#0 1   2  104 cs   cargo ship     0,2      nn                  ith
-    Play#0 output Play#0 1 25 ships
+    Play#0 output Play#0 1   2   60 dd   destroyer     -6,2      nn                  ihb
+    Play#0 output Play#0 1   2   67 dd   destroyer     -6,2      nn                  hb
+    Play#0 output Play#0 1   2   80 dd   destroyer     -6,2      nn                  ihb
+    Play#0 output Play#0 1   2   81 dd   destroyer     -6,2      nn                  ihb
+    Play#0 output Play#0 1   2   82 dd   destroyer     -6,2      nn                  ihb
+    Play#0 output Play#0 1   2   84 dd   destroyer     -6,2      nn                  ihb
+    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 6 0 639
     Play#0 input miss s * ?mission#0 q
     Play#0 command mission
@@ -1574,26 +1390,26 @@
     Play#0 output Play#0 1 own    # unit type          x,y    a   eff mil frt  mu  fd tch retr xl ln carry
     Play#0 output Play#0 1   1    0 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        89%   9 127 113   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         1,1        93%  10 127 119   0  50  42%  0  1
-    Play#0 output Play#0 1   2   10 cav  cavalry       4,0        61%   6 127  61   0  50  42%  0  0
-    Play#0 output Play#0 1   2   31 cav  cavalry       0,2        99%  10 127 126   0  50  42%  0  0   35S
-    Play#0 output Play#0 1   2   32 cav  cavalry       3,1        83%   0 127  96   0  50  42%  0  0
-    Play#0 output Play#0 1   2   33 cav  cavalry       1,1        85%   8 127  97   0  50  42%  0  0
-    Play#0 output Play#0 1   2   34 cav  cavalry       1,1       100%  10 127 127   0  50  42%  0  0    9L
-    Play#0 output Play#0 1   2   35 cav  cavalry       1,1        91%   9 127   0   0  50  42%  0  0
-    Play#0 output Play#0 1   2   40 cav  cavalry       2,2        89%   9 127 -15   0  50  42%  0  0
-    Play#0 output Play#0 1   2   41 cav  cavalry       3,1        86%   9 127  99   0  50  42%  0  0
-    Play#0 output Play#0 1   2   42 cav  cavalry       1,1        83%   9 127 105   0  50  42%  0  0
-    Play#0 output Play#0 1   2   43 eng  engineer      0,0    m   96%  10 127 110   0 130  42%  0  0
-    Play#0 output Play#0 1   2   44 eng  engineer      0,0    m   90%  10 127 103   0 130  42%  0  0
-    Play#0 output Play#0 1   2   60 cav  cavalry       3,1        73%   7 127  71   0  50  42%  0  0
-    Play#0 output Play#0 1   2   61 cav  cavalry       0,0       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   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   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   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   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       3,1        74%   7 127  72   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 6 0 637
     Play#0 input lretr * ?rflags#0
@@ -1603,16 +1419,16 @@
     Play#0 output Play#0 1   1    4 inf  infantry      -3,1    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   31 cav  cavalry        0,2      j                   b
-    Play#0 output Play#0 1   2   34 cav  cavalry        1,1      j                   b
-    Play#0 output Play#0 1   2   35 cav  cavalry        1,1      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   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   43 eng  engineer       0,0    m u          Yes      b
-    Play#0 output Play#0 1   2   44 eng  engineer       0,0    m u          Yes      b
-    Play#0 output Play#0 1   2   61 cav  cavalry        0,0      nj                  ihb
+    Play#0 output Play#0 1   2   43 eng  engineer       1,1    m yu         Yes      b
+    Play#0 output Play#0 1   2   60 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 6 0 636
     Play#0 input miss l * ?mission#0 q

diff --git a/tests/retreat/setup-POGO b/tests/retreat/setup-POGO
index da7ff404f008e5442c1f8dd0e1807d723de5c37c..535ec25a84d96e97108254ae41605328724693f9 100644 (file)
--- a/tests/retreat/setup-POGO
+++ b/tests/retreat/setup-POGO
@@ -1,10 +1,11 @@
 || create land
 desi @0,0:2 a
 desi 4,4 h
+des -6,2 h
 give c * ?des#. 100
 || country#1
 add 1 1 1 p
-edit l * ?des#.&xloc<0 o 1 O 1
+edit l * ?des#.&xloc>-6&xloc<0 o 1 O 1
 desi -2,0 c
 edit c 1 c -2,0 s 4 b 640 M 25000 T 100
 | two forts (-2,-2 with return fire, -2,2 without)
@@ -48,7 +49,7 @@ edit l 2,2 e 1
 | ship that can return fire to -2,-2 and -5,-1 weakly
 edit s 5 U 9 O 2 L -4,-2 E 60
 | a train to carry land units
-edit u 0 U 9 O 2 T tra L 1,1
+edit u 0 U 9 O 2 T tra L 0,2
 | target ships gun fire: injured, helpless, not helpless
 edit s 0 U 20 O 2 U 10 L 0,2 U 11
 retr 10 nhhnj ih
@@ -94,16 +95,16 @@ retr 51 gg dh
 retr 52/53 gg h
 | target ships bombs: injured vs. bombed, bombed
 | five of each, to have a decent chance at getting both a hit and a miss
-edit s 10 U 60 t dd U 61 U 62 U 63 U 64 U 65 U 66 U 67 U 68 U 69
+edit s 10 U 60 t dd L -6,2 U 61 U 62 U 63 U 64 U 65 U 66 U 67 U 68 U 69
 retr 60/61/62/63/64 nn bih
 retr 65/66/67/68/69 nn bh
 | target ships missiles: injured (bombed doesn't apply)
 | five, to have a decent chance at getting both a hit and a miss
-edit s 60 U 80 U 81 U 82 U 83 U 84
+edit s 60 U 80 L -6,2 U 81 U 82 U 83 U 84
 retr 80/81/82/83/84 nn bih
 | target ships torpedoes: torpedoed (injured not implemented)
 | five, to have a decent chance at getting both a hit and a miss
-edit s 10 U 100 U 101 U 102 U 103 U 104
+edit s 10 U 100 L 0,4 U 101 U 102 U 103 U 104
 retr 100/101/102/103/104 nn tih
 | target ship sonar
 edit s 50 U 120
@@ -112,21 +113,21 @@ retr 120 gg s
 edit s 50 U 130 t tt
 retr 130 gg u
 | target land units bombs: bombed
-edit u 9 U 10 T cav
+edit u 9 U 10 T cav L 1,1
 lret 10 jhhuy b
 | target land units that want to retreat, but can't:
 | destroyed
-edit u 10 U 30 T inf e 10
+edit u 10 U 30 L 0,2 e 10
 | loaded on ship
-edit u 10 U 31 S 35
+edit u 10 U 31 L 0,2 S 35
 | crewless
-edit u 10 U 32 m 0
+edit u 10 U 32 L 0,2 m 0
 | kidnapped
 edit u 10 U 33 L -1,1
 | loaded on train
-edit u 10 U 34 Y 9
+edit u 10 U 34 L 0,2 Y 9
 | no mobility
-edit u 10 U 35 M 0
+edit u 10 U 35 L 0,2 M 0
 lret 30/31/32/33/34/35 j b
 | target land units having difficulties during retreat:
 | runs out of mobility