update: Saner rounding of unit building money and work

shiprepair() limits the efficiency gain to how much the workers can
build, rounding randomly.  It charges work, money and materials for
the efficiency actually gained, rounding work up, money down, and
materials randomly.  Same for planerepair() and landrepair().  Has
always been that way.

If you get lucky with the random rounding, you may get a bit of extra
work done for free.

The budget command runs the update code, and can be off by one due to
different random rounding.

Sector production used to have the same issue, only more serious,
because a single unit of tech production matters much more for the
budget than a single point of unit efficiency gain.  I fixed it in
commit 6f7c93c, v4.3.31.

Fix it for unit building the same way: limit efficiency gain to the
amount the workers can produce (no rounding).  Work becomes a hard
limit, not subject to random fluctuations.  Randomly round work and
money charged for actual gain, like we do for materials.  On average,
this charges exactly the work and money that's used.

This lets budget predict how much gets built a bit more accurately.
It's still not exact, as the amount of work available for building
remains slightly random, and the build cost is randomly rounded.

The old rounding of work for ships carries the comment "I didn't use
roundavg here, because I want to penalize the player with a large
number of ships."  Likewise for planes.  Rounding work up rather than
randomly increases the work cost by 0.5 per ship, plane or land unit
on average.  I could keep the penalty by adding 0.5 before random
rounding.  Not worth it, since the effect is actually pretty trivial.
Let's examine a fairly extreme case: an airfield with 600 available
work repairing a huge number of lightly damaged planes, say f2 with
81% average efficiency.  The old code lets the airfield repair roughly
600 / 6.5 = ~92 planes, the new code 600 / 6 = 100.

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

diff --git a/src/lib/update/land.c b/src/lib/update/land.c
index 5eb965009ee3ddac224a2cd5be5e6be6024df408..6f48a68ef3fd3aca82b0c77994e5a63a80ae4a0b 100644 (file)
--- a/src/lib/update/land.c
+++ b/src/lib/update/land.c
@@ -223,7 +223,7 @@ landrepair(struct lndstr *land, struct natstr *np, struct bp *bp, int etus)
 
     avail = sp->sct_avail * 100;
 
-    delta = roundavg((double)avail / lp->l_bwork);
+    delta = avail / lp->l_bwork;
     if (delta <= 0)
        return;
     if (delta > (int)((float)etus * land_grow_scale))
@@ -236,13 +236,13 @@ landrepair(struct lndstr *land, struct natstr *np, struct bp *bp, int etus)
     if ((sp->sct_type != SCT_HEADQ) && (sp->sct_type != SCT_FORTR))
        build /= 3;
 
-    avail -= build * lp->l_bwork;
+    avail = roundavg((avail - build * lp->l_bwork) / 100.0);
     if (avail < 0)
        avail = 0;
-    sp->sct_avail = avail / 100;
+    sp->sct_avail = avail;
 
     bp_set_from_sect(bp, sp);
-    np->nat_money -= mult * lp->l_cost * build / 100.0;
+    np->nat_money -= roundavg(mult * lp->l_cost * build / 100.0);
     if (!player->simulation) {
        land->lnd_effic += (signed char)build;
     }

diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c
index 4b1c867cd8f618e27350bb8cad10683b5187ef9c..d8fe4512aca9a855126df5ad0d2815bb0bc9de2b 100644 (file)
--- a/src/lib/update/plane.c
+++ b/src/lib/update/plane.c
@@ -169,7 +169,7 @@ planerepair(struct plnstr *pp, struct natstr *np, struct bp *bp, int etus)
     if (carrier)
        avail += etus * carrier->shp_item[I_MILIT] / 2;
 
-    delta = roundavg((double)avail / pcp->pl_bwork);
+    delta = avail / pcp->pl_bwork;
     if (delta <= 0)
        return;
     if (delta > (int)((float)etus * plane_grow_scale))
@@ -183,11 +183,7 @@ planerepair(struct plnstr *pp, struct natstr *np, struct bp *bp, int etus)
        build = delta;
 
     used = build * pcp->pl_bwork;
-    /*
-     * I didn't use roundavg here, because I want to
-     * penalize the player with a large number of planes.
-     */
-    avail = (sp->sct_avail * 100 - used) / 100;
+    avail = roundavg((sp->sct_avail * 100 - used) / 100.0);
     if (avail < 0)
        avail = 0;
     sp->sct_avail = avail;
@@ -200,7 +196,7 @@ planerepair(struct plnstr *pp, struct natstr *np, struct bp *bp, int etus)
     }
 
     bp_set_from_sect(bp, sp);
-    np->nat_money -= mult * build * pcp->pl_cost / 100.0;
+    np->nat_money -= roundavg(mult * build * pcp->pl_cost / 100.0);
 
     if (!player->simulation)
        pp->pln_effic += (signed char)build;

diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index bf280e51aceb9ced8268a42a74937873054696e2..a54b0fdc5f9c8e72615290e97122595b1902131f 100644 (file)
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -282,7 +282,7 @@ shiprepair(struct shpstr *ship, struct natstr *np, struct bp *bp, int etus)
     } else
        avail = wf + sp->sct_avail * 100;
 
-    delta = roundavg((double)avail / mp->m_bwork);
+    delta = avail / mp->m_bwork;
     if (delta <= 0)
        return;
     if (delta > (int)((float)etus * ship_grow_scale))
@@ -297,11 +297,7 @@ shiprepair(struct shpstr *ship, struct natstr *np, struct bp *bp, int etus)
 
     wf -= build * mp->m_bwork;
     if (wf < 0) {
-       /*
-        * I didn't use roundavg here, because I want to penalize
-        * the player with a large number of ships.
-        */
-       avail = (sp->sct_avail * 100 + wf) / 100;
+       avail = roundavg((sp->sct_avail * 100 + wf) / 100.0);
        if (avail < 0)
            avail = 0;
        sp->sct_avail = avail;
@@ -314,7 +310,7 @@ shiprepair(struct shpstr *ship, struct natstr *np, struct bp *bp, int etus)
        }
 
     bp_set_from_sect(bp, sp);
-    np->nat_money -= mult * mp->m_cost * build / 100.0;
+    np->nat_money -= roundavg(mult * mp->m_cost * build / 100.0);
     if (!player->simulation)
        ship->shp_effic += (signed char)build;
 }

diff --git a/tests/smoke/final.xdump b/tests/smoke/final.xdump
index 581e02a123152b26706cc5fd4ef5d25550cd1a08..6e54977b16e421ed4ef131f2ec3aa08b6285f8f5 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 1 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 668 71 100 1 13 78 0 0 0 45 1 1000 108 183 0 1226 3724 475 0 0 721 2701 4389 0 0 0 0 0 0 0 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 183 0 1226 3724 475 0 0 721 2702 4387 0 0 0 0 0 0 0 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 0 0 0 0 0 0 11 -11 650 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 21 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 100 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

diff --git a/tests/smoke/journal.log b/tests/smoke/journal.log
index 866b12ec9ac39e5cb3c5360dfb630efbf7117b92..1159094e7b0c0133ee63f085536f792965e9230e 100644 (file)
--- a/tests/smoke/journal.log
+++ b/tests/smoke/journal.log
@@ -10214,7 +10214,7 @@
     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 143  244   11    0  9.6K 1.5K 588    0    2    4   32K
-    Play#0 output Play#0 1    420.39
+    Play#0 output Play#0 1    420.38
     Play#0 output Play#0 1         8  29   58%  15K 110    0    0    0   12K 1.8K 485    0    0    0   29K
     Play#0 output Play#0 1    189.01
     Play#0 output Play#0 1         6   3  100% 3.0K 110    0    0    0    0  413    0    0    0    0   34K
@@ -10426,7 +10426,7 @@
     Play#0 output Play#0 1   1   5,-11  m .......... ...0......   0   0    0    0    0   0    0    0    0   0
     Play#0 output Play#0 1   1   7,-11  k .......... ........0.   0   0    0  601    0   0    0    0    1   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 .......... ..........  43   0    0 1367 1175   0  439 1454 1933   0
+    Play#0 output Play#0 1   1  11,-11  w .......... ..........  43   0    0 1367 1175   0  439 1454 1931   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  10    0    0    0   0    0  198  199   0
     Play#0 output Play#0 1   8  21,-11  g .......... ....0.....   0   0    0    0    1   0    0    0    0   0
@@ -11375,7 +11375,7 @@
     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 176  373   18    0  9.6K 1.2K 846    0    3    4   39K
-    Play#0 output Play#0 1    501.68
+    Play#0 output Play#0 1    501.67
     Play#0 output Play#0 1         8  29   72%  19K 110    0    0    0   13K 2.1K 367    0    0    0   25K
     Play#0 output Play#0 1    268.44
     Play#0 output Play#0 1         2  30   15% 3.7K   0    0    0    0    0  1.1K   0    0    0    0   34K
@@ -11587,7 +11587,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  k .......... ..2....22.   0   0    0    1    0   0    0    0    1   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 .......... .......... 172   0    0 2996  850   0  696 1670 2646   0
+    Play#0 output Play#0 1   1  11,-11  w .......... .......... 172   0    0 2996  850   0  696 1670 2644   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. 160   7    0    0    0   0    0  200  200   0
     Play#0 output Play#0 1   8  21,-11  g .......... ....0.....   0   0    0    0    1   0    0    0    0   0
@@ -12426,7 +12426,7 @@
     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 209  516   26    0  9.9K 851  1.2K   3    5    4   46K
-    Play#0 output Play#0 1    594.26
+    Play#0 output Play#0 1    594.24
     Play#0 output Play#0 1         8  29   92%  25K 110  101    0    0   14K 2.8K 537    0    0    0   21K
     Play#0 output Play#0 1    384.58
     Play#0 output Play#0 1         2  30   28% 4.9K   0    0    0    0  1.7K 1.3K 169    0    0    0   35K
@@ -12638,7 +12638,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.   0   0    0    1    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 .......... .......... 275   0    0 3354  525   0  830 1815 3065   0
+    Play#0 output Play#0 1   1  11,-11  w .......... .......... 275   0    0 3354  525   0  830 1815 3063   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  15    0    0    0   0    0  200  200   0
     Play#0 output Play#0 1   8  21,-11  g .......... .......0..   0   0    0    0    1   0    0    0    0   0
@@ -13065,7 +13065,7 @@
     Play#1 output Play#1 1    7,1    d  100%     127 .. ..      999    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%     101 .. ..     1000   30    0    0 100%  570        0   1
+    Play#1 output Play#1 1    2,2    *  100%     101 .. ..     1000   30    0    0 100%  571        0   1
     Play#1 output Play#1 1    4,2    r  100%     127 .. ..      999    0    0    0 100%  489        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 .. ..      967    1    0    0 100%  650        0   1
@@ -13520,7 +13520,7 @@
     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 231  661   34  994   10K 526  1.0K   3    5    4   51K
-    Play#0 output Play#0 1    686.44
+    Play#0 output Play#0 1    686.43
     Play#0 output Play#0 1         8  29  100%  29K 105  214    5    0   16K 2.4K 545    0    0    0   22K
     Play#0 output Play#0 1    486.16
     Play#0 output Play#0 1         2  30   33% 6.3K   0    0    0    0  3.2K 1.2K 527    0    0    0   36K
@@ -13610,7 +13610,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 .. ..     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%     101 .. ..     1000   30    0    0 100%  570    0   1
+    Play#0 output Play#0 1   1    7,-11  *  100%     101 .. ..     1000   30    0    0 100%  571    0   1
     Play#0 output Play#0 1   1    9,-11  r  100%     127 .. ..      999    0    0    0 100%  489    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 .. ..      967    1    0    0 100%  650    0   1
@@ -13732,7 +13732,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    1    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 .......... ..........  27   0  778 3590  500   0  809 2146 3688   0
+    Play#0 output Play#0 1   1  11,-11  w .......... ..........  27   0  778 3590  500   0  809 2147 3686   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  15    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

diff --git a/tests/update/final.xdump b/tests/update/final.xdump
index de21e28e408ae85d996be455cab40077677816b5..98f0aba85440aa01839e9d3276c2a57e99ffc55b 100644 (file)
--- a/tests/update/final.xdump
+++ b/tests/update/final.xdump
@@ -1,6 +1,6 @@
 config sect
 owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist ydist avail elev work coastal newdes min gold fert ocontent uran oldown civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad c_dist m_dist s_dist g_dist p_dist i_dist d_dist b_dist f_dist o_dist l_dist h_dist u_dist r_dist c_del m_del s_del g_del p_del i_del d_del b_del f_del o_del l_del h_del u_del r_del mines pstage ptime che che_target fallout access road rail dfense
-1 0 0 5 100 120 0 0 0 0 0 0 0 0 0 281 0 100 0 5 0 0 0 0 0 1 650 2 0 0 0 0 0 0 84 0 7 34 0 0 0 0 0 0 0 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 0 0 5 100 120 0 0 0 0 0 0 0 0 0 282 0 100 0 5 0 0 0 0 0 1 650 2 0 0 0 0 0 0 84 0 7 34 0 0 0 0 0 0 0 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 24 100 120 0 0 0 0 0 0 0 2 0 939 0 100 0 24 0 0 0 0 0 1 783 0 0 0 0 0 0 0 0 0 0 0 783 0 0 0 0 0 0 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 4 0 24 100 120 0 0 0 0 0 0 0 4 0 1002 0 100 0 24 0 0 0 0 0 1 866 0 0 0 0 0 0 0 1 0 0 0 805 0 0 0 0 0 0 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 6 0 24 100 120 0 0 0 0 0 0 0 6 0 1029 0 100 0 24 0 0 0 0 0 1 910 0 0 0 0 0 0 0 1 0 0 0 805 0 0 0 0 0 0 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
@@ -105,7 +105,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 1 6 6 4 39 120 0 0 0 0 0 0 0 6 6 39 0 100 0 4 0 0 0 0 0 1 130 0 0 0 0 0 0 0 96 0 0 0 0 0 0 0 0 0 0 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 8 6 19 100 120 0 0 0 0 0 0 0 8 6 564 0 100 0 19 0 0 0 0 0 1 1000 0 0 0 0 0 0 0 70 0 5 15 0 0 0 0 0 0 0 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 10 6 26 100 120 0 0 0 0 0 0 0 10 6 544 0 100 0 26 0 0 0 0 0 1 1000 0 0 0 0 0 0 0 70 0 0 13 0 0 0 0 0 0 0 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 12 6 14 100 120 0 0 0 0 0 0 0 12 6 570 0 100 0 14 0 0 0 0 0 1 1000 9 0 0 0 0 0 0 70 0 0 8 0 0 0 0 0 0 0 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 12 6 14 100 120 0 0 0 0 0 0 0 12 6 570 0 100 0 14 0 0 0 0 0 1 1000 8 0 0 0 0 0 0 70 0 0 8 0 0 0 0 0 0 0 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 14 6 12 100 120 0 0 0 0 0 0 0 14 6 440 0 100 1 12 0 0 0 0 0 1 1000 0 0 0 0 0 0 0 70 0 40 0 0 0 0 0 0 0 0 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 -16 6 29 100 120 0 0 0 0 0 0 0 -16 6 3 0 100 1 29 0 0 0 0 0 1 130 1 0 0 0 0 25 15 97 0 0 0 0 0 0 0 0 0 0 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 -14 6 29 100 120 0 0 0 0 0 0 0 -14 6 290 0 100 0 29 0 0 0 0 0 1 650 1 0 0 0 0 0 20 84 0 0 0 0 0 0 0 0 0 0 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
@@ -133,15 +133,15 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 1 -1 7 4 39 120 0 0 0 0 0 0 0 -1 7 39 0 100 0 4 0 0 0 0 0 1 130 1 0 0 0 0 0 0 97 0 0 0 0 0 0 0 0 0 0 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
 6 0 8 5 100 120 0 0 0 0 0 0 0 0 8 394 0 100 1 5 0 0 0 0 0 6 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 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
 6 2 8 4 100 120 0 0 0 0 0 0 0 2 8 294 0 100 1 4 0 0 0 0 0 6 650 20 0 0 0 0 0 0 84 0 400 400 0 0 0 0 0 0 0 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
-6 4 8 19 100 120 0 0 0 0 0 0 0 4 8 444 0 100 1 19 0 0 0 0 0 6 650 20 0 0 0 0 0 0 83 0 391 396 0 0 0 0 0 0 0 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
-6 6 8 14 100 120 0 0 0 0 0 0 0 6 8 444 0 100 1 14 0 0 0 0 0 6 650 19 0 0 0 0 0 0 85 0 386 396 0 0 0 0 0 0 0 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
+6 4 8 19 100 120 0 0 0 0 0 0 0 4 8 444 0 100 1 19 0 0 0 0 0 6 650 20 0 0 0 0 0 0 83 0 391 395 0 0 0 0 0 0 0 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
+6 6 8 14 100 120 0 0 0 0 0 0 0 6 8 444 0 100 1 14 0 0 0 0 0 6 650 18 0 0 0 0 0 0 85 0 385 397 0 0 0 0 0 0 0 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
 6 8 8 12 100 120 0 0 0 0 0 0 0 8 8 444 0 100 1 12 0 0 0 0 0 6 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 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
 6 10 8 26 100 120 0 0 0 0 0 0 0 10 8 394 0 100 1 26 0 0 0 0 0 6 650 20 0 0 0 0 0 0 84 0 400 400 0 0 0 0 0 0 0 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
 6 12 8 14 100 120 0 0 0 0 0 0 0 12 8 394 0 100 1 14 0 0 0 0 0 6 650 20 0 0 0 0 0 0 84 0 400 400 0 0 0 0 0 0 0 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
 6 14 8 12 100 120 0 0 0 0 0 0 0 14 8 394 0 100 1 12 0 0 0 0 0 6 650 20 0 0 0 0 0 0 84 0 400 400 0 0 0 0 0 0 0 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
 7 -16 8 4 100 120 0 0 0 0 0 0 0 -16 8 294 0 100 1 4 0 0 0 0 0 7 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 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
 7 -14 8 12 100 120 0 0 0 0 0 0 0 -14 8 394 0 100 1 12 0 0 0 0 0 7 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 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
-7 -12 8 14 100 120 0 0 0 0 0 0 0 -12 8 394 0 100 1 14 0 0 0 0 0 7 650 19 0 0 0 0 0 0 83 0 398 398 0 0 0 0 0 0 0 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
+7 -12 8 14 100 120 0 0 0 0 0 0 0 -12 8 394 0 100 1 14 0 0 0 0 0 7 650 19 0 0 0 0 0 0 83 0 398 400 0 0 0 0 0 0 0 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
 7 -10 8 26 100 120 0 0 0 0 0 0 0 -10 8 394 0 100 1 26 0 0 0 0 0 7 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 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
 7 -8 8 12 100 120 0 0 0 0 0 0 0 -8 8 444 0 100 1 12 0 0 0 0 0 7 650 20 0 0 0 0 0 0 84 0 352 368 0 0 0 0 0 0 0 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
 7 -6 8 14 100 120 0 0 0 0 0 0 0 -6 8 444 0 100 1 14 0 0 0 0 0 7 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 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
@@ -304,9 +304,9 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
 62 7 15 -1 2 20 90 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
 65 2 -8 8 2 20 90 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
 70 1 16 6 2 20 90 0 20 0 0 none 0 "" 4 10 0 0 0 0 0 0 9 0 10 10 0 0 healthy 0 0 "" 14 6 1 () ""
-71 1 16 6 2 21 90 0 20 0 0 none 0 "" 4 10 0 0 0 0 0 0 10 0 10 10 0 0 healthy 0 0 "" 14 6 1 () ""
-72 1 16 6 2 21 90 0 20 0 0 none 0 "" 4 10 0 0 0 0 0 0 10 0 10 10 0 0 healthy 0 0 "" 14 6 1 () ""
-73 1 16 6 2 21 90 0 20 0 0 none 0 "" 4 10 0 0 0 0 0 0 9 0 10 10 0 0 healthy 0 0 "" 14 6 1 () ""
+71 1 16 6 2 20 90 0 20 0 0 none 0 "" 4 10 0 0 0 0 0 0 10 0 10 10 0 0 healthy 0 0 "" 14 6 1 () ""
+72 1 16 6 2 20 90 0 20 0 0 none 0 "" 4 10 0 0 0 0 0 0 10 0 10 10 0 0 healthy 0 0 "" 14 6 1 () ""
+73 1 16 6 2 20 90 0 20 0 0 none 0 "" 4 10 0 0 0 0 0 0 9 0 10 10 0 0 healthy 0 0 "" 14 6 1 () ""
 74 1 16 6 2 21 90 0 20 0 0 none 0 "" 12 10 0 0 0 0 0 0 9 0 10 10 0 0 healthy 0 0 "" 14 6 1 () ""
 75 1 16 6 6 21 90 0 20 0 0 none 0 "" 0 11 0 0 0 0 0 0 10 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
 76 1 16 6 6 80 90 0 20 0 0 none 0 "" 0 60 0 0 0 0 0 0 9 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
@@ -343,10 +343,10 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range
 70 1 16 6 0 12 60 0 50 0 0 none 0 "" 4 0 1 -1 () 0 0.00000
 71 1 16 6 0 80 60 0 50 0 0 none 0 "" 4 0 1 -1 () 0 0.00000
 72 1 6 8 0 80 60 0 50 0 0 none 0 "" 4 0 2 -1 () 0 0.00000
-75 1 -12 8 0 18 60 0 50 0 0 none 0 "" 4 0 3 -1 () 0 0.00000
+75 1 -12 8 0 17 60 0 50 0 0 none 0 "" 4 0 3 -1 () 0 0.00000
 76 1 -12 8 0 17 60 0 50 0 0 none 0 "" 4 0 3 -1 () 0 0.00000
-77 1 -12 8 0 18 60 0 50 0 0 none 0 "" 4 0 3 -1 () 0 0.00000
-78 1 -12 8 0 18 60 0 50 0 0 none 0 "" 4 0 3 -1 () 0 0.00000
+77 1 -12 8 0 17 60 0 50 0 0 none 0 "" 4 0 3 -1 () 0 0.00000
+78 1 -12 8 0 17 60 0 50 0 0 none 0 "" 4 0 3 -1 () 0 0.00000
 80 1 0 0 0 40 60 0 50 0 0 none 0 "" 4 0 -1 -1 () 0 0.00000
 81 1 0 0 0 60 60 0 50 0 0 none 0 "" 4 0 -1 -1 () 0 0.00000
 82 1 2 4 0 10 60 0 50 2 4 none 0 "" 4 0 -1 -1 () 0 0.00000
@@ -411,7 +411,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" 0 0 0 0 0 1 0 255 640 0 0 13309 0 0 0 0 102.787 3.37264 21.0875 12.3287 neutral neutral neutral neutral neutral neutral allied friendly neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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" 0 0 0 0 0 1 0 255 640 0 0 13338 0 0 0 0 102.787 3.37264 21.0875 12.3287 neutral neutral neutral neutral neutral neutral allied friendly neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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" -2 0 0 0 0 1 0 255 193 0 975 -5912 0 0 0 0 101.081 1.68632 15.2381 2.74222 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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" 1 -1 0 0 0 1 0 255 640 0 0 4337 0 0 0 0 101.081 1.68632 15.2381 4.44444 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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" -1 -1 0 0 0 1 0 255 640 0 0 18752 0 0 0 0 31.5183 1.68632 3.04762 4.44444 neutral allied neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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/update/journal.log b/tests/update/journal.log
index dfa69334e83b9bfae5b138b093db93dc13ebfd99..39e5d660d51f08e6de6749894cdd4b495301fd09 100644 (file)
--- a/tests/update/journal.log
+++ b/tests/update/journal.log
@@ -33,21 +33,21 @@
     Play#1 output Play#1 1 bank                        41 bars                              410
     Play#1 output Play#1 1 refinery                    2581 petrol                          291
     Play#1 output Play#1 1 enlistment center           75 mil                               225
-    Play#1 output Play#1 1 Ship building                       13 ships                            1536
+    Play#1 output Play#1 1 Ship building                       10 ships                            1519
     Play#1 output Play#1 1 Ship maintenance            32 ships                            2202
-    Play#1 output Play#1 1 Plane building                      13 planes                           1936
+    Play#1 output Play#1 1 Plane building                      13 planes                           1924
     Play#1 output Play#1 1 Plane maintenance           20 planes                           1004
     Play#1 output Play#1 1 Unit building                       6 units                             2300
     Play#1 output Play#1 1 Unit maintenance            16 units                             510
     Play#1 output Play#1 1 Sector building                     40 sectors                           773
     Play#1 output Play#1 1 Sector maintenance          2 sectors                            120
     Play#1 output Play#1 1 Military payroll            1155 mil, 0 res                     5777
-    Play#1 output Play#1 1 Total expenses.....................................................24676
+    Play#1 output Play#1 1 Total expenses.....................................................24647
     Play#1 output Play#1 1 Income from taxes           26911 civs, 9007 uws              +12625
     Play#1 output Play#1 1 Total income......................................................+12625
     Play#1 output Play#1 1 Balance forward                                                        25000
-    Play#1 output Play#1 1 Estimated delta                                                       -12051
-    Play#1 output Play#1 1 Estimated new treasury.............................................12949
+    Play#1 output Play#1 1 Estimated delta                                                       -12022
+    Play#1 output Play#1 1 Estimated new treasury.............................................12978
     Play#1 output Play#1 6 0 99
     Play#1 input neweff * ?newd#-
     Play#1 command neweff
@@ -532,8 +532,8 @@
     Play#0 output Play#0 1  78 happiness, 178 education produced
     Play#0 output Play#0 1 total pop was 28106, yielding 14.19 hap, 24.57 edu
     Play#0 output Play#0 1 3.4330 tech, 3.3939 research produced
-    Play#0 output Play#0 1 Army delta $-2810, Navy delta $-3738, Air force delta $-2580
-    Play#0 output Play#0 1 money delta was $-11691 for this update
+    Play#0 output Play#0 1 Army delta $-2810, Navy delta $-3721, Air force delta $-2568
+    Play#0 output Play#0 1 money delta was $-11662 for this update
     Play#0 output Play#0 6 0 640
     Play#0 input nation 1
     Play#0 command nation
@@ -541,7 +541,7 @@
     Play#0 output Play#0 1 (#1) 1 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 0,0 has 650 civilians & 2 military
-    Play#0 output Play#0 1  The treasury has $13309.00     Military reserves: 0
+    Play#0 output Play#0 1  The treasury has $13338.00     Military reserves: 0
     Play#0 output Play#0 1 Education.......... 21.09       Happiness....... 12.33
     Play#0 output Play#0 1 Technology.........102.79       Research........  3.37
     Play#0 output Play#0 1 Technology factor : 50.46%     Plague factor :   1.96%
@@ -555,7 +555,7 @@
     Play#0 output Play#0 1 Thu Jan  1 00:00:00 1970
     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   1    0,0    c  100%     120 .. ..      650    2    0   84 100%  281    0
+    Play#0 output Play#0 1   1    0,0    c  100%     120 .. ..      650    2    0   84 100%  282    0
     Play#0 output Play#0 1   1    2,0    +  100%     120 .. ..      783    0  783    0 100%  939    0
     Play#0 output Play#0 1   1    4,0    +  100%     120 .. ..      866    0  805    1 100% 1002    0
     Play#0 output Play#0 1   1    6,0    +  100%     120 .. ..      910    0  805    1 100% 1029    0
@@ -679,7 +679,7 @@
     Play#0 output Play#0 1   1    6,6    -   39%     120 .. ..      130    0    0   96 100%   39    0
     Play#0 output Play#0 1   1    8,6    f  100%     120 .. ..     1000    0    0   70 100%  564    0
     Play#0 output Play#0 1   1   10,6    !  100%     120 .. ..     1000    0    0   70 100%  544    0
-    Play#0 output Play#0 1   1   12,6    *  100%     120 .. ..     1000    9    0   70 100%  570    0
+    Play#0 output Play#0 1   1   12,6    *  100%     120 .. ..     1000    8    0   70 100%  570    0
     Play#0 output Play#0 1   1   14,6    h  100%     120 .. ..     1000    0    0   70 100%  440    0   1
     Play#0 output Play#0 1   1  -15,7    t  100%     120 .. ..      130    1    0   97 100%   14    0   1
     Play#0 output Play#0 1   1  -13,7    t  100%     120 .. ..      650    1    0   84 100%  310    0
@@ -783,9 +783,9 @@
     Play#0 output Play#0 1   1   43 cs   cargo ship    17,1       100%  17  50   0   0  0  0  0  0  90   20
     Play#0 output Play#0 1   1   60 cs   cargo ship    14,6        20%   0   0   0   0  0  0  0  0  90   20
     Play#0 output Play#0 1   1   70 cs   cargo ship    16,6        20%   4  10   0   9  0  0  0  0  90   20
-    Play#0 output Play#0 1   1   71 cs   cargo ship    16,6        21%   4  10   0  10  0  0  0  0  90   20
-    Play#0 output Play#0 1   1   72 cs   cargo ship    16,6        21%   4  10   0  10  0  0  0  0  90   20
-    Play#0 output Play#0 1   1   73 cs   cargo ship    16,6        21%   4  10   0   9  0  0  0  0  90   20
+    Play#0 output Play#0 1   1   71 cs   cargo ship    16,6        20%   4  10   0  10  0  0  0  0  90   20
+    Play#0 output Play#0 1   1   72 cs   cargo ship    16,6        20%   4  10   0  10  0  0  0  0  90   20
+    Play#0 output Play#0 1   1   73 cs   cargo ship    16,6        20%   4  10   0   9  0  0  0  0  90   20
     Play#0 output Play#0 1   1   74 cs   cargo ship    16,6        21%  12  10   0   9  0  0  0  0  90   20
     Play#0 output Play#0 1   1   75 frg  frigate       16,6        21%   0  11   0  10  0  0  0  0  90   20
     Play#0 output Play#0 1   1   76 frg  frigate       16,6        80%   0  60   0   9  0  0  0  0  90   20
@@ -818,9 +818,9 @@
     Play#0 output Play#0 1   43 cs     17,1      100%  17  50   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1   60 cs     14,6       20%   0   0   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1   70 cs     16,6       20%   4  10   0   0   0   0   0   0   0   0  10  10   0
-    Play#0 output Play#0 1   71 cs     16,6       21%   4  10   0   0   0   0   0   0   0   0  10  10   0
-    Play#0 output Play#0 1   72 cs     16,6       21%   4  10   0   0   0   0   0   0   0   0  10  10   0
-    Play#0 output Play#0 1   73 cs     16,6       21%   4  10   0   0   0   0   0   0   0   0  10  10   0
+    Play#0 output Play#0 1   71 cs     16,6       20%   4  10   0   0   0   0   0   0   0   0  10  10   0
+    Play#0 output Play#0 1   72 cs     16,6       20%   4  10   0   0   0   0   0   0   0   0  10  10   0
+    Play#0 output Play#0 1   73 cs     16,6       20%   4  10   0   0   0   0   0   0   0   0  10  10   0
     Play#0 output Play#0 1   74 cs     16,6       21%  12  10   0   0   0   0   0   0   0   0  10  10   0
     Play#0 output Play#0 1   75 frg    16,6       21%   0  11   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1   76 frg    16,6       80%   0  60   0   0   0   0   0   0   0   0   0   0   0
@@ -1052,10 +1052,10 @@
     Play#0 output Play#0 1   2   31 f1   Sopwith Camel   -16,0        10%  60   1   50   4    0
     Play#0 output Play#0 1   1   61 f1   Sopwith Camel    -6,8        10%  60   1   50   4    0
     Play#0 output Play#0 1   6   62 f1   Sopwith Camel    -6,8        10%  60   1   50   4    0
-    Play#0 output Play#0 1   1   75 f1   Sopwith Camel   -12,8        18%  60   1   50   4    0    3S
+    Play#0 output Play#0 1   1   75 f1   Sopwith Camel   -12,8        17%  60   1   50   4    0    3S
     Play#0 output Play#0 1   1   76 f1   Sopwith Camel   -12,8        17%  60   1   50   4    0    3S
-    Play#0 output Play#0 1   1   77 f1   Sopwith Camel   -12,8        18%  60   1   50   4    0    3S
-    Play#0 output Play#0 1   1   78 f1   Sopwith Camel   -12,8        18%  60   1   50   4    0    3S
+    Play#0 output Play#0 1   1   77 f1   Sopwith Camel   -12,8        17%  60   1   50   4    0    3S
+    Play#0 output Play#0 1   1   78 f1   Sopwith Camel   -12,8        17%  60   1   50   4    0    3S
     Play#0 output Play#0 1 8 planes
     Play#0 output Play#0 6 0 640
     Play#0 input land -32:-1,0:15
@@ -1719,7 +1719,7 @@
     Play#0 output Play#0 1   6    0,8    c  100%     120 .. ..      650   20    0   83 100%  394    0   1
     Play#0 output Play#0 1   6    2,8    -  100%     120 .. ..      650   20    0   84 100%  294    0   1
     Play#0 output Play#0 1   6    4,8    f  100%     120 .. ..      650   20    0   83 100%  444    0   1
-    Play#0 output Play#0 1   6    6,8    *  100%     120 .. ..      650   19    0   85 100%  444    0   1
+    Play#0 output Play#0 1   6    6,8    *  100%     120 .. ..      650   18    0   85 100%  444    0   1
     Play#0 output Play#0 1   6    8,8    h  100%     120 .. ..      650   20    0   83 100%  444    0   1
     Play#0 output Play#0 1   6   10,8    !  100%     120 .. ..      650   20    0   84 100%  394    0   1
     Play#0 output Play#0 1   6   12,8    *  100%     120 .. ..      650   20    0   84 100%  394    0   1
@@ -1733,8 +1733,8 @@
     Play#0 output Play#0 1      sect      sgpidbolhr sgpidbolhr  sh gun  pet iron dust bar  oil  lcm  hcm rad
     Play#0 output Play#0 1   6   0,8    c .......... ..........   0   0    0    0    0   0    0  400  400   0
     Play#0 output Play#0 1   6   2,8    - .......... ..........   0   0    0    0    0   0    0  400  400   0
-    Play#0 output Play#0 1   6   4,8    f .......... ..........   0   0    0    0    0   0    0  391  396   0
-    Play#0 output Play#0 1   6   6,8    * .......... ..........   0   0    0    0    0   0    0  386  396   0
+    Play#0 output Play#0 1   6   4,8    f .......... ..........   0   0    0    0    0   0    0  391  395   0
+    Play#0 output Play#0 1   6   6,8    * .......... ..........   0   0    0    0    0   0    0  385  397   0
     Play#0 output Play#0 1   6   8,8    h .......... ..........   0   0    0    0    0   0    0  400  400   0
     Play#0 output Play#0 1   6  10,8    ! .......... ..........   0   0    0    0    0   0    0  400  400   0
     Play#0 output Play#0 1   6  12,8    * .......... ..........   0   0    0    0    0   0    0  400  400   0
@@ -1788,7 +1788,7 @@
     Play#0 output Play#0 1      sect      sgpidbolhr sgpidbolhr  sh gun  pet iron dust bar  oil  lcm  hcm rad
     Play#0 output Play#0 1   7 -16,8    - .......... ..........   0   0    0    0    0   0    0  400  400   0
     Play#0 output Play#0 1   7 -14,8    h .......... ..........   0   0    0    0    0   0    0  400  400   0
-    Play#0 output Play#0 1   7 -12,8    * .......... ..........   0   0    0    0    0   0    0  398  398   0
+    Play#0 output Play#0 1   7 -12,8    * .......... ..........   0   0    0    0    0   0    0  398  400   0
     Play#0 output Play#0 1   7 -10,8    ! .......... ..........   0   0    0    0    0   0    0  400  400   0
     Play#0 output Play#0 1   7  -8,8    h .......... ..........   0   0    0    0    0   0    0  352  368   0
     Play#0 output Play#0 1   7  -6,8    * .......... ..........   0   0    0    0    0   0    0  400  400   0

diff --git a/tests/update/setup-POGO b/tests/update/setup-POGO
index 8e6af9a05795806bd5a5db788e0eb49531a785db..d26da0eb8638719f02f7169b978fcfc97d70e167 100644 (file)
--- a/tests/update/setup-POGO
+++ b/tests/update/setup-POGO
@@ -292,7 +292,7 @@ stop sh 60
 edit s 0 U 61 E 20 L 15,-1 U 62 O 7
 | #65 friendly harbor, no money
 edit s 61 U 65 L -8,8 O 2
-| #70..73 at sea, civilian repairs, +0.5%
+| #70..73 at sea, civilian repairs, +0%
 edit s 61 U 70 L 16,6 c 4 m 10 f 10 l 10 h 10 U 71 U 72 U 73 U 74 c 12
 | #74 at sea, civilian repairs, +1%
 edit s 73 U 74 c 12
@@ -325,7 +325,7 @@ edit p 61 U 70 s 1 U 71 e 79
 | #72 in carrier in allied airfield, +70% (limit 80%)
 edit s 1 U 2 L 6,8
 edit p 70 U 72 s 2
-| #75/76/77/78 in allied carrier in friendly airfield, +7.5%
+| #75/76/77/78 in allied carrier in friendly airfield, +7%
 edit s 1 U 3 O 6 L -12,8
 edit p 61 U 75 s 3 U 76 U 77 U 78
 | #80/81 in the field, +30/20%