power: Saner power for items, ships, planes and land units

Items, ships, planes and land units all contribute to the power
factor, which determines position on the power chart.

Items are worth

    amount * item value * (0.5 + nation tech level / 1000.0)

The item values aren't quite right: producing stuff can *hurt* your
position on the power chart.  Food, uw and rads are worth nothng.

Reduce the value of oil, and give rads the same value as oil.  Tweak
value of iron and oil products so that production's power change is
roughly zero around p.e. 0.9 (tech 110), except for construction
materials, where it's zero at p.e. 0.5 (tech 0).  Construction
materials become less valuable, shells, guns and petrol become more
valuable.  Increase value of bars to roughly match the other changes.
It may still be too low.  Halve the value of civilians, and give the
other half to uw.  Results:

            old     new     change
    civ      100     50   / 2
    mil      100    100
    shell     80    125   * 1.5625
    gun      400    950   * 2.375
    pet        2      7   * 3.5
    iron      10     10
    dust     200    200
    bar     1000   2500   * 2.5
    food       0      0
    oil      100     50   / 2
    lcm      100     20   / 5
    hcm      200     40   / 5
    uw         0     50   new
    rad        0     50   new

Ships, planes and land units are worth

    base value * effic/100.0 * (0.5 + unit tech level / 1000.0)

For ships and land units, the base value is

    lcm/5.0 + hcm/5.0

Build cost is ignored, but lcms are valued twice as much "loose" ones
(before this commit).  Therefore, building stuff can change your
position on the power chart in both directions, depending on the type
of build.

For planes, the base value is

    20 * (0.5 + nation tech level / 1000.0)

Build cost and materials are ignored, and tech is squared.  This
is plainly absurd.

Unify to

    (power value of money and materials to build) * effic/100.0

This formula is chosen so that building stuff doesn't change your
power factor.  Bonus: it doesn't assume anything about possible build
materials.

For ships and land units, factoring in build cost overcompensates the
discounted value of construction materials more often than not.

Noteworthy changes for the stock game:

    ship type          old     new    change
    ss   slave ship     20     5.8    * 0.29    largest decrease
    cs   cargo ship     20     7.8    * 0.39
    ts   trade ship     60    25.5    * 0.42
    frg  frigate        12     7.8    * 0.65
    bb   battleship     24    21.8    * 0.91
    cal  light carrier  22    30.4    * 1.38
    can  nuc carrier    30    84.6    * 2.82    largest increase

    land unit type     old     new    change
    hat  hvy artillery  12     9.6    * 0.8     largest decrease
    linf light infantry  2.4   3.32   * 1.38
    cav  cavalry         3     5.4    * 1.8
    inf  infantry        3     5.4    * 1.8
    lar  lt armor        3     6.4    * 2.13
    com  commando        3    15.4    * 5.13
    eng  engineer        3    30.4    * 10.13
    meng mech engineer   3    45.4    * 15.13   largest increase

For planes, the power value change depends on the type.  Below a
certain nation tech level, planes of this type become more valuable,
above less.

For the stock game, planes costing at most $1000 become less valuable
at any nation tech level that can build them, and planes costing at
least $1800 become more valuable at any practical tech level,
i.e. under 400.  Noteworthy planes:

    plane type                 new
    sam  Sea Sparrow           2.1              least valuable
    f2   P-51 Mustang          4.34
    lb   TBD-1 Devastator      5.92
    jf1  F-4 Phantom          10.6
    tr   C-56 Lodestar        10.78
    jt   C-141 Starlifter     15.86
    jhb  B-52 Strato-Fortress 33.54
    ss   KH-7 spysat          41.2              most valuable

The old value is a flat 12 at nation tech level 100, 15 at tech level
250, and 18 at tech level 400.

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

diff --git a/info/Item-types.t b/info/Item-types.t
index bf4246ad2a7e1a5ecca6cb3b3b3897cfdabe61aa..6f29edfecef1020ff079076beda1e5e464f732ae 100644 (file)
--- a/info/Item-types.t
+++ b/info/Item-types.t
@@ -11,20 +11,20 @@ The show command displays the detailed characteristics of items.
 .NF
 item power value sell lbs    packing     melt  item
 mnem                      in no wh ur bk deno  name
-  c    100     1   no   1  1 10 10 10 10    4  civilians
+  c     50     1   no   1  1 10 10 10 10    4  civilians
   m    100     0  yes   1  1  1  1  1  1   20  military
-  s     80     5  yes   1  1  1 10  1  1   80  shells
-  g    400    60  yes  10  1  1 10  1  1  100  guns
-  p      2     4  yes   1  1  1 10  1  1   50  petrol
+  s    125     5  yes   1  1  1 10  1  1   80  shells
+  g    950    60  yes  10  1  1 10  1  1  100  guns
+  p      7     4  yes   1  1  1 10  1  1   50  petrol
   i     10     2  yes   1  1  1 10  1  1  100  iron ore
   d    200    20  yes   5  1  1 10  1  1  100  dust (gold)
-  b   1000   280  yes  50  1  1  5  1  4  200  bars of gold
+  b   2500   280  yes  50  1  1  5  1  4  200  bars of gold
   f      0     0  yes   1  1  1 10  1  1    2  food
-  o    100     8  yes   1  1  1 10  1  1   50  oil
-  l    100     2  yes   1  1  1 10  1  1  100  light products
-  h    200     4  yes   1  1  1 10  1  1  100  heavy products
-  u      0     1  yes   2  1  1  2  1  1    2  uncompensated workers
-  r      0   150  yes   8  1  1 10  1  1 1000  radioactive materials
+  o     50     8  yes   1  1  1 10  1  1   50  oil
+  l     20     2  yes   1  1  1 10  1  1  100  light products
+  h     40     4  yes   1  1  1 10  1  1  100  heavy products
+  u     50     1  yes   2  1  1  2  1  1    2  uncompensated workers
+  r     50   150  yes   8  1  1 10  1  1 1000  radioactive materials
 .FI
 .s1
 The meaning of the headings are:

diff --git a/info/power.t b/info/power.t
index bb5d0820116775602aeb01fb82fc2214911b4bcb..a455f90a7c420b6dac2a32c4825bec864b05ac6d 100644 (file)
--- a/info/power.t
+++ b/info/power.t
@@ -80,11 +80,8 @@ The power value of money is dollars / 100.
 .s1
 The power value of a sector is efficiency / 10.
 .s1
-The power value of a ship or land unit is (lcm cost / 10 + hcm cost +
-10) * efficiency / 100 * 2.
-.s1
-The power value of a plane is 20 * efficiency / 100 * (20 + nation
-tech level) / 500.
+The power value of a ship, plane or land unit is the power value of
+the materials and money needed to build * efficiency / 100.
 .s1
 The power value of commodities is amount * type factor.  \*Qshow
 item\*U shows the type factor in column \*Qpower\*U.

diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c
index 3603df0011da8500475e03670d18a68ab02fe001..ae6e0ee1e5c4a7ea63d3ba9c40c9f331d0f7f287 100644 (file)
--- a/src/lib/commands/powe.c
+++ b/src/lib/commands/powe.c
@@ -51,6 +51,8 @@ static void out5(double, int, int);
 static void gen_power(struct powstr *, int);
 static int powcmp(const void *, const void *);
 static void addtopow(short *, struct powstr *);
+static float empunit_power(int, int, short[], int);
+static float money_power(int);
 static float power_tech_factor(float);
 static float item_power(short[]);
 
@@ -223,12 +225,14 @@ gen_power(struct powstr *powbuf, int save)
     int i;
     struct sctstr sect;
     struct plnstr plane;
+    struct plchrstr *pcp;
     struct shpstr ship;
+    struct mchrstr *mcp;
     struct lndstr land;
+    struct lchrstr *lcp;
     struct nstr_item ni;
     struct nstr_sect ns;
     struct natstr *natp;
-    float f;
 
     player->btused += 10;
     memset(powbuf, 0, MAXNOC * sizeof(*powbuf));
@@ -246,39 +250,37 @@ gen_power(struct powstr *powbuf, int save)
     while (nxtitem(&ni, &land)) {
        if (land.lnd_own == 0)
            continue;
+       lcp = &lchr[land.lnd_type];
        pow = &powbuf[land.lnd_own];
        addtopow(land.lnd_item, pow);
-       f = (lchr[land.lnd_type].l_mat[I_LCM] / 10.0)
-           * (land.lnd_effic / 100.0);
-       f += (lchr[land.lnd_type].l_mat[I_HCM] / 10.0)
-           * (land.lnd_effic / 100.0);
-       upower[land.lnd_own] += f * 2 * power_tech_factor(land.lnd_tech);
-       if (!(lchr[(int)land.lnd_type].l_flags & L_SPY))
+       upower[land.lnd_own] += empunit_power(land.lnd_effic,
+                                             land.lnd_tech,
+                                             lcp->l_mat, lcp->l_cost);
+       if (!(lcp->l_flags & L_SPY))
            pow->p_units += 1.0;
     }
     snxtitem_all(&ni, EF_SHIP);
     while (nxtitem(&ni, &ship)) {
        if (ship.shp_own == 0)
            continue;
+       mcp = &mchr[ship.shp_type];
        pow = &powbuf[ship.shp_own];
        addtopow(ship.shp_item, pow);
-       f = (mchr[ship.shp_type].m_mat[I_LCM] / 10.0)
-           * (ship.shp_effic / 100.0);
-       f += (mchr[ship.shp_type].m_mat[I_HCM] / 10.0)
-           * (ship.shp_effic / 100.0);
-       upower[ship.shp_own] += f * 2 * power_tech_factor(ship.shp_tech);
+       upower[ship.shp_own] += empunit_power(ship.shp_effic,
+                                             ship.shp_tech,
+                                             mcp->m_mat, mcp->m_cost);
        pow->p_ships += 1.0;
     }
     snxtitem_all(&ni, EF_PLANE);
     while (nxtitem(&ni, &plane)) {
        if (plane.pln_own == 0)
            continue;
+       pcp = &plchr[plane.pln_type];
        pow = &powbuf[plane.pln_own];
+       upower[plane.pln_own] += empunit_power(plane.pln_effic,
+                                              plane.pln_tech,
+                                              pcp->pl_mat, pcp->pl_cost);
        pow->p_planes += 1.0;
-       natp = getnatp(plane.pln_own);
-       f = 20 * (plane.pln_effic / 100.0) *
-           (20 + natp->nat_level[NAT_TLEV]) / 500.0;
-       upower[plane.pln_own] += f * power_tech_factor(plane.pln_tech);
     }
     for (i = 1; NULL != (natp = getnatp(i)); i++) {
        pow = &powbuf[i];
@@ -288,7 +290,7 @@ gen_power(struct powstr *powbuf, int save)
            continue;
        }
        pow->p_money = natp->nat_money;
-       pow->p_power += pow->p_money / 100.;
+       pow->p_power += money_power(natp->nat_money);
 
        if (pow->p_sects > 0)
            pow->p_power += pow->p_sects
@@ -349,6 +351,19 @@ addtopow(short *vec, struct powstr *pow)
     pow->p_power += item_power(vec);
 }
 
+static float
+empunit_power(int effic, int tech, short mat[], int cost)
+{
+    return (item_power(mat) + money_power(cost)) * (effic / 100.0)
+       * power_tech_factor(tech);
+}
+
+static float
+money_power(int money)
+{
+    return money / 100.0;
+}
+
 static float
 power_tech_factor(float tech)
 {

diff --git a/src/lib/global/item.config b/src/lib/global/item.config
index ecce9e67f2f3dde89036e3837c97cf8645346933..0c2c907a7dad138dc08d9c01ae6c80c0614673f4 100644 (file)
--- a/src/lib/global/item.config
+++ b/src/lib/global/item.config
@@ -38,24 +38,29 @@
 # Columns pkg are indexed by packing types in compiled-in table
 # packing.
 
+# Column pow should ensure that producing stuff doesn't lose power.
+# For instance, if 1s takes 2l 1h $3, worth 0.02, 0.04 and 0.01
+# respectively, and production efficiency is ~0.9, then 1s should be
+# worth no less than 0.11 / 0.9 =~ 0.122.
+
 # Do not edit this file to customize a game!  Create your own custom
 # configuration file(s), best next to your econfig, and name them in
 # econfig key custom_tables.
 
 config item #          ineff  norm   ware   urban  bank
 uid mnem   pow val sell lbs pkg(0) pkg(1) pkg(2) pkg(3) pkg(4) melt name
-  0  "c"   100   1    0   1     1     10     10     10     10     4 "civilians"
+  0  "c"    50   1    0   1     1     10     10     10     10     4 "civilians"
   1  "m"   100   0    1   1     1      1      1      1      1    20 "military"
-  2  "s"    80   5    1   1     1      1     10      1      1    80 "shells"
-  3  "g"   400  60    1  10     1      1     10      1      1   100 "guns"
-  4  "p"     2   4    1   1     1      1     10      1      1    50 "petrol"
+  2  "s"   125   5    1   1     1      1     10      1      1    80 "shells"
+  3  "g"   950  60    1  10     1      1     10      1      1   100 "guns"
+  4  "p"     7   4    1   1     1      1     10      1      1    50 "petrol"
   5  "i"    10   2    1   1     1      1     10      1      1   100 "iron ore"
   6  "d"   200  20    1   5     1      1     10      1      1   100 "dust (gold)"
-  7  "b"  1000 280    1  50     1      1      5      1      4   200 "bars of gold"
+  7  "b"  2500 280    1  50     1      1      5      1      4   200 "bars of gold"
   8  "f"     0   0    1   1     1      1     10      1      1     2 "food"
-  9  "o"   100   8    1   1     1      1     10      1      1    50 "oil"
- 10  "l"   100   2    1   1     1      1     10      1      1   100 "light products"
- 11  "h"   200   4    1   1     1      1     10      1      1   100 "heavy products"
- 12  "u"     0   1    1   2     1      1      2      1      1     2 "uncompensated workers"
- 13  "r"     0 150    1   8     1      1     10      1      1  1000 "radioactive materials"
+  9  "o"    50   8    1   1     1      1     10      1      1    50 "oil"
+ 10  "l"    20   2    1   1     1      1     10      1      1   100 "light products"
+ 11  "h"    40   4    1   1     1      1     10      1      1   100 "heavy products"
+ 12  "u"    50   1    1   2     1      1      2      1      1     2 "uncompensated workers"
+ 13  "r"    50 150    1   8     1      1     10      1      1  1000 "radioactive materials"
 /config

diff --git a/src/lib/global/product.config b/src/lib/global/product.config
index b61235b0959c5e20ed29922ede05d67840a9eded..ba44df5e30af2b50797616cfe38465237ca61dec 100644 (file)
--- a/src/lib/global/product.config
+++ b/src/lib/global/product.config
@@ -27,7 +27,7 @@
 #   product.config: Product characteristics
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2006-2011
+#      Markus Armbruster, 2006-2016
 #
 #   Derived from product.c; no known contributors
 #
@@ -43,6 +43,9 @@
 # natural resource.  When nrdep is non-zero, mining depletes the
 # resource.  The smaller the value, the slower the depletion.
 
+# If you customize constituents (columns ct and ca), you may need to
+# customize item.config column power, too.
+
 # Do not edit this file to customize a game!  Create your own custom
 # configuration file(s), best next to your econfig, and name them in
 # econfig key custom_tables.

diff --git a/tests/smoke/journal.log b/tests/smoke/journal.log
index 1a20748ca840ecf98835d8a431e0bcd695669227..cb3d0c07f525409f7fc6e87b624dd4b663706845 100644 (file)
--- a/tests/smoke/journal.log
+++ b/tests/smoke/journal.log
@@ -847,25 +847,25 @@
     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         2   3   67% 2.0K 110    0    0    0    0    0    0    0    0    0   25K
-    Play#0 output Play#0 1     19.24
+    Play#0 output Play#0 1     15.54
     Play#0 output Play#0 1         3   3   67% 2.0K 110    0    0    0    0    0    0    0    0    0   25K
-    Play#0 output Play#0 1     19.24
+    Play#0 output Play#0 1     15.54
     Play#0 output Play#0 1         4   3   67% 2.0K 110    0    0    0    0    0    0    0    0    0   25K
-    Play#0 output Play#0 1     19.24
+    Play#0 output Play#0 1     15.54
     Play#0 output Play#0 1         5   3   67% 2.0K 110    0    0    0    0    0    0    0    0    0   25K
-    Play#0 output Play#0 1     19.24
+    Play#0 output Play#0 1     15.54
     Play#0 output Play#0 1         6   3   67% 2.0K 110    0    0    0    0    0    0    0    0    0   25K
-    Play#0 output Play#0 1     19.24
+    Play#0 output Play#0 1     15.54
     Play#0 output Play#0 1         7   3   67% 2.0K 110    0    0    0    0    0    0    0    0    0   25K
-    Play#0 output Play#0 1     19.24
+    Play#0 output Play#0 1     15.54
     Play#0 output Play#0 1         8   3   67% 2.0K 110    0    0    0    0    0    0    0    0    0   25K
-    Play#0 output Play#0 1     19.24
+    Play#0 output Play#0 1     15.54
     Play#0 output Play#0 1         9   3   67% 2.0K 110    0    0    0    0    0    0    0    0    0   25K
-    Play#0 output Play#0 1     19.24
+    Play#0 output Play#0 1     15.54
     Play#0 output Play#0 1        10   3   67% 2.0K 110    0    0    0    0    0    0    0    0    0   25K
-    Play#0 output Play#0 1     19.24
+    Play#0 output Play#0 1     15.54
     Play#0 output Play#0 1         1  30    7% 2.1K   0    0    0    0    0    0    0    0    0    0   24K
-    Play#0 output Play#0 1     19.02
+    Play#0 output Play#0 1     15.10
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  57   35%  20K 990    0    0    0    0    0    0    0    0    0  249K
     Play#0 output Play#0 1
@@ -1195,25 +1195,25 @@
     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  30   11% 2.7K   0    0    0    0  904   36    0    0    0    0   24K
-    Play#0 output Play#0 1     22.70
+    Play#0 output Play#0 1     17.56
     Play#0 output Play#0 1         8   3   93% 2.3K 110    0    0    0    0   51    0    0    0    0   25K
-    Play#0 output Play#0 1     21.11
+    Play#0 output Play#0 1     16.91
     Play#0 output Play#0 1         6   3   93% 2.3K 110    0    0    0    0   50    0    0    0    0   25K
-    Play#0 output Play#0 1     21.09
+    Play#0 output Play#0 1     16.90
     Play#0 output Play#0 1         3   3   93% 2.3K 110    0    0    0    0   47    0    0    0    0   25K
-    Play#0 output Play#0 1     21.07
+    Play#0 output Play#0 1     16.88
     Play#0 output Play#0 1         5   3   93% 2.3K 110    0    0    0    0   47    0    0    0    0   25K
-    Play#0 output Play#0 1     21.07
+    Play#0 output Play#0 1     16.88
     Play#0 output Play#0 1         7   3   93% 2.3K 110    0    0    0    0   44    0    0    0    0   25K
-    Play#0 output Play#0 1     21.05
+    Play#0 output Play#0 1     16.86
     Play#0 output Play#0 1         4   3   93% 2.3K 110    0    0    0    0   38    0    0    0    0   25K
-    Play#0 output Play#0 1     21.00
+    Play#0 output Play#0 1     16.81
     Play#0 output Play#0 1        10   3   93% 2.3K 110    0    0    0    0   29    0    0    0    0   25K
-    Play#0 output Play#0 1     20.93
+    Play#0 output Play#0 1     16.74
     Play#0 output Play#0 1         2   3   93% 2.3K 110    0    0    0    0    6    0    0    0    0   25K
-    Play#0 output Play#0 1     20.75
+    Play#0 output Play#0 1     16.55
     Play#0 output Play#0 1         9   3   93% 2.3K 110    0    0    0    0    3    0    0    0    0   25K
-    Play#0 output Play#0 1     20.71
+    Play#0 output Play#0 1     16.52
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  57   50%  23K 990    0    0    0  904  351    0    0    0    0  251K
     Play#0 output Play#0 1
@@ -1635,25 +1635,25 @@
     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  30   13% 3.3K   0    0    0    0  2.2K 210    0    0    0    0   25K
-    Play#0 output Play#0 1     27.36
+    Play#0 output Play#0 1     21.24
     Play#0 output Play#0 1         8   3  100% 2.3K 110    0    0    0    0  183    0    0    0    0   26K
-    Play#0 output Play#0 1     22.74
+    Play#0 output Play#0 1     18.43
     Play#0 output Play#0 1         6   3  100% 2.3K 110    0    0    0    0  181    0    0    0    0   26K
-    Play#0 output Play#0 1     22.72
+    Play#0 output Play#0 1     18.42
     Play#0 output Play#0 1         3   3  100% 2.3K 110    0    0    0    0  169    0    0    0    0   26K
-    Play#0 output Play#0 1     22.63
+    Play#0 output Play#0 1     18.33
     Play#0 output Play#0 1         5   3  100% 2.3K 110    0    0    0    0  167    0    0    0    0   26K
-    Play#0 output Play#0 1     22.61
+    Play#0 output Play#0 1     18.31
     Play#0 output Play#0 1         7   3  100% 2.3K 110    0    0    0    0  158    0    0    0    0   26K
-    Play#0 output Play#0 1     22.54
+    Play#0 output Play#0 1     18.24
     Play#0 output Play#0 1         4   3  100% 2.3K 110    0    0    0    0  138    0    0    0    0   26K
-    Play#0 output Play#0 1     22.38
+    Play#0 output Play#0 1     18.08
     Play#0 output Play#0 1        10   3  100% 2.3K 110    0    0    0    0  105    0    0    0    0   26K
-    Play#0 output Play#0 1     22.12
+    Play#0 output Play#0 1     17.81
     Play#0 output Play#0 1         2   3  100% 2.3K 110    0    0    0    0   23    0    0    0    0   26K
-    Play#0 output Play#0 1     21.46
+    Play#0 output Play#0 1     17.16
     Play#0 output Play#0 1         9   3  100% 2.3K 110    0    0    0    0   12    0    0    0    0   26K
-    Play#0 output Play#0 1     21.36
+    Play#0 output Play#0 1     17.07
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  57   54%  24K 990    0    0    0  2.2K 1.3K   0    0    0    0  256K
     Play#0 output Play#0 1
@@ -2170,25 +2170,25 @@
     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  30   23% 4.2K   0    0    0    0  3.1K 310    0    0    1    0   26K
-    Play#0 output Play#0 1     35.01
+    Play#0 output Play#0 1     26.98
     Play#0 output Play#0 1         8   4   75% 2.5K 110    0    0    0    0  301    0    0    0    0   26K
-    Play#0 output Play#0 1     24.31
+    Play#0 output Play#0 1     19.85
     Play#0 output Play#0 1         6   3  100% 2.5K 110    0    0    0    0  299    0    0    0    0   26K
-    Play#0 output Play#0 1     24.29
+    Play#0 output Play#0 1     19.84
     Play#0 output Play#0 1         3   3  100% 2.5K 110    0    0    0    0  277    0    0    0    0   26K
-    Play#0 output Play#0 1     24.12
+    Play#0 output Play#0 1     19.67
     Play#0 output Play#0 1         5   3  100% 2.5K 110    0    0    0    0  275    0    0    0    0   26K
-    Play#0 output Play#0 1     24.10
+    Play#0 output Play#0 1     19.65
     Play#0 output Play#0 1         7   3  100% 2.5K 110    0    0    0    0  261    0    0    0    0   26K
-    Play#0 output Play#0 1     23.99
+    Play#0 output Play#0 1     19.54
     Play#0 output Play#0 1         4   3  100% 2.5K 110    0    0    0    0  227    0    0    0    0   26K
-    Play#0 output Play#0 1     23.72
+    Play#0 output Play#0 1     19.27
     Play#0 output Play#0 1        10   3  100% 2.5K 110    0    0    0    0  173    0    0    0    0   26K
-    Play#0 output Play#0 1     23.29
+    Play#0 output Play#0 1     18.84
     Play#0 output Play#0 1         2   3  100% 2.5K 110    0    0    0    0   39    0    0    0    0   26K
-    Play#0 output Play#0 1     22.22
+    Play#0 output Play#0 1     17.76
     Play#0 output Play#0 1         9   3  100% 2.5K 110    0    0    0    0   20    0    0    0    0   26K
-    Play#0 output Play#0 1     22.06
+    Play#0 output Play#0 1     17.61
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  58   59%  26K 990    0    0    0  3.1K 2.2K   0    0    1    0  261K
     Play#0 output Play#0 1
@@ -2675,25 +2675,25 @@
     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  31   30% 5.2K  60    0    0    0  3.8K 419   58    0    1    0   26K
-    Play#0 output Play#0 1     42.52
-    Play#0 output Play#0 1         8   3  100% 2.6K 110    0    0    0    0  375    0    0    0    0   27K
-    Play#0 output Play#0 1     25.66
+    Play#0 output Play#0 1     31.94
     Play#0 output Play#0 1         6   3  100% 2.6K 110    0    0    0    0  373    0    0    0    0   27K
-    Play#0 output Play#0 1     25.65
+    Play#0 output Play#0 1     21.01
+    Play#0 output Play#0 1         8   3  100% 2.6K 110    0    0    0    0  375    0    0    0    0   27K
+    Play#0 output Play#0 1     21.00
     Play#0 output Play#0 1         3   3  100% 2.6K 110    0    0    0    0  344    0    0    0    0   27K
-    Play#0 output Play#0 1     25.43
+    Play#0 output Play#0 1     20.78
     Play#0 output Play#0 1         5   3  100% 2.6K 110    0    0    0    0  338    0    0    0    0   27K
-    Play#0 output Play#0 1     25.38
+    Play#0 output Play#0 1     20.73
     Play#0 output Play#0 1         7   3  100% 2.6K 110    0    0    0    0  321    0    0    0    0   27K
-    Play#0 output Play#0 1     25.25
+    Play#0 output Play#0 1     20.59
     Play#0 output Play#0 1         4   3  100% 2.6K 110    0    0    0    0  283    0    0    0    0   27K
-    Play#0 output Play#0 1     24.95
+    Play#0 output Play#0 1     20.29
     Play#0 output Play#0 1        10   3  100% 2.6K 110    0    0    0    0  211    0    0    0    0   27K
-    Play#0 output Play#0 1     24.37
+    Play#0 output Play#0 1     19.72
     Play#0 output Play#0 1         2   3  100% 2.6K 110    0    0    0    0   49    0    0    0    0   27K
-    Play#0 output Play#0 1     23.08
+    Play#0 output Play#0 1     18.41
     Play#0 output Play#0 1         9   3  100% 2.6K 110    0    0    0    0   23    0    0    0    0   27K
-    Play#0 output Play#0 1     22.86
+    Play#0 output Play#0 1     18.21
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  58   63%  29K 1.1K   0    0    0  3.8K 2.7K  58    0    1    0  266K
     Play#0 output Play#0 1
@@ -3052,25 +3052,25 @@
     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  31   37% 6.8K  60    0    0    0  4.5K 418  122    0    1    0   23K
-    Play#0 output Play#0 1     58.23
+    Play#0 output Play#0 1     42.43
     Play#0 output Play#0 1         6   3  100% 2.8K 110    0    0    0    0  404    0    0    0    0   27K
-    Play#0 output Play#0 1     29.09
+    Play#0 output Play#0 1     23.77
     Play#0 output Play#0 1         8   3  100% 2.8K 110    0    0    0    0  402    0    0    0    0   27K
-    Play#0 output Play#0 1     29.07
+    Play#0 output Play#0 1     23.72
     Play#0 output Play#0 1         3   3  100% 2.8K 110    0    0    0    0  371    0    0    0    0   27K
-    Play#0 output Play#0 1     28.82
+    Play#0 output Play#0 1     23.49
     Play#0 output Play#0 1         5   3  100% 2.8K 110    0    0    0    0  361    0    0    0    0   27K
-    Play#0 output Play#0 1     28.74
+    Play#0 output Play#0 1     23.40
     Play#0 output Play#0 1         7   3  100% 2.8K 110    0    0    0    0  343    0    0    0    0   27K
-    Play#0 output Play#0 1     28.59
+    Play#0 output Play#0 1     23.25
     Play#0 output Play#0 1         4   3  100% 2.8K 110    0    0    0    0  306    0    0    0    0   27K
-    Play#0 output Play#0 1     28.27
+    Play#0 output Play#0 1     22.92
     Play#0 output Play#0 1        10   3  100% 2.8K 110    0    0    0    0  225    0    0    0    0   27K
-    Play#0 output Play#0 1     27.57
+    Play#0 output Play#0 1     22.23
     Play#0 output Play#0 1         2   3  100% 2.8K 110    0    0    0    0   53    0    0    0    0   27K
-    Play#0 output Play#0 1     26.08
+    Play#0 output Play#0 1     20.73
     Play#0 output Play#0 1         9   3  100% 2.8K 110    0    0    0    0   23    0    0    0    0   27K
-    Play#0 output Play#0 1     25.81
+    Play#0 output Play#0 1     20.47
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  58   66%  32K 1.1K   0    0    0  4.5K 2.9K 122    0    1    0  270K
     Play#0 output Play#0 1
@@ -3806,25 +3806,25 @@
     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  31   41% 8.8K  52    0    0    0  4.7K 378  190    0    1    0   22K
-    Play#0 output Play#0 1     80.89
-    Play#0 output Play#0 1         8  29   10% 3.0K 110    0    0    0    0  407    0    0    0    0   28K
-    Play#0 output Play#0 1     33.09
+    Play#0 output Play#0 1     56.34
     Play#0 output Play#0 1         6   3  100% 3.0K 110    0    0    0    0  404    0    0    0    0   28K
-    Play#0 output Play#0 1     33.05
+    Play#0 output Play#0 1     26.84
+    Play#0 output Play#0 1         8  29   10% 3.0K 110    0    0    0    0  407    0    0    0    0   28K
+    Play#0 output Play#0 1     26.83
     Play#0 output Play#0 1         3   3  100% 3.0K 110    0    0    0    0  376    0    0    0    0   28K
-    Play#0 output Play#0 1     32.82
+    Play#0 output Play#0 1     26.58
     Play#0 output Play#0 1         5   3  100% 3.0K 110    0    0    0    0  361    0    0    0    0   28K
-    Play#0 output Play#0 1     32.67
+    Play#0 output Play#0 1     26.44
     Play#0 output Play#0 1         7   3  100% 3.0K 110    0    0    0    0  348    0    0    0    0   28K
-    Play#0 output Play#0 1     32.56
+    Play#0 output Play#0 1     26.32
     Play#0 output Play#0 1         4   3  100% 3.0K 110    0    0    0    0  306    0    0    0    0   28K
-    Play#0 output Play#0 1     32.17
+    Play#0 output Play#0 1     25.92
     Play#0 output Play#0 1        10   3  100% 3.0K 110    0    0    0    0  225    0    0    0    0   28K
-    Play#0 output Play#0 1     31.40
+    Play#0 output Play#0 1     25.17
     Play#0 output Play#0 1         2   3  100% 3.0K 110    0    0    0    0   53    0    0    0    0   28K
-    Play#0 output Play#0 1     29.78
+    Play#0 output Play#0 1     23.53
     Play#0 output Play#0 1         9   3  100% 3.0K 110    0    0    0    0   23    0    0    0    0   28K
-    Play#0 output Play#0 1     29.49
+    Play#0 output Play#0 1     23.25
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  84   47%  36K 1.0K   0    0    0  4.7K 2.9K 190    0    1    0  275K
     Play#0 output Play#0 1
@@ -4775,25 +4775,25 @@
     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  32   44%  11K  52    0    0    0  5.4K 718  234    0    1    0   20K
-    Play#0 output Play#0 1    112.41
+    Play#0 output Play#0 1     77.53
     Play#0 output Play#0 1         8  29   10% 3.0K 110    0    0    0    0  407    0    0    0    0   29K
-    Play#0 output Play#0 1     36.42
+    Play#0 output Play#0 1     29.69
     Play#0 output Play#0 1         6   3  100% 3.0K 110    0    0    0    0  404    0    0    0    0   29K
-    Play#0 output Play#0 1     36.25
+    Play#0 output Play#0 1     29.63
     Play#0 output Play#0 1         3   3  100% 3.0K 110    0    0    0    0  376    0    0    0    0   29K
-    Play#0 output Play#0 1     35.97
+    Play#0 output Play#0 1     29.34
     Play#0 output Play#0 1         5   3  100% 3.0K 110    0    0    0    0  361    0    0    0    0   29K
-    Play#0 output Play#0 1     35.82
+    Play#0 output Play#0 1     29.19
     Play#0 output Play#0 1         7   3  100% 3.0K 110    0    0    0    0  348    0    0    0    0   29K
-    Play#0 output Play#0 1     35.68
+    Play#0 output Play#0 1     29.06
     Play#0 output Play#0 1         4   3  100% 3.0K 110    0    0    0    0  306    0    0    0    0   29K
-    Play#0 output Play#0 1     35.26
+    Play#0 output Play#0 1     28.62
     Play#0 output Play#0 1        10   3  100% 3.0K 110    0    0    0    0  225    0    0    0    0   29K
-    Play#0 output Play#0 1     34.43
+    Play#0 output Play#0 1     27.81
     Play#0 output Play#0 1         2   3  100% 3.0K 110    0    0    0    0   53    0    0    0    0   29K
-    Play#0 output Play#0 1     32.68
+    Play#0 output Play#0 1     26.04
     Play#0 output Play#0 1         9   3  100% 3.0K 110    0    0    0    0   23    0    0    0    0   29K
-    Play#0 output Play#0 1     32.37
+    Play#0 output Play#0 1     25.74
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  85   48%  38K 1.0K   0    0    0  5.4K 3.2K 234    0    1    0  281K
     Play#0 output Play#0 1
@@ -5483,25 +5483,25 @@
     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  32   55%  13K  52    0    0    0  6.3K 1.6K 249    0    1    0   20K
-    Play#0 output Play#0 1    165.58
+    Play#0 output Play#0 1    115.74
     Play#0 output Play#0 1         8  29   17% 3.9K 110    0    0    0  474  1.5K   0    0    0    0   29K
-    Play#0 output Play#0 1     57.47
+    Play#0 output Play#0 1     47.88
     Play#0 output Play#0 1         6   3  100% 3.0K 110    0    0    0    0  404    0    0    0    0   30K
-    Play#0 output Play#0 1     39.48
+    Play#0 output Play#0 1     32.53
     Play#0 output Play#0 1         3   3  100% 3.0K 110    0    0    0    0  376    0    0    0    0   30K
-    Play#0 output Play#0 1     39.18
+    Play#0 output Play#0 1     32.21
     Play#0 output Play#0 1         5   3  100% 3.0K 110    0    0    0    0  361    0    0    0    0   30K
-    Play#0 output Play#0 1     39.01
+    Play#0 output Play#0 1     32.05
     Play#0 output Play#0 1         7   3  100% 3.0K 110    0    0    0    0  348    0    0    0    0   30K
-    Play#0 output Play#0 1     38.87
+    Play#0 output Play#0 1     31.91
     Play#0 output Play#0 1         4   3  100% 3.0K 110    0    0    0    0  306    0    0    0    0   30K
-    Play#0 output Play#0 1     38.41
+    Play#0 output Play#0 1     31.43
     Play#0 output Play#0 1        10   3  100% 3.0K 110    0    0    0    0  225    0    0    0    0   30K
-    Play#0 output Play#0 1     37.52
+    Play#0 output Play#0 1     30.56
     Play#0 output Play#0 1         2   3  100% 3.0K 110    0    0    0    0   53    0    0    0    0   30K
-    Play#0 output Play#0 1     35.64
+    Play#0 output Play#0 1     28.66
     Play#0 output Play#0 1         9   3  100% 3.0K 110    0    0    0    0   23    0    0    0    0   30K
-    Play#0 output Play#0 1     35.30
+    Play#0 output Play#0 1     28.33
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  85   55%  41K 1.0K   0    0    0  6.7K 5.2K 249    0    1    0  287K
     Play#0 output Play#0 1
@@ -6222,25 +6222,25 @@
     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  32   73%  17K  52    0    0    0  7.6K 1.7K 619    0    1    0   19K
-    Play#0 output Play#0 1    236.81
+    Play#0 output Play#0 1    158.54
     Play#0 output Play#0 1         8  29   21% 5.1K 110    0    0    0  2.4K 1.8K   0    0    0    0   30K
-    Play#0 output Play#0 1     74.54
+    Play#0 output Play#0 1     61.00
     Play#0 output Play#0 1         6   3  100% 3.0K 110    0    0    0    0  404    0    0    0    0   31K
-    Play#0 output Play#0 1     42.77
+    Play#0 output Play#0 1     35.53
     Play#0 output Play#0 1         3   3  100% 3.0K 110    0    0    0    0  376    0    0    0    0   31K
-    Play#0 output Play#0 1     42.44
+    Play#0 output Play#0 1     35.19
     Play#0 output Play#0 1         5   3  100% 3.0K 110    0    0    0    0  361    0    0    0    0   31K
-    Play#0 output Play#0 1     42.27
+    Play#0 output Play#0 1     35.02
     Play#0 output Play#0 1         7   3  100% 3.0K 110    0    0    0    0  348    0    0    0    0   31K
-    Play#0 output Play#0 1     42.11
+    Play#0 output Play#0 1     34.86
     Play#0 output Play#0 1         4   3  100% 3.0K 110    0    0    0    0  306    0    0    0    0   31K
-    Play#0 output Play#0 1     41.62
+    Play#0 output Play#0 1     34.36
     Play#0 output Play#0 1        10   3  100% 3.0K 110    0    0    0    0  225    0    0    0    0   31K
-    Play#0 output Play#0 1     40.67
+    Play#0 output Play#0 1     33.43
     Play#0 output Play#0 1         2   3  100% 3.0K 110    0    0    0    0   53    0    0    0    0   31K
-    Play#0 output Play#0 1     38.65
+    Play#0 output Play#0 1     31.39
     Play#0 output Play#0 1         9   3  100% 3.0K 110    0    0    0    0   23    0    0    0    0   31K
-    Play#0 output Play#0 1     38.30
+    Play#0 output Play#0 1     31.04
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  85   63%  46K 1.0K   0    0    0   10K 5.6K 619    0    1    0  295K
     Play#0 output Play#0 1
@@ -7145,25 +7145,25 @@
     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   87%  22K  52    0    0    0  8.7K 2.5K 788    0    1    0   19K
-    Play#0 output Play#0 1    343.50
+    Play#0 output Play#0 1    224.53
     Play#0 output Play#0 1         8  29   28% 6.7K 110    0    0    0  5.0K 2.3K   0    0    0    0   30K
-    Play#0 output Play#0 1    100.24
+    Play#0 output Play#0 1     82.11
     Play#0 output Play#0 1         6   3  100% 3.0K 110    0    0    0    0  404    0    0    0    0   32K
-    Play#0 output Play#0 1     46.53
+    Play#0 output Play#0 1     39.00
     Play#0 output Play#0 1         3   3  100% 3.0K 110    0    0    0    0  376    0    0    0    0   32K
-    Play#0 output Play#0 1     46.18
+    Play#0 output Play#0 1     38.64
     Play#0 output Play#0 1         5   3  100% 3.0K 110    0    0    0    0  361    0    0    0    0   32K
-    Play#0 output Play#0 1     45.99
+    Play#0 output Play#0 1     38.45
     Play#0 output Play#0 1         7   3  100% 3.0K 110    0    0    0    0  348    0    0    0    0   32K
-    Play#0 output Play#0 1     45.83
+    Play#0 output Play#0 1     38.28
     Play#0 output Play#0 1         4   3  100% 3.0K 110    0    0    0    0  306    0    0    0    0   32K
-    Play#0 output Play#0 1     45.30
+    Play#0 output Play#0 1     37.74
     Play#0 output Play#0 1        10   3  100% 3.0K 110    0    0    0    0  225    0    0    0    0   32K
-    Play#0 output Play#0 1     44.28
+    Play#0 output Play#0 1     36.74
     Play#0 output Play#0 1         2   3  100% 3.0K 110    0    0    0    0   53    0    0    0    0   32K
-    Play#0 output Play#0 1     42.11
+    Play#0 output Play#0 1     34.55
     Play#0 output Play#0 1         9   3  100% 3.0K 110    0    0    0    0   23    0    0    0    0   32K
-    Play#0 output Play#0 1     41.73
+    Play#0 output Play#0 1     34.17
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  86   71%  53K 1.0K   0    0    0   14K 6.9K 788    0    1    0  303K
     Play#0 output Play#0 1
@@ -7949,25 +7949,25 @@
     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   95%  28K  82   51    0    0  9.2K 2.1K 812    0    1    0   23K
-    Play#0 output Play#0 1    456.32
+    Play#0 output Play#0 1    294.61
     Play#0 output Play#0 1         8  29   37% 8.7K 110    0    0    0  7.4K 2.1K 299    0    0    0   31K
-    Play#0 output Play#0 1    130.22
+    Play#0 output Play#0 1    107.72
     Play#0 output Play#0 1         6   3  100% 3.0K 110    0    0    0    0  404    0    0    0    0   33K
-    Play#0 output Play#0 1     50.34
+    Play#0 output Play#0 1     42.61
     Play#0 output Play#0 1         3   3  100% 3.0K 110    0    0    0    0  376    0    0    0    0   33K
-    Play#0 output Play#0 1     49.97
+    Play#0 output Play#0 1     42.21
     Play#0 output Play#0 1         5   3  100% 3.0K 110    0    0    0    0  361    0    0    0    0   33K
-    Play#0 output Play#0 1     49.77
+    Play#0 output Play#0 1     42.01
     Play#0 output Play#0 1         7   3  100% 3.0K 110    0    0    0    0  348    0    0    0    0   33K
-    Play#0 output Play#0 1     49.59
+    Play#0 output Play#0 1     41.83
     Play#0 output Play#0 1         4   3  100% 3.0K 110    0    0    0    0  306    0    0    0    0   33K
-    Play#0 output Play#0 1     49.03
+    Play#0 output Play#0 1     41.25
     Play#0 output Play#0 1        10   3  100% 3.0K 110    0    0    0    0  225    0    0    0    0   33K
-    Play#0 output Play#0 1     47.94
+    Play#0 output Play#0 1     40.18
     Play#0 output Play#0 1         2   3  100% 3.0K 110    0    0    0    0   53    0    0    0    0   33K
-    Play#0 output Play#0 1     45.62
+    Play#0 output Play#0 1     37.84
     Play#0 output Play#0 1         9   3  100% 3.0K 110    0    0    0    0   23    0    0    0    0   33K
-    Play#0 output Play#0 1     45.21
+    Play#0 output Play#0 1     37.43
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  86   77%  61K 1.1K  51    0    0   17K 6.4K 1.1K   0    1    0  314K
     Play#0 output Play#0 1
@@ -8647,25 +8647,25 @@
     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   98%  31K 115  136    4    0  9.5K 1.8K 723    0    4    5   28K
-    Play#0 output Play#0 1    547.04
+    Play#0 output Play#0 1    356.44
     Play#0 output Play#0 1         8  29   43%  11K 110    0    0    0   10K 1.9K 480    0    0    0   32K
-    Play#0 output Play#0 1    164.04
+    Play#0 output Play#0 1    136.15
     Play#0 output Play#0 1         6   3  100% 3.0K 110    0    0    0    0  404    0    0    0    0   33K
-    Play#0 output Play#0 1     54.20
+    Play#0 output Play#0 1     46.35
     Play#0 output Play#0 1         3   3  100% 3.0K 110    0    0    0    0  376    0    0    0    0   33K
-    Play#0 output Play#0 1     53.80
+    Play#0 output Play#0 1     45.93
     Play#0 output Play#0 1         5   3  100% 3.0K 110    0    0    0    0  361    0    0    0    0   33K
-    Play#0 output Play#0 1     53.58
+    Play#0 output Play#0 1     45.71
     Play#0 output Play#0 1         7   3  100% 3.0K 110    0    0    0    0  348    0    0    0    0   33K
-    Play#0 output Play#0 1     53.40
+    Play#0 output Play#0 1     45.52
     Play#0 output Play#0 1         4   3  100% 3.0K 110    0    0    0    0  306    0    0    0    0   33K
-    Play#0 output Play#0 1     52.79
+    Play#0 output Play#0 1     44.89
     Play#0 output Play#0 1        10   3  100% 3.0K 110    0    0    0    0  225    0    0    0    0   33K
-    Play#0 output Play#0 1     51.64
+    Play#0 output Play#0 1     43.76
     Play#0 output Play#0 1         2   3  100% 3.0K 110    0    0    0    0   53    0    0    0    0   33K
-    Play#0 output Play#0 1     49.17
+    Play#0 output Play#0 1     41.27
     Play#0 output Play#0 1         9   3  100% 3.0K 110    0    0    0    0   23    0    0    0    0   33K
-    Play#0 output Play#0 1     48.73
+    Play#0 output Play#0 1     40.84
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide  86   80%  66K 1.1K 136    4    0   20K 5.8K 1.2K   0    4    5  327K
     Play#0 output Play#0 1
@@ -10182,25 +10182,25 @@
     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 147  243    9    0  9.6K 1.5K 608    0    2    4   32K
-    Play#0 output Play#0 1    632.85
+    Play#0 output Play#0 1    421.79
     Play#0 output Play#0 1         8  29   59%  15K 110    0    0    0   12K 1.9K 483    0    0    0   29K
-    Play#0 output Play#0 1    233.54
+    Play#0 output Play#0 1    189.13
     Play#0 output Play#0 1         6   3  100% 3.0K 110    0    0    0    0  404    0    0    0    0   34K
-    Play#0 output Play#0 1     57.96
+    Play#0 output Play#0 1     50.13
     Play#0 output Play#0 1         3   3  100% 3.0K 110    0    0    0    0  376    0    0    0    0   34K
-    Play#0 output Play#0 1     57.54
+    Play#0 output Play#0 1     49.67
     Play#0 output Play#0 1         5   3  100% 3.0K 110    0    0    0    0  361    0    0    0    0   34K
-    Play#0 output Play#0 1     57.31
+    Play#0 output Play#0 1     49.45
     Play#0 output Play#0 1         7   3  100% 3.0K 110    0    0    0    0  348    0    0    0    0   34K
-    Play#0 output Play#0 1     57.11
+    Play#0 output Play#0 1     49.24
     Play#0 output Play#0 1         4   3  100% 3.0K 110    0    0    0    0  306    0    0    0    0   34K
-    Play#0 output Play#0 1     56.48
+    Play#0 output Play#0 1     48.58
     Play#0 output Play#0 1        10   3  100% 3.0K 110    0    0    0    0  225    0    0    0    0   34K
-    Play#0 output Play#0 1     55.25
-    Play#0 output Play#0 1         2  30   10% 3.1K   0    0    0    0    0   53    0    0    0    0   34K
-    Play#0 output Play#0 1     52.23
+    Play#0 output Play#0 1     47.39
     Play#0 output Play#0 1         9   3  100% 3.0K 110    0    0    0    0   23    0    0    0    0   34K
-    Play#0 output Play#0 1     52.19
+    Play#0 output Play#0 1     44.30
+    Play#0 output Play#0 1         2  30   10% 3.1K   0    0    0    0    0   53    0    0    0    0   34K
+    Play#0 output Play#0 1     43.92
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide 113   65%  70K 1.0K 243    9    0   22K 5.4K 1.1K   0    2    4  335K
     Play#0 output Play#0 1
@@ -11340,25 +11340,25 @@
     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 180  372   15    0  9.2K 1.2K 866    0    3    4   39K
-    Play#0 output Play#0 1    750.07
+    Play#0 output Play#0 1    503.66
     Play#0 output Play#0 1         8  29   73%  19K 110    0    0    0   13K 2.1K 365    0    0    0   24K
-    Play#0 output Play#0 1    344.74
+    Play#0 output Play#0 1    268.78
     Play#0 output Play#0 1         2  30   15% 3.7K   0    0    0    0    0  1.1K   0    0    0    0   34K
-    Play#0 output Play#0 1     79.91
+    Play#0 output Play#0 1     70.29
     Play#0 output Play#0 1         6   3  100% 3.0K 110    0    0    0    0  404    0    0    0    0   35K
-    Play#0 output Play#0 1     62.31
+    Play#0 output Play#0 1     54.56
     Play#0 output Play#0 1         3   3  100% 3.0K 110    0    0    0    0  376    0    0    0    0   35K
-    Play#0 output Play#0 1     61.86
+    Play#0 output Play#0 1     54.07
     Play#0 output Play#0 1         5   3  100% 3.0K 110    0    0    0    0  361    0    0    0    0   35K
-    Play#0 output Play#0 1     61.62
+    Play#0 output Play#0 1     53.83
     Play#0 output Play#0 1         7   3  100% 3.0K 110    0    0    0    0  348    0    0    0    0   35K
-    Play#0 output Play#0 1     61.41
+    Play#0 output Play#0 1     53.61
     Play#0 output Play#0 1         4   3  100% 3.0K 110    0    0    0    0  306    0    0    0    0   35K
-    Play#0 output Play#0 1     60.73
+    Play#0 output Play#0 1     52.89
     Play#0 output Play#0 1        10   3  100% 3.0K 110    0    0    0    0  225    0    0    0    0   35K
-    Play#0 output Play#0 1     59.44
+    Play#0 output Play#0 1     51.65
     Play#0 output Play#0 1         9   3  100% 3.0K 110    0    0    0    0   23    0    0    0    0   35K
-    Play#0 output Play#0 1     56.18
+    Play#0 output Play#0 1     48.35
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide 113   70%  75K 1.1K 372   15    0   22K 6.5K 1.2K   0    3    4  344K
     Play#0 output Play#0 1
@@ -12391,25 +12391,25 @@
     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 213  514   22    0  9.1K 849  1.2K   3    5    4   46K
-    Play#0 output Play#0 1    883.35
+    Play#0 output Play#0 1    596.79
     Play#0 output Play#0 1         8  29   91%  25K 110  101    0    0   14K 2.8K 527    0    0    0   21K
-    Play#0 output Play#0 1    507.49
+    Play#0 output Play#0 1    384.57
     Play#0 output Play#0 1         2  30   28% 4.9K   0    0    0    0  1.7K 1.3K 170    0    0    0   35K
-    Play#0 output Play#0 1    105.54
+    Play#0 output Play#0 1     91.81
     Play#0 output Play#0 1         6   3  100% 3.0K 110    0    0    0    0  404    0    0    0    0   36K
-    Play#0 output Play#0 1     66.77
+    Play#0 output Play#0 1     59.25
     Play#0 output Play#0 1         3   3  100% 3.0K 110    0    0    0    0  376    0    0    0    0   36K
-    Play#0 output Play#0 1     66.29
+    Play#0 output Play#0 1     58.72
     Play#0 output Play#0 1         5   3  100% 3.0K 110    0    0    0    0  361    0    0    0    0   36K
-    Play#0 output Play#0 1     66.04
+    Play#0 output Play#0 1     58.47
     Play#0 output Play#0 1         7   3  100% 3.0K 110    0    0    0    0  348    0    0    0    0   36K
-    Play#0 output Play#0 1     65.82
+    Play#0 output Play#0 1     58.23
     Play#0 output Play#0 1         4   3  100% 3.0K 110    0    0    0    0  306    0    0    0    0   36K
-    Play#0 output Play#0 1     65.10
+    Play#0 output Play#0 1     57.47
     Play#0 output Play#0 1        10   3  100% 3.0K 110    0    0    0    0  225    0    0    0    0   36K
-    Play#0 output Play#0 1     63.73
+    Play#0 output Play#0 1     56.16
     Play#0 output Play#0 1         9   3  100% 3.0K 110    0    0    0    0   23    0    0    0    0   36K
-    Play#0 output Play#0 1     60.27
+    Play#0 output Play#0 1     52.66
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide 113   79%  82K 1.1K 615   22    0   25K 7.0K 1.9K   3    5    4  355K
     Play#0 output Play#0 1
@@ -13485,25 +13485,25 @@
     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 235  659   30  994  8.9K 524  1.0K   3    5    4   51K
-    Play#0 output Play#0 1   1009.88
+    Play#0 output Play#0 1    690.02
     Play#0 output Play#0 1         8  29  100%  29K 105  215    5    0   15K 2.5K 541    0    0    0   23K
-    Play#0 output Play#0 1    648.10
+    Play#0 output Play#0 1    485.22
     Play#0 output Play#0 1         2  30   33% 6.3K   0    0    0    0  3.2K 1.2K 523    0    0    0   36K
-    Play#0 output Play#0 1    139.06
+    Play#0 output Play#0 1    122.53
     Play#0 output Play#0 1         6   3  100% 3.0K 110    0    0    0    0  404    0    0    0    0   37K
-    Play#0 output Play#0 1     71.32
+    Play#0 output Play#0 1     64.22
     Play#0 output Play#0 1         3   3  100% 3.0K 110    0    0    0    0  376    0    0    0    0   37K
-    Play#0 output Play#0 1     70.82
+    Play#0 output Play#0 1     63.65
     Play#0 output Play#0 1         5   3  100% 3.0K 110    0    0    0    0  361    0    0    0    0   37K
-    Play#0 output Play#0 1     70.55
+    Play#0 output Play#0 1     63.38
     Play#0 output Play#0 1         7   3  100% 3.0K 110    0    0    0    0  348    0    0    0    0   37K
-    Play#0 output Play#0 1     70.32
+    Play#0 output Play#0 1     63.14
     Play#0 output Play#0 1         4   3  100% 3.0K 110    0    0    0    0  306    0    0    0    0   37K
-    Play#0 output Play#0 1     69.56
+    Play#0 output Play#0 1     62.32
     Play#0 output Play#0 1        10   3  100% 3.0K 110    0    0    0    0  225    0    0    0    0   37K
-    Play#0 output Play#0 1     68.11
+    Play#0 output Play#0 1     60.96
     Play#0 output Play#0 1         9   3  100% 3.0K 110    0    0    0    0   23    0    0    0    0   37K
-    Play#0 output Play#0 1     64.47
+    Play#0 output Play#0 1     57.25
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
     Play#0 output Play#0 1 worldwide 113   82%  87K 1.1K 874   35  994   28K 6.3K 2.1K   3    5    4  370K
     Play#0 output Play#0 1

diff --git a/tests/update/journal.log b/tests/update/journal.log
index 77ab15a8639ab9c1e5ed59b1676f541fe02e3e73..0dbd66a0a778bd46a47f94cdacbebbd22ab70db9 100644 (file)
--- a/tests/update/journal.log
+++ b/tests/update/journal.log
@@ -482,17 +482,17 @@
     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  96   62%  28K 1.2K   0    0    0  2.5K 340  580   21   32   16   25K
-    Play#0 output Play#0 1   1557.40
+    Play#0 output Play#0 1    890.36
+    Play#0 output Play#0 1         2  32   22% 7.1K 1.9K   0    0    0    0    1    5    3    3    3  100
+    Play#0 output Play#0 1    440.95
+    Play#0 output Play#0 1         4  64    8%  25K 1.1K   0    0    0   20K  21  4.0K   0   10   10   25K
+    Play#0 output Play#0 1    284.01
     Play#0 output Play#0 1         3  64   14%  17K 170    0    0    0    0    0    0    0    0    0 -100
-    Play#0 output Play#0 1    451.42
+    Play#0 output Play#0 1    231.59
     Play#0 output Play#0 1         6   8   88% 4.0K 168    0    0    0    0    0    0    3    1    3   25K
-    Play#0 output Play#0 1    417.19
+    Play#0 output Play#0 1    193.20
     Play#0 output Play#0 1         7   8   88% 4.0K 160    0    0    0    0    0    0    0    3    0   25K
-    Play#0 output Play#0 1    407.81
-    Play#0 output Play#0 1         4  64    8%  25K 1.1K   0    0    0   20K  21  4.0K   0   10   10   25K
-    Play#0 output Play#0 1    378.22
-    Play#0 output Play#0 1         2  32   22% 7.1K 1.9K   0    0    0    0    1    5    3    3    3  100
-    Play#0 output Play#0 1    333.05
+    Play#0 output Play#0 1    175.02
     Play#0 output Play#0 1         5   0    0%   0    0    0    0    0    0    0    0    0    0    0   25K
     Play#0 output Play#0 1     60.00
     Play#0 output Play#0 1           ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----

diff --git a/tests/version/journal.log b/tests/version/journal.log
index aabc96af7b102143b2e0fd1985bbc042f6f402b5..ec6813d3a8311b35addc92fe589627278d168c98 100644 (file)
--- a/tests/version/journal.log
+++ b/tests/version/journal.log
@@ -577,20 +577,20 @@
     Play#0 command show
     Play#0 output Play#0 1 item power value sell lbs    packing     melt  item
     Play#0 output Play#0 1 mnem                      in no wh ur bk deno  name
-    Play#0 output Play#0 1   c    100     1   no   1  1 10 10 10 10    4  civilians
+    Play#0 output Play#0 1   c     50     1   no   1  1 10 10 10 10    4  civilians
     Play#0 output Play#0 1   m    100     0  yes   1  1  1  1  1  1   20  military
-    Play#0 output Play#0 1   s     80     5  yes   1  1  1 10  1  1   80  shells
-    Play#0 output Play#0 1   g    400    60  yes  10  1  1 10  1  1  100  guns
-    Play#0 output Play#0 1   p      2     4  yes   1  1  1 10  1  1   50  petrol
+    Play#0 output Play#0 1   s    125     5  yes   1  1  1 10  1  1   80  shells
+    Play#0 output Play#0 1   g    950    60  yes  10  1  1 10  1  1  100  guns
+    Play#0 output Play#0 1   p      7     4  yes   1  1  1 10  1  1   50  petrol
     Play#0 output Play#0 1   i     10     2  yes   1  1  1 10  1  1  100  iron ore
     Play#0 output Play#0 1   d    200    20  yes   5  1  1 10  1  1  100  dust (gold)
-    Play#0 output Play#0 1   b   1000   280  yes  50  1  1  5  1  4  200  bars of gold
+    Play#0 output Play#0 1   b   2500   280  yes  50  1  1  5  1  4  200  bars of gold
     Play#0 output Play#0 1   f      0     0  yes   1  1  1 10  1  1    2  food
-    Play#0 output Play#0 1   o    100     8  yes   1  1  1 10  1  1   50  oil
-    Play#0 output Play#0 1   l    100     2  yes   1  1  1 10  1  1  100  light products
-    Play#0 output Play#0 1   h    200     4  yes   1  1  1 10  1  1  100  heavy products
-    Play#0 output Play#0 1   u      0     1  yes   2  1  1  2  1  1    2  uncompensated workers
-    Play#0 output Play#0 1   r      0   150  yes   8  1  1 10  1  1 1000  radioactive materials
+    Play#0 output Play#0 1   o     50     8  yes   1  1  1 10  1  1   50  oil
+    Play#0 output Play#0 1   l     20     2  yes   1  1  1 10  1  1  100  light products
+    Play#0 output Play#0 1   h     40     4  yes   1  1  1 10  1  1  100  heavy products
+    Play#0 output Play#0 1   u     50     1  yes   2  1  1  2  1  1    2  uncompensated workers
+    Play#0 output Play#0 1   r     50   150  yes   8  1  1 10  1  1 1000  radioactive materials
     Play#0 output Play#0 6 0 640
     Play#0 input show updates
     Play#0 command show
@@ -1452,20 +1452,20 @@
     Play#0 input xdump item *
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP item 0
-    Play#0 output Play#0 1 0 "civilians" "c" 100 1 0 1 1 10 10 10 10 4
+    Play#0 output Play#0 1 0 "civilians" "c" 50 1 0 1 1 10 10 10 10 4
     Play#0 output Play#0 1 1 "military" "m" 100 0 1 1 1 1 1 1 1 20
-    Play#0 output Play#0 1 2 "shells" "s" 80 5 1 1 1 1 10 1 1 80
-    Play#0 output Play#0 1 3 "guns" "g" 400 60 1 10 1 1 10 1 1 100
-    Play#0 output Play#0 1 4 "petrol" "p" 2 4 1 1 1 1 10 1 1 50
+    Play#0 output Play#0 1 2 "shells" "s" 125 5 1 1 1 1 10 1 1 80
+    Play#0 output Play#0 1 3 "guns" "g" 950 60 1 10 1 1 10 1 1 100
+    Play#0 output Play#0 1 4 "petrol" "p" 7 4 1 1 1 1 10 1 1 50
     Play#0 output Play#0 1 5 "iron\\040ore" "i" 10 2 1 1 1 1 10 1 1 100
     Play#0 output Play#0 1 6 "dust\\040(gold)" "d" 200 20 1 5 1 1 10 1 1 100
-    Play#0 output Play#0 1 7 "bars\\040of\\040gold" "b" 1000 280 1 50 1 1 5 1 4 200
+    Play#0 output Play#0 1 7 "bars\\040of\\040gold" "b" 2500 280 1 50 1 1 5 1 4 200
     Play#0 output Play#0 1 8 "food" "f" 0 0 1 1 1 1 10 1 1 2
-    Play#0 output Play#0 1 9 "oil" "o" 100 8 1 1 1 1 10 1 1 50
-    Play#0 output Play#0 1 10 "light\\040products" "l" 100 2 1 1 1 1 10 1 1 100
-    Play#0 output Play#0 1 11 "heavy\\040products" "h" 200 4 1 1 1 1 10 1 1 100
-    Play#0 output Play#0 1 12 "uncompensated\\040workers" "u" 0 1 1 2 1 1 2 1 1 2
-    Play#0 output Play#0 1 13 "radioactive\\040materials" "r" 0 150 1 8 1 1 10 1 1 1000
+    Play#0 output Play#0 1 9 "oil" "o" 50 8 1 1 1 1 10 1 1 50
+    Play#0 output Play#0 1 10 "light\\040products" "l" 20 2 1 1 1 1 10 1 1 100
+    Play#0 output Play#0 1 11 "heavy\\040products" "h" 40 4 1 1 1 1 10 1 1 100
+    Play#0 output Play#0 1 12 "uncompensated\\040workers" "u" 50 1 1 2 1 1 2 1 1 2
+    Play#0 output Play#0 1 13 "radioactive\\040materials" "r" 50 150 1 8 1 1 10 1 1 1000
     Play#0 output Play#0 1 /14
     Play#0 output Play#0 6 0 640
     Play#0 input xdump product *
@@ -2173,20 +2173,20 @@
     Play#1 input xdump item *
     Play#1 command xdump
     Play#1 output Play#1 1 XDUMP item 0
-    Play#1 output Play#1 1 0 "civilians" "c" 100 1 0 1 1 10 10 10 10 4
+    Play#1 output Play#1 1 0 "civilians" "c" 50 1 0 1 1 10 10 10 10 4
     Play#1 output Play#1 1 1 "military" "m" 100 0 1 1 1 1 1 1 1 20
-    Play#1 output Play#1 1 2 "shells" "s" 80 5 1 1 1 1 10 1 1 80
-    Play#1 output Play#1 1 3 "guns" "g" 400 60 1 10 1 1 10 1 1 100
-    Play#1 output Play#1 1 4 "petrol" "p" 2 4 1 1 1 1 10 1 1 50
+    Play#1 output Play#1 1 2 "shells" "s" 125 5 1 1 1 1 10 1 1 80
+    Play#1 output Play#1 1 3 "guns" "g" 950 60 1 10 1 1 10 1 1 100
+    Play#1 output Play#1 1 4 "petrol" "p" 7 4 1 1 1 1 10 1 1 50
     Play#1 output Play#1 1 5 "iron\\040ore" "i" 10 2 1 1 1 1 10 1 1 100
     Play#1 output Play#1 1 6 "dust\\040(gold)" "d" 200 20 1 5 1 1 10 1 1 100
-    Play#1 output Play#1 1 7 "bars\\040of\\040gold" "b" 1000 280 1 50 1 1 5 1 4 200
+    Play#1 output Play#1 1 7 "bars\\040of\\040gold" "b" 2500 280 1 50 1 1 5 1 4 200
     Play#1 output Play#1 1 8 "food" "f" 0 0 1 1 1 1 10 1 1 2
-    Play#1 output Play#1 1 9 "oil" "o" 100 8 1 1 1 1 10 1 1 50
-    Play#1 output Play#1 1 10 "light\\040products" "l" 100 2 1 1 1 1 10 1 1 100
-    Play#1 output Play#1 1 11 "heavy\\040products" "h" 200 4 1 1 1 1 10 1 1 100
-    Play#1 output Play#1 1 12 "uncompensated\\040workers" "u" 0 1 1 2 1 1 2 1 1 2
-    Play#1 output Play#1 1 13 "radioactive\\040materials" "r" 0 150 1 8 1 1 10 1 1 1000
+    Play#1 output Play#1 1 9 "oil" "o" 50 8 1 1 1 1 10 1 1 50
+    Play#1 output Play#1 1 10 "light\\040products" "l" 20 2 1 1 1 1 10 1 1 100
+    Play#1 output Play#1 1 11 "heavy\\040products" "h" 40 4 1 1 1 1 10 1 1 100
+    Play#1 output Play#1 1 12 "uncompensated\\040workers" "u" 50 1 1 2 1 1 2 1 1 2
+    Play#1 output Play#1 1 13 "radioactive\\040materials" "r" 50 150 1 8 1 1 10 1 1 1000
     Play#1 output Play#1 1 /14
     Play#1 output Play#1 6 0 0
     Play#1 input xdump product *