retreat: Rewrite automatic retreat code to fix its many bugs

[empserver] / tests / retreat / 01-retreat-1

diff --git a/tests/retreat/01-retreat-1 b/tests/retreat/01-retreat-1
index c542ad6d6b9105e4e307a847257efc82716d05fc..bf596b0dbf55ed062ede9cfc4e318f82f4605461 100644 (file)
--- a/tests/retreat/01-retreat-1
+++ b/tests/retreat/01-retreat-1
@@ -40,14 +40,18 @@ lret
 ||| Ships
 || ships failing to retreat
 | sunk
-| as group (fleet c): 30 sinks, 32 crewless, 35 no mobility
+| as group (fleet c): 30 sinks, 32 crewless, 35 no mobility, 36 on sale
 fire se -2,2 30
 __cmd added -2 -2 0
+| in canal 4,0
+fire se -2,2 31
+__cmd added 1 1 0
 | in construction zone 2,2
 fire se -2,2 33
 | landlocked in 3,1
 fire se -2,2 34
 __cmd added -1 -1 0
+| as group (fleet c): 30 sinks, 31 on sale, 32 crewless, 35 no mobility,
 || ships having difficulties during retreat
 | out of mobility after n
 fire se -2,2 40
@@ -58,6 +62,10 @@ fire se -2,2 42
 | into minefield -6,4, sweep and hit mines, stop
 | as group (fleet m): 44/43
 fire se -2,2 44
+| into canal
+| as group (fleet n): 46 can't, 47 can
+fire se -2,2 46
+__cmd added 1 1 0
 || ships retreating fully
 | nh
 fire se -2,2 10
@@ -138,20 +146,20 @@ board 130 5
 | these bombing runs must hit; if they don't, use __cmd to make them
 | destroyed
 | as group (army c): 30 dies, 31 loaded on ship, 32 crewless,
-| 34 loaded on train, 35 no mobility
+| 34 loaded on train, 35 no mobility, 36 on sale
 bomb 30 . p -2,2 jh
 l
 30
-| BUG: 31 retreats anyway
-| BUG: 32 retreats anyway
-| BUG: 34 retreats anyway
 __cmd added -1 -2 0
 | kidnapped in -1,1
 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
@@ -159,6 +167,7 @@ bomb 30 . p -2,2 ujh
 l
 40
 | into mountain 2,0 after j
+| not actually having difficulties; such a retreat is permitted now
 __cmd added -1 0 0
 bomb 30 . p -2,2 ujh
 l
@@ -173,22 +182,33 @@ __cmd added -1 0 0
 bomb 30 . p -2,2 ujh
 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
+| into foreign, 47 can't, 48 can
+__cmd added -1 0 0
+bomb 31 . p -2,2 uuuh
+l
+47
+__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
-| BUG: can't enter allied sector
 | own land unit stays put
 bomb 30 . p -3,1 h
 l