update: Reorder unit building and maintenance for fairness

The update visits ships, planes and land units in increasing order of
country number.  Within a country, it visits first ships, then planes,
then land units, each in increasing order of unit number.

The order is relevant when money, materials and work don't suffice to
build everything.

Money is charged to the owner, so only the relative order for the same
owner matters there.  One order is as good as any.

Work and materials come from the sector, so only the relative order in
each sector matters.  The current order unfairly prefers countries
with lower country numbers.  Mitigating factor: the affected countries
need to be friendly (ships only) or allied.

The unfairness goes back to Chainsaw's option BUDGET.  See the commit
before previous for more detailed historical notes.

The update test demonstrates the unfair behavior: sector 14,6 builds
ships 95/97 owned by country#1, but not 96 owned by country#7.
Likewise, planes 95/96/97 and land units 95/96/97.

Go back to the the pre-BUDGET order: first ships, then planes, then
land units, all in increasing order of unit number, regardless of
owner.

The update test now builds ship, plane and land unit 96 instead of 97.

Bonus: speeds up both the update and budget by a similar absolute
amount.  For budget, this is roughly a factor of two in my testing.
For the update, which does much more, it's around 10%.

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

diff --git a/include/update.h b/include/update.h
index 3bda2aca64e2099906d3a3dd827cff2b87c5294e..241b3fcd20a6fae601eba5a5102cf8f041e00dae 100644 (file)
--- a/include/update.h
+++ b/include/update.h
@@ -98,8 +98,8 @@ extern int feed_people(short *, int);
 extern double food_needed(short *, int);
 extern int famine_victims(short *, int);
 /* land.c */
-extern void prep_lands(int, natid);
-extern void prod_land(int, int, struct bp *, int);
+extern void prep_lands(int);
+extern void prod_land(int, struct bp *, int);
 /* main.c */
 /* in server.h */
 /* material.c */
@@ -122,8 +122,8 @@ extern void do_plague(struct sctstr *, int);
 extern int plague_people(struct natstr *, short *, int *, int *, int);
 extern void plague_report(natid, int, int, int, int, char *, char *);
 /* plane.c */
-extern void prep_planes(int, natid);
-extern void prod_plane(int, int, struct bp *, int);
+extern void prep_planes(int);
+extern void prod_plane(int, struct bp *, int);
 /* populace.c */
 extern void populace(struct sctstr *, int);
 extern int total_work(int, int, int, int, int, int);
@@ -148,7 +148,7 @@ extern void spread_fallout(struct sctstr *, int);
 extern void decay_fallout(struct sctstr *, int);
 extern void produce_sect(struct natstr *, int, struct bp *);
 /* ship.c */
-extern void prep_ships(int, natid);
-extern void prod_ship(int, int, struct bp *, int);
+extern void prep_ships(int);
+extern void prod_ship(int, struct bp *, int);
 
 #endif

diff --git a/info/Update-sequence.t b/info/Update-sequence.t
index e40486365d9d99b6d78cdae4da0da234190808c3..bab526eb7c90fa7f9909f7db8ea07406e78a2ccb 100644 (file)
--- a/info/Update-sequence.t
+++ b/info/Update-sequence.t
@@ -26,12 +26,12 @@ This document gives a rough order of events during the update.
        e) pay for military reserves.
 
 2) Produce
-       a) ship maintenance, in order of country number
+       a) ship maintenance, in order of ship number
                pay maintenance, then feed and plague people on board
-       b) plane maintenance, in order of country number
-       c) land unit maintenance, in order of country number
+       b) plane maintenance, in order of plane number
+       c) land unit maintenance, in order of land unit number
                pay maintenance, then feed and plague people on board
-       g) sectors, in order of country number
+       d) sectors, in order of country number
                 a) people in non-sanctuary sectors eat
                         If not enough is available, the excess people will
                        starve off.  No more than 50% of the people
@@ -45,12 +45,12 @@ This document gives a rough order of events during the update.
                 e) sectors that are stopped are skipped (see info stop)
                 f) first increase eff
                 g) then make things
-       d) ship building, in order of country number
+       d) ship building, in order of ship number
                first increase efficiency, then produce
                 stopped ships are started, but not built (see info stop)
-       e) plane building, in order of country number
+       e) plane building, in order of plane number
                 stopped planes are started, but not built (see info stop)
-       f) land unit building, in order of country number
+       f) land unit building, in order of land unit number
                 stopped land units are started, but not built (see info stop)
 
 3) Then, do deliveries for all sectors in the world, row by row, going from

diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c
index dfc0fa5bd598563324781173660358bf86092ebf..3df458264b8e7bb0bcda11656aa9b9a6e8a2dc4e 100644 (file)
--- a/src/lib/commands/budg.c
+++ b/src/lib/commands/budg.c
@@ -157,30 +157,25 @@ calc_all(void)
     bp = bp_alloc();
 
     prepare_sects(etu, bp);
-    for (i = 0; i < MAXNOC; i++) {
-       prep_ships(etu, i);
-       prep_planes(etu, i);
-       prep_lands(etu, i);
+    prep_ships(etu);
+    prep_planes(etu);
+    prep_lands(etu);
+    for (i = 0; i < MAXNOC; i++)
        pay_reserve(getnatp(i), etu);
-    }
 
     /* Maintain ships, planes and land units */
-    for (i = 0; i < MAXNOC; i++) {
-       prod_ship(etu, i, bp, 0);
-       prod_plane(etu, i, bp, 0);
-       prod_land(etu, i, bp, 0);
-    }
+    prod_ship(etu, bp, 0);
+    prod_plane(etu, bp, 0);
+    prod_land(etu, bp, 0);
 
     /* Produce */
     for (i = 0; i < MAXNOC; i++)
        produce_sect(getnatp(i), etu, bp);
 
     /* Build ships, planes and land units */
-    for (i = 0; i < MAXNOC; i++) {
-       prod_ship(etu, i, bp, 1);
-       prod_plane(etu, i, bp, 1);
-       prod_land(etu, i, bp, 1);
-    }
+    prod_ship(etu, bp, 1);
+    prod_plane(etu, bp, 1);
+    prod_land(etu, bp, 1);
 
     if (CANT_HAPPEN(np->nat_money != budget->start_money))
        np->nat_money = budget->start_money;

diff --git a/src/lib/update/land.c b/src/lib/update/land.c
index 860330bcb02324d4fcdd99c97401caa189beda6d..e9e901e1d6761093f11a159792406d6c8cfd1a22 100644 (file)
--- a/src/lib/update/land.c
+++ b/src/lib/update/land.c
@@ -54,7 +54,7 @@ static void landrepair(struct lndstr *, struct natstr *, struct bp *,
                       int, struct budget *);
 static int feed_land(struct lndstr *, int);
 
-void prep_lands(int etus, natid natnum)
+void prep_lands(int etus)
 {
     int mil, i;
     double mil_pay;
@@ -63,8 +63,6 @@ void prep_lands(int etus, natid natnum)
     for (i = 0; (lp = getlandp(i)); i++) {
        if (lp->lnd_own == 0)
            continue;
-       if (lp->lnd_own != natnum)
-           continue;
        if (CANT_HAPPEN(lp->lnd_effic < LAND_MINEFF)) {
            makelost(EF_LAND, lp->lnd_own, lp->lnd_uid,
                     lp->lnd_x, lp->lnd_y);
@@ -74,14 +72,14 @@ void prep_lands(int etus, natid natnum)
 
        mil = lp->lnd_item[I_MILIT];
        mil_pay = mil * etus * money_mil;
-       nat_budget[natnum].mil.count += mil;
-       nat_budget[natnum].mil.money += mil_pay;
-       nat_budget[natnum].money += mil_pay;
+       nat_budget[lp->lnd_own].mil.count += mil;
+       nat_budget[lp->lnd_own].mil.money += mil_pay;
+       nat_budget[lp->lnd_own].money += mil_pay;
     }
 }
 
 void
-prod_land(int etus, int natnum, struct bp *bp, int build)
+prod_land(int etus, struct bp *bp, int build)
                /* build = 1, maintain = 0 */
 {
     struct lndstr *lp;
@@ -90,8 +88,6 @@ prod_land(int etus, int natnum, struct bp *bp, int build)
     for (i = 0; (lp = getlandp(i)); i++) {
        if (lp->lnd_own == 0)
            continue;
-       if (lp->lnd_own != natnum)
-           continue;
        upd_land(lp, etus, bp, build);
     }
 }

diff --git a/src/lib/update/main.c b/src/lib/update/main.c
index 39cba643d88476c98ff219284f95b9fe745fcb6e..8ef843638a2371e9ada070320234250474eebd44 100644 (file)
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -94,31 +94,26 @@ update_main(void)
     logerror("preparing sectors...");
     prepare_sects(etu, NULL);
     logerror("done preparing sectors.");
-    for (i = 0; i < MAXNOC; i++) {
-       prep_ships(etu, i);
-       prep_planes(etu, i);
-       prep_lands(etu, i);
+    prep_ships(etu);
+    prep_planes(etu);
+    prep_lands(etu);
+    for (i = 0; i < MAXNOC; i++)
        pay_reserve(getnatp(i), etu);
-    }
 
     logerror("producing for countries...");
     /* maintain units */
-    for (i = 0; i < MAXNOC; i++) {
-       prod_ship(etu, i, NULL, 0);
-       prod_plane(etu, i, NULL, 0);
-       prod_land(etu, i, NULL, 0);
-    }
+    prod_ship(etu, NULL, 0);
+    prod_plane(etu, NULL, 0);
+    prod_land(etu, NULL, 0);
 
     /* produce all sects */
     for (i = 0; i < MAXNOC; i++)
        produce_sect(getnatp(i), etu, NULL);
 
     /* build units */
-    for (i = 0; i < MAXNOC; i++) {
-       prod_ship(etu, i, NULL, 1);
-       prod_plane(etu, i, NULL, 1);
-       prod_land(etu, i, NULL, 1);
-    }
+    prod_ship(etu, NULL, 1);
+    prod_plane(etu, NULL, 1);
+    prod_land(etu, NULL, 1);
     logerror("done producing for countries.");
 
     finish_sects(etu);

diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c
index 689fd8f22189799732183aac6e05528e328a3c09..39820e91f55fbe93c494c9b3ada7735e528bd4c2 100644 (file)
--- a/src/lib/update/plane.c
+++ b/src/lib/update/plane.c
@@ -49,7 +49,7 @@ static void upd_plane(struct plnstr *, int, struct bp *, int);
 static void planerepair(struct plnstr *, struct natstr *, struct bp *,
                        int, struct budget *);
 
-void prep_planes(int etus, natid natnum)
+void prep_planes(int etus)
 {
     int mil, i;
     double mil_pay;
@@ -58,8 +58,6 @@ void prep_planes(int etus, natid natnum)
     for (i = 0; (pp = getplanep(i)); i++) {
        if (pp->pln_own == 0)
            continue;
-       if (pp->pln_own != natnum)
-           continue;
        if (pp->pln_effic < PLANE_MINEFF) {
            makelost(EF_PLANE, pp->pln_own, pp->pln_uid,
                     pp->pln_x, pp->pln_y);
@@ -70,13 +68,13 @@ void prep_planes(int etus, natid natnum)
        mil = plchr[pp->pln_type].pl_mat[I_MILIT];
        /* flight pay is 5x the pay received by other military */
        mil_pay = mil * etus * money_mil * 5;
-       nat_budget[natnum].bm[BUDG_PLN_MAINT].money += mil_pay;
-       nat_budget[natnum].money += mil_pay;
+       nat_budget[pp->pln_own].bm[BUDG_PLN_MAINT].money += mil_pay;
+       nat_budget[pp->pln_own].money += mil_pay;
     }
 }
 
 void
-prod_plane(int etus, int natnum, struct bp *bp, int buildem)
+prod_plane(int etus, struct bp *bp, int buildem)
                 /* Build = 1, maintain =0 */
 {
     struct plnstr *pp;
@@ -85,8 +83,6 @@ prod_plane(int etus, int natnum, struct bp *bp, int buildem)
     for (i = 0; (pp = getplanep(i)); i++) {
        if (pp->pln_own == 0)
            continue;
-       if (pp->pln_own != natnum)
-           continue;
        upd_plane(pp, etus, bp, buildem);
     }
 }

diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index 2315c761a3dea003f62e855807e4f89339172054..1e59889b2a3c93a8fd01066f04616c2ba625a5e6 100644 (file)
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -57,7 +57,7 @@ static void shiprepair(struct shpstr *, struct natstr *, struct bp *,
 static void ship_produce(struct shpstr *, int, struct budget *);
 static int feed_ship(struct shpstr *, int);
 
-void prep_ships(int etus, natid natnum)
+void prep_ships(int etus)
 {
     int mil, i;
     double mil_pay;
@@ -66,8 +66,6 @@ void prep_ships(int etus, natid natnum)
     for (i = 0; (sp = getshipp(i)); i++) {
        if (sp->shp_own == 0)
            continue;
-       if (sp->shp_own != natnum)
-           continue;
        if (CANT_HAPPEN(sp->shp_effic < SHIP_MINEFF)) {
            makelost(EF_SHIP, sp->shp_own, sp->shp_uid,
                     sp->shp_x, sp->shp_y);
@@ -77,14 +75,14 @@ void prep_ships(int etus, natid natnum)
 
        mil = sp->shp_item[I_MILIT];
        mil_pay = mil * etus * money_mil;
-       nat_budget[natnum].mil.count += mil;
-       nat_budget[natnum].mil.money += mil_pay;
-       nat_budget[natnum].money += mil_pay;
+       nat_budget[sp->shp_own].mil.count += mil;
+       nat_budget[sp->shp_own].mil.money += mil_pay;
+       nat_budget[sp->shp_own].money += mil_pay;
     }
 }
 
 void
-prod_ship(int etus, int natnum, struct bp *bp, int build)
+prod_ship(int etus, struct bp *bp, int build)
                /* build = 1, maintain = 0 */
 {
     struct shpstr *sp;
@@ -93,8 +91,6 @@ prod_ship(int etus, int natnum, struct bp *bp, int build)
     for (i = 0; (sp = getshipp(i)); i++) {
        if (sp->shp_own == 0)
            continue;
-       if (sp->shp_own != natnum)
-           continue;
        upd_ship(sp, etus, bp, build);
     }
 }

diff --git a/tests/update/99-POGO b/tests/update/99-POGO
index c5754f9b5f25511752793668f9a26c82642e49ba..560e7d03b094244afdcfbbe91369e808323f8729 100644 (file)
--- a/tests/update/99-POGO
+++ b/tests/update/99-POGO
@@ -39,7 +39,7 @@ read 0
 |  92/93 +0% friendly city without work
 |     odd: cities don't repair ships
 |  95 +80% own harbor
-|  97 +20% own harbor, materials limit
+|  97 +0% own harbor, materials limit
 | 103 +13% at sea
 | 104 +13% at sea
 | 113 +5%  at sea
@@ -58,7 +58,7 @@ read 0
 |  90/91 +90% allied airfield with and without work
 |  92/93 +30% allied city without work
 |  95 +50% own airfield
-|  97 +50% own airfield
+|  97 +0% own airfield, materials limit
 | 100 allied airfield where plague killed off mil
 | land unit building
 |  60 stopped
@@ -69,7 +69,7 @@ read 0
 |  90/91 allied fort/hq with and without work
 |  92/93 +30% allied city without work
 |  95 +90% own hq
-|  97 +50% own hq, materials limit
+|  97 +0% own hq, materials limit
 |  98 +90% own fort
 | produce sect
 |          make    units  avail
@@ -204,10 +204,10 @@ nation 5
 || country#6
 | plane building
 |  62 friendly airfield
-|  96 allied airfield, no materials left
+|  96 +50% allied airfield
 | land unit building
 |  62 friendly hq
-|  96 allied hq, no materials left
+|  96 +50% allied hq, materials limit
 read 6
 nation 6
 cens 0:15,8
@@ -215,7 +215,7 @@ comm 0:15,8
 || country#7
 | ship building
 |  62 neutral harbor
-|  96 friendly harbor, no materials left
+|  96 +20% friendly harbor, materials limit
 read 7
 nation 7
 cens -16:-1,8

diff --git a/tests/update/final.xdump b/tests/update/final.xdump
index d1aa154e387882e4cba02e4668d41c463e435343..7c323348302db22fb02851ada7fbd16ec5a8991a 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 3 0 0 0 0 0 0 84 0 7 33 0 0 0 0 0 0 0 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 3 0 0 0 0 0 0 84 0 8 33 0 0 0 0 0 0 0 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 940 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 0 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
@@ -72,8 +72,8 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 1 10 4 16 100 120 0 0 0 0 0 0 0 10 4 0 0 100 0 16 0 0 0 92 0 1 130 0 0 0 0 0 0 0 96 71 20 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 healthy 0 0 0 0 0 0 0 0
 1 12 4 4 39 120 0 0 0 0 0 0 0 12 4 39 0 100 0 4 0 0 0 0 0 1 130 0 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
 1 14 4 4 39 120 0 0 0 0 0 0 0 14 4 39 0 100 1 4 0 0 0 0 0 1 130 0 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
-0 16 4 0 0 0 0 0 0 0 0 0 0 16 4 0 0 100 1 0 0 0 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 18 4 0 0 0 0 0 0 0 0 0 0 18 4 0 0 100 1 0 0 0 100 91 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 16 4 0 0 0 0 0 0 0 0 0 0 16 4 0 0 100 1 0 0 0 10 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 18 4 0 0 0 0 0 0 0 0 0 0 18 4 0 0 100 1 0 0 0 100 90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 20 4 0 0 0 0 0 0 0 0 0 0 20 4 0 0 100 1 0 0 0 100 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 0 0 0 healthy 0 0 0 0 0 0 0 0
 1 -16 4 10 100 120 0 0 0 0 0 0 0 -16 4 9 0 100 1 10 10 0 0 0 0 1 130 1 0 0 0 7 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 -14 4 10 100 120 0 0 0 0 0 0 0 -14 4 0 0 100 0 10 100 0 0 0 0 1 130 1 0 0 0 78 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
@@ -103,8 +103,8 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 1 2 6 18 100 120 0 0 0 0 0 0 0 2 6 292 0 100 0 18 0 0 0 0 0 1 650 0 0 0 0 2 0 0 84 0 0 45 0 0 0 0 0 0 0 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 6 18 100 120 0 0 0 0 0 0 0 4 6 37 0 100 0 18 0 0 0 0 0 1 130 0 0 0 0 59 0 0 97 0 0 9999 0 0 0 0 0 0 0 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 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 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 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 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 16 0 0 0 0 0 0 0 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 12 0 0 0 0 0 0 0 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 571 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 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
@@ -132,16 +132,16 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 1 -3 7 4 39 120 0 0 0 0 0 0 0 -3 7 39 0 100 0 4 0 0 0 0 0 1 130 1 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 -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 395 0 100 1 5 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 2 8 4 100 120 0 0 0 0 0 0 0 2 8 254 0 100 1 4 0 0 0 0 0 6 650 19 0 0 0 0 0 0 83 0 384 394 0 0 0 0 0 0 0 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 255 0 100 1 4 0 0 0 0 0 6 650 19 0 0 0 0 0 0 83 0 384 394 0 0 0 0 0 0 0 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 408 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 387 0 100 1 14 0 0 0 0 0 6 650 18 0 0 0 0 0 0 84 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 8 8 12 100 120 0 0 0 0 0 0 0 8 8 445 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 358 0 100 1 26 0 0 0 0 0 6 650 20 0 0 0 0 0 0 84 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 12 8 14 100 120 0 0 0 0 0 0 0 12 8 367 0 100 1 14 0 0 0 0 0 6 650 19 0 0 0 0 0 0 83 0 393 399 0 0 0 0 0 0 0 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 366 0 100 1 14 0 0 0 0 0 6 650 19 0 0 0 0 0 0 83 0 392 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
 6 14 8 12 100 120 0 0 0 0 0 0 0 14 8 395 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
 7 -16 8 4 100 120 0 0 0 0 0 0 0 -16 8 295 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 267 0 100 1 12 0 0 0 0 0 7 650 20 0 0 0 0 0 0 83 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 -12 8 14 100 120 0 0 0 0 0 0 0 -12 8 279 0 100 1 14 0 0 0 0 0 7 650 17 0 0 0 0 0 0 83 0 372 392 0 0 0 0 0 0 0 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 278 0 100 1 14 0 0 0 0 0 7 650 16 0 0 0 0 0 0 83 0 371 393 0 0 0 0 0 0 0 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 395 0 100 1 26 0 0 0 0 0 7 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 -8 8 12 100 120 0 0 0 0 0 0 0 -8 8 317 0 100 1 12 0 0 0 0 0 7 650 20 0 0 0 0 0 0 83 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 445 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
@@ -281,17 +281,17 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
 0 1 14 6 2 100 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 () ""
 1 1 16 6 21 100 90 0 160 0 0 none 0 "" 0 8 0 0 0 0 0 0 10 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
 2 1 6 8 21 100 90 0 160 0 0 none 0 "" 0 8 0 0 0 0 0 0 10 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
-3 6 -12 8 21 100 90 0 160 0 0 none 0 "" 0 8 0 0 0 0 0 0 9 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
-10 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 20 2 0 0 0 0 0 0 17 0 0 0 0 0 healthy 54 0 "" 14 6 1 () ""
-11 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 dying 46 0 "" 14 6 1 () ""
-12 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 infect 72 0 "" 14 6 1 () ""
-13 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 infect 71 0 "" 14 6 1 () ""
-14 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 infect 82 0 "" 14 6 1 () ""
-15 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 16 0 0 0 1 0 incubate 1 0 "" 14 6 1 () ""
-16 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 incubate 73 0 "" 14 6 1 () ""
-17 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 incubate 73 0 "" 14 6 1 () ""
-18 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 incubate 85 0 "" 14 6 1 () ""
-19 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 incubate 63 0 "" 14 6 1 () ""
+3 6 -12 8 21 100 90 0 160 0 0 none 0 "" 0 8 0 0 0 0 0 0 10 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
+10 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 20 2 0 0 0 0 0 0 17 0 0 0 0 0 healthy 40 0 "" 14 6 1 () ""
+11 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 dying 54 0 "" 14 6 1 () ""
+12 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 infect 61 0 "" 14 6 1 () ""
+13 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 infect 42 0 "" 14 6 1 () ""
+14 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 16 0 0 0 1 0 infect 58 0 "" 14 6 1 () ""
+15 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 incubate 1 0 "" 14 6 1 () ""
+16 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 16 0 0 0 1 0 incubate 77 0 "" 14 6 1 () ""
+17 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 incubate 69 0 "" 14 6 1 () ""
+18 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 incubate 68 0 "" 14 6 1 () ""
+19 4 -18 -6 2 100 90 0 20 0 0 none 0 "" 100 10 0 0 0 0 0 0 17 0 0 0 1 0 incubate 71 0 "" 14 6 1 () ""
 30 2 -18 0 2 88 90 0 20 0 0 none 0 "" 150 50 0 0 0 0 0 0 11 0 0 0 100 0 healthy 0 0 "" 14 6 1 () ""
 31 2 -18 0 2 20 90 0 20 0 0 none 0 "" 150 50 0 0 0 0 0 0 11 0 0 0 100 0 healthy 0 0 "" 14 6 1 () ""
 35 1 16 0 2 100 90 0 20 0 0 none 0 "" 150 50 0 0 0 0 0 0 11 0 0 0 100 0 healthy 0 0 "" 14 6 1 () ""
@@ -303,21 +303,21 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
 61 1 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 () ""
 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 10 0 10 10 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 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 9 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 10 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 9 0 0 0 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 8 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
 90 1 -8 8 2 100 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 () ""
 91 1 -14 8 2 100 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 () ""
 92 1 -2 8 0 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 () ""
 93 7 0 0 0 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 () ""
 95 1 14 6 2 100 90 0 200 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
-96 7 14 6 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 () ""
-97 1 14 6 2 40 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 () ""
-100 1 16 4 0 100 90 0 20 0 0 none 0 "" 50 0 0 0 0 0 0 0 20 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
+96 7 14 6 2 40 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 () ""
+97 1 14 6 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 () ""
+100 1 16 4 0 100 90 0 20 0 0 none 0 "" 50 0 0 0 0 0 0 0 21 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
 101 1 18 4 0 100 90 0 20 0 0 none 0 "" 100 0 0 0 0 0 0 0 412 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
 102 1 20 4 0 100 90 0 20 0 0 none 0 "" 100 0 0 0 0 0 0 0 7 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
 103 1 18 4 0 73 90 0 20 0 0 none 0 "" 100 0 0 0 0 0 0 0 303 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
@@ -355,24 +355,24 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range
 92 1 2 8 0 40 60 0 50 0 0 none 0 "" 4 0 -1 -1 () 0 0.00000
 93 6 0 0 0 40 60 0 50 0 0 none 0 "" 4 0 -1 -1 () 0 0.00000
 95 1 12 6 0 100 60 0 200 0 0 none 0 "" 11 0 -1 -1 () 0 0.00000
-96 6 12 6 0 50 60 0 50 0 0 none 0 "" 4 0 -1 -1 () 0 0.00000
-97 1 12 6 0 100 60 0 50 0 0 none 0 "" 4 0 -1 -1 () 0 0.00000
+96 6 12 6 0 100 60 0 50 0 0 none 0 "" 4 0 -1 -1 () 0 0.00000
+97 1 12 6 0 50 60 0 50 0 0 none 0 "" 4 0 -1 -1 () 0 0.00000
 100 1 -12 -6 0 10 60 0 50 0 0 none 0 "" 4 0 -1 -1 () 0 0.00000
 149 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
 /config
 config land
 uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship harden retreat rflags rpath civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime land access
 0 1 10 6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-10 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 20 0 0 0 0 0 0 7 0 0 0 0 0 healthy 51 -1 0
-11 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 dying 53 -1 0
-12 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 infect 46 -1 0
-13 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 infect 43 -1 0
-14 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 infect 61 -1 0
+10 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 20 0 0 0 0 0 0 7 0 0 0 0 0 healthy 81 -1 0
+11 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 dying 62 -1 0
+12 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 infect 52 -1 0
+13 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 infect 73 -1 0
+14 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 infect 73 -1 0
 15 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 incubate 1 -1 0
-16 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 incubate 87 -1 0
-17 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 incubate 32 -1 0
-18 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 incubate 44 -1 0
-19 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 incubate 59 -1 0
+16 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 incubate 56 -1 0
+17 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 incubate 65 -1 0
+18 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 incubate 51 -1 0
+19 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 incubate 53 -1 0
 30 2 -16 0 2 88 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 healthy 0 -1 0
 31 2 -16 0 2 10 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 healthy 0 -1 0
 35 1 14 0 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 healthy 0 -1 0
@@ -391,8 +391,8 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
 92 1 2 8 2 40 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 93 6 0 0 2 40 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 95 1 10 6 2 100 60 0 200 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-96 6 10 6 2 10 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-97 1 10 6 2 60 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+96 6 10 6 2 60 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+97 1 10 6 2 10 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 98 1 8 6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 99 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 /config
@@ -411,13 +411,13 @@ 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 10246 0 0 0 0 102.920 3.48828 21.0871 12.3282 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 10796 0 0 0 0 102.920 3.48828 21.0871 12.3282 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 -6221 0 0 0 0 101.147 1.74414 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.147 1.74414 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 18690 0 0 0 0 31.5848 1.74414 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
 5 active (flash beep coastwatch sonar techlists) "5" "5" "127.0.0.1" "" "tester" -16 -8 0 0 0 1 0 255 99 0 0 26497 0 0 0 0 101.147 1.74414 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
-6 active (flash beep coastwatch sonar techlists) "6" "6" "127.0.0.1" "" "tester" 0 8 0 0 0 1 0 255 640 0 0 24803 0 0 0 0 101.147 1.74414 15.2381 4.44444 allied allied allied allied allied 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
-7 active (flash beep coastwatch sonar techlists) "7" "7" "127.0.0.1" "" "tester" -2 8 0 0 0 1 0 255 640 0 0 25819 0 0 0 0 101.147 1.74414 15.2381 4.44444 friendly friendly friendly friendly friendly friendly 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
+6 active (flash beep coastwatch sonar techlists) "6" "6" "127.0.0.1" "" "tester" 0 8 0 0 0 1 0 255 640 0 0 24353 0 0 0 0 101.147 1.74414 15.2381 4.44444 allied allied allied allied allied 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
+7 active (flash beep coastwatch sonar techlists) "7" "7" "127.0.0.1" "" "tester" -2 8 0 0 0 1 0 255 640 0 0 25719 0 0 0 0 101.147 1.74414 15.2381 4.44444 friendly friendly friendly friendly friendly friendly 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
 /config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate

diff --git a/tests/update/journal.log b/tests/update/journal.log
index 50e5ca9e6f833430c21a0e1a01b1955cc71b2902..cacd5cc0a2595d4528c9ecddbd52817dc6822a0b 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                    2580 petrol                          290
     Play#1 output Play#1 1 enlistment center           75 mil                               225
-    Play#1 output Play#1 1 Ship building                       11 ships                            1920
+    Play#1 output Play#1 1 Ship building                       10 ships                            1820
     Play#1 output Play#1 1 Ship maintenance                    32 ships                            2207
-    Play#1 output Play#1 1 Plane building                      15 planes                           3412
+    Play#1 output Play#1 1 Plane building                      14 planes                           3212
     Play#1 output Play#1 1 Plane maintenance                   21 planes                           1244
-    Play#1 output Play#1 1 Unit building                       8 units                             2900
+    Play#1 output Play#1 1 Unit building                       7 units                             2650
     Play#1 output Play#1 1 Unit maintenance                    16 units                             510
     Play#1 output Play#1 1 Sector building                     40 sectors                           774
     Play#1 output Play#1 1 Sector maintenance                  2 sectors                            120
     Play#1 output Play#1 1 Military payroll            1164 mil, 0 res                     5820
-    Play#1 output Play#1 1 Total expenses.....................................................27737
+    Play#1 output Play#1 1 Total expenses.....................................................27187
     Play#1 output Play#1 1 Income from taxes           26911 civs, 9007 uws              +12627
     Play#1 output Play#1 1 Total income......................................................+12627
     Play#1 output Play#1 1 Balance forward                                                        25000
-    Play#1 output Play#1 1 Estimated delta                                                       -15110
-    Play#1 output Play#1 1 Estimated new treasury..............................................9890
+    Play#1 output Play#1 1 Estimated delta                                                       -14560
+    Play#1 output Play#1 1 Estimated new treasury.............................................10440
     Play#1 output Play#1 6 0 99
     Play#1 input neweff * ?newd#-
     Play#1 command neweff
@@ -389,18 +389,18 @@
     Play#6 command budget
     Play#6 output Play#6 1 Sector Type                 Production                          Cost
     Play#6 output Play#6 1 Ship maintenance                    1 ship                               540
-    Play#6 output Play#6 1 Plane building                      1 plane                              120
+    Play#6 output Play#6 1 Plane building                      2 planes                             320
     Play#6 output Play#6 1 Plane maintenance                   3 planes                             147
-    Play#6 output Play#6 1 Unit building                       1 unit                               150
+    Play#6 output Play#6 1 Unit building                       2 units                              400
     Play#6 output Play#6 1 Unit maintenance                    3 units                               90
     Play#6 output Play#6 1 Sector maintenance                  1 sector                              60
     Play#6 output Play#6 1 Military payroll            168 mil, 0 res                       840
-    Play#6 output Play#6 1 Total expenses......................................................1945
+    Play#6 output Play#6 1 Total expenses......................................................2395
     Play#6 output Play#6 1 Income from taxes           4000 civs, 0 uws                   +1749
     Play#6 output Play#6 1 Total income.......................................................+1749
     Play#6 output Play#6 1 Balance forward                                                        25000
-    Play#6 output Play#6 1 Estimated delta                                                         -196
-    Play#6 output Play#6 1 Estimated new treasury.............................................24804
+    Play#6 output Play#6 1 Estimated delta                                                         -646
+    Play#6 output Play#6 1 Estimated new treasury.............................................24354
     Play#6 output Play#6 6 0 99
     Play#6 input ctld
     Play#6 output Play#6 1 Bye-bye
@@ -423,15 +423,16 @@
     Play#7 input budget
     Play#7 command budget
     Play#7 output Play#7 1 Sector Type                 Production                          Cost
+    Play#7 output Play#7 1 Ship building                       1 ship                               100
     Play#7 output Play#7 1 Ship maintenance                    3 ships                               71
     Play#7 output Play#7 1 Sector maintenance                  1 sector                              60
     Play#7 output Play#7 1 Military payroll            160 mil, 0 res                       800
-    Play#7 output Play#7 1 Total expenses.......................................................929
+    Play#7 output Play#7 1 Total expenses......................................................1029
     Play#7 output Play#7 1 Income from taxes           4000 civs, 0 uws                   +1749
     Play#7 output Play#7 1 Total income.......................................................+1749
     Play#7 output Play#7 1 Balance forward                                                        25000
-    Play#7 output Play#7 1 Estimated delta                                                         +820
-    Play#7 output Play#7 1 Estimated new treasury.............................................25820
+    Play#7 output Play#7 1 Estimated delta                                                         +720
+    Play#7 output Play#7 1 Estimated new treasury.............................................25720
     Play#7 output Play#7 6 0 99
     Play#7 input show updates
     Play#7 command show
@@ -534,8 +535,8 @@
     Play#0 output Play#0 1  78 happiness, 178 education produced
     Play#0 output Play#0 1 total pop was 28109, yielding 14.19 hap, 24.57 edu
     Play#0 output Play#0 1 3.5668 tech, 3.5102 research produced
-    Play#0 output Play#0 1 Army delta $-3410, Navy delta $-4126, Air force delta $-4295
-    Play#0 output Play#0 1 money delta was $-14754 for this update
+    Play#0 output Play#0 1 Army delta $-3160, Navy delta $-4026, Air force delta $-4095
+    Play#0 output Play#0 1 money delta was $-14204 for this update
     Play#0 output Play#0 6 0 640
     Play#0 input nation 1
     Play#0 command nation
@@ -543,7 +544,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 & 3 military
-    Play#0 output Play#0 1  The treasury has $10246.00     Military reserves: 0
+    Play#0 output Play#0 1  The treasury has $10796.00     Military reserves: 0
     Play#0 output Play#0 1 Education.......... 21.09       Happiness....... 12.33
     Play#0 output Play#0 1 Technology.........102.92       Research........  3.49
     Play#0 output Play#0 1 Technology factor : 50.48%     Plague factor :   1.96%
@@ -557,7 +558,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    3    0   84 100%  281    0
+    Play#0 output Play#0 1   1    0,0    c  100%     120 .. ..      650    3    0   84 100%  282    0
     Play#0 output Play#0 1   1    2,0    +  100%     120 .. ..      783    0  783    0 100%  940    0
     Play#0 output Play#0 1   1    4,0    +  100%     120 .. ..      866    0  805    0 100% 1002    0
     Play#0 output Play#0 1   1    6,0    +  100%     120 .. ..      910    0  805    1 100% 1029    0
@@ -596,7 +597,7 @@
     Play#0 output Play#0 1 Thu Jan  1 00:00:00 1970
     Play#0 output Play#0 1    COMMODITIES deliver--  distribute
     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   1   0,0    c .......... ..........   0   0    0    0    0   0    0    7   33   0
+    Play#0 output Play#0 1   1   0,0    c .......... ..........   0   0    0    0    0   0    0    8   33   0
     Play#0 output Play#0 1   1   2,0    + .......... ..........   0   0    0    0    0   0    0    0    0   0
     Play#0 output Play#0 1   1   4,0    + .......... ..........   0   0    0    0    0   0    0    0    0   0
     Play#0 output Play#0 1   1   6,0    + .......... ..........   0   0    0    0    0   0    0    0    0   0
@@ -750,8 +751,8 @@
     Play#0 output Play#0 1   1   2,6    k .......... ..........   0   0    0    2    0   0    0    0   45   0
     Play#0 output Play#0 1   1   4,6    k .......... ..........   0   0    0   59    0   0    0    0 9999   0
     Play#0 output Play#0 1   1   6,6    - .......... ..........   0   0    0    0    0   0    0    0    0   0
-    Play#0 output Play#0 1   1   8,6    f .......... ..........   0   0    0    0    0   0    0    5   15   0
-    Play#0 output Play#0 1   1  10,6    ! .......... ..........   0   0    0    0    0   0    0    0   13   0
+    Play#0 output Play#0 1   1   8,6    f .......... ..........   0   0    0    0    0   0    0    5   16   0
+    Play#0 output Play#0 1   1  10,6    ! .......... ..........   0   0    0    0    0   0    0    0   12   0
     Play#0 output Play#0 1   1  12,6    * .......... ..........   0   0    0    0    0   0    0    0    8   0
     Play#0 output Play#0 1   1  14,6    h .......... ..........   0   0    0    0    0   0    0   40    0   0
     Play#0 output Play#0 1   1 -15,7    t .......... ..........   0   0    0    0    5   0   25    1    0   0
@@ -784,18 +785,18 @@
     Play#0 output Play#0 1   1   42 cs   cargo ship    17,1       100%   0  25   0   0  0  0  0  0  90   20
     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  10  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        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   9  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  10  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   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   8  0  0  0  0  90   20
     Play#0 output Play#0 1   7   93 fb   fishing boa    0,0        20%   0   0   0   0  0  0  0  0  90   20
     Play#0 output Play#0 1   1   95 cs   cargo ship    14,6       100%   0   0   0   0  0  0  0  0  90  200
-    Play#0 output Play#0 1   7   96 cs   cargo ship    14,6        20%   0   0   0   0  0  0  0  0  90   20
-    Play#0 output Play#0 1   1   97 cs   cargo ship    14,6        40%   0   0   0   0  0  0  0  0  90   20
-    Play#0 output Play#0 1   1  100 fb   fishing boa   16,4       100%  50   0   0  20  0  0  0  0  90   20
+    Play#0 output Play#0 1   7   96 cs   cargo ship    14,6        40%   0   0   0   0  0  0  0  0  90   20
+    Play#0 output Play#0 1   1   97 cs   cargo ship    14,6        20%   0   0   0   0  0  0  0  0  90   20
+    Play#0 output Play#0 1   1  100 fb   fishing boa   16,4       100%  50   0   0  21  0  0  0  0  90   20
     Play#0 output Play#0 1   1  101 fb   fishing boa   18,4       100% 100   0   0 412  0  0  0  0  90   20
     Play#0 output Play#0 1   1  102 fb   fishing boa   20,4       100% 100   0   0   7  0  0  0  0  90   20
     Play#0 output Play#0 1   1  103 fb   fishing boa   18,4        73% 100   0   0 303  0  0  0  0  90   20
@@ -828,8 +829,8 @@
     Play#0 output Play#0 1   76 frg    16,6       80%   0  60   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1   93 fb      0,0       20%   0   0   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1   95 cs     14,6      100%   0   0   0   0   0   0   0   0   0   0   0   0   0
-    Play#0 output Play#0 1   96 cs     14,6       20%   0   0   0   0   0   0   0   0   0   0   0   0   0
-    Play#0 output Play#0 1   97 cs     14,6       40%   0   0   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   96 cs     14,6       40%   0   0   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   97 cs     14,6       20%   0   0   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1  100 fb     16,4      100%  50   0   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1  101 fb     18,4      100% 100   0   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1  102 fb     20,4      100% 100   0   0   0   0   0   0   0   0   0   0   0   0
@@ -860,8 +861,8 @@
     Play#0 output Play#0 1   1   92 f1   Sopwith Camel     2,8        40%  60   1   50   4    0
     Play#0 output Play#0 1   6   93 f1   Sopwith Camel     0,0        40%  60   1   50   4    0
     Play#0 output Play#0 1   1   95 f1   Sopwith Camel    12,6       100%  60   8  200  11    0
-    Play#0 output Play#0 1   6   96 f1   Sopwith Camel    12,6        50%  60   1   50   4    0
-    Play#0 output Play#0 1   1   97 f1   Sopwith Camel    12,6       100%  60   1   50   4    0
+    Play#0 output Play#0 1   6   96 f1   Sopwith Camel    12,6       100%  60   1   50   4    0
+    Play#0 output Play#0 1   1   97 f1   Sopwith Camel    12,6        50%  60   1   50   4    0
     Play#0 output Play#0 1 17 planes
     Play#0 output Play#0 6 0 640
     Play#0 input land 0:31,0:15
@@ -882,8 +883,8 @@
     Play#0 output Play#0 1   1   92 inf  infantry      2,8        40%   0   0  60   0  50  42%  0  0
     Play#0 output Play#0 1   6   93 inf  infantry      0,0        40%   0   0  60   0  50  42%  0  0
     Play#0 output Play#0 1   1   95 inf  infantry     10,6       100%   0   0  60   0 200  42%  0  0
-    Play#0 output Play#0 1   6   96 inf  infantry     10,6        10%   0   0  60   0  50  42%  0  0
-    Play#0 output Play#0 1   1   97 inf  infantry     10,6        60%   0   0  60   0  50  42%  0  0
+    Play#0 output Play#0 1   6   96 inf  infantry     10,6        60%   0   0  60   0  50  42%  0  0
+    Play#0 output Play#0 1   1   97 inf  infantry     10,6        10%   0   0  60   0  50  42%  0  0
     Play#0 output Play#0 1   1   98 inf  infantry      8,6       100%   0   0  60   0  50  42%  0  0
     Play#0 output Play#0 1 18 units
     Play#0 output Play#0 6 0 640
@@ -1038,7 +1039,7 @@
     Play#0 input ship -32:-1,0:15
     Play#0 command ship
     Play#0 output Play#0 1 own shp#     ship type       x,y   fl   eff civ mil  uw  fd pn he xl ln mob tech
-    Play#0 output Play#0 1   6    3 car  aircraft ca  -12,8       100%   0   8   0   9  4  0  0  0  90  160
+    Play#0 output Play#0 1   6    3 car  aircraft ca  -12,8       100%   0   8   0  10  4  0  0  0  90  160
     Play#0 output Play#0 1   2   30 cs   cargo ship   -18,0        88% 150  50 100  11  0  0  0  0  90   20
     Play#0 output Play#0 1   2   31 cs   cargo ship   -18,0        20% 150  50 100  11  0  0  0  0  90   20
     Play#0 output Play#0 1   2   65 cs   cargo ship    -8,8        20%   0   0   0   0  0  0  0  0  90   20
@@ -1371,20 +1372,20 @@
     Play#0 output Play#0 1 Outbreak of PLAGUE in -5,-3!
     Play#0 output Play#0 1 Outbreak of PLAGUE in -3,-3!
     Play#0 output Play#0 1 Outbreak of PLAGUE in -1,-3!
-    Play#0 output Play#0 1 1 satellite spotted over -4,-4
     Play#0 output Play#0 1 PLAGUE deaths reported on cs   cargo ship (#10)
     Play#0 output Play#0 1 cs   cargo ship (#11) battling PLAGUE
     Play#0 output Play#0 1 cs   cargo ship (#12) battling PLAGUE
     Play#0 output Play#0 1 cs   cargo ship (#13) battling PLAGUE
     Play#0 output Play#0 1 cs   cargo ship (#14) battling PLAGUE
     Play#0 output Play#0 1 Outbreak of PLAGUE on cs   cargo ship (#15)!
+    Play#0 output Play#0 1 1 satellite spotted over -4,-4
     Play#0 output Play#0 1 PLAGUE deaths reported on inf  infantry #10
     Play#0 output Play#0 1 inf  infantry #11 battling PLAGUE
     Play#0 output Play#0 1 inf  infantry #12 battling PLAGUE
     Play#0 output Play#0 1 inf  infantry #13 battling PLAGUE
     Play#0 output Play#0 1 inf  infantry #14 battling PLAGUE
     Play#0 output Play#0 1 Outbreak of PLAGUE on inf  infantry #15!
-    Play#0 output Play#0 1 Outbreak of PLAGUE on inf  infantry #17!
+    Play#0 output Play#0 1 Outbreak of PLAGUE on inf  infantry #16!
     Play#0 output Play#0 1 Outbreak of PLAGUE on inf  infantry #18!
     Play#0 output Play#0 1 Outbreak of PLAGUE on inf  infantry #19!
     Play#0 output Play#0 1 Technology level too low to produce in -5,-1 (need 40)
@@ -1630,9 +1631,9 @@
     Play#0 output Play#0 1   4   11 cs   cargo ship   -18,-6      100% 100  10   1  17  0  0  0  0  90   20
     Play#0 output Play#0 1   4   12 cs   cargo ship   -18,-6      100% 100  10   1  17  0  0  0  0  90   20
     Play#0 output Play#0 1   4   13 cs   cargo ship   -18,-6      100% 100  10   1  17  0  0  0  0  90   20
-    Play#0 output Play#0 1   4   14 cs   cargo ship   -18,-6      100% 100  10   1  17  0  0  0  0  90   20
-    Play#0 output Play#0 1   4   15 cs   cargo ship   -18,-6      100% 100  10   1  16  0  0  0  0  90   20
-    Play#0 output Play#0 1   4   16 cs   cargo ship   -18,-6      100% 100  10   1  17  0  0  0  0  90   20
+    Play#0 output Play#0 1   4   14 cs   cargo ship   -18,-6      100% 100  10   1  16  0  0  0  0  90   20
+    Play#0 output Play#0 1   4   15 cs   cargo ship   -18,-6      100% 100  10   1  17  0  0  0  0  90   20
+    Play#0 output Play#0 1   4   16 cs   cargo ship   -18,-6      100% 100  10   1  16  0  0  0  0  90   20
     Play#0 output Play#0 1   4   17 cs   cargo ship   -18,-6      100% 100  10   1  17  0  0  0  0  90   20
     Play#0 output Play#0 1   4   18 cs   cargo ship   -18,-6      100% 100  10   1  17  0  0  0  0  90   20
     Play#0 output Play#0 1   4   19 cs   cargo ship   -18,-6      100% 100  10   1  17  0  0  0  0  90   20
@@ -1693,8 +1694,8 @@
     Play#0 output Play#0 1   0 happiness,   0 education produced
     Play#0 output Play#0 1 total pop was 4000, 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 $-240, Navy delta $-540, Air force delta $-266
-    Play#0 output Play#0 1 money delta was $-197 for this update
+    Play#0 output Play#0 1 Army delta $-490, Navy delta $-540, Air force delta $-466
+    Play#0 output Play#0 1 money delta was $-647 for this update
     Play#0 output Play#0 6 0 640
     Play#0 input nation 6
     Play#0 command nation
@@ -1702,7 +1703,7 @@
     Play#0 output Play#0 1 (#6) 6 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,8 has 650 civilians & 20 military
-    Play#0 output Play#0 1  The treasury has $24803.00     Military reserves: 0
+    Play#0 output Play#0 1  The treasury has $24353.00     Military reserves: 0
     Play#0 output Play#0 1 Education.......... 15.24       Happiness.......  4.44
     Play#0 output Play#0 1 Technology.........101.15       Research........  1.74
     Play#0 output Play#0 1 Technology factor : 50.19%     Plague factor :   1.98%
@@ -1717,12 +1718,12 @@
     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   6    0,8    c  100%     120 .. ..      650   20    0   84 100%  395    0   1
-    Play#0 output Play#0 1   6    2,8    -  100%     120 .. ..      650   19    0   83 100%  254    0   1
+    Play#0 output Play#0 1   6    2,8    -  100%     120 .. ..      650   19    0   83 100%  255    0   1
     Play#0 output Play#0 1   6    4,8    f  100%     120 .. ..      650   20    0   83 100%  408    0   1
     Play#0 output Play#0 1   6    6,8    *  100%     120 .. ..      650   18    0   84 100%  387    0   1
     Play#0 output Play#0 1   6    8,8    h  100%     120 .. ..      650   20    0   83 100%  445    0   1
     Play#0 output Play#0 1   6   10,8    !  100%     120 .. ..      650   20    0   84 100%  358    0   1
-    Play#0 output Play#0 1   6   12,8    *  100%     120 .. ..      650   19    0   83 100%  367    0   1
+    Play#0 output Play#0 1   6   12,8    *  100%     120 .. ..      650   19    0   83 100%  366    0   1
     Play#0 output Play#0 1   6   14,8    h  100%     120 .. ..      650   20    0   83 100%  395    0   1
     Play#0 output Play#0 1 8 sectors
     Play#0 output Play#0 6 0 640
@@ -1737,7 +1738,7 @@
     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   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  391  396   0
-    Play#0 output Play#0 1   6  12,8    * .......... ..........   0   0    0    0    0   0    0  393  399   0
+    Play#0 output Play#0 1   6  12,8    * .......... ..........   0   0    0    0    0   0    0  392  398   0
     Play#0 output Play#0 1   6  14,8    h .......... ..........   0   0    0    0    0   0    0  400  400   0
     Play#0 output Play#0 1 8 sectors
     Play#0 output Play#0 6 0 640
@@ -1748,8 +1749,8 @@
     Play#0 output Play#0 1   0 happiness,   0 education produced
     Play#0 output Play#0 1 total pop was 4000, 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 $0, Navy delta $-70, Air force delta $0
-    Play#0 output Play#0 1 money delta was $819 for this update
+    Play#0 output Play#0 1 Army delta $0, Navy delta $-170, Air force delta $0
+    Play#0 output Play#0 1 money delta was $719 for this update
     Play#0 output Play#0 6 0 640
     Play#0 input nation 7
     Play#0 command nation
@@ -1757,7 +1758,7 @@
     Play#0 output Play#0 1 (#7) 7 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 -2,8 has 650 civilians & 20 military
-    Play#0 output Play#0 1  The treasury has $25819.00     Military reserves: 0
+    Play#0 output Play#0 1  The treasury has $25719.00     Military reserves: 0
     Play#0 output Play#0 1 Education.......... 15.24       Happiness.......  4.44
     Play#0 output Play#0 1 Technology.........101.15       Research........  1.74
     Play#0 output Play#0 1 Technology factor : 50.19%     Plague factor :   1.98%
@@ -1773,7 +1774,7 @@
     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   7  -16,8    -  100%     120 .. ..      650   20    0   83 100%  295    0   1
     Play#0 output Play#0 1   7  -14,8    h  100%     120 .. ..      650   20    0   83 100%  267    0   1
-    Play#0 output Play#0 1   7  -12,8    *  100%     120 .. ..      650   17    0   83 100%  279    0   1
+    Play#0 output Play#0 1   7  -12,8    *  100%     120 .. ..      650   16    0   83 100%  278    0   1
     Play#0 output Play#0 1   7  -10,8    !  100%     120 .. ..      650   20    0   84 100%  395    0   1
     Play#0 output Play#0 1   7   -8,8    h  100%     120 .. ..      650   20    0   83 100%  317    0   1
     Play#0 output Play#0 1   7   -6,8    *  100%     120 .. ..      650   20    0   83 100%  445    0   1
@@ -1788,7 +1789,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  352  368   0
-    Play#0 output Play#0 1   7 -12,8    * .......... ..........   0   0    0    0    0   0    0  372  392   0
+    Play#0 output Play#0 1   7 -12,8    * .......... ..........   0   0    0    0    0   0    0  371  393   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
@@ -1829,8 +1830,8 @@
     Play#0 output Play#0 1   1    0,4    a  100%    0    0   10   0    0
     Play#0 output Play#0 1   1    2,4    a  100%    0    0  100   0    0
     Play#0 output Play#0 1   1    4,4    a  100%    0    0  100   0    0
-    Play#0 output Play#0 1   0   16,4    .    0%    0    0   10  10    0
-    Play#0 output Play#0 1   0   18,4    .    0%    0    0  100  91    0
+    Play#0 output Play#0 1   0   16,4    .    0%    0    0   10   9    0
+    Play#0 output Play#0 1   0   18,4    .    0%    0    0  100  90    0
     Play#0 output Play#0 1   0   20,4    .    0%    0    0  100 100    0
     Play#0 output Play#0 1 8 sectors
     Play#0 output Play#0 6 0 640
@@ -1841,8 +1842,8 @@
     Play#0 output Play#0 1 own   sect        eff  min gold fert oil uran
     Play#0 output Play#0 1   1    8,4    o  100%    0    0    0   9    0
     Play#0 output Play#0 1   1   10,4    o  100%    0    0    0  92    0
-    Play#0 output Play#0 1   0   16,4    .    0%    0    0   10  10    0
-    Play#0 output Play#0 1   0   18,4    .    0%    0    0  100  91    0
+    Play#0 output Play#0 1   0   16,4    .    0%    0    0   10   9    0
+    Play#0 output Play#0 1   0   18,4    .    0%    0    0  100  90    0
     Play#0 output Play#0 1   0   20,4    .    0%    0    0  100 100    0
     Play#0 output Play#0 1 5 sectors
     Play#0 output Play#0 6 0 640

diff --git a/tests/update/setup-POGO b/tests/update/setup-POGO
index d26da0eb8638719f02f7169b978fcfc97d70e167..9d9fbc53d034383e8de2ea24ad3f3ebd9e27416c 100644 (file)
--- a/tests/update/setup-POGO
+++ b/tests/update/setup-POGO
@@ -306,7 +306,7 @@ edit s 75 U 76 m 60 E 78
 edit s 61 U 90 L -8,8 U 91 L -14,8
 | #92/93 friendly city without old work, +0/0%
 edit s 61 U 92 t fb L -2,8 U 93 L 0,0 O 7
-| #95/97 own harbor, #96 friendly, materials for 100%, +80/0/20%
+| #95/97 own harbor, #96 friendly, materials for 100%, +80/20/0%
 | #95 costs double due to tech
 edit s 61 U 95 L 14,6 U 97 U 96 O 7
 edit s 95 T 200
@@ -342,7 +342,7 @@ give m 2,4 10
 edit p 61 U 90 l 6,8 U 91 l 12,8
 | #92/93 allied city without old work, +30%
 edit p 61 U 92 l 2,8 U 93 l 0,0 O 6
-| #95/97 own airfield, #96 allied, materials for 100%, +50/0/50%
+| #95/97 own airfield, #96 allied, materials for 100%, +50/50/0%
 | #95 costs double due to tech
 edit p 61 U 95 e 50 l 12,6 U 97 U 96 O 6
 edit p 95 t 200
@@ -370,7 +370,7 @@ give h 10,4 20
 edit u 61 U 90 L 4,8 U 91 L 10,8
 | #92/93 allied city without old work, +30%
 edit u 61 U 92 L 2,8 U 93 L 0,0 O 6
-| #95/97 own hq, #96 allied, materials for 140%, +90/0/50%
+| #95/97 own hq, #96 allied, materials for 140%, +90/50/0%
 | #95 costs double due to tech
 edit u 61 U 95 L 10,6 U 97 U 96 O 6
 edit u 95 t 200