From 0447bf3f585ed6deac6f08234126a1daa15d510e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 12 Jan 2015 19:37:55 +0100 Subject: [PATCH] tests/retreat: Cover retreat after failed board sinks victim Should trigger group retreat, but doesn't; marked "BUG:" in the test input. Signed-off-by: Markus Armbruster --- tests/retreat/01-retreat-1 | 5 +++ tests/retreat/final.xdump | 41 +++++++++++---------- tests/retreat/journal.log | 74 ++++++++++++++++++++++++++------------ tests/retreat/setup-POGO | 10 ++++-- 4 files changed, 86 insertions(+), 44 deletions(-) diff --git a/tests/retreat/01-retreat-1 b/tests/retreat/01-retreat-1 index 19d5002b..5b9fcb68 100644 --- a/tests/retreat/01-retreat-1 +++ b/tests/retreat/01-retreat-1 @@ -142,6 +142,11 @@ navi 5 bsh navi 5 nh board 130 5 1 +| as group (fleet u): 132 sinks, 131 unremarkable +board 132 5 +50 +| BUG: group does not retreat +__cmd added 1 4 0 ||| Land units | BUG: condition b triggers only on hit || land units failing to retreat diff --git a/tests/retreat/final.xdump b/tests/retreat/final.xdump index 1f1750e0..1bd1de00 100644 --- a/tests/retreat/final.xdump +++ b/tests/retreat/final.xdump @@ -14,10 +14,10 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd 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 11 2 57 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 +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 91 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 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,37 +30,37 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil 2 1 -3 1 10 93 118 0 45 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 torpedoed sonared helpless bombed depth-charged boarded) "bgyujnbgy" 3 1 -3 1 10 100 127 0 45 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 10 100 127 0 45 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 6 31 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 6 1 -1 3 18 100 97 0 165 0 0 none 0 "" 0 10 21 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 7 1 -5 1 10 100 127 0 45 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 10 85 68 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 () "" +9 2 -4 -2 17 60 127 0 70 0 0 none 0 "" 0 60 38 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" +10 2 4 4 10 86 70 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 () "" 11 2 1 3 10 93 105 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 () "" -20 2 -3 1 10 96 122 0 45 -3 1 interdiction 1 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (helpless) "u" +20 2 -3 1 10 96 122 0 45 -3 1 interdiction 1 "" 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 10 100 127 0 45 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 10 93 94 0 45 -4 2 none 1 "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 10 93 93 0 45 -4 2 none 1 "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 2 10 100 127 0 45 -4 2 interdiction 1 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "bn" 27 2 -4 2 10 100 127 0 45 -4 2 interdiction 1 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "bn" 28 2 -8 2 10 100 103 0 45 -4 2 none 1 "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 5 3 10 100 127 0 45 5 3 interdiction 1 "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "ggg" -30 0 0 2 10 0 119 0 45 0 2 interdiction 1 "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 10 95 121 0 45 4 0 interdiction 1 "" 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 10 0 120 0 45 0 2 interdiction 1 "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 10 95 120 0 45 4 0 interdiction 1 "" 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 10 100 127 0 45 0 2 interdiction 1 "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 10 95 121 0 45 2 2 interdiction 1 "" 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 10 95 120 0 45 2 2 interdiction 1 "" 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 10 94 120 0 45 3 1 interdiction 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n" 35 2 0 2 10 100 0 0 45 0 2 interdiction 1 "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 0 2 10 100 127 0 45 0 2 interdiction 1 "c" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "n" 40 2 1 3 10 91 -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) "nnn" -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) "u" -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) "uggg" -43 2 -6 4 16 87 98 0 45 0 0 none 0 "m" 0 8 1 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 68 73 0 45 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" +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) "u" +42 2 -4 2 10 95 121 0 45 -4 2 interdiction 1 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "uggg" +43 2 -6 4 16 68 76 0 45 0 0 none 0 "m" 0 6 1 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 77 83 0 45 0 0 none 0 "m" 0 8 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 10 93 118 0 45 5 1 interdiction 1 "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 45 5 1 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 34 0 60 -5 1 none 1 "" 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 29 0 60 -5 1 none 1 "" 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 46 0 60 -5 1 none 1 "" 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 -4 -2 interdiction 1 "" 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 35 0 60 -5 1 none 1 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" +51 2 -9 1 18 64 29 0 60 -5 1 none 1 "" 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 46 0 60 -5 1 none 1 "" 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 -4 -2 interdiction 1 "" 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 -6 2 interdiction 1 "" 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 66 0 70 -6 2 none 1 "" 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 56 0 70 -6 2 none 1 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" @@ -83,6 +83,8 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil 104 2 0 4 10 100 127 0 45 0 4 interdiction 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torpedoed helpless) "nn" 120 2 -9 1 18 100 93 0 60 -5 1 none 1 "" 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 96 0 60 -5 1 none 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" +131 2 -5 1 12 100 127 0 60 -5 1 interdiction 1 "u" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group boarded) "gg" +132 0 -5 1 12 0 127 0 60 -5 1 interdiction 1 "u" 0 65 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group boarded) "gg" 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 @@ -159,7 +161,7 @@ actor action victim times duration time 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 19 2 2 0 0 1 55 2 15 0 0 1 55 1 1 0 0 /config @@ -190,6 +192,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 1 132 -5 1 0 2 3 30 0 2 /config config realm diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log index 0fd60b75..ec215345 100644 --- a/tests/retreat/journal.log +++ b/tests/retreat/journal.log @@ -644,7 +644,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 56) : Play#1 input 1 Play#1 output Play#1 1 Play#1 output Play#1 1 Initial attack strength: 1 @@ -658,6 +658,28 @@ 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 board 132 5 + Play#1 command board + Play#1 output Play#1 1 Approaching tt troop transport (#132)... + Play#1 output Play#1 1 tt troop transport (#132) is about 20% efficient and has approximately 80 mil on board. + Play#1 output Play#1 4 Number of mil from dd destroyer (#5) (max 55) : + Play#1 input 50 + Play#1 output Play#1 1 + Play#1 output Play#1 1 Initial attack strength: 50 + Play#1 output Play#1 1 Final board strength: 50 + Play#1 output Play#1 1 Final defense strength: 130 + Play#1 output Play#1 1 Final odds: 27% + Play#1 output Play#1 1 @@!!@!!@@@!@@@@@@@@@!@@@@@@@@@@@!!@@!@@@!!@@@@@@!@!@@@@!@@!@@@@@@ + Play#1 output Play#1 1 - Casualties - + Play#1 output Play#1 1 Yours: 50 + Play#1 output Play#1 1 Theirs: 15 + Play#1 output Play#1 1 Papershuffling ... 9.8 B.T.U + Play#1 output Play#1 1 You have been repelled + Play#1 output Play#1 1 Ship #132 is not in the same sector! + Play#1 output Play#1 6 0 565 + Play#1 input __cmd added 1 4 0 + Play#1 command __cmd + Play#1 output Play#1 6 0 569 Play#1 input bomb 30 . p -2,2 jh Play#1 command bomb Play#1 output Play#1 1 No escorts... @@ -1239,14 +1261,15 @@ Play#0 output Play#0 1 Sweep... Play#0 output Play#0 1 Sweep... Play#0 output Play#0 1 Sweep... - Play#0 output Play#0 1 Kawhomp! Mine detected in -6,4! - Play#0 output Play#0 1 ms minesweeper (#44) takes 14 + Play#0 output Play#0 1 Sweep... Play#0 output Play#0 1 Sweep... Play#0 output Play#0 1 Sweep... Play#0 output Play#0 1 Kawhomp! Mine detected in -6,4! - Play#0 output Play#0 1 ms minesweeper (#44) takes 13 + Play#0 output Play#0 1 ms minesweeper (#43) takes 18 Play#0 output Play#0 1 Kawhomp! Mine detected in -6,4! - Play#0 output Play#0 1 ms minesweeper (#43) takes 13 + Play#0 output Play#0 1 ms minesweeper (#44) takes 15 + Play#0 output Play#0 1 Kawhomp! Mine detected in -6,4! + Play#0 output Play#0 1 ms minesweeper (#43) takes 17 Play#0 output Play#0 1 ms minesweeper (#44) stopped at -6,4 Play#0 output Play#0 1 ms minesweeper (#43) stopped at -6,4 Play#0 output Play#0 1 Country #1 shelled lc light cruiser (#46) in 5,1 for 11 damage. @@ -1388,6 +1411,10 @@ Play#0 output Play#0 1 We lost 0 troops defending Play#0 output Play#0 1 tt troop transport (#130) retreats along path gg Play#0 output Play#0 1 tt troop transport (#130) stopped at -9,1 + Play#0 output Play#0 1 tt troop transport (#132) is being approached by dd destroyer (#5)... + Play#0 output Play#0 1 1 (#1) lost 50 troops trying to board tt troop transport (#132) + Play#0 output Play#0 1 We lost 15 troops defending + Play#0 output Play#0 1 tt troop transport (#132) sunk! Play#0 output Play#0 1 1 planes spotted over 0,2 Play#0 output Play#0 1 1 bombs did 44% damage to cav cavalry #30 at 0,2 Play#0 output Play#0 1 cav cavalry #30 takes 17 @@ -1519,36 +1546,36 @@ Play#0 output Play#0 1 1 2 lc light cruis -3,1 93% 0 9 0 0 0 0 0 0 118 45 Play#0 output Play#0 1 1 3 lc light cruis -3,1 a 100% 0 10 0 0 0 0 0 0 127 45 Play#0 output Play#0 1 1 4 lc light cruis -5,1 a 100% 0 10 0 0 0 0 0 0 127 45 - 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 6 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 lc light cruis -5,1 a 100% 0 10 0 0 0 0 0 0 127 45 - 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 lc light cruis 4,4 85% 0 9 0 0 0 0 0 0 68 45 + Play#0 output Play#0 1 2 9 dd destroyer -4,-2 60% 0 60 0 0 0 0 0 0 127 70 + Play#0 output Play#0 1 2 10 lc light cruis 4,4 86% 0 9 0 0 0 0 0 0 70 45 Play#0 output Play#0 1 2 11 lc light cruis 1,3 93% 0 10 0 0 0 0 0 0 105 45 - Play#0 output Play#0 1 2 20 lc light cruis -3,1 96% 0 9 0 0 0 0 0 0 122 45 + Play#0 output Play#0 1 2 20 lc light cruis -3,1 96% 0 10 0 0 0 0 0 0 122 45 Play#0 output Play#0 1 1 24 lc light cruis -4,2 g 100% 0 10 0 0 0 0 0 0 127 45 - Play#0 output Play#0 1 2 25 lc light cruis -8,2 g 93% 0 9 0 0 0 0 0 0 94 45 + Play#0 output Play#0 1 2 25 lc light cruis -8,2 g 93% 0 10 0 0 0 0 0 0 93 45 Play#0 output Play#0 1 2 26 lc light cruis -4,2 g 100% 0 10 0 0 0 0 0 0 127 45 Play#0 output Play#0 1 2 27 lc light cruis -4,2 g 100% 0 10 0 0 0 0 0 0 127 45 Play#0 output Play#0 1 2 28 lc light cruis -8,2 g 100% 0 10 0 0 0 0 0 0 103 45 Play#0 output Play#0 1 2 29 lc light cruis 5,3 g 100% 0 10 0 0 0 0 0 0 127 45 - Play#0 output Play#0 1 2 31 lc light cruis 4,0 95% 0 9 0 0 0 0 0 0 121 45 + Play#0 output Play#0 1 2 31 lc light cruis 4,0 95% 0 9 0 0 0 0 0 0 120 45 Play#0 output Play#0 1 2 32 lc light cruis 0,2 c 100% 0 0 0 0 0 0 0 0 127 45 - Play#0 output Play#0 1 2 33 lc light cruis 2,2 95% 0 9 0 0 0 0 0 0 121 45 + Play#0 output Play#0 1 2 33 lc light cruis 2,2 95% 0 9 0 0 0 0 0 0 120 45 Play#0 output Play#0 1 2 34 lc light cruis 3,1 94% 0 10 0 0 0 0 0 0 120 45 Play#0 output Play#0 1 2 35 lc light cruis 0,2 c 100% 0 10 0 0 0 0 0 1 0 45 Play#0 output Play#0 1 2 36 lc light cruis 0,2 c 100% 0 10 0 0 0 0 0 0 127 45 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 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 87% 0 8 0 0 0 0 0 0 98 45 - Play#0 output Play#0 1 2 44 ms minesweeper -6,4 m 68% 0 6 0 0 0 0 0 0 73 45 + Play#0 output Play#0 1 2 41 lc light cruis 1,3 96% 0 10 0 0 0 0 0 0 109 45 + Play#0 output Play#0 1 2 42 lc light cruis -4,2 95% 0 9 0 0 0 0 0 0 121 45 + Play#0 output Play#0 1 2 43 ms minesweeper -6,4 m 68% 0 6 0 0 0 0 0 0 76 45 + Play#0 output Play#0 1 2 44 ms minesweeper -6,4 m 77% 0 8 0 0 0 0 0 0 83 45 Play#0 output Play#0 1 2 46 lc light cruis 5,1 n 93% 0 9 0 0 0 0 0 0 118 45 Play#0 output Play#0 1 2 47 pt patrol boat 4,0 n 100% 0 2 0 0 0 0 0 0 117 45 - 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 29 60 - Play#0 output Play#0 1 2 52 sb submarine -9,1 73% 0 7 0 0 0 0 0 0 46 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 6 0 0 0 0 0 0 35 60 + Play#0 output Play#0 1 2 51 sb submarine -9,1 64% 0 6 0 0 0 0 0 0 29 60 + Play#0 output Play#0 1 2 52 sb submarine -9,1 73% 0 8 0 0 0 0 0 0 46 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 66 70 Play#0 output Play#0 1 2 62 dd destroyer -4,4 67% 0 7 0 0 0 0 0 0 56 70 @@ -1571,7 +1598,8 @@ Play#0 output Play#0 1 2 104 lc light cruis 0,4 100% 0 10 0 0 0 0 0 0 127 45 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 96 60 - Play#0 output Play#0 1 57 ships + Play#0 output Play#0 1 2 131 tt troop trans -5,1 u 100% 0 10 0 0 0 0 0 0 127 60 + Play#0 output Play#0 1 58 ships Play#0 output Play#0 6 0 640 Play#0 input retr * ?rflags#0 q Play#0 command retreat @@ -1607,7 +1635,8 @@ Play#0 output Play#0 1 2 84 dd destroyer -6,2 nn ihb Play#0 output Play#0 1 2 101 lc light cruis 0,4 nn ith Play#0 output Play#0 1 2 104 lc light cruis 0,4 nn ith - Play#0 output Play#0 1 31 ships + Play#0 output Play#0 1 2 131 tt troop trans -5,1 u gg Yes u + Play#0 output Play#0 1 32 ships Play#0 output Play#0 6 0 639 Play#0 input miss s * ?mission#0 q Play#0 command mission @@ -1633,6 +1662,7 @@ Play#0 output Play#0 1 dd destroyer (#84) -6,2 -6,2 1 is on an interdiction mission Play#0 output Play#0 1 lc light cruiser (#101) 0,4 0,4 1 is on an interdiction mission Play#0 output Play#0 1 lc light cruiser (#104) 0,4 0,4 1 is on an interdiction mission + Play#0 output Play#0 1 tt troop transport (#131) -5,1 -5,1 1 is on an interdiction mission Play#0 output Play#0 6 0 637 Play#0 input land * Play#0 command land diff --git a/tests/retreat/setup-POGO b/tests/retreat/setup-POGO index b5088203..7a79ab28 100644 --- a/tests/retreat/setup-POGO +++ b/tests/retreat/setup-POGO @@ -17,14 +17,15 @@ desi -3,1 h build s -3,1 lc 5 edit s 4 L -5,1 U 7 | fleet a defined below -| ship to drop depth charges +| ship to drop depth charges and board build s -3,1 dd -edit s 5 g 1 s 40 +edit s 5 g 1 s 40 m 60 | ship to launch torpedoes build s -3,1 sb edit s 6 T 165 L -1,3 g 1 s 36 | complete the ships -edit s * ?own#0 E 100 M 127 m 10 +edit s * ?own#0 E 100 M 127 +edit s * ?own#0&mil=0 m 10 | p-bombers with 50% hit chance vs. dd in port build p -2,2 lb 5 | marine missiles acc 50 @@ -139,6 +140,9 @@ retr 120 gg s | target ship boarding edit s 50 U 130 t tt retr 130 gg u +edit s 130 U 131 U 132 E 20 m 80 +fleet u 131/132 +retr u gg u | target land units bombs: bombed edit u 9 U 10 T cav L 1,1 lret 10 jhhuy b