update: Reorder unit building and maintenance for fairness

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

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

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

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

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

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

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

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

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

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-07-10 23:08:57 +02:00
parent 70f69640e1
commit c5df505c98
11 changed files with 152 additions and 173 deletions

View file

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