update/revolt: Don't kill land units without military

[empserver] / tests / update / journal.log

diff --git a/tests/update/journal.log b/tests/update/journal.log
index 739ee36584d349976e26dbd9ba6f93644d1cac1c..cbc9e9a039779b395c123bf60f8e82a45c5b50fb 100644 (file)
--- a/tests/update/journal.log
+++ b/tests/update/journal.log
@@ -1357,14 +1357,13 @@
     Play#0 output Play#0 1 Revolutionary subversion reported in -16,-8!
     Play#0 output Play#0 1 inf  infantry #20 captured when 5 took -16,-8!
     Play#0 output Play#0 1 Partisans take over -16,-8!
-    Play#0 output Play#0 1 inf  infantry #21 dies fighting guerrillas in -14,-8
     Play#0 output Play#0 1 inf  infantry #22 dies fighting guerrillas in -14,-8
-    Play#0 output Play#0 1 inf  infantry #23 captured when 5 took -14,-8!
+    Play#0 output Play#0 1 inf  infantry #21 captured when 5 took -14,-8!
+    Play#0 output Play#0 1 inf  infantry #23 blown up by the crew when 5 took -14,-8!
     Play#0 output Play#0 1 Guerrilla warfare in -14,-8
     Play#0 output Play#0 1   rebels murder 2 military
     Play#0 output Play#0 1 Partisans take over -14,-8!
     Play#0 output Play#0 1 sec  security #25 kills 4 guerrillas in raid at -12,-8!
-    Play#0 output Play#0 1 spy  infiltrator #24 dies fighting guerrillas in -12,-8
     Play#0 output Play#0 1 inf  infantry #26 dies fighting guerrillas in -12,-8
     Play#0 output Play#0 1 sec  security #25 dies fighting guerrillas in -12,-8
     Play#0 output Play#0 1 sec  security #27 dies fighting guerrillas in -12,-8
@@ -1414,8 +1413,8 @@
     Play#0 output Play#0 1   0 happiness,   0 education produced
     Play#0 output Play#0 1 total pop was 24024, yielding 0.00 hap, 0.00 edu
     Play#0 output Play#0 1 1.7834 technology (0.0000 + 1.7834), 1.7551 research (0.0000 + 1.7551) produced
-    Play#0 output Play#0 1 Army delta $-636, Navy delta $-300, Air force delta $0
-    Play#0 output Play#0 1 money delta was $-7231 for this update
+    Play#0 output Play#0 1 Army delta $-726, Navy delta $-300, Air force delta $0
+    Play#0 output Play#0 1 money delta was $-7321 for this update
     Play#0 output Play#0 6 0 640
     Play#0 input nation 4
     Play#0 command nation
@@ -1423,7 +1422,7 @@
     Play#0 output Play#0 1 (#4) 4 Nation Report        Thu Jan  1 00:00:00 1970
     Play#0 output Play#0 1 Nation status is ACTIVE     Bureaucratic Time Units: 640
     Play#0 output Play#0 1 100% eff capital at -1,-1 has 130 civilians & 0 military
-    Play#0 output Play#0 1  The treasury has $17769.00     Military reserves: 0
+    Play#0 output Play#0 1  The treasury has $17679.00     Military reserves: 0
     Play#0 output Play#0 1 Education..........  3.05       Happiness.......  4.44
     Play#0 output Play#0 1 Technology......... 31.58       Research........  1.74
     Play#0 output Play#0 1 Technology factor : 35.23%     Plague factor :   1.29%
@@ -1438,7 +1437,7 @@
     Play#0 output Play#0 1     CENSUS                   del dst
     Play#0 output Play#0 1 own   sect        eff prd mob uf uf old  civ  mil   uw food work avail fall coa
     Play#0 output Play#0 1   5  -16,-8   -    0%     120 .. ..      124    5    0   96 100%    0    0   1
-    Play#0 output Play#0 1   5  -14,-8   b  100%     120 .. ..      124    5    0   97 100%    0    0   1
+    Play#0 output Play#0 1   5  -14,-8   b  100%     120 .. ..      123    5    0   97 100%    0    0   1
     Play#0 output Play#0 1   4  -12,-8   -   37%     120 .. ..   0  123    5    0   96 100%   38    0   1
     Play#0 output Play#0 1   4  -10,-8   -   39%     120 .. ..      130    0    0   97 100%   39    0   1
     Play#0 output Play#0 1   4   -8,-8   -   39%     120 .. ..   2  130    0    0   97 100%   39    0   1
@@ -1681,9 +1680,10 @@
     Play#0 output Play#0 1   4   18 inf  infantry    -10,-6      100% 100   0  60   7  50  42%  0  0
     Play#0 output Play#0 1   4   19 inf  infantry    -10,-6      100% 100   0  60   7  50  42%  0  0
     Play#0 output Play#0 1   5   20 inf  infantry    -16,-8       20%   0   0  60  10  50  42%  0  0
-    Play#0 output Play#0 1   5   23 inf  infantry    -14,-8       20%   0   0  60  10  50  42%  0  0
+    Play#0 output Play#0 1   5   21 inf  infantry    -14,-8       20%   0   0  60  10  50  42%  0  0
+    Play#0 output Play#0 1   4   24 spy  infiltrato  -12,-8      100%   0   0  60   0 170  42%  0  0
     Play#0 output Play#0 1   4   28 linf light infa   -8,-8       70%  14   0  45   9  50  42%  0  0
-    Play#0 output Play#0 1 13 units
+    Play#0 output Play#0 1 14 units
     Play#0 output Play#0 6 0 640
     Play#0 input read 5
     Play#0 command read
@@ -1691,7 +1691,8 @@
     Play#0 output Play#0 1 > Production Report   dated Thu Jan  1 00:00:00 1970
     Play#0 output Play#0 1 We have captured inf  infantry #20!
     Play#0 output Play#0 1 Sector -16,-8 has been retaken!
-    Play#0 output Play#0 1 We have captured inf  infantry #23!
+    Play#0 output Play#0 1 We have captured inf  infantry #21!
+    Play#0 output Play#0 1 inf  infantry #23 blown up by the crew!
     Play#0 output Play#0 1 Sector -14,-8 has been retaken!
     Play#0 output Play#0 1   0 happiness,   0 education produced
     Play#0 output Play#0 1 total pop was 190, yielding 0.00 hap, 0.00 edu