build scrap: Redo 4.2.3's fix for manufacturing military

scrap has always returned the scrapped planes' full crew, regardless
of efficiency.  build, however, charged only 10%.  If you built ten
planes with one crew each, you used up one military.  Or none, if you
abused random rounding.  If you scrapped them again, you got ten back.
Pretty pricey way to manufacture military, but wrong all the same.

4.2.3 plugged this hole by making build never round military to zero.
Ugly special case, and not documented.  Also doesn't prevent abuse of
random rounding for planes requiring more than 10 crew, but such
planes don't exist in the stock game.

Redo this fix:

1. Make scrap return crew proportional to efficiency, randomly
rounded.  Note that scrap returns only two thirds of the other
materials, rounded down.  Recycling materials isn't perfect, but
recycling aircrew is.

2. Drop the special case from build: treat military just like other
materials.

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

diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c
index 38e7637c0cdc476d7770602783e273130856378b..cb20b162ead845662c8b477031bf965c09e74505 100644 (file)
--- a/src/lib/commands/buil.c
+++ b/src/lib/commands/buil.c
@@ -379,14 +379,9 @@ build_plane(struct sctstr *sp, int type, int tlev)
     short mat[I_MAX+1];
     int work;
     struct plnstr plane;
-    double eff = PLANE_MINEFF / 100.0;
-    int mil;
 
-    mil = roundavg(pp->pl_crew * eff);
-    /* Always use at least 1 mil to build a plane */
-    if (mil == 0 && pp->pl_crew > 0)
-       mil = 1;
     memset(mat, 0, sizeof(mat));
+    mat[I_MILIT] = pp->pl_crew;
     mat[I_LCM] = pp->pl_lcm;
     mat[I_HCM] = pp->pl_hcm;
     work = PLN_BLD_WORK(pp->pl_lcm, pp->pl_hcm);
@@ -399,12 +394,6 @@ build_plane(struct sctstr *sp, int type, int tlev)
        return 0;
     if (!build_can_afford(pp->pl_cost, PLANE_MINEFF, pp->pl_name))
        return 0;
-    if (sp->sct_item[I_MILIT] < mil) {
-       pr("Not enough military for crew in %s\n",
-          xyas(sp->sct_x, sp->sct_y, player->cnum));
-       return 0;
-    }
-    sp->sct_item[I_MILIT] -= mil;
     build_charge(sp, mat, work, pp->pl_cost, PLANE_MINEFF);
 
     ef_blank(EF_PLANE, pick_unused_unit_uid(EF_PLANE), &plane);

diff --git a/src/lib/commands/scra.c b/src/lib/commands/scra.c
index 36669562177519e4250067f10862693d7abb78ae..d85a64c768635d54bab6c7d22b7ce6b02208a6e0 100644 (file)
--- a/src/lib/commands/scra.c
+++ b/src/lib/commands/scra.c
@@ -34,6 +34,7 @@
 #include <config.h>
 
 #include <ctype.h>
+#include "chance.h"
 #include "commands.h"
 #include "optlist.h"
 #include "plague.h"
@@ -170,7 +171,7 @@ scra(void)
            pp = &plchr[(int)item.plane.pln_type];
            sect.sct_item[I_LCM] += pp->pl_lcm * 2 / 3 * eff;
            sect.sct_item[I_HCM] += pp->pl_hcm * 2 / 3 * eff;
-           sect.sct_item[I_MILIT] += pp->pl_crew;
+           sect.sct_item[I_MILIT] += roundavg(pp->pl_crew * eff);
        }
        item.gen.effic = 0;
        put_empobj(type, item.gen.uid, &item.gen);

diff --git a/tests/build/final.xdump b/tests/build/final.xdump
index 1202dc29ce9c3318303ab5758a406f14d4a4f7fa..fab500341fea11e054786e7b151f40675373cb8d 100644 (file)
--- a/tests/build/final.xdump
+++ b/tests/build/final.xdump
@@ -10,8 +10,8 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 0 -6 0 0 0 0 0 0 0 0 0 0 0 -6 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 0 -4 0 0 0 0 0 0 0 0 0 0 0 -4 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 -2 0 5 100 127 0 0 0 0 0 0 0 -2 0 0 0 0 1 5 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
-2 1 1 14 100 127 0 0 0 0 0 0 0 1 1 3 0 0 0 14 0 0 0 0 0 2 100 2 0 0 0 0 0 0 0 0 2 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
-2 3 1 14 60 127 0 0 0 0 0 0 0 3 1 7 0 0 0 14 0 0 0 0 0 2 100 3 0 0 0 0 0 0 0 0 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
+2 1 1 14 100 127 0 0 0 0 0 0 0 1 1 3 0 0 0 14 0 0 0 0 0 2 100 4 0 0 0 0 0 0 0 0 2 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
+2 3 1 14 60 127 0 0 0 0 0 0 0 3 1 7 0 0 0 14 0 0 0 0 0 2 100 4 0 0 0 0 0 0 0 0 4 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 2 5 1 14 59 127 0 0 0 0 0 0 0 5 1 11 0 0 1 14 0 0 0 0 0 2 100 50 0 0 0 0 0 0 0 500 500 500 0 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 0 7 1 0 0 0 0 0 0 0 0 0 0 7 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 0 9 1 0 0 0 0 0 0 0 0 0 0 9 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0

diff --git a/tests/build/journal.log b/tests/build/journal.log
index ee168c8b4866e4431b34d12511c675a7470a14e1..a6474cc7acb56e6312301d9db07bb2c2ad77d5cb 100644 (file)
--- a/tests/build/journal.log
+++ b/tests/build/journal.log
@@ -269,6 +269,7 @@
     Play#2 output Play#2 6 0 635
     Play#2 input build p 3:5,1 f2
     Play#2 command build
+    Play#2 output Play#2 1 Not enough military in 3,1 (need 1 more)
     Play#2 output Play#2 1 Not enough light products in 3,1 (need 1 more)
     Play#2 output Play#2 1 Not enough heavy products in 3,1 (need 1 more)
     Play#2 output Play#2 1 Sector 5,1 is not 60% efficient.
@@ -292,7 +293,7 @@
     Play#2 command build
     Play#2 output Play#2 1 Not enough light products in 1,1 (need 1 more)
     Play#2 output Play#2 1 Not enough heavy products in 1,1 (need 1 more)
-    Play#2 output Play#2 1 Not enough military for crew in 3,1
+    Play#2 output Play#2 1 Not enough military in 3,1 (need 1 more)
     Play#2 output Play#2 6 0 630
     Play#2 input move m -1,1 3 jh
     Play#2 command move
@@ -364,8 +365,8 @@
     Play#2 output Play#2 1 Thu Jan  1 00:00:00 1970
     Play#2 output Play#2 1 CENSUS                   del dst
     Play#2 output Play#2 1   sect        eff prd mob uf uf old  civ  mil   uw food work avail ter fall coa
-    Play#2 output Play#2 1    1,1    *  100%     127 .. ..      100    2    0    0   0%    3        0
-    Play#2 output Play#2 1    3,1    *   60%     127 .. ..      100    3    0    0   0%    7        0
+    Play#2 output Play#2 1    1,1    *  100%     127 .. ..      100    4    0    0   0%    3        0
+    Play#2 output Play#2 1    3,1    *   60%     127 .. ..      100    4    0    0   0%    7        0
     Play#2 output Play#2 1    5,1    *   59%     127 .. ..      100   50    0    0   0%   11        0   1
     Play#2 output Play#2 1 3 sectors
     Play#2 output Play#2 6 0 621
@@ -374,8 +375,8 @@
     Play#2 output Play#2 1 Thu Jan  1 00:00:00 1970
     Play#2 output Play#2 1 COMMODITIES deliver--  distribute
     Play#2 output Play#2 1   sect      sgpidbolhr sgpidbolhr  sh gun  pet iron dust bar  oil  lcm  hcm rad
-    Play#2 output Play#2 1    1,1    * .......... ..........   0   0    0    0    0   0    0    2    2   0
-    Play#2 output Play#2 1    3,1    * .......... ..........   0   0    0    0    0   0    0    3    3   0
+    Play#2 output Play#2 1    1,1    * .......... ..........   0   0    0    0    0   0    0    2    3   0
+    Play#2 output Play#2 1    3,1    * .......... ..........   0   0    0    0    0   0    0    4    3   0
     Play#2 output Play#2 1    5,1    * .......... ..........   0   0    0    0    0   0  500  500  500 500
     Play#2 output Play#2 1 3 sectors
     Play#2 output Play#2 6 0 621

diff --git a/tests/smoke/final.xdump b/tests/smoke/final.xdump
index db7a9aa0f6de18176cc39eba6274764b315fae96..e1a3d41933ba96e7afd2600b1f9158fc6843b177 100644 (file)
--- a/tests/smoke/final.xdump
+++ b/tests/smoke/final.xdump
@@ -677,7 +677,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 1 5 -11 10 100 127 0 0 0 0 0 0 0 11 -11 0 93 100 0 10 100 0 0 0 100 1 1000 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
 1 7 -11 14 100 127 0 0 0 0 0 0 0 11 -11 657 79 100 1 14 91 0 0 0 68 1 1000 30 180 0 200 0 0 0 0 0 200 200 0 0 0 30 180 0 200 0 0 0 0 0 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
 1 9 -11 21 100 127 0 0 0 0 0 0 0 11 -11 490 75 100 1 21 85 0 0 0 57 1 1000 0 0 0 0 0 10 0 0 50 100 0 0 0 0 0 0 0 0 0 10 0 0 50 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
-1 11 -11 13 100 127 0 0 0 0 0 0 0 11 -11 667 71 100 1 13 78 0 0 0 45 1 1000 105 181 0 1226 2071 473 0 0 740 4114 4522 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
+1 11 -11 13 100 127 0 0 0 0 0 0 0 11 -11 668 71 100 1 13 78 0 0 0 45 1 1000 108 181 0 1226 2071 473 0 0 740 4113 4521 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
 1 13 -11 31 100 127 0 12 0 0 0 0 0 11 -11 649 64 100 1 31 67 0 0 0 25 1 967 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
 1 15 -11 26 100 127 0 0 0 0 0 0 0 11 -11 656 57 100 1 26 56 0 0 0 5 1 1000 25 200 17 0 0 0 0 0 0 200 200 0 0 0 25 200 25 0 0 0 0 0 0 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
 0 17 -11 0 0 0 0 0 0 0 0 0 0 17 -11 0 -9 0 1 0 0 0 50 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
@@ -1221,7 +1221,7 @@ uid owner type unitid price maxbidder markettime xloc yloc
 config nat
 cnum stat flags cname passwd ip hostname userid xcap ycap xorg yorg update tgms ann timeused btu access milreserve money login logout newstim annotim tech research education happiness relations(0) relations(1) relations(2) relations(3) relations(4) relations(5) relations(6) relations(7) relations(8) relations(9) relations(10) relations(11) relations(12) relations(13) relations(14) relations(15) relations(16) relations(17) relations(18) relations(19) relations(20) relations(21) relations(22) relations(23) relations(24) relations(25) relations(26) relations(27) relations(28) relations(29) relations(30) relations(31) relations(32) relations(33) relations(34) relations(35) relations(36) relations(37) relations(38) relations(39) relations(40) relations(41) relations(42) relations(43) relations(44) relations(45) relations(46) relations(47) relations(48) relations(49) relations(50) relations(51) relations(52) relations(53) relations(54) relations(55) relations(56) relations(57) relations(58) relations(59) relations(60) relations(61) relations(62) relations(63) relations(64) relations(65) relations(66) relations(67) relations(68) relations(69) relations(70) relations(71) relations(72) relations(73) relations(74) relations(75) relations(76) relations(77) relations(78) relations(79) relations(80) relations(81) relations(82) relations(83) relations(84) relations(85) relations(86) relations(87) relations(88) relations(89) relations(90) relations(91) relations(92) relations(93) relations(94) relations(95) relations(96) relations(97) relations(98) contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98) rejects(0) rejects(1) rejects(2) rejects(3) rejects(4) rejects(5) rejects(6) rejects(7) rejects(8) rejects(9) rejects(10) rejects(11) rejects(12) rejects(13) rejects(14) rejects(15) rejects(16) rejects(17) rejects(18) rejects(19) rejects(20) rejects(21) rejects(22) rejects(23) rejects(24) rejects(25) rejects(26) rejects(27) rejects(28) rejects(29) rejects(30) rejects(31) rejects(32) rejects(33) rejects(34) rejects(35) rejects(36) rejects(37) rejects(38) rejects(39) rejects(40) rejects(41) rejects(42) rejects(43) rejects(44) rejects(45) rejects(46) rejects(47) rejects(48) rejects(49) rejects(50) rejects(51) rejects(52) rejects(53) rejects(54) rejects(55) rejects(56) rejects(57) rejects(58) rejects(59) rejects(60) rejects(61) rejects(62) rejects(63) rejects(64) rejects(65) rejects(66) rejects(67) rejects(68) rejects(69) rejects(70) rejects(71) rejects(72) rejects(73) rejects(74) rejects(75) rejects(76) rejects(77) rejects(78) rejects(79) rejects(80) rejects(81) rejects(82) rejects(83) rejects(84) rejects(85) rejects(86) rejects(87) rejects(88) rejects(89) rejects(90) rejects(91) rejects(92) rejects(93) rejects(94) rejects(95) rejects(96) rejects(97) rejects(98)
 0 deity (flash beep coastwatch sonar techlists) "POGO" "peter" "127.0.0.1" "" "tester" 0 0 0 0 0 0 0 255 640 0 0 123456789 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
-1 active (flash beep coastwatch sonar techlists) "1" "1" "127.0.0.1" "" "tester" 5 -15 5 -13 0 0 0 255 640 0 27 59888 0 0 0 0 65.5628 21.7072 38.6526 12.0091 neutral neutral allied neutral neutral neutral neutral neutral at-war neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
+1 active (flash beep coastwatch sonar techlists) "1" "1" "127.0.0.1" "" "tester" 5 -15 5 -13 0 0 0 255 640 0 27 59858 0 0 0 0 65.5628 21.7072 38.6526 12.0091 neutral neutral allied neutral neutral neutral neutral neutral at-war neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
 2 active (flash beep coastwatch sonar techlists) "2" "2" "127.0.0.1" "" "tester" 18 8 16 10 0 1 0 255 640 0 101 38069 0 0 0 0 27.2793 10.8536 11.7623 0.00000 neutral allied neutral neutral neutral neutral neutral neutral hostile neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
 3 active (flash beep coastwatch sonar techlists) "3" "3" "127.0.0.1" "" "tester" -4 10 -4 10 0 17 1 255 640 0 0 38161 0 0 0 0 27.2793 10.8536 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
 4 active (flash beep coastwatch sonar techlists) "4" "4" "127.0.0.1" "" "tester" -15 1 -15 1 0 17 1 255 640 0 0 38156 0 0 0 0 27.2793 10.8536 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()

diff --git a/tests/smoke/journal.log b/tests/smoke/journal.log
index 0e7c67205e6e998758db40811be52461896498ec..259e232df831c03d9b91a32f8f3c942219dbf77c 100644 (file)
--- a/tests/smoke/journal.log
+++ b/tests/smoke/journal.log
@@ -13560,7 +13560,7 @@
     Play#1 output Play#1 1    7,1    d  100%     127 .. ..      769    0    0    0 100%  489        0   1
     Play#1 output Play#1 1   -2,2    i  100%     127 .. ..      769    0    0    0 100%    0        0   1
     Play#1 output Play#1 1    0,2    m  100%     127 .. ..      769    0    0    0 100%    0        0
-    Play#1 output Play#1 1    2,2    *  100%     127 .. ..      769   27    0    0 100%  462        0   1
+    Play#1 output Play#1 1    2,2    *  100%     127 .. ..      769   30    0    0 100%  462        0   1
     Play#1 output Play#1 1    4,2    r  100%     127 .. ..      769    0    0    0 100%  489        0   1
     Play#1 output Play#1 1    6,2    w  100%     127 .. ..     7895   44    0    0 100%  662        0   1
     Play#1 output Play#1 1    8,2    e  100%     127 .. ..      769    1    0    0 100%  649        0   1
@@ -14038,7 +14038,7 @@
     Play#0 output Play#0 1       as of Thu Jan  1 00:00:00 1970
     Play#0 output Play#0 1
     Play#0 output Play#0 1          sects  eff civ  mil  shell gun pet  iron dust oil  pln ship unit money
-    Play#0 output Play#0 1         1  33  100%  31K 210  514   22    0  9.1K 849  1.2K   3    5    4   46K
+    Play#0 output Play#0 1         1  33  100%  31K 213  514   22    0  9.1K 849  1.2K   3    5    4   46K
     Play#0 output Play#0 1    639.37
     Play#0 output Play#0 1         8  29   91%  25K 110  101    0    0   14K 2.8K 527    0    0    0   21K
     Play#0 output Play#0 1    329.62
@@ -14129,7 +14129,7 @@
     Play#0 output Play#0 1  10  -11,-11  g  100%     127 .. ..     1000    0    0    0 100%  650    0   1
     Play#0 output Play#0 1   1    3,-11  i  100%     127 .. ..      769    0    0    0 100%    0    0   1
     Play#0 output Play#0 1   1    5,-11  m  100%     127 .. ..      769    0    0    0 100%    0    0
-    Play#0 output Play#0 1   1    7,-11  *  100%     127 .. ..      769   27    0    0 100%  462    0   1
+    Play#0 output Play#0 1   1    7,-11  *  100%     127 .. ..      769   30    0    0 100%  462    0   1
     Play#0 output Play#0 1   1    9,-11  r  100%     127 .. ..      769    0    0    0 100%  489    0   1
     Play#0 output Play#0 1   1   11,-11  w  100%     127 .. ..     7895   44    0    0 100%  662    0   1
     Play#0 output Play#0 1   1   13,-11  e  100%     127 .. ..      769    1    0    0 100%  649    0   1
@@ -14249,7 +14249,7 @@
     Play#0 output Play#0 1  10 -11,-11  g .......... ..........   0   0    0    0  225   0    0    0    0   0
     Play#0 output Play#0 1   1   3,-11  i .......... 0......63.   1   0    0    0    0   0    0  600  300   0
     Play#0 output Play#0 1   1   5,-11  m .......... ...0......   0   0    0    1    0   0    0    0    0   0
-    Play#0 output Play#0 1   1   7,-11  * .......... 1.2....22.   0   0    0    0    0   0    0  198  200   0
+    Play#0 output Play#0 1   1   7,-11  * .......... 1.2....22.   0   0    0    0    0   0    0  197  199   0
     Play#0 output Play#0 1   1   9,-11  r .......... ....0.01..   0   0    0    0   10   0   50  100    0   0
     Play#0 output Play#0 1   1  11,-11  w .......... .......... 273   0    0 2519  523   0  849 2514 3122   0
     Play#0 output Play#0 1   1  13,-11  e .......... ..........   0   0    0    0    0   0    0    0    0   0
@@ -14692,9 +14692,9 @@
     Play#1 output Play#1 1    7,1    d  100%     127 .. ..     1000    0    0    0 100%  489        0   1
     Play#1 output Play#1 1   -2,2    i  100%     127 .. ..     1000    0    0    0 100%    2        0   1
     Play#1 output Play#1 1    0,2    m  100%     127 .. ..     1000    0    0    0 100%    0        0
-    Play#1 output Play#1 1    2,2    *  100%      98 .. ..     1000   30    0    0 100%  568        0   1
+    Play#1 output Play#1 1    2,2    *  100%      98 .. ..     1000   30    0    0 100%  569        0   1
     Play#1 output Play#1 1    4,2    r  100%     127 .. ..     1000    0    0    0 100%  489        0   1
-    Play#1 output Play#1 1    6,2    w  100%     127 .. ..     1000   72    0    0 100%  660        0   1
+    Play#1 output Play#1 1    6,2    w  100%     127 .. ..     1000   75    0    0 100%  660        0   1
     Play#1 output Play#1 1    8,2    e  100%     127 .. ..      966    1    0    0 100%  649        0   1
     Play#1 output Play#1 1   10,2    !  100%     127 .. ..     1000   25    0    0 100%  655        0   1
     Play#1 output Play#1 1   -1,3    o  100%     127 .. ..     1000    0    0    0 100%    0        0   1
@@ -14757,7 +14757,7 @@
     Play#1 output Play#1 1 total pop was 31449, yielding 12.08 hap, 43.62 edu
     Play#1 output Play#1 1 7.2647 technology (4.4917 + 2.7730), 3.7040 research (3.7040 + 0.0000) produced
     Play#1 output Play#1 1 Army delta $-138, Navy delta $-1650, Air force delta $-1227
-    Play#1 output Play#1 1 money delta was $5350 for this update
+    Play#1 output Play#1 1 money delta was $5335 for this update
     Play#1 output Play#1 1
     Play#1 output Play#1 1 > BULLETIN from POGO, (#0)  dated Thu Jan  1 00:00:00 1970
     Play#1 output Play#1 1 Flying a support mission from 11,-1 to 12,-2
@@ -15145,8 +15145,8 @@
     Play#0 output Play#0 1       as of Thu Jan  1 00:00:00 1970
     Play#0 output Play#0 1
     Play#0 output Play#0 1          sects  eff civ  mil  shell gun pet  iron dust oil  pln ship unit money
-    Play#0 output Play#0 1         1  33  100%  31K 232  659   30  994  8.9K 524  1.0K   3    5    4   51K
-    Play#0 output Play#0 1    756.27
+    Play#0 output Play#0 1         1  33  100%  31K 235  659   30  994  8.9K 524  1.0K   3    5    4   51K
+    Play#0 output Play#0 1    756.25
     Play#0 output Play#0 1         8  29  100%  29K 105  215    5    0   15K 2.5K 541    0    0    0   23K
     Play#0 output Play#0 1    447.37
     Play#0 output Play#0 1         2  30   33% 6.3K   0    0    0    0  3.2K 1.2K 523    0    0    0   36K
@@ -15236,9 +15236,9 @@
     Play#0 output Play#0 1  10  -11,-11  g  100%     127 .. ..     1000    0    0    0 100%  650    0   1
     Play#0 output Play#0 1   1    3,-11  i  100%     127 .. ..     1000    0    0    0 100%    2    0   1
     Play#0 output Play#0 1   1    5,-11  m  100%     127 .. ..     1000    0    0    0 100%    0    0
-    Play#0 output Play#0 1   1    7,-11  *  100%      98 .. ..     1000   30    0    0 100%  568    0   1
+    Play#0 output Play#0 1   1    7,-11  *  100%      98 .. ..     1000   30    0    0 100%  569    0   1
     Play#0 output Play#0 1   1    9,-11  r  100%     127 .. ..     1000    0    0    0 100%  489    0   1
-    Play#0 output Play#0 1   1   11,-11  w  100%     127 .. ..     1000   72    0    0 100%  660    0   1
+    Play#0 output Play#0 1   1   11,-11  w  100%     127 .. ..     1000   75    0    0 100%  660    0   1
     Play#0 output Play#0 1   1   13,-11  e  100%     127 .. ..      966    1    0    0 100%  649    0   1
     Play#0 output Play#0 1   1   15,-11  !  100%     127 .. ..     1000   25    0    0 100%  655    0   1
     Play#0 output Play#0 1   8   21,-11  p  100%     127 .. ..      769    0    0    0 100%  474    0   1
@@ -15358,7 +15358,7 @@
     Play#0 output Play#0 1   1   5,-11  m .......... ...0......   0   0    0    1    0   0    0    0    0   0
     Play#0 output Play#0 1   1   7,-11  * .......... 1.2....22. 180   0  200    0    0   0    0  200  200   0
     Play#0 output Play#0 1   1   9,-11  r .......... ....0.01..   0   0    0    0   10   0   50  100    0   0
-    Play#0 output Play#0 1   1  11,-11  w .......... ..........  25   0  778 2295  498   0  828 3246 3776   0
+    Play#0 output Play#0 1   1  11,-11  w .......... ..........  25   0  778 2295  498   0  828 3245 3775   0
     Play#0 output Play#0 1   1  13,-11  e .......... ..........   0   0    0    0    0   0    0    0    0   0
     Play#0 output Play#0 1   1  15,-11  ! .......... 20.....22. 200  11    0    0    0   0    0  200  200   0
     Play#0 output Play#0 1   8  21,-11  p .......... .......0..   0   0    0    0    1   0    0   75    0   0
@@ -15649,7 +15649,7 @@
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP nat 0
     Play#0 output Play#0 1 0 5 62 "POGO" "peter" "127.0.0.1" "" "tester" 0 0 0 0 0 0 0 255 640 0 0 123456789 0 0 0 0 0.00000 0.00000 0.00000 0.00000 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    Play#0 output Play#0 1 1 4 62 "1" "1" "127.0.0.1" "" "tester" 5 -15 5 -13 0 1 0 255 640 0 27 59888 0 0 0 0 65.5628 21.7072 38.6526 12.0091 2 2 4 2 2 2 2 2 0 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+    Play#0 output Play#0 1 1 4 62 "1" "1" "127.0.0.1" "" "tester" 5 -15 5 -13 0 1 0 255 640 0 27 59858 0 0 0 0 65.5628 21.7072 38.6526 12.0091 2 2 4 2 2 2 2 2 0 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
     Play#0 output Play#0 1 2 4 62 "2" "2" "127.0.0.1" "" "tester" 18 8 16 10 0 1 0 255 640 0 101 38069 0 0 0 0 27.2793 10.8536 11.7623 0.00000 2 4 2 2 2 2 2 2 1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
     Play#0 output Play#0 1 3 4 62 "3" "3" "127.0.0.1" "" "tester" -4 10 -4 10 0 17 1 255 640 0 0 38161 0 0 0 0 27.2793 10.8536 0.00000 0.00000 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
     Play#0 output Play#0 1 4 4 62 "4" "4" "127.0.0.1" "" "tester" -15 1 -15 1 0 17 1 255 640 0 0 38156 0 0 0 0 27.2793 10.8536 0.00000 0.00000 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -17034,7 +17034,7 @@
     Play#1 input xdump country *
     Play#1 command xdump
     Play#1 output Play#1 1 XDUMP country 0
-    Play#1 output Play#1 1 1 62 "127.0.0.1" "" "tester" 0 -2 0 0 0 255 640 0 27 59888 0 0 0 0 65.5628 21.7072 38.6526 12.0091
+    Play#1 output Play#1 1 1 62 "127.0.0.1" "" "tester" 0 -2 0 0 0 255 640 0 27 59858 0 0 0 0 65.5628 21.7072 38.6526 12.0091
     Play#1 output Play#1 1 /1
     Play#1 output Play#1 6 0 640
     Play#1 input ctld