diff --git a/tests/retreat/01-retreat-1 b/tests/retreat/01-retreat-1 index c3717157..7198a309 100644 --- a/tests/retreat/01-retreat-1 +++ b/tests/retreat/01-retreat-1 @@ -194,17 +194,26 @@ bomb 31 . p -2,2 uyuuh l 45 | BUG: 46 retreats anyway -__cmd added 1 2 0 +| into foreign, 47 can't, 48 can +__cmd added -1 0 0 +bomb 31 . p -2,2 uuuh +l +47 +| BUG: 48 can't enter foreign sector +__cmd added 2 4 0 || land units retreating fully | jh +__cmd added -1 0 0 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 96e5d5d0..0d4cbf33 100644 --- a/tests/retreat/final.xdump +++ b/tests/retreat/final.xdump @@ -1,20 +1,20 @@ 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 94 healthy 0 0 0 0 0 0 0 0 +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 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 1 -2 0 5 100 127 0 0 0 0 0 0 0 -2 0 0 0 0 0 5 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 -2 1 1 15 93 117 0 0 0 0 0 0 0 1 1 0 0 0 0 15 0 0 0 0 0 2 93 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 -2 3 1 15 97 122 0 0 0 0 0 0 0 3 1 0 0 0 1 15 0 0 0 0 0 2 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 -1 -3 1 12 99 126 0 0 0 0 0 0 0 -3 1 0 0 0 1 12 0 0 0 0 0 1 99 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 +2 1 1 15 93 118 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 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 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 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 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 +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 94 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 @@ -30,15 +30,15 @@ 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 8 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 9 31 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 6 1 -1 3 18 100 97 0 165 0 0 none 0 "" 0 10 21 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 7 1 -5 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group helpless) "b" 9 2 -4 -2 17 60 127 0 70 0 0 none 0 "" 0 10 38 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" -10 2 4 4 2 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 () "" +10 2 4 4 2 83 53 0 20 0 0 none 0 "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 11 2 1 3 2 91 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" +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 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" +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" 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" @@ -50,17 +50,17 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil 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 10 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 -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 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 -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" +43 2 -8 4 16 100 99 0 40 0 0 none 0 "m" 0 10 2 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" +44 2 -6 4 16 64 70 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 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" +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" 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 () "" @@ -103,25 +103,25 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range 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 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 +31 1 -2 2 17 100 101 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 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 +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 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 -4 0 2 100 127 0 50 0 0 none 0 "a" -1 127 42 (group helpless) "b" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 7 1 -4 0 2 100 127 0 50 0 0 none 0 "a" -1 127 42 (group helpless) "b" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 9 2 0 2 7 99 126 0 50 0 0 none 0 "" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 -10 2 4 0 0 70 69 0 50 0 0 none 0 "" -1 127 42 (bombed) "y" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +10 2 4 0 0 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 24 1 3 1 0 100 127 0 50 0 0 none 0 "g" -1 127 42 (group bombed) "bhg" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 -25 2 2 2 0 86 89 0 50 0 0 none 0 "g" -1 127 42 (group bombed) "g" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +25 2 2 2 0 91 96 0 50 0 0 none 0 "g" -1 127 42 (group bombed) "g" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 26 2 4 0 0 100 117 0 50 0 0 none 0 "g" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 27 2 4 0 0 100 117 0 50 0 0 none 0 "g" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 28 2 2 2 0 100 107 0 50 0 0 none 0 "g" -1 127 42 (group injured) "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 -29 2 3 1 0 100 117 0 50 0 0 none 0 "g" -1 127 42 (group bombed) "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +29 2 3 1 0 100 116 0 50 0 0 none 0 "g" -1 127 42 (group bombed) "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 30 0 0 2 0 0 105 0 50 0 0 none 0 "c" -1 127 42 (group bombed) "j" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 31 2 2 2 0 100 107 0 50 0 0 none 0 "c" 35 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 32 2 2 2 0 100 107 0 50 0 0 none 0 "c" -1 127 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 @@ -137,11 +137,13 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h 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 +47 2 1 -1 0 91 115 0 50 0 0 none 0 "s" -1 127 42 (group bombed) "gh" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +48 2 1 -1 8 100 127 0 50 0 0 none 0 "s" -1 127 42 (group bombed) "gh" 0 0 0 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 62 2 0 0 0 100 127 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "nj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 63 2 0 0 0 100 127 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "nj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 -64 2 0 0 0 100 127 0 50 0 0 none 0 "" -1 127 42 (injured helpless bombed) "nj" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +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 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 @@ -153,12 +155,12 @@ actor action victim times duration time 2 25 0 1 0 0 1 11 1 1 0 0 2 14 1 2 0 0 -1 9 2 10 0 0 +1 9 2 11 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 +1 55 2 15 0 0 2 56 0 1 0 0 1 55 1 1 0 0 /config diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log index 3cada373..79dde5ec 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 8) : + Play#1 output Play#1 4 Number of mil from dd destroyer (#5) (max 9) : Play#1 input 1 Play#1 output Play#1 1 Play#1 output Play#1 1 Initial attack strength: 1 @@ -930,7 +930,39 @@ 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 input __cmd added -1 0 0 + Play#1 command __cmd + Play#1 output Play#1 6 0 551 + Play#1 input bomb 31 . p -2,2 uuuh + 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 3 + 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 agribusiness at 0,0 + 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 (# 44) 2 completely eng engineer #44 + Play#1 output Play#1 1 (# 45) 2 completely tra train #45 + Play#1 output Play#1 1 (# 47) 2 completely cav cavalry #47 + 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 (# 44) 2 completely eng engineer #44 + Play#1 output Play#1 1 (# 45) 2 completely tra train #45 + Play#1 output Play#1 1 (# 47) 2 completely cav cavalry #47 + Play#1 output Play#1 4 ac AH-64 Apache #31, 1 bombs. Target ('~' to skip)? + Play#1 input 47 + Play#1 output Play#1 1 72% hitchance...Blam + Play#1 output Play#1 6 0 549 + Play#1 input __cmd added 2 4 0 + Play#1 command __cmd + Play#1 output Play#1 6 0 553 + Play#1 input __cmd added -1 0 0 Play#1 command __cmd Play#1 output Play#1 6 0 553 Play#1 input bomb 30 . p -2,2 ujh @@ -962,6 +994,9 @@ Play#1 input 10 Play#1 output Play#1 1 71% 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 6 0 551 Play#1 input bomb 30 . p -2,2 ujjh Play#1 command bomb Play#1 output Play#1 1 No escorts... @@ -998,6 +1033,9 @@ Play#1 input 10 Play#1 output Play#1 1 73% 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 6 0 549 Play#1 input bomb 30 . p -2,2 ujjh Play#1 command bomb Play#1 output Play#1 1 No escorts... @@ -1013,7 +1051,7 @@ 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 completely cav cavalry #10 + Play#1 output Play#1 1 (# 10) 2 moderately cav cavalry #10 Play#1 output Play#1 1 (# 24) 1 completely cav cavalry #24 Play#1 output Play#1 1 (# 25) 2 completely cav cavalry #25 Play#1 output Play#1 1 (# 26) 2 completely cav cavalry #26 @@ -1023,7 +1061,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 (# 10) 2 completely cav cavalry #10 + Play#1 output Play#1 1 (# 10) 2 moderately cav cavalry #10 Play#1 output Play#1 1 (# 24) 1 completely cav cavalry #24 Play#1 output Play#1 1 (# 25) 2 completely cav cavalry #25 Play#1 output Play#1 1 (# 26) 2 completely cav cavalry #26 @@ -1032,7 +1070,7 @@ 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 1 75% hitchance...BLAM Play#1 output Play#1 6 0 547 Play#1 input bomb 30 . p -3,1 h Play#1 command bomb @@ -1060,9 +1098,9 @@ Play#1 output Play#1 4 ac AH-64 Apache #30, 1 bombs. Target ('~' to skip)? Play#1 input 2 Play#1 output Play#1 1 73% hitchance...Blam - Play#1 output Play#1 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 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 6 0 545 Play#1 input bomb 30 . p -2,2 ujjh Play#1 command bomb @@ -1138,20 +1176,19 @@ 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...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 (# 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 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...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 (# 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 Play#1 output Play#1 1 (# 63) 2 completely cav cavalry #63 Play#1 output Play#1 1 (# 64) 2 completely cav cavalry #64 @@ -1160,7 +1197,7 @@ 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 Play#1 output Play#1 1 (# 63) 2 completely cav cavalry #63 Play#1 output Play#1 1 (# 64) 2 completely cav cavalry #64 @@ -1169,13 +1206,13 @@ 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 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...thud + Play#1 output Play#1 1 50% hitchance...Blam-Blam Play#1 output Play#1 6 0 543 Play#1 input ctld Play#1 output Play#1 1 Bye-bye @@ -1240,8 +1277,8 @@ 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 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 (#44) takes 29 + 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, 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 @@ -1416,40 +1453,51 @@ 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 1 planes spotted over 0,0 + Play#0 output Play#0 1 1 planes spotted over 1,-1 + Play#0 output Play#0 1 1 pinpoint bombing raid did 24 damage to cav cavalry #47 + Play#0 output Play#0 1 cav cavalry #47 takes 9 + Play#0 output Play#0 1 cav cavalry #47 was bombed, + Play#0 output Play#0 1 but could not retreat to -1,-1! + Play#0 output Play#0 1 spy infiltrator #48 retreated with a bombed friend, + Play#0 output Play#0 1 but could not retreat to -1,-1! + 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 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 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 + 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 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 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 cav cavalry #10 was bombed, Play#0 output Play#0 1 but could not retreat to 3,-1! - Play#0 output Play#0 1 3,1 takes 2% collateral damage - Play#0 output Play#0 1 1 pinpoint bombing raid did 36 damage to cav cavalry #25 - Play#0 output Play#0 1 cav cavalry #25 takes 14 + Play#0 output Play#0 1 3,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 24 damage to cav cavalry #25 + Play#0 output Play#0 1 cav cavalry #25 takes 9 Play#0 output Play#0 1 cav cavalry #25 was bombed, and retreated to 2,2 Play#0 output Play#0 1 cav cavalry #26 retreated with a bombed friend, and ended up at 4,0 Play#0 output Play#0 1 cav cavalry #27 retreated with a bombed friend, and ended up at 4,0 Play#0 output Play#0 1 cav cavalry #28 retreated with a bombed friend, and ended up at 2,2 Play#0 output Play#0 1 cav cavalry #29 retreated with a bombed friend, and ended up at 3,1 - Play#0 output Play#0 1 3,1 takes 4% collateral damage + Play#0 output Play#0 1 3,1 takes 2% collateral damage Play#0 output Play#0 1 1 planes spotted over 0,0 - Play#0 output Play#0 1 0,0 takes 4% collateral damage - Play#0 output Play#0 1 1 pinpoint bombing raid did 56 damage to cav cavalry #61 - Play#0 output Play#0 1 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 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 0,0 takes 3% 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 6 0 640 Play#0 input ship * Play#0 command ship @@ -1459,15 +1507,15 @@ 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 8 0 0 0 0 0 0 63 70 + Play#0 output Play#0 1 1 5 dd destroyer -5,1 96% 0 9 0 0 0 0 0 0 63 70 Play#0 output Play#0 1 1 6 sb submarine -1,3 100% 0 10 0 0 0 0 0 0 97 165 Play#0 output Play#0 1 1 7 cs cargo ship -5,1 a 100% 0 10 0 0 0 0 0 0 127 20 Play#0 output Play#0 1 2 9 dd destroyer -4,-2 60% 0 10 0 0 0 0 0 0 127 70 - Play#0 output Play#0 1 2 10 cs cargo ship 4,4 82% 0 8 0 0 0 0 0 0 53 20 + Play#0 output Play#0 1 2 10 cs cargo ship 4,4 83% 0 8 0 0 0 0 0 0 53 20 Play#0 output Play#0 1 2 11 cs cargo ship 1,3 91% 0 9 0 0 0 0 0 0 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 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 10 0 0 0 0 0 0 81 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 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 @@ -1478,17 +1526,17 @@ 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 10 0 0 0 0 0 0 -8 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 -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 44 ms minesweeper -6,4 m 64% 0 6 0 0 0 0 0 0 70 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 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 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 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 @@ -1556,18 +1604,18 @@ 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 92% 10 127 117 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 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 -4,0 a 100% 10 127 127 0 50 42% 0 0 Play#0 output Play#0 1 1 7 inf infantry -4,0 a 100% 10 127 127 0 50 42% 0 0 Play#0 output Play#0 1 2 9 tra train 0,2 99% 10 127 126 0 50 42% 0 1 - Play#0 output Play#0 1 2 10 cav cavalry 4,0 70% 7 127 69 0 50 42% 0 0 + Play#0 output Play#0 1 2 10 cav cavalry 4,0 61% 6 127 61 0 50 42% 0 0 Play#0 output Play#0 1 1 24 cav cavalry 3,1 g 100% 10 127 127 0 50 42% 0 0 - Play#0 output Play#0 1 2 25 cav cavalry 2,2 g 86% 9 127 89 0 50 42% 0 0 + Play#0 output Play#0 1 2 25 cav cavalry 2,2 g 91% 9 127 96 0 50 42% 0 0 Play#0 output Play#0 1 2 26 cav cavalry 4,0 g 100% 10 127 117 0 50 42% 0 0 Play#0 output Play#0 1 2 27 cav cavalry 4,0 g 100% 10 127 117 0 50 42% 0 0 Play#0 output Play#0 1 2 28 cav cavalry 2,2 g 100% 10 127 107 0 50 42% 0 0 - Play#0 output Play#0 1 2 29 cav cavalry 3,1 g 100% 10 127 117 0 50 42% 0 0 + Play#0 output Play#0 1 2 29 cav cavalry 3,1 g 100% 10 127 116 0 50 42% 0 0 Play#0 output Play#0 1 2 31 cav cavalry 2,2 c 100% 10 127 107 0 50 42% 0 0 35S Play#0 output Play#0 1 2 32 cav cavalry 2,2 c 100% 0 127 107 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 @@ -1582,12 +1630,14 @@ 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 47 cav cavalry 1,-1 s 91% 9 127 115 0 50 42% 0 0 + Play#0 output Play#0 1 2 48 spy infiltrato 1,-1 s 100% 0 127 127 0 50 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 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 33 units + 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 35 units Play#0 output Play#0 6 0 637 Play#0 input lretr * ?rflags#0 Play#0 command lretreat @@ -1607,11 +1657,12 @@ 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 47 cav cavalry 1,-1 s gh Yes b + Play#0 output Play#0 1 2 48 spy infiltrator 1,-1 s gh Yes b + Play#0 output Play#0 1 2 61 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 19 units + Play#0 output Play#0 1 20 units Play#0 output Play#0 6 0 636 Play#0 input miss l * ?mission#0 q Play#0 command mission diff --git a/tests/retreat/setup-POGO b/tests/retreat/setup-POGO index e7c663a2..98634491 100644 --- a/tests/retreat/setup-POGO +++ b/tests/retreat/setup-POGO @@ -192,6 +192,10 @@ edit u 10 U 45 T tra L 0,-2 edit u 10 U 46 L 0,-2 army t 45/46 lret t nb b +| into foreign X,Y +edit u 10 U 47 L 1,-1 U 48 T spy +army s 47/48 +lret s gh b | missions for retreat to clear miss l 40/41/42 res . | target land units bombs: injured vs. bombed