tests/navi-march: Cover running out of mobility completely

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

diff --git a/tests/navi-march/01-navigate-1 b/tests/navi-march/01-navigate-1
index a6bbbf0d318ed3f4d00ddb50b3d7eb186490a74d..3e0b3ee64dd816fcb318b364dfe45dad9112e451 100644 (file)
--- a/tests/navi-march/01-navigate-1
+++ b/tests/navi-march/01-navigate-1
@@ -72,6 +72,9 @@ h
 navi 84/83/80/81/82
 yyyy
 h
+| run out of mob, stop
+navi 85 y
+__cmd added 1 1 0
 || path finding
 | to sea, sea, land
 navi 90 -3,-3

diff --git a/tests/navi-march/02-march-1 b/tests/navi-march/02-march-1
index 3fd10ca09093836dd1e90b3c3992b8b4de2ad42b..41783f4a46df00154686b18fa3d2b8e82fee924c 100644 (file)
--- a/tests/navi-march/02-march-1
+++ b/tests/navi-march/02-march-1
@@ -73,6 +73,9 @@ n
 march 84/83/80/81/82
 jjun
 h
+| run out of mob, stop
+march 85 y
+__cmd added 1 1 0
 || path finding
 | within own
 march 90 4,4

diff --git a/tests/navi-march/final.xdump b/tests/navi-march/final.xdump
index d8f02f0887d53f3e9a5eb3833df1717c039f3a9f..910913887450bc78887d4dbcd066972580a365e4 100644 (file)
--- a/tests/navi-march/final.xdump
+++ b/tests/navi-march/final.xdump
@@ -177,6 +177,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
 82 1 -3 -3 2 100 -13 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
 83 1 -1 -1 2 100 -13 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
 84 1 0 0 2 100 0 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
+85 1 0 0 2 100 0 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
 90 1 0 -4 9 100 81 0 40 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
 91 1 -3 1 9 100 108 0 40 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
 92 1 0 0 9 100 127 0 40 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
@@ -256,6 +257,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
 82 1 8 4 0 100 -14 0 30 3 5 none 3 "" -1 0 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 83 1 5 5 0 100 -10 0 30 3 5 none 3 "" -1 0 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 84 1 3 5 0 100 0 0 30 3 5 none 3 "" -1 127 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+85 1 3 5 0 100 0 0 30 3 5 none 3 "" -1 127 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 90 1 4 2 0 100 24 0 30 1 1 none 3 "" -1 0 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 91 1 1 1 0 100 127 0 30 1 1 none 3 "" -1 127 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 100 1 -4 4 21 100 67 0 270 0 0 none 0 "" -1 0 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0

diff --git a/tests/navi-march/journal.log b/tests/navi-march/journal.log
index bb328a591561ac997d636a50bdfbc012c9c86b6a..13985d960dd84eb65e7e476609f7bb5dad4cee42 100644 (file)
--- a/tests/navi-march/journal.log
+++ b/tests/navi-march/journal.log
@@ -345,6 +345,15 @@
     Play#1 output Play#1 1 cs   cargo ship (#80) stopped at -4,-4
     Play#1 output Play#1 1 cs   cargo ship (#81) stopped at -4,-4
     Play#1 output Play#1 6 0 611
+    Play#1 input navi 85 y
+    Play#1 command navigate
+    Play#1 output Play#1 1 Flagship is cs   cargo ship (#85)
+    Play#1 output Play#1 1 cs   cargo ship (#85) is out of mobility & stays in 0,0
+    Play#1 output Play#1 1 No ships left
+    Play#1 output Play#1 6 0 610
+    Play#1 input __cmd added 1 1 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 611
     Play#1 input navi 90 -3,-3
     Play#1 command navigate
     Play#1 output Play#1 1 Flagship is pt   patrol boat (#90)
@@ -1027,6 +1036,15 @@
     Play#1 output Play#1 1 cav  cavalry #80 stopped at 9,5
     Play#1 output Play#1 1 cav  cavalry #81 stopped at 9,5
     Play#1 output Play#1 6 0 566
+    Play#1 input march 85 y
+    Play#1 command march
+    Play#1 output Play#1 1 Leader is cav  cavalry #85
+    Play#1 output Play#1 1 cav  cavalry #85 is out of mobility & stays in 3,5
+    Play#1 output Play#1 1 No lands left
+    Play#1 output Play#1 6 0 565
+    Play#1 input __cmd added 1 1 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 566
     Play#1 input march 90 4,4
     Play#1 command march
     Play#1 output Play#1 1 Leader is cav  cavalry #90
@@ -1455,6 +1473,7 @@
     Play#0 output Play#0 1   1   82 cs   cargo ship    -3,-3      100%   0   5   0   0  0  0  0  0 -13   20
     Play#0 output Play#0 1   1   83 cs   cargo ship    -1,-1      100%   0   5   0   0  0  0  0  0 -13   20
     Play#0 output Play#0 1   1   84 cs   cargo ship     0,0       100%   0   5   0   0  0  0  0  0   0   20
+    Play#0 output Play#0 1   1   85 cs   cargo ship     0,0       100%   0   5   0   0  0  0  0  0   0   20
     Play#0 output Play#0 1   1   90 pt   patrol boat    0,-4      100%   0   2   0   0  0  0  0  0  81   40
     Play#0 output Play#0 1   1   91 pt   patrol boat   -3,1       100%   0   2   0   0  0  0  0  0 108   40
     Play#0 output Play#0 1   1   92 pt   patrol boat    0,0       100%   0   2   0   0  0  0  0  0 127   40
@@ -1474,7 +1493,7 @@
     Play#0 output Play#0 1   1  137 pt   patrol boat   11,-5      100%   0   2   0   0  0  0  0  0 117   40
     Play#0 output Play#0 1   1  138 pt   patrol boat   11,-5       80%   0   1   0   0  0  0  0  0  93   40
     Play#0 output Play#0 1   1  139 pt   patrol boat   11,-5       74%   0   1   0   0  0  0  0  0  86   40
-    Play#0 output Play#0 1 71 ships
+    Play#0 output Play#0 1 72 ships
     Play#0 output Play#0 6 0 640
     Play#0 input carg * ?shell#0
     Play#0 command cargo
@@ -1569,6 +1588,7 @@
     Play#0 output Play#0 1   1   82 cav  cavalry       8,4       100%   5   0 -14   0  30  42%  0  0
     Play#0 output Play#0 1   1   83 cav  cavalry       5,5       100%   5   0 -10   0  30  42%  0  0
     Play#0 output Play#0 1   1   84 cav  cavalry       3,5       100%   5 127   0   0  30  42%  0  0
+    Play#0 output Play#0 1   1   85 cav  cavalry       3,5       100%   5 127   0   0  30  42%  0  0
     Play#0 output Play#0 1   1   90 cav  cavalry       4,2       100%   5   0  24   0  30  42%  0  0
     Play#0 output Play#0 1   1   91 cav  cavalry       1,1       100%   5 127 127   0  30  42%  0  0
     Play#0 output Play#0 1   1  100 rad  radar unit   -4,4       100%   5   0  67   0 270  42%  0  0
@@ -1585,7 +1605,7 @@
     Play#0 output Play#0 1   1  137 cav  cavalry       8,6       100%   5   0 104   0  30  42%  0  0
     Play#0 output Play#0 1   1  138 cav  cavalry       8,6       100%   5   0 104   0  30  42%  0  0
     Play#0 output Play#0 1   1  139 cav  cavalry       8,6        84%   4   0  88   0  30  42%  0  0
-    Play#0 output Play#0 1 68 units
+    Play#0 output Play#0 1 69 units
     Play#0 output Play#0 6 0 637
     Play#0 input lcar * ?shell#0
     Play#0 command lcargo

diff --git a/tests/navi-march/setup-POGO b/tests/navi-march/setup-POGO
index adc1c7842ba24a445b68536b9b6b166cf2aa1e03..40a77405cd443da9dfec3d1540e8686c3c7dc4cb 100644 (file)
--- a/tests/navi-march/setup-POGO
+++ b/tests/navi-march/setup-POGO
@@ -109,7 +109,7 @@ edit s 1 U 65 L -9,1
 | next to unowned bridge 10,0, friendly -6,0, unfriendly -10,0
 edit s 0 U 70 L -12,0 U 71 L -4,0 U 72 L -8,0
 | at sea, low on mobility
-edit s 1 U 80 L 0,0 U 81 U 82 M 30 U 83 M 1 U 84 M 0
+edit s 1 U 80 L 0,0 U 81 U 82 M 30 U 83 M 1 U 84 M 0 U 85
 | at sea, path finding
 edit s 0 U 90 L 0,0 U 91 U 92
 | at sea dd/ft/oe, mapping, sensors etc.
@@ -171,7 +171,7 @@ edit u 0 U 76 L 1,7 U 77
 edit u 0 U 78 L 3,7 U 79
 give c 1:3,7 -100
 | low on mobility
-edit u 0 U 80 L 3,5 U 81 U 82 M 30 U 83 M 1 U 84 M 0
+edit u 0 U 80 L 3,5 U 81 U 82 M 30 U 83 M 1 U 84 M 0 U 85
 | path finding
 edit u 0 U 90 U 91
 | rad/cav, mapping, sensors, etc.