march: Don't scatter land units on crossing border

[empserver] / tests / navi-march / journal.log

diff --git a/tests/navi-march/journal.log b/tests/navi-march/journal.log
index a0ecf9c475f9c1a6c921036024ba77085419ae67..4d66635964b85cb6e9854df23d30b47e1488c80a 100644 (file)
--- a/tests/navi-march/journal.log
+++ b/tests/navi-march/journal.log
@@ -852,17 +852,16 @@
     Play#1 input march 52/53 g
     Play#1 command march
     Play#1 output Play#1 1 Leader is cav  cavalry #52
-    Play#1 output Play#1 1 can't go to -5,3
+    Play#1 output Play#1 1 cav  cavalry #52 can't go to -5,3 & stays in -3,3
+    Play#1 output Play#1 1 Changing leader to spy  infiltrator #53
     Play#1 output Play#1 1  c c
     Play#1 output Play#1 1 + + +
     Play#1 output Play#1 1  m m
-    Play#1 output Play#1 4 <127.0:127.0: -3,3>
+    Play#1 output Play#1 4 <106.3:106.3: -5,3>
     Play#1 input ijjh
     Play#1 output Play#1 1 lnd#     land type       x,y    a  eff mil  sh gun xl ln  mu tech retr
-    Play#1 output Play#1 1   52 cav  cavalry       -3,3      100%   5   0   0  0  0 127  30  42%
-    Play#1 output Play#1 1   53 spy  infiltrator   -3,3      100%   0   0   0  0  0 127  40  42%
-    Play#1 output Play#1 1 cav  cavalry #52 stopped at 1,3
-    Play#1 output Play#1 1 spy  infiltrator #53 stopped at 1,3
+    Play#1 output Play#1 1   53 spy  infiltrator   -5,3      100%   0   0   0  0  0 106  40  42%
+    Play#1 output Play#1 1 spy  infiltrator #53 stopped at -1,3
     Play#1 output Play#1 6 0 578
     Play#1 input __cmd added -1 0 0
     Play#1 command __cmd
@@ -870,17 +869,15 @@
     Play#1 input march 55/54 g
     Play#1 command march
     Play#1 output Play#1 1 Leader is spy  infiltrator #55
-    Play#1 output Play#1 1 can't go to -5,3
+    Play#1 output Play#1 1 cav  cavalry #54 can't go to -5,3 & stays in -3,3
     Play#1 output Play#1 1  c c
     Play#1 output Play#1 1 + + +
     Play#1 output Play#1 1  m m
-    Play#1 output Play#1 4 <127.0:106.3: -5,3>
+    Play#1 output Play#1 4 <106.3:106.3: -5,3>
     Play#1 input ijjh
     Play#1 output Play#1 1 lnd#     land type       x,y    a  eff mil  sh gun xl ln  mu tech retr
     Play#1 output Play#1 1   55 spy  infiltrator   -5,3      100%   0   0   0  0  0 106  40  42%
-    Play#1 output Play#1 1   54 cav  cavalry       -3,3      100%   5   0   0  0  0 127  30  42%
     Play#1 output Play#1 1 spy  infiltrator #55 stopped at -1,3
-    Play#1 output Play#1 1 cav  cavalry #54 stopped at 1,3
     Play#1 output Play#1 6 0 577
     Play#1 input march 56/57/58/59 jh
     Play#1 command march
@@ -1505,9 +1502,9 @@
     Play#0 output Play#0 1   1   39 cav  cavalry       7,5        84%   1   0  93   0  30  42%  0  0
     Play#0 output Play#0 1   1   50 cav  cavalry      11,3       100%   5   0 105   0  30  42%  0  0
     Play#0 output Play#0 1   1   51 cav  cavalry      -1,3       100%   5   0 105   0  30  42%  0  0
-    Play#0 output Play#0 1   1   52 cav  cavalry       1,3       100%   5   0  84   0  30  42%  0  0
-    Play#0 output Play#0 1   1   53 spy  infiltrato    1,3       100%   0   0  85   0  40  42%  0  0
-    Play#0 output Play#0 1   1   54 cav  cavalry       1,3       100%   5   0  84   0  30  42%  0  0
+    Play#0 output Play#0 1   1   52 cav  cavalry      -3,3       100%   5   0 127   0  30  42%  0  0
+    Play#0 output Play#0 1   1   53 spy  infiltrato   -1,3       100%   0   0  64   0  40  42%  0  0
+    Play#0 output Play#0 1   1   54 cav  cavalry      -3,3       100%   5   0 127   0  30  42%  0  0
     Play#0 output Play#0 1   1   55 spy  infiltrato   -1,3       100%   0   0  64   0  40  42%  0  0
     Play#0 output Play#0 1   1   56 spy  infiltrato   10,4        60%   0   0 116   0  40  42%  0  0
     Play#0 output Play#0 1   1   57 spy  infiltrato   10,4        60%   0   0 116   0  40  42%  0  0