From 891039d3841b92120d70825e3f369cdc545ae284 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 7 Jan 2015 14:54:21 +0100 Subject: [PATCH] tests/retreat: Cover trains This exposes yet another bug. It's marked "BUG:" in the test input. Signed-off-by: Markus Armbruster --- tests/retreat-test | 1 + tests/retreat/01-retreat-1 | 12 ++- tests/retreat/final.xdump | 51 +++++++------ tests/retreat/journal.log | 148 ++++++++++++++++++++++++++++++------- tests/retreat/setup-POGO | 16 +++- 5 files changed, 175 insertions(+), 53 deletions(-) diff --git a/tests/retreat-test b/tests/retreat-test index 2e7d1bbd3..ff0587da7 100755 --- a/tests/retreat-test +++ b/tests/retreat-test @@ -16,6 +16,7 @@ WORLD_Y 12 MARKET 1 EOF customize big-city +# TODO cover RAILWAYS 0 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 64fa55c65..c37171573 100644 --- a/tests/retreat/01-retreat-1 +++ b/tests/retreat/01-retreat-1 @@ -161,7 +161,10 @@ bomb 30 . p -2,2 uh l 33 | BUG: retreats anyway -__cmd added -1 -2 0 +| no rail in 1,1 +bomb 30 . p -2,2 ujh +l +37 || 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 @@ -185,6 +188,13 @@ l 44 | BUG: sweeps silently | BUG: 43 doesn't retreat when 44 retreats fully +| rail ends after n +| as group (army t): 45 train, 46 not +bomb 31 . p -2,2 uyuuh +l +45 +| BUG: 46 retreats anyway +__cmd added 1 2 0 || land units retreating fully | jh bomb 30 . p -2,2 ujh diff --git a/tests/retreat/final.xdump b/tests/retreat/final.xdump index 812eea5d1..96e5d5d09 100644 --- a/tests/retreat/final.xdump +++ b/tests/retreat/final.xdump @@ -1,6 +1,6 @@ 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 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 94 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 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 @@ -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 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 +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 12 2 59 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 +2 0 -2 24 98 124 0 0 0 0 0 0 0 0 -2 0 0 0 1 24 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 3 2 -2 15 100 127 0 0 0 0 0 0 0 2 -2 0 0 0 1 15 0 0 0 0 0 3 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 -1 -2 -2 19 99 125 0 0 0 0 0 0 0 -2 -2 0 0 0 1 19 0 0 0 0 0 1 99 5 98 2 99 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 +1 -2 -2 19 99 126 0 0 0 0 0 0 0 -2 -2 0 0 0 1 19 0 0 0 0 0 1 99 5 98 2 99 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 2 1 -1 15 100 127 0 0 0 0 0 0 0 1 -1 0 0 0 0 15 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 3 3 -1 15 100 127 0 0 0 0 0 0 0 3 -1 0 0 0 1 15 0 0 0 0 0 3 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 1 -3 -1 15 100 127 0 0 0 0 0 0 0 -3 -1 0 0 0 1 15 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 @@ -30,37 +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 30 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 8 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 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" +10 2 4 4 2 82 53 0 20 0 0 none 0 "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" +11 2 1 3 2 91 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 121 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" 24 1 -4 2 2 100 127 0 20 0 0 none 0 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "ggg" 25 2 -8 2 2 91 81 0 20 0 0 none 0 "g" 0 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 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" +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 4 0 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" 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 10 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 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n" 34 2 3 1 2 92 117 0 20 0 0 none 0 "" 0 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" +40 2 1 3 10 91 -8 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) "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 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" +43 2 -8 4 16 100 99 0 40 0 0 none 0 "m" 0 10 4 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" +44 2 -6 4 16 57 61 0 40 0 0 none 0 "m" 0 6 2 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 9 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 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" +50 2 -9 1 18 67 34 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 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 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" 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 () "" @@ -102,7 +102,8 @@ 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 99 27 0 400 0 0 none 0 "" 18 0 -1 -1 () 0 0.00000 +30 1 -2 2 17 99 18 0 400 0 0 none 0 "" 18 0 -1 -1 () 0 0.00000 +31 1 -2 2 17 100 113 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 @@ -128,11 +129,14 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h 34 2 2 2 0 100 107 0 50 0 0 none 0 "c" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 9 0 35 2 0 2 0 100 0 0 50 0 0 none 0 "c" -1 127 42 (group bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 36 2 2 2 0 100 107 0 50 0 0 none 0 "c" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +37 2 1 1 7 82 105 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 +45 2 1 -1 7 84 65 0 50 0 0 none 0 "t" -1 127 42 (group bombed) "b" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +46 2 0 0 0 92 99 0 50 0 0 none 0 "t" -1 127 42 () "" 0 9 0 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 79 0 50 0 0 none 0 "" -1 127 42 () "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 62 2 0 0 0 100 127 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "nj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 @@ -146,15 +150,16 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile p config news actor action victim times duration time 1 11 2 15 0 0 -2 25 0 2 0 0 +2 25 0 1 0 0 1 11 1 1 0 0 2 14 1 2 0 0 -1 9 2 9 0 0 +1 9 2 10 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 11 0 0 +1 55 2 13 0 0 +2 56 0 1 0 0 1 55 1 1 0 0 /config config trade diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log index a4e4d5d66..3cada373e 100644 --- a/tests/retreat/journal.log +++ b/tests/retreat/journal.log @@ -664,7 +664,7 @@ Play#1 command board Play#1 output Play#1 1 Approaching tt troop transport (#130)... Play#1 output Play#1 1 tt troop transport (#130) is about 100% efficient and has approximately 10 mil on board. - Play#1 output Play#1 4 Number of mil from dd destroyer (#5) (max 9) : + Play#1 output Play#1 4 Number of mil from dd destroyer (#5) (max 8) : Play#1 input 1 Play#1 output Play#1 1 Play#1 output Play#1 1 Initial attack strength: 1 @@ -733,8 +733,40 @@ 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 __cmd added -1 -2 0 - Play#1 command __cmd + Play#1 input bomb 30 . p -2,2 ujh + 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 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 # owner eff type + 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 (# 37) 2 completely tra train #37 + 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 (# 10) 2 completely cav cavalry #10 + Play#1 output Play#1 1 (# 33) 2 completely cav cavalry #33 + Play#1 output Play#1 1 (# 37) 2 completely tra train #37 + 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 37 + Play#1 output Play#1 1 91% hitchance...Blam Play#1 output Play#1 6 0 561 Play#1 input bomb 30 . p -2,2 ujh Play#1 command bomb @@ -750,6 +782,7 @@ 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 (# 33) 2 completely cav cavalry #33 + Play#1 output Play#1 1 (# 37) 2 completely tra train #37 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 @@ -760,6 +793,7 @@ 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 (# 33) 2 completely cav cavalry #33 + Play#1 output Play#1 1 (# 37) 2 completely tra train #37 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 @@ -786,6 +820,7 @@ 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 (# 33) 2 completely cav cavalry #33 + Play#1 output Play#1 1 (# 37) 2 completely tra train #37 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 @@ -795,6 +830,7 @@ 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 (# 33) 2 completely cav cavalry #33 + Play#1 output Play#1 1 (# 37) 2 completely tra train #37 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 @@ -817,6 +853,7 @@ 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 (# 33) 2 completely cav cavalry #33 + Play#1 output Play#1 1 (# 37) 2 completely tra train #37 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 @@ -825,6 +862,7 @@ 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 (# 33) 2 completely cav cavalry #33 + Play#1 output Play#1 1 (# 37) 2 completely tra train #37 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 @@ -849,6 +887,7 @@ 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 (# 33) 2 completely cav cavalry #33 + Play#1 output Play#1 1 (# 37) 2 completely tra train #37 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 @@ -857,6 +896,7 @@ 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 (# 33) 2 completely cav cavalry #33 + Play#1 output Play#1 1 (# 37) 2 completely tra train #37 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 @@ -865,6 +905,34 @@ 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 31 . p -2,2 uyuuh + 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 4 + Play#1 output Play#1 1 ac AH-64 Apache #31 standing by + Play#1 output Play#1 1 ac AH-64 Apache #31 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 city at -2,0 + Play#1 output Play#1 1 flying over agribusiness at -1,-1 + Play#1 output Play#1 1 flying over highway at 0,-2 + Play#1 output Play#1 1 Target sector is a completely constructed highway + Play#1 output Play#1 1 # owner eff type + Play#1 output Play#1 1 (# 45) 2 completely tra train #45 + Play#1 output Play#1 1 (# 46) 2 completely cav cavalry #46 + 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 (# 45) 2 completely tra train #45 + Play#1 output Play#1 1 (# 46) 2 completely cav cavalry #46 + Play#1 output Play#1 4 ac AH-64 Apache #31, 1 bombs. Target ('~' to skip)? + Play#1 input 45 + Play#1 output Play#1 1 92% hitchance...Blam + Play#1 output Play#1 6 0 551 + Play#1 input __cmd added 1 2 0 + Play#1 command __cmd + Play#1 output Play#1 6 0 553 Play#1 input bomb 30 . p -2,2 ujh Play#1 command bomb Play#1 output Play#1 1 No escorts... @@ -879,6 +947,7 @@ 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 (# 33) 2 completely cav cavalry #33 + Play#1 output Play#1 1 (# 37) 2 completely tra train #37 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) @@ -886,6 +955,7 @@ 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 (# 33) 2 completely cav cavalry #33 + Play#1 output Play#1 1 (# 37) 2 completely tra train #37 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)? @@ -1051,6 +1121,7 @@ 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 (# 46) 2 completely cav cavalry #46 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 @@ -1059,6 +1130,7 @@ 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 (# 46) 2 completely cav cavalry #46 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 @@ -1068,6 +1140,7 @@ Play#1 input 60 Play#1 output Play#1 1 50% hitchance...thud Play#1 output Play#1 1 # owner eff type + Play#1 output Play#1 1 (# 46) 2 completely cav cavalry #46 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 @@ -1077,6 +1150,7 @@ Play#1 input 61 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 (# 46) 2 completely cav cavalry #46 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 @@ -1085,6 +1159,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 (# 46) 2 completely cav cavalry #46 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 @@ -1093,6 +1168,7 @@ 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 (# 46) 2 completely cav cavalry #46 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 @@ -1164,11 +1240,9 @@ 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 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 28 + Play#0 output Play#0 1 ms minesweeper (#44) takes 37 + Play#0 output Play#0 1 ms minesweeper (#43) cleared 4 mines in -6,4 while retreating + Play#0 output Play#0 1 ms minesweeper (#43) retreated with a damaged friend, and ended up at -8,4 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, @@ -1303,6 +1377,11 @@ 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 tra train #37 + Play#0 output Play#0 1 tra train #37 takes 14 + Play#0 output Play#0 1 tra train #37 was bombed, + Play#0 output Play#0 1 but could not retreat to 3,1! + Play#0 output Play#0 1 1,1 takes 2% collateral damage 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, @@ -1314,21 +1393,34 @@ 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 3% collateral damage + Play#0 output Play#0 1 tra train #37 takes 1 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 #37 takes 1 Play#0 output Play#0 1 1 planes spotted over 1,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 #37 takes 1 + Play#0 output Play#0 1 1 planes spotted over 0,-2 + Play#0 output Play#0 1 1 pinpoint bombing raid did 28 damage to tra train #45 + Play#0 output Play#0 1 tra train #45 takes 16 + Play#0 output Play#0 1 tra train #45 was bombed, + Play#0 output Play#0 1 but could not retreat to 0,0! + Play#0 output Play#0 1 cav cavalry #46 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 cav cavalry #46 takes 8 + Play#0 output Play#0 1 0,-2 takes 3% collateral damage 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 1,1 takes 4% collateral damage + Play#0 output Play#0 1 tra train #37 takes 1 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 @@ -1367,36 +1459,36 @@ Play#0 output Play#0 1 1 2 cs cargo ship -3,1 91% 0 9 0 0 0 0 0 0 115 20 Play#0 output Play#0 1 1 3 cs cargo ship -3,1 a 100% 0 10 0 0 0 0 0 0 127 20 Play#0 output Play#0 1 1 4 cs cargo ship -5,1 a 100% 0 10 0 0 0 0 0 0 127 20 - Play#0 output Play#0 1 1 5 dd destroyer -5,1 96% 0 9 0 0 0 0 0 0 63 70 + Play#0 output Play#0 1 1 5 dd destroyer -5,1 96% 0 8 0 0 0 0 0 0 63 70 Play#0 output Play#0 1 1 6 sb submarine -1,3 100% 0 10 0 0 0 0 0 0 97 165 Play#0 output Play#0 1 1 7 cs cargo ship -5,1 a 100% 0 10 0 0 0 0 0 0 127 20 Play#0 output Play#0 1 2 9 dd destroyer -4,-2 60% 0 10 0 0 0 0 0 0 127 70 - Play#0 output Play#0 1 2 10 cs cargo ship 4,4 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 2 10 cs cargo ship 4,4 82% 0 8 0 0 0 0 0 0 53 20 + Play#0 output Play#0 1 2 11 cs cargo ship 1,3 91% 0 9 0 0 0 0 0 0 98 20 + Play#0 output Play#0 1 2 20 cs cargo ship -3,1 95% 0 10 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 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 4,0 94% 0 10 0 0 0 0 0 0 119 20 + Play#0 output Play#0 1 2 31 cs cargo ship 4,0 94% 0 9 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 10 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 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 40 lc light cruis 1,3 91% 0 10 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 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 43 ms minesweeper -8,4 m 100% 0 10 0 0 0 0 0 0 99 40 + Play#0 output Play#0 1 2 44 ms minesweeper -6,4 m 57% 0 6 0 0 0 0 0 0 61 40 + Play#0 output Play#0 1 2 46 cs cargo ship 5,1 n 91% 0 9 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 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 50 sb submarine -9,1 67% 0 7 0 0 0 0 0 0 34 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 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 93 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 @@ -1440,7 +1532,6 @@ Play#0 output Play#0 1 2 40 lc light cruis 1,3 nnnh i Play#0 output Play#0 1 2 41 lc light cruis 1,3 uh i Play#0 output Play#0 1 2 42 lc light cruis -4,2 ugggh i - Play#0 output Play#0 1 2 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 @@ -1453,7 +1544,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 29 ships + Play#0 output Play#0 1 28 ships Play#0 output Play#0 6 0 639 Play#0 input miss s * ?mission#0 q Play#0 command mission @@ -1483,17 +1574,20 @@ Play#0 output Play#0 1 2 34 cav cavalry 2,2 c 100% 10 127 107 0 50 42% 0 0 9L Play#0 output Play#0 1 2 35 cav cavalry 0,2 c 100% 10 127 0 0 50 42% 0 0 Play#0 output Play#0 1 2 36 cav cavalry 2,2 c 100% 10 127 107 0 50 42% 0 0 + Play#0 output Play#0 1 2 37 tra train 1,1 82% 8 127 105 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 45 tra train 1,-1 t 84% 9 127 65 0 50 42% 0 0 + Play#0 output Play#0 1 2 46 cav cavalry 0,0 t 92% 9 127 99 0 50 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 79 0 50 42% 0 0 Play#0 output Play#0 1 2 62 cav cavalry 0,0 100% 10 127 127 0 50 42% 0 0 Play#0 output Play#0 1 2 63 cav cavalry 0,0 100% 10 127 127 0 50 42% 0 0 Play#0 output Play#0 1 2 64 cav cavalry 0,0 100% 10 127 127 0 50 42% 0 0 - Play#0 output Play#0 1 30 units + Play#0 output Play#0 1 33 units Play#0 output Play#0 6 0 637 Play#0 input lretr * ?rflags#0 Play#0 command lretreat @@ -1507,15 +1601,17 @@ Play#0 output Play#0 1 2 28 cav cavalry 2,2 g g Yes i Play#0 output Play#0 1 2 29 cav cavalry 3,1 g g Yes b Play#0 output Play#0 1 2 35 cav cavalry 0,2 c j Yes b + Play#0 output Play#0 1 2 37 tra train 1,1 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 1,1 m yu Yes b + Play#0 output Play#0 1 2 45 tra train 1,-1 t b 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 17 units + Play#0 output Play#0 1 19 units Play#0 output Play#0 6 0 636 Play#0 input miss l * ?mission#0 q Play#0 command mission diff --git a/tests/retreat/setup-POGO b/tests/retreat/setup-POGO index f1866437b..e7c663a2f 100644 --- a/tests/retreat/setup-POGO +++ b/tests/retreat/setup-POGO @@ -31,8 +31,8 @@ build p -2,2 lb 5 edit p 0 U 10 T mi t 160 U 11 U 12 U 13 U 14 | p-bombers with 50% hit chance vs. cav edit p 0 U 20 t 400 U 21 U 22 U 23 U 24 -| very accurate p-bomber -edit p 0 U 30 T ac t 400 +| very accurate p-bombers +edit p 0 U 30 T ac t 400 U 31 | complete the planes edit p * ?own#0 e 100 m 127 | land units for testing retreat command @@ -52,6 +52,8 @@ desi 4,0 c | harbors, 0,2 efficient, 2,2 construction zone desi 0:2,2 h edit l 2,2 e 1 +| a bit of rail +desi 0,-2 + | 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 @@ -164,9 +166,11 @@ edit u 10 U 35 L 0,2 M 0 | on sale edit u 10 U 36 L 0,2 | set as POGO doesn't work, done in setup-2 +| no rail in 1,1 +edit u 10 U 37 T tra army c 30/31/32/34/35/36 lret c j b -lret 33 j b +lret 33/37 j b | target land units having difficulties during retreat: | runs out of mobility edit u 10 U 40 M 5 @@ -182,6 +186,12 @@ edit u 10 U 10 U 43 T eng U 44 army m 43/44 edit l 0,0 O 1 M 100 lret m yu b +| into 0,0 no rail +edit u 10 U 45 T tra L 0,-2 +| non-train retreating with train +edit u 10 U 46 L 0,-2 +army t 45/46 +lret t nb b | missions for retreat to clear miss l 40/41/42 res . | target land units bombs: injured vs. bombed -- 2.43.0