tests/retreat: Clean up setup, improve comments

setup-POGO unintentionally gives dead ships, planes and land units
mobility, which makes them show up in final.xdump.  Rearrange to avoid
that, and for clarity.  While there, improve comments.

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

diff --git a/tests/retreat/01-retreat-1 b/tests/retreat/01-retreat-1
index 5cb828d25fe18558fd3ae28d7d1e4faade85ec41..63f65d35bdab24b893d416c622a7094152d538d0 100644 (file)
--- a/tests/retreat/01-retreat-1
+++ b/tests/retreat/01-retreat-1
@@ -40,27 +40,27 @@ fire se -2,2 30
 __cmd added -1 -1 0
 | crewless
 fire se -2,2 32
-| construction zone
+| in construction zone 2,2
 fire se -2,2 33
-| landlocked
+| landlocked in 3,1
 fire se -2,2 34
 | no mobility
 fire se -2,2 35
 || ships having difficulties during retreat
 | out of mobility after n
 fire se -2,2 40
-| into non-navigable sector after n
+| into construction zone 2,2 after n
 fire se -2,2 41
-| into unfriendly sector right away
+| into unfriendly -3,1 right away
 fire se -2,2 42
-| gg with 43, sweeping and hitting mines
+| into minefield -6,4 with 43, sweep and hit mines, stop
 fire se -2,2 44
 || ships retreating fully
 | nh
 fire se -2,2 10
 | h
 fire se -2,2 10
-| nj into friendly harbor
+| nj into friendly harbor 4,4
 fire se -2,2 10
 || own ship stays put
 fire se -2,2 2
@@ -116,7 +116,7 @@ torp 6 104
 | injured is not implemented
 | helpless is not implemented
 || ships retreating from sonar pings
-| naval sonar
+| naval sonar, 120 detects
 navi 5 bsh
 | retreat on plane sonar is not implemented
 || ships retreating from unsuccessful boarding
@@ -124,7 +124,6 @@ navi 5 nh
 board 130 5
 1
 ||| Land units
-| only retreat on p-bombing is implemented
 | BUG: condition b triggers only on hit
 || land units failing to retreat
 | these bombing runs must hit; if they don't, use __cmd to make them
@@ -132,18 +131,19 @@ board 130 5
 bomb 30 . p -2,2 ujh
 l
 30
-| loaded, but there's no way to trigger a retreat then
+| 31 is on a ship, but there's no way to trigger a retreat then
 | crewless
 __cmd added -1 0 0
 bomb 30 . p -2,2 ujh
 l
 32
 | BUG: retreats anyway
-| kidnapped
+| kidnapped in -1,1
 bomb 30 . p -2,2 uh
 l
 33
 | BUG: retreats anyway
+| 34 is on a land unit, but there's no way to trigger a retreat then
 | no mobility
 bomb 30 . p -2,2 ujh
 l
@@ -155,16 +155,16 @@ __cmd added -1 0 0
 bomb 30 . p -2,2 ujh
 l
 40
-| into mountain after j
+| into mountain 2,0 after j
 bomb 30 . p -2,2 ujh
 l
 41
-| into foreign sector right away
+| into foreign -1,1 right away
 __cmd added -1 0 0
 bomb 30 . p -2,2 ujh
 l
 42
-| yu with 43, sweeping and hitting mines
+| into minefield 0,0 with 43, sweep and hit mines, stop
 __cmd added -1 0 0
 bomb 30 . p -2,2 ujh
 l
@@ -180,7 +180,7 @@ __cmd added -1 0 0
 bomb 30 . p -2,2 ujjh
 l
 10
-| uy into allied sector
+| uy into allied 3,-1
 __cmd added -1 0 0
 bomb 30 . p -2,2 ujjh
 l
@@ -190,6 +190,9 @@ l
 bomb 30 . p -3,1 h
 l
 2
+|| land units retreating from bombs
+| only retreat on p-bombing is implemented
+| bombed covered above
 | injured
 bomb 20/21/22/23/24 . p -2,2 uuh
 l

diff --git a/tests/retreat/final.xdump b/tests/retreat/final.xdump
index 36b0f0d8f3376ea02004122298d4afd1afa89355..1fee9a304473761bd4bf9fdc280b32a94d4f3f08 100644 (file)
--- a/tests/retreat/final.xdump
+++ b/tests/retreat/final.xdump
@@ -32,59 +32,25 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
 4 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group helpless) "b"
 5 1 -5 1 17 96 63 0 70 0 0 none 0 "a" 0 9 31 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 6 1 -1 3 18 100 97 0 165 0 0 none 0 "a" 0 10 21 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-7 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-8 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
 9 2 -4 -2 17 60 127 0 70 0 0 none 0 "a" 0 10 38 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 10 2 4 4 2 83 53 0 20 0 0 none 0 "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 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 () ""
-12 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-13 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-14 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-15 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-16 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-17 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-18 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-19 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
 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"
-21 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-22 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-23 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-24 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-25 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-26 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-27 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-28 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-29 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
 30 0 0 2 2 0 117 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
 31 2 0 2 2 100 127 0 20 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
 32 2 0 2 2 94 119 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
 33 2 2 2 2 94 120 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
 34 2 3 1 2 92 116 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
 35 2 0 2 2 94 0 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "n"
-36 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-37 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-38 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-39 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
 40 2 1 3 10 91 -7 0 45 0 2 none 1 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "nnnh"
 41 2 1 3 10 96 108 0 45 0 2 none 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "uh"
 42 2 -4 2 10 95 120 0 45 -4 2 interdiction 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured) "ugggh"
 43 2 -6 4 16 76 86 0 40 0 0 none 0 "m" 0 7 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g"
 44 2 -6 4 16 63 70 0 40 0 0 none 0 "m" 0 7 2 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group injured) "g"
-45 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-46 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-47 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-48 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-49 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
 50 2 -9 1 18 67 33 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 51 2 -9 1 18 64 27 0 60 0 0 none 0 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 52 2 -9 1 18 73 44 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 53 2 -4 -2 18 73 92 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (helpless) "gg"
-54 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-55 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-56 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-57 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-58 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-59 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
 60 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured helpless bombed) "nn"
 61 2 2 4 17 84 83 0 70 0 0 none 0 "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 62 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured helpless bombed) "nn"
@@ -95,86 +61,19 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
 67 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (helpless bombed) "nn"
 68 2 2 4 17 62 46 0 70 0 0 none 0 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 69 2 2 4 17 48 21 0 70 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-70 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-71 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-72 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-73 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-74 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-75 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-76 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-77 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-78 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-79 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
 80 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured helpless bombed) "nn"
 81 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured helpless bombed) "nn"
 82 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured helpless bombed) "nn"
 83 2 2 4 17 29 -28 0 70 0 0 none 0 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 84 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured helpless bombed) "nn"
-85 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-86 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-87 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-88 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-89 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-90 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-91 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-92 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-93 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-94 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-95 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-96 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-97 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-98 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-99 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
 100 2 2 4 2 38 -29 0 20 0 0 none 0 "" 0 4 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 101 2 0 2 2 100 127 0 20 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torped helpless) "nn"
 102 2 2 4 2 64 35 0 20 0 0 none 0 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
 103 2 1 3 2 21 -42 0 20 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torped helpless) "n"
 104 2 0 2 2 100 127 0 20 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torped helpless) "nn"
-105 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-106 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-107 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-108 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-109 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-110 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-111 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-112 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-113 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-114 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-115 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-116 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-117 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-118 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-119 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
 120 2 -9 1 18 100 93 0 60 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-121 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-122 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-123 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-124 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-125 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-126 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-127 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-128 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-129 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
 130 2 -9 1 12 100 95 0 60 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
-131 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-132 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-133 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-134 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-135 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-136 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-137 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-138 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-139 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-140 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-141 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-142 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-143 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-144 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-145 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-146 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-147 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-148 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
-149 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
+149 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
 /config
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta
@@ -183,51 +82,18 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range
 2 1 -2 2 7 100 105 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
 3 1 -2 2 7 100 105 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
 4 1 -2 2 7 100 105 0 60 0 0 none 0 "" 7 0 -1 -1 () 0 0.00000
-5 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-6 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-7 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-8 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-9 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
 10 0 -2 2 26 0 127 0 160 0 0 none 0 "" 6 0 -1 -1 (launched) 0 0.00000
 11 0 -2 2 26 0 127 0 160 0 0 none 0 "" 6 0 -1 -1 (launched) 0 0.00000
 12 0 -2 2 26 0 127 0 160 0 0 none 0 "" 6 0 -1 -1 (launched) 0 0.00000
 13 0 -2 2 26 0 127 0 160 0 0 none 0 "" 6 0 -1 -1 (launched) 0 0.00000
 14 0 -2 2 26 0 127 0 160 0 0 none 0 "" 6 0 -1 -1 (launched) 0 0.00000
-15 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-16 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-17 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-18 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-19 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
 20 1 -2 2 7 100 117 0 400 0 0 none 0 "" 15 0 -1 -1 () 0 0.00000
 21 1 -2 2 7 100 117 0 400 0 0 none 0 "" 15 0 -1 -1 () 0 0.00000
 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
-25 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-26 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-27 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-28 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-29 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
 30 1 -2 2 17 100 19 0 400 0 0 none 0 "" 18 0 -1 -1 () 0 0.00000
-31 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-32 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-33 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-34 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-35 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-36 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-37 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-38 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-39 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-40 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-41 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-42 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-43 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-44 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-45 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-46 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-47 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-48 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-49 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 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
@@ -236,101 +102,25 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
 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 -3 1 2 100 127 0 50 0 0 none 0 "a" -1 127 42 (group helpless) "b" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-5 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-6 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-7 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-8 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 9 2 1 1 7 93 119 0 50 0 0 none 0 "" -1 127 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 10 2 4 0 0 61 61 0 50 0 0 none 0 "" -1 127 42 (bombed) "y" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-11 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-12 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-13 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-14 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-15 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-16 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-17 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-18 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-19 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-20 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-21 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-22 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-23 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-24 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-25 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-26 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-27 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-28 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-29 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 30 0 1 1 2 0 111 0 50 0 0 none 0 "" -1 127 42 (bombed) "j" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 31 2 0 2 0 99 126 0 50 0 0 none 0 "" 35 127 42 (bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 32 2 3 1 0 83 96 0 50 0 0 none 0 "" -1 127 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 33 2 1 1 0 85 97 0 50 0 0 none 0 "" -1 127 42 () "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 34 2 1 1 0 100 127 0 50 0 0 none 0 "" -1 127 42 (bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 9 0
 35 2 1 1 0 91 0 0 50 0 0 none 0 "" -1 127 42 (bombed) "j" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-36 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-37 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-38 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-39 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 40 2 2 2 0 89 -15 0 50 1 1 none 3 "" -1 127 42 (bombed) "u" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 41 2 3 1 0 86 99 0 50 1 1 none 3 "" -1 127 42 (bombed) "y" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 42 2 1 1 0 83 105 0 50 1 1 reserve 3 "" -1 127 42 (bombed) "g" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 43 2 0 0 15 96 110 0 130 0 0 none 0 "m" -1 127 42 (group bombed) "u" 0 10 2 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 44 2 0 0 15 90 103 0 130 0 0 none 0 "m" -1 127 42 (group bombed) "u" 0 10 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-45 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-46 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-47 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-48 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-49 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 127 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-50 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-51 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-52 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-53 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-54 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-55 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-56 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-57 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-58 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-59 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 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 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
-65 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-66 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-67 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-68 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-69 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-70 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-71 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-72 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-73 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-74 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-75 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-76 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-77 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-78 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-79 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-80 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-81 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-82 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-83 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-84 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-85 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-86 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-87 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-88 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-89 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-90 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-91 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-92 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-93 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-94 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-95 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-96 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-97 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-98 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-99 0 0 0 0 0 127 0 0 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+99 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 /config
 config nuke
 uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile plane

diff --git a/tests/retreat/setup-POGO b/tests/retreat/setup-POGO
index 33bcaa7c2b1cdfdfda1c493f55f0d00059b80a74..d84d392a51df7cd0b2a8dfb6528c0338992b6b86 100644 (file)
--- a/tests/retreat/setup-POGO
+++ b/tests/retreat/setup-POGO
@@ -4,22 +4,24 @@ desi 4,4 h
 give c * ?des#. 100
 || country#1
 add 1 1 1 p
+edit l * ?des#.&xloc<0 o 1 O 1
 desi -2,0 c
 edit c 1 c -2,0 s 4 b 640 M 25000 T 100
-| two forts (one with, one without return fire)
+| two forts (-2,-2 with return fire, -2,2 without)
 desi -2,2 f
 desi -2,-2 f
-| harbor for building of non-landlocked ships
+| harbor
 desi -3,1 h
-edit l * ?des#.&xloc<0 o 1 O 1
 | ships for testing retreat command
 build s -3,1 cs 5
 | ship to drop depth charges
 build s -3,1 dd
-| ship to launch torpedoes
 edit s 5 g 1 s 40
+| 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
 | p-bombers with 50% hit chance vs. dd in port
 build p -2,2 lb 5
 | marine missiles acc 50
@@ -28,19 +30,21 @@ edit p 0 U 10 T mi t 160 U 11 U 12 U 13 U 14
 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
+| complete the planes
+edit p * ?own#0 e 100 m 127
 | land units for testing retreat command
 build l -3,1 inf 5
-| fortify to reduce unwanted collateral damage
-edit u * F 127
+| complete the land units (fortify to reduce unwanted collateral damage)
+edit u * ?own#0 e 100 M 127 m 10 F 127
 || country#2
 add 2 2 2 p
+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 harbor for building, a harbor for testing construction zone retreat
+| harbors, 0,2 efficient, 2,2 construction zone
 desi 0:2,2 h
 edit l 2,2 e 1
-edit l * ?des#.&own=0 o 2 O 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
@@ -50,26 +54,37 @@ edit s 0 U 20 O 2 U 10 L 0,2 U 11
 retr 10 nhhnj ih
 retr 11 n h
 retr 20 u h
-| target ships that want to retreat, but can't: sunk, crewless,
-| in construction zone, landlocked, no mobility
-edit s 10 U 30 U 31 U 32 U 33 U 34 U 35
+| target ships that want to retreat, but can't:
+| sunk
+edit s 10 U 30 E 20
 | #31 unused
-edit s 33 L 2,2
-edit s 34 L 3,1
+edit s 10 U 31
+| crewless
+edit s 10 U 32 m 0
+| in construction zone
+edit s 10 U 33 L 2,2
+| landlocked in 3,1
+edit s 10 U 34 L 3,1
+| no mobility
+edit s 10 U 35 M 0
 retr 30/31/32/33/34/35 n i
-| target ships having difficulties during retreat: out of mobility,
-| into non-navigable, into unfriendly, as group into minefield
+| target ships having difficulties during retreat:
 edit s 10 U 40 t lc U 41 U 42
-retr 40 nnnnh i
+| runs out of mobility
 edit s 40 M 5
+retr 40 nnnnh i
+| into construction zone 2,2
 retr 41 nuh i
+| into unfriendly -3,1
 edit s 42 L -4,2
 retr 42 ugggh i
+| as group into minefield -6,4
 edit s 10 U 43 t ms U 44
 fleet m 43/44
 edit s m L -4,4
 edit l -8:-6,4 M 100
 retr m gg i
+| missions for retreat to clear
 miss s 40/41/42 int .
 | target ships depth-charges: injured vs. depth-charged, depth-charged,
 | helpless, not helpless
@@ -99,25 +114,36 @@ retr 130 gg u
 | target land units bombs: bombed
 edit u 9 U 10 T cav
 lret 10 jhhuy b
-| target land units that want to retreat, but can't: destroyed,
-| loaded on ship, crewless, kidnapped, loaded on land unit, no mobility
-edit u 10 U 30 T inf
+| target land units that want to retreat, but can't:
+| destroyed
+edit u 10 U 30 T inf e 10
+| loaded on ship
 edit u 10 U 31 S 35
-edit u 10 U 32 U 33 U 35
-edit u 33 L -1,1
+| crewless
+edit u 10 U 32 m 0
+| kidnapped
+edit u 10 U 33 L -1,1
+| loaded on train
 edit u 10 U 34 Y 9
+| no mobility
+edit u 10 U 35 M 0
 lret 30/31/32/33/34/35 j b
-| target land units having difficulties during retreat: out of mobility,
-| into mountain, into foreign sector, as group into minefield
-edit u 10 U 40 U 41 U 42
+| target land units having difficulties during retreat:
+| runs out of mobility
+edit u 10 U 40 M 5
 lret 40 nu b
-edit u 40 M 5
+| into mountain 2,0
+edit u 10 U 41
 lret 41 jy b
+| into foreign sector -1,1
+edit u 10 U 42
 lret 42 g b
-edit u 10 U 43 T eng U 44
+| as group into minefield 0,0
+edit u 10 U 10 U 43 T eng U 44
 army m 43/44
 edit l 0:1,-1:0 O 1 M 100
 lret m yu b
+| missions for retreat to clear
 miss l 40/41/42 res .
 | target land units bombs: injured vs. bombed
 | five, to have a decent chance at getting both a hit and a miss
@@ -135,16 +161,9 @@ give g * ?des=f 2
 give s * ?des=f 100
 give p * ?des=f 100
 edit l * ?des#.&eff=0 e 100 m 127
-edit s * ?eff=20&uid#30 E 100
-edit s * ?mob=0&uid#35 M 127
-edit s * ?uid#32 m 10
-edit u * ?eff=10&uid#30 e 100
-edit u * ?mob=0&uid#35 M 127
-edit u * ?uid#32 m 10
 fleet a * ?own=1&uid#2
 fleet a 9
 army a * ?own=1&uid#2
-edit p * e 100 m 127
 || relations
 decl w 1 2
 decl w 2 1
@@ -152,6 +171,7 @@ decl a 2 3
 decl f 2 4
 || show initial state here to help maintainers
 map *
+cens * ?des#.
 ship *
 retr *
 land *