From d48851c0ac7f077e12bfd623d84416677b443f8e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 27 May 2016 19:58:58 +0200 Subject: [PATCH] power: Saner power value for tech, particularly at low tech In the old times, power didn't consider tech at all. Chainsaw's option NEWPOWER (mandatory since v4.2.14, on by default before) changed this dramatically: the power factor gets multiplied by max(1, tech) / 500. In the early game, small absolute tech differences yield large power factor differences. For instance, if country A has tech level 10, and B has 5, then A gets a factor two boost. As the game progresses, tech differences between viable countries tend to grow, but only slowly. The influence on power diminishes. For instance, if C has tech level 270 and D has 240 (quite a respectable tech lead), then C gets a modest 1.125x boost over D. Change the factor to (20 + tech) / 500. Now A's advantage is only 1.2, and C's is 1.115. You might think that's rather low. However, tech is not power unless you project it, and then it manifests itself as sectors, population and other stuff power counts. The same tech term occurs in plane power, except with just tech instead of max(1, tech) . Change it there as well, for consistency. Signed-off-by: Markus Armbruster --- info/power.t | 6 +- src/lib/commands/powe.c | 4 +- tests/smoke/journal.log | 340 +++++++++++++++++++-------------------- tests/update/journal.log | 16 +- 4 files changed, 183 insertions(+), 183 deletions(-) diff --git a/info/power.t b/info/power.t index 471e6f24..3f5b3ae8 100644 --- a/info/power.t +++ b/info/power.t @@ -72,7 +72,7 @@ power factor = ( power value of money + power value of commodities in sectors + power value of ships, planes and land units + power value of commodities loaded on ships and land units) - * nation tech level / 500 + * (20 + nation tech level) / 500 .FI .s1 The power value of money is dollars / 100. @@ -82,8 +82,8 @@ The power value of a sector is efficiency / 10. 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 * nation tech -level / 500. +The power value of a plane is 20 * efficiency / 100 * (20 + nation +tech level) / 500. .s1 The power value of commodities is civilians / 10 + military / 10 + shells / 12.5 + guns / 2.5 + petrol / 500 + iron / 100 + dust / 5 + diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c index 7b6e074e..707300cc 100644 --- a/src/lib/commands/powe.c +++ b/src/lib/commands/powe.c @@ -274,7 +274,7 @@ gen_power(struct powstr *powbuf, int save) pow->p_planes += 1.0; natp = getnatp(plane.pln_own); pow->p_power += 20 * (plane.pln_effic / 100.0) * - (natp->nat_level[NAT_TLEV] / 500.0); + (20 + natp->nat_level[NAT_TLEV]) / 500.0; } for (i = 1; NULL != (natp = getnatp(i)); i++) { pow = &powbuf[i]; @@ -290,7 +290,7 @@ gen_power(struct powstr *powbuf, int save) pow->p_power += pow->p_sects * (pow->p_effic / pow->p_sects / 100.0) * 10.0; - pow->p_power *= MAX(1.0, natp->nat_level[NAT_TLEV]) / 500.0; + pow->p_power *= (20 + natp->nat_level[NAT_TLEV]) / 500.0; /* ack. add this vec to the "world power" element */ f_pt2 = &powbuf[0].p_sects; f_ptr = &pow->p_sects; diff --git a/tests/smoke/journal.log b/tests/smoke/journal.log index fb541f14..56130b2d 100644 --- 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 0.96 + Play#0 output Play#0 1 19.24 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 0.96 + Play#0 output Play#0 1 19.24 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 0.96 + Play#0 output Play#0 1 19.24 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 0.96 + Play#0 output Play#0 1 19.24 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 0.96 + Play#0 output Play#0 1 19.24 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 0.96 + Play#0 output Play#0 1 19.24 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 0.96 + Play#0 output Play#0 1 19.24 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 0.96 + Play#0 output Play#0 1 19.24 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 0.96 + Play#0 output Play#0 1 19.24 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 0.95 + Play#0 output Play#0 1 19.02 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 1.14 + Play#0 output Play#0 1 22.70 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 1.06 + Play#0 output Play#0 1 21.11 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 1.05 + Play#0 output Play#0 1 21.09 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 1.05 + Play#0 output Play#0 1 21.07 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 1.05 + Play#0 output Play#0 1 21.07 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 1.05 + Play#0 output Play#0 1 21.05 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 1.05 + Play#0 output Play#0 1 21.00 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 1.05 + Play#0 output Play#0 1 20.93 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 1.04 + Play#0 output Play#0 1 20.75 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 1.04 + Play#0 output Play#0 1 20.71 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 1.37 + Play#0 output Play#0 1 27.36 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 1.14 + Play#0 output Play#0 1 22.74 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 1.14 + Play#0 output Play#0 1 22.72 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 1.13 + Play#0 output Play#0 1 22.63 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 1.13 + Play#0 output Play#0 1 22.61 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 1.13 + Play#0 output Play#0 1 22.54 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 1.12 + Play#0 output Play#0 1 22.38 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 1.11 + Play#0 output Play#0 1 22.12 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 1.07 + Play#0 output Play#0 1 21.46 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 1.07 + Play#0 output Play#0 1 21.36 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 1.75 + Play#0 output Play#0 1 35.01 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 1.22 + Play#0 output Play#0 1 24.31 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 1.21 + Play#0 output Play#0 1 24.29 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 1.21 + Play#0 output Play#0 1 24.12 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 1.21 + Play#0 output Play#0 1 24.10 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 1.20 + Play#0 output Play#0 1 23.99 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 1.19 + Play#0 output Play#0 1 23.72 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 1.16 + Play#0 output Play#0 1 23.29 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 1.11 + Play#0 output Play#0 1 22.22 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 1.10 + Play#0 output Play#0 1 22.06 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 2.13 + 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 1.28 + Play#0 output Play#0 1 25.66 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 1.28 + Play#0 output Play#0 1 25.65 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 1.27 + Play#0 output Play#0 1 25.43 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 1.27 + Play#0 output Play#0 1 25.38 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 1.26 + Play#0 output Play#0 1 25.25 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 1.25 + Play#0 output Play#0 1 24.95 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 1.22 + Play#0 output Play#0 1 24.37 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 1.15 + Play#0 output Play#0 1 23.08 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 1.14 + Play#0 output Play#0 1 22.86 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 8.30 + Play#0 output Play#0 1 58.31 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 2.23 + Play#0 output Play#0 1 29.09 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 2.23 + Play#0 output Play#0 1 29.07 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 2.21 + Play#0 output Play#0 1 28.82 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 2.20 + Play#0 output Play#0 1 28.74 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 2.19 + Play#0 output Play#0 1 28.59 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 2.17 + Play#0 output Play#0 1 28.27 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 2.11 + Play#0 output Play#0 1 27.57 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 2.00 + Play#0 output Play#0 1 26.08 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 1.98 + Play#0 output Play#0 1 25.81 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 21.22 + Play#0 output Play#0 1 81.06 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 4.98 + Play#0 output Play#0 1 33.09 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 4.98 + Play#0 output Play#0 1 33.05 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 4.94 + Play#0 output Play#0 1 32.82 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 4.92 + Play#0 output Play#0 1 32.67 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 4.90 + Play#0 output Play#0 1 32.56 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 4.84 + Play#0 output Play#0 1 32.17 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 4.73 + Play#0 output Play#0 1 31.40 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 4.49 + Play#0 output Play#0 1 29.78 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 4.44 + Play#0 output Play#0 1 29.49 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 39.86 + Play#0 output Play#0 1 112.67 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 7.83 + Play#0 output Play#0 1 36.42 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 7.79 + Play#0 output Play#0 1 36.25 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 7.73 + Play#0 output Play#0 1 35.97 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 7.70 + Play#0 output Play#0 1 35.82 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 7.67 + Play#0 output Play#0 1 35.68 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 7.58 + Play#0 output Play#0 1 35.26 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 7.40 + Play#0 output Play#0 1 34.43 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 7.02 + Play#0 output Play#0 1 32.68 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 6.96 + Play#0 output Play#0 1 32.37 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 70.60 + Play#0 output Play#0 1 165.93 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 15.53 + Play#0 output Play#0 1 57.47 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 10.67 + Play#0 output Play#0 1 39.48 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 10.59 + Play#0 output Play#0 1 39.18 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 10.54 + Play#0 output Play#0 1 39.01 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 10.50 + Play#0 output Play#0 1 38.87 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 10.38 + Play#0 output Play#0 1 38.41 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 10.14 + Play#0 output Play#0 1 37.52 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 9.63 + Play#0 output Play#0 1 35.64 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 9.54 + Play#0 output Play#0 1 35.30 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 114.51 + Play#0 output Play#0 1 237.26 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 23.71 + Play#0 output Play#0 1 74.54 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 13.60 + Play#0 output Play#0 1 42.77 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 13.50 + Play#0 output Play#0 1 42.44 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 13.44 + Play#0 output Play#0 1 42.27 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 13.40 + Play#0 output Play#0 1 42.11 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 13.24 + Play#0 output Play#0 1 41.62 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 12.94 + Play#0 output Play#0 1 40.67 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 12.30 + Play#0 output Play#0 1 38.65 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 12.18 + Play#0 output Play#0 1 38.30 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 184.23 + Play#0 output Play#0 1 344.05 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 36.65 + Play#0 output Play#0 1 100.24 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 17.01 + Play#0 output Play#0 1 46.53 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 16.88 + Play#0 output Play#0 1 46.18 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 16.82 + Play#0 output Play#0 1 45.99 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 16.76 + Play#0 output Play#0 1 45.83 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 16.56 + Play#0 output Play#0 1 45.30 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 16.19 + Play#0 output Play#0 1 44.28 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 15.40 + Play#0 output Play#0 1 42.11 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 15.26 + Play#0 output Play#0 1 41.73 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 264.16 + Play#0 output Play#0 1 456.98 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 52.94 + Play#0 output Play#0 1 130.22 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 20.47 + Play#0 output Play#0 1 50.34 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 20.31 + Play#0 output Play#0 1 49.97 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 20.23 + Play#0 output Play#0 1 49.77 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 20.16 + Play#0 output Play#0 1 49.59 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 19.93 + Play#0 output Play#0 1 49.03 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 19.49 + Play#0 output Play#0 1 47.94 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 18.54 + Play#0 output Play#0 1 45.62 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 18.38 + Play#0 output Play#0 1 45.21 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 335.85 + Play#0 output Play#0 1 547.82 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 72.51 + Play#0 output Play#0 1 164.04 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 23.96 + Play#0 output Play#0 1 54.20 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 23.78 + Play#0 output Play#0 1 53.80 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 23.69 + Play#0 output Play#0 1 53.58 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 23.60 + Play#0 output Play#0 1 53.40 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 23.34 + Play#0 output Play#0 1 52.79 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 22.82 + Play#0 output Play#0 1 51.64 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 21.73 + Play#0 output Play#0 1 49.17 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 21.54 + Play#0 output Play#0 1 48.73 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 415.36 + Play#0 output Play#0 1 634.16 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 122.41 + Play#0 output Play#0 1 233.54 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 27.35 + Play#0 output Play#0 1 57.96 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 27.15 + Play#0 output Play#0 1 57.54 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 27.05 + Play#0 output Play#0 1 57.31 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 26.95 + Play#0 output Play#0 1 57.11 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 26.65 + Play#0 output Play#0 1 56.48 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 26.07 + 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 24.65 + Play#0 output Play#0 1 52.23 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 24.63 + Play#0 output Play#0 1 52.19 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 520.25 + Play#0 output Play#0 1 752.06 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 205.55 + Play#0 output Play#0 1 344.74 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 40.18 + Play#0 output Play#0 1 79.91 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 31.33 + Play#0 output Play#0 1 62.31 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 31.11 + Play#0 output Play#0 1 61.86 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 30.98 + Play#0 output Play#0 1 61.62 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 30.88 + Play#0 output Play#0 1 61.41 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 30.54 + Play#0 output Play#0 1 60.73 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 29.89 + Play#0 output Play#0 1 59.44 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 28.25 + Play#0 output Play#0 1 56.18 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 639.37 + Play#0 output Play#0 1 886.30 Play#0 output Play#0 1 8 29 91% 25K 110 101 0 0 14K 2.8K 527 0 0 0 21K - Play#0 output Play#0 1 329.62 + Play#0 output Play#0 1 507.49 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 55.97 + Play#0 output Play#0 1 105.54 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 35.41 + Play#0 output Play#0 1 66.77 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 35.16 + Play#0 output Play#0 1 66.29 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 35.02 + Play#0 output Play#0 1 66.04 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 34.91 + Play#0 output Play#0 1 65.82 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 34.52 + Play#0 output Play#0 1 65.10 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 33.80 + Play#0 output Play#0 1 63.73 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 31.97 + Play#0 output Play#0 1 60.27 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 756.25 + Play#0 output Play#0 1 1014.32 Play#0 output Play#0 1 8 29 100% 29K 105 215 5 0 15K 2.5K 541 0 0 0 23K - Play#0 output Play#0 1 447.37 + Play#0 output Play#0 1 648.10 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 77.17 + Play#0 output Play#0 1 139.06 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 39.58 + Play#0 output Play#0 1 71.32 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 39.30 + Play#0 output Play#0 1 70.82 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 39.15 + Play#0 output Play#0 1 70.55 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 39.02 + Play#0 output Play#0 1 70.32 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 38.60 + Play#0 output Play#0 1 69.56 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 37.80 + Play#0 output Play#0 1 68.11 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 35.77 + Play#0 output Play#0 1 64.47 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 ecbf9cfc..eee9fc55 100644 --- a/tests/update/journal.log +++ b/tests/update/journal.log @@ -482,19 +482,19 @@ 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 1327.68 + Play#0 output Play#0 1 1594.49 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 376.18 + Play#0 output Play#0 1 451.42 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 345.30 + Play#0 output Play#0 1 414.49 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 341.12 - 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 281.89 + Play#0 output Play#0 1 409.34 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 228.61 + Play#0 output Play#0 1 381.02 + 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 338.51 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 50.00 + Play#0 output Play#0 1 60.00 Play#0 output Play#0 1 ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- Play#0 output Play#0 1 worldwide 272 35% 84K 4.7K 0 0 0 22K 362 4.6K 27 49 32 125K Play#0 output Play#0 1