From 7da0c919f12bc5327fd5bafa25b7f0f5b895f50f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 7 Jan 2015 14:36:53 +0100 Subject: [PATCH] tests/retreat: Cover canals Signed-off-by: Markus Armbruster --- tests/retreat-test | 1 + tests/retreat/01-retreat-1 | 8 +++++ tests/retreat/final.xdump | 38 ++++++++++---------- tests/retreat/journal.log | 71 +++++++++++++++++++++++++++----------- tests/retreat/setup-POGO | 10 ++++-- 5 files changed, 88 insertions(+), 40 deletions(-) diff --git a/tests/retreat-test b/tests/retreat-test index c35294688..2e7d1bbd3 100755 --- a/tests/retreat-test +++ b/tests/retreat-test @@ -15,6 +15,7 @@ WORLD_X 24 WORLD_Y 12 MARKET 1 EOF +customize big-city begin_test "$srcdir"/tests/retreat/setup-POGO "$srcdir"/tests/retreat/setup-2 feed_dir "$srcdir"/tests/retreat diff --git a/tests/retreat/01-retreat-1 b/tests/retreat/01-retreat-1 index 95777fdfd..64fa55c65 100644 --- a/tests/retreat/01-retreat-1 +++ b/tests/retreat/01-retreat-1 @@ -44,11 +44,15 @@ lret fire se -2,2 30 | BUG: 36 retreats anyway __cmd added -2 -2 0 +| in canal 4,0 +fire se -2,2 31 +__cmd added 1 1 0 | in construction zone 2,2 fire se -2,2 33 | landlocked in 3,1 fire se -2,2 34 __cmd added -1 -1 0 +| as group (fleet c): 30 sinks, 31 on sale, 32 crewless, 35 no mobility, || ships having difficulties during retreat | out of mobility after n fire se -2,2 40 @@ -59,6 +63,10 @@ fire se -2,2 42 | into minefield -6,4, sweep and hit mines, stop | as group (fleet m): 44/43 fire se -2,2 44 +| into canal +| as group (fleet n): 46 can't, 47 can +fire se -2,2 46 +__cmd added 1 1 0 || ships retreating fully | nh fire se -2,2 10 diff --git a/tests/retreat/final.xdump b/tests/retreat/final.xdump index 195773995..812eea5d1 100644 --- a/tests/retreat/final.xdump +++ b/tests/retreat/final.xdump @@ -2,7 +2,7 @@ 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 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 +2 4 0 5 100 127 0 0 0 0 0 0 0 4 0 0 0 0 1 5 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 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 @@ -12,12 +12,12 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd 2 0 2 12 98 124 0 0 0 0 0 0 0 0 2 0 0 0 1 12 0 0 0 0 0 2 98 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 2 2 2 12 1 0 0 0 0 0 0 0 0 2 2 0 0 0 1 12 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 2 -6 2 12 81 102 0 0 0 0 0 0 0 -6 2 0 0 0 1 12 0 0 0 0 0 2 83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 -1 -2 2 19 100 127 0 0 0 0 0 0 0 -2 2 0 0 0 1 19 0 0 0 0 0 1 100 5 16 2 63 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 +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 63 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 4 4 4 12 100 127 0 0 0 0 0 0 0 4 4 0 0 0 1 12 0 0 0 0 0 4 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 0 -6 4 0 0 0 0 0 0 0 0 0 0 -6 4 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 92 healthy 0 0 0 0 0 0 0 0 2 0 -2 15 100 127 0 0 0 0 0 0 0 0 -2 0 0 0 1 15 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 3 2 -2 15 100 127 0 0 0 0 0 0 0 2 -2 0 0 0 1 15 0 0 0 0 0 3 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 -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 @@ -30,35 +30,37 @@ 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 -5 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group helpless) "b" -5 1 -5 1 17 96 63 0 70 0 0 none 0 "" 0 9 31 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" +5 1 -5 1 17 96 63 0 70 0 0 none 0 "" 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 "" 0 10 21 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 7 1 -5 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group helpless) "b" 9 2 -4 -2 17 60 127 0 70 0 0 none 0 "" 0 10 38 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" -10 2 4 4 2 82 54 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 98 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 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 (helpless) "u" +10 2 4 4 2 81 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" 24 1 -4 2 2 100 127 0 20 0 0 none 0 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "ggg" -25 2 -8 2 2 91 82 0 20 0 0 none 0 "g" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g" +25 2 -8 2 2 91 81 0 20 0 0 none 0 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g" 26 2 -4 4 2 100 97 0 20 0 0 none 0 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 27 2 -4 4 2 100 97 0 20 0 0 none 0 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 28 2 -8 2 2 100 97 0 20 0 0 none 0 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group bombed) "g" 29 2 1 3 2 100 97 0 20 0 0 none 0 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g" -30 0 0 2 2 0 117 0 20 0 0 none 0 "c" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "n" -31 2 0 2 2 100 127 0 20 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n" +30 0 0 2 2 0 117 0 20 0 0 none 0 "c" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "n" +31 2 4 0 2 94 119 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 100 127 0 20 0 0 none 0 "c" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "n" -33 2 2 2 2 94 119 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n" +33 2 2 2 2 94 119 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 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" 35 2 0 2 2 100 0 0 20 0 0 none 0 "c" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "n" 36 2 1 3 2 100 112 0 20 0 0 none 0 "c" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 40 2 1 3 10 91 -8 0 45 0 2 none 1 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "nnnh" 41 2 1 3 10 96 109 0 45 0 2 none 1 "" 0 9 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 65 74 0 40 0 0 none 0 "m" 0 7 2 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g" -44 2 -6 4 16 61 68 0 40 0 0 none 0 "m" 0 6 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g" +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 72 81 0 40 0 0 none 0 "m" 0 7 2 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g" +44 2 -6 4 16 66 72 0 40 0 0 none 0 "m" 0 6 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g" +46 2 5 1 2 91 116 0 20 0 0 none 0 "n" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "y" +47 2 4 0 9 100 117 0 40 0 0 none 0 "n" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 50 2 -9 1 18 67 33 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" -51 2 -9 1 18 64 27 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" -52 2 -9 1 18 73 45 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 () "" -53 2 -4 -2 18 73 93 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" +51 2 -9 1 18 64 28 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 () "" +52 2 -9 1 18 73 45 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" +53 2 -4 -2 18 73 92 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (helpless) "gg" 60 2 -6 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured helpless bombed) "nn" 61 2 -4 4 17 73 65 0 70 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 62 2 -4 4 17 67 55 0 70 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" @@ -143,7 +145,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile p /config config news actor action victim times duration time -1 11 2 13 0 0 +1 11 2 15 0 0 2 25 0 2 0 0 1 11 1 1 0 0 2 14 1 2 0 0 diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log index bf01a9b83..a4e4d5d66 100644 --- a/tests/retreat/journal.log +++ b/tests/retreat/journal.log @@ -163,6 +163,16 @@ Play#1 input __cmd added -2 -2 0 Play#1 command __cmd Play#1 output Play#1 6 0 627 + Play#1 input fire se -2,2 31 + Play#1 command fire + Play#1 output Play#1 1 Sector -2,2 ready to fire + Play#1 output Play#1 1 range is 5.00 (4.50) + Play#1 output Play#1 1 \007Kaboom!!! + Play#1 output Play#1 1 Shells hit cs cargo ship (#31) in 4,0 for 8 damage. + Play#1 output Play#1 6 0 626 + Play#1 input __cmd added 1 1 0 + Play#1 command __cmd + Play#1 output Play#1 6 0 627 Play#1 input fire se -2,2 33 Play#1 command fire Play#1 output Play#1 1 Sector -2,2 ready to fire @@ -208,6 +218,16 @@ Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit ms minesweeper (#44) in -4,4 for 11 damage. Play#1 output Play#1 6 0 620 + Play#1 input fire se -2,2 46 + Play#1 command fire + Play#1 output Play#1 1 Sector -2,2 ready to fire + Play#1 output Play#1 1 range is 4.00 (4.50) + Play#1 output Play#1 1 \007Kaboom!!! + Play#1 output Play#1 1 Shells hit cs cargo ship (#46) in 5,1 for 11 damage. + Play#1 output Play#1 6 0 619 + Play#1 input __cmd added 1 1 0 + Play#1 command __cmd + Play#1 output Play#1 6 0 620 Play#1 input fire se -2,2 10 Play#1 command fire Play#1 output Play#1 1 Sector -2,2 ready to fire @@ -669,7 +689,6 @@ 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 @@ -1116,6 +1135,10 @@ Play#0 output Play#0 1 but had no mobility, and couldn't retreat! Play#0 output Play#0 1 cs cargo ship (#36) retreated with a damaged friend, and ended up at 1,3 Play#0 output Play#0 1 cs cargo ship (#30) sunk! + Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#31) in 4,0 for 8 damage. + Play#0 output Play#0 1 cs cargo ship (#31) takes 6 + Play#0 output Play#0 1 cs cargo ship (#31) was damaged, + Play#0 output Play#0 1 but was landlocked, and couldn't retreat! Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#33) in 2,2 for 8 damage. Play#0 output Play#0 1 cs cargo ship (#33) takes 6 Play#0 output Play#0 1 cs cargo ship (#33) was damaged, @@ -1138,14 +1161,19 @@ 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 4 mines in -6,4 while retreating + 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) 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 32 - Play#0 output Play#0 1 ms minesweeper (#43) cleared 2 mines in -6,4 while retreating + Play#0 output Play#0 1 ms minesweeper (#44) takes 27 + 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 (#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 35 + Play#0 output Play#0 1 ms minesweeper (#43) takes 28 + Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#46) in 5,1 for 11 damage. + Play#0 output Play#0 1 cs cargo ship (#46) takes 9 + Play#0 output Play#0 1 cs cargo ship (#46) was damaged, + Play#0 output Play#0 1 but could not retreat to 4,0! + Play#0 output Play#0 1 pt patrol boat (#47) retreated with a damaged friend, and ended up at 4,0 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 @@ -1343,30 +1371,32 @@ Play#0 output Play#0 1 1 6 sb submarine -1,3 100% 0 10 0 0 0 0 0 0 97 165 Play#0 output Play#0 1 1 7 cs cargo ship -5,1 a 100% 0 10 0 0 0 0 0 0 127 20 Play#0 output Play#0 1 2 9 dd destroyer -4,-2 60% 0 10 0 0 0 0 0 0 127 70 - Play#0 output Play#0 1 2 10 cs cargo ship 4,4 82% 0 9 0 0 0 0 0 0 54 20 - Play#0 output Play#0 1 2 11 cs cargo ship 1,3 91% 0 9 0 0 0 0 0 0 98 20 - Play#0 output Play#0 1 2 20 cs cargo ship -3,1 95% 0 10 0 0 0 0 0 0 120 20 + Play#0 output Play#0 1 2 10 cs cargo ship 4,4 81% 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 1 24 cs cargo ship -4,2 g 100% 0 10 0 0 0 0 0 0 127 20 - Play#0 output Play#0 1 2 25 cs cargo ship -8,2 g 91% 0 9 0 0 0 0 0 0 82 20 + Play#0 output Play#0 1 2 25 cs cargo ship -8,2 g 91% 0 10 0 0 0 0 0 0 81 20 Play#0 output Play#0 1 2 26 cs cargo ship -4,4 g 100% 0 10 0 0 0 0 0 0 97 20 Play#0 output Play#0 1 2 27 cs cargo ship -4,4 g 100% 0 10 0 0 0 0 0 0 97 20 Play#0 output Play#0 1 2 28 cs cargo ship -8,2 g 100% 0 10 0 0 0 0 0 0 97 20 Play#0 output Play#0 1 2 29 cs cargo ship 1,3 g 100% 0 10 0 0 0 0 0 0 97 20 - Play#0 output Play#0 1 2 31 cs cargo ship 0,2 100% 0 10 0 0 0 0 0 0 127 20 + Play#0 output Play#0 1 2 31 cs cargo ship 4,0 94% 0 10 0 0 0 0 0 0 119 20 Play#0 output Play#0 1 2 32 cs cargo ship 0,2 c 100% 0 0 0 0 0 0 0 0 127 20 - Play#0 output Play#0 1 2 33 cs cargo ship 2,2 94% 0 9 0 0 0 0 0 0 119 20 + Play#0 output Play#0 1 2 33 cs cargo ship 2,2 94% 0 10 0 0 0 0 0 0 119 20 Play#0 output Play#0 1 2 34 cs cargo ship 3,1 92% 0 9 0 0 0 0 0 0 117 20 Play#0 output Play#0 1 2 35 cs cargo ship 0,2 c 100% 0 10 0 0 0 0 0 1 0 20 Play#0 output Play#0 1 2 36 cs cargo ship 1,3 c 100% 0 10 0 0 0 0 0 0 112 20 Play#0 output Play#0 1 2 40 lc light cruis 1,3 91% 0 9 0 0 0 0 0 0 -8 45 Play#0 output Play#0 1 2 41 lc light cruis 1,3 96% 0 9 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 120 45 - Play#0 output Play#0 1 2 43 ms minesweeper -6,4 m 65% 0 7 0 0 0 0 0 0 74 40 - Play#0 output Play#0 1 2 44 ms minesweeper -6,4 m 61% 0 6 0 0 0 0 0 0 68 40 + 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 72% 0 7 0 0 0 0 0 0 81 40 + Play#0 output Play#0 1 2 44 ms minesweeper -6,4 m 66% 0 6 0 0 0 0 0 0 72 40 + Play#0 output Play#0 1 2 46 cs cargo ship 5,1 n 91% 0 10 0 0 0 0 0 0 116 20 + Play#0 output Play#0 1 2 47 pt patrol boat 4,0 n 100% 0 2 0 0 0 0 0 0 117 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 7 0 0 0 0 0 0 27 60 - Play#0 output Play#0 1 2 52 sb submarine -9,1 73% 0 8 0 0 0 0 0 0 45 60 - Play#0 output Play#0 1 2 53 sb submarine -4,-2 73% 0 7 0 0 0 0 0 0 93 60 + Play#0 output Play#0 1 2 51 sb submarine -9,1 64% 0 7 0 0 0 0 0 0 28 60 + Play#0 output Play#0 1 2 52 sb submarine -9,1 73% 0 7 0 0 0 0 0 0 45 60 + Play#0 output Play#0 1 2 53 sb submarine -4,-2 73% 0 7 0 0 0 0 0 0 92 60 Play#0 output Play#0 1 2 60 dd destroyer -6,2 100% 0 10 0 0 0 0 0 0 127 70 Play#0 output Play#0 1 2 61 dd destroyer -4,4 73% 0 7 0 0 0 0 0 0 65 70 Play#0 output Play#0 1 2 62 dd destroyer -4,4 67% 0 7 0 0 0 0 0 0 55 70 @@ -1389,7 +1419,7 @@ 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 55 ships + Play#0 output Play#0 1 57 ships Play#0 output Play#0 6 0 640 Play#0 input retr * ?rflags#0 Play#0 command retreat @@ -1402,7 +1432,7 @@ Play#0 output Play#0 1 2 25 cs cargo ship -8,2 g g Yes i Play#0 output Play#0 1 2 28 cs cargo ship -8,2 g g Yes b Play#0 output Play#0 1 2 29 cs cargo ship 1,3 g g Yes i - Play#0 output Play#0 1 2 31 cs cargo ship 0,2 n i + Play#0 output Play#0 1 2 31 cs cargo ship 4,0 n i Play#0 output Play#0 1 2 32 cs cargo ship 0,2 c n Yes i Play#0 output Play#0 1 2 33 cs cargo ship 2,2 n i Play#0 output Play#0 1 2 34 cs cargo ship 3,1 n i @@ -1412,6 +1442,7 @@ Play#0 output Play#0 1 2 42 lc light cruis -4,2 ugggh i Play#0 output Play#0 1 2 43 ms minesweeper -6,4 m g Yes i Play#0 output Play#0 1 2 44 ms minesweeper -6,4 m g Yes i + Play#0 output Play#0 1 2 46 cs cargo ship 5,1 n y 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 -6,2 nn ihb Play#0 output Play#0 1 2 67 dd destroyer -6,2 nn hb @@ -1422,7 +1453,7 @@ Play#0 output Play#0 1 2 101 cs cargo ship 0,4 nn ith Play#0 output Play#0 1 2 103 cs cargo ship 1,5 n ith Play#0 output Play#0 1 2 104 cs cargo ship 0,4 nn ith - Play#0 output Play#0 1 28 ships + Play#0 output Play#0 1 29 ships Play#0 output Play#0 6 0 639 Play#0 input miss s * ?mission#0 q Play#0 command mission diff --git a/tests/retreat/setup-POGO b/tests/retreat/setup-POGO index 2eabd4746..f1866437b 100644 --- a/tests/retreat/setup-POGO +++ b/tests/retreat/setup-POGO @@ -47,6 +47,8 @@ edit l * ?des#.&own=0 o 2 O 2 | mountain, to test "can't retreat into mountain" desi 2,0 ^ edit c 2 c 2,0 s 4 b 640 M 25000 T 100 +| a city for testing canals +desi 4,0 c | harbors, 0,2 efficient, 2,2 construction zone desi 0:2,2 h edit l 2,2 e 1 @@ -71,8 +73,8 @@ retr g ?uid=29 ggg i | target ships that want to retreat, but can't: | sunk edit s 10 U 30 E 20 -| #31 unused -edit s 10 U 31 +| in canal +edit s 10 U 31 L 4,0 | crewless edit s 10 U 32 m 0 | in construction zone @@ -103,6 +105,10 @@ fleet m 43/44 edit s m L -4,4 edit l -6,4 M 100 retr m gg i +| into canal 4,0 +edit s 10 U 46 L 5,1 U 47 t pt +fleet n 46/47 +retr n y i | missions for retreat to clear miss s 40/41/42 int . | target ships depth-charges: injured vs. depth-charged, depth-charged, -- 2.43.0