empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

budget: Track ship, plane, land unit expenses in nat_budget[]

Browse source 
Extend struct budget member bm[] to cover ships, planes and land
units, too.

Plane maintenance changes because pilot pay is now consistently
rounded down.  Before it was rounded down for broke countries, else
up.  The stock game's pilots earn a little less than $25, and solvent
countries save $1 per plane.  The rounding doesn't make much sense
either way.  To be be addressed in a later commit.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-18 17:00:16 +02:00
parent 16f9a393c4
commit 2eb08f40c7
10 changed files with 148 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

36
tests/update/journal.log
View file

@ -36,18 +36,18 @@
Play#1 output Play#1 1 Ship building 10 ships 1519
Play#1 output Play#1 1 Ship maintenance 32 ships 2202
Play#1 output Play#1 1 Plane building 13 planes 1924
Play#1 output Play#1 1 Plane maintenance 20 planes 1004
Play#1 output Play#1 1 Plane maintenance 20 planes 984
Play#1 output Play#1 1 Unit building 6 units 2300
Play#1 output Play#1 1 Unit maintenance 16 units 510
Play#1 output Play#1 1 Sector building 40 sectors 774
Play#1 output Play#1 1 Sector maintenance 2 sectors 120
Play#1 output Play#1 1 Military payroll 1164 mil, 0 res 5777
Play#1 output Play#1 1 Total expenses.....................................................24647
Play#1 output Play#1 1 Total expenses.....................................................24627
Play#1 output Play#1 1 Income from taxes 26911 civs, 9007 uws +12625
Play#1 output Play#1 1 Total income......................................................+12625
Play#1 output Play#1 1 Balance forward 25000
Play#1 output Play#1 1 Estimated delta -12022
Play#1 output Play#1 1 Estimated new treasury.............................................12978
Play#1 output Play#1 1 Estimated delta -12002
Play#1 output Play#1 1 Estimated new treasury.............................................12998
Play#1 output Play#1 6 0 99
Play#1 input neweff * ?newd#-
Play#1 command neweff
@ -229,19 +229,19 @@
Play#2 output Play#2 1 Ship building 2 ships 450
Play#2 output Play#2 1 Ship maintenance 3 ships 90
Play#2 output Play#2 1 Plane building 1 plane 360
Play#2 output Play#2 1 Plane maintenance 3 planes 147
Play#2 output Play#2 1 Plane maintenance 3 planes 144
Play#2 output Play#2 1 Unit building 1 unit 450
Play#2 output Play#2 1 Unit maintenance 3 units 90
Play#2 output Play#2 1 Sector building 26 sectors 209
Play#2 output Play#2 1 Sector maintenance 5 sectors 300
Play#2 output Play#2 1 Military payroll 1900 mil, 1000 res 9994
Play#2 output Play#2 1 Total expenses.....................................................12390
Play#2 output Play#2 1 Total expenses.....................................................12387
Play#2 output Play#2 1 Income from taxes 6800 civs, 4000 uws +1076
Play#2 output Play#2 1 Income from bars 400 bars +2865
Play#2 output Play#2 1 Total income.......................................................+3941
Play#2 output Play#2 1 Balance forward 100
Play#2 output Play#2 1 Estimated delta -8449
Play#2 output Play#2 1 Estimated new treasury.............................................-8349
Play#2 output Play#2 1 Estimated delta -8446
Play#2 output Play#2 1 Estimated new treasury.............................................-8346
Play#2 output Play#2 1 After processsing sectors, you will be broke!
Play#2 output Play#2 1 Sectors will not produce, distribute, or deliver!
Play#2 output Play#2 1
@ -390,16 +390,16 @@
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 maintenance 3 planes 147
Play#6 output Play#6 1 Plane maintenance 3 planes 144
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 831
Play#6 output Play#6 1 Total expenses......................................................1668
Play#6 output Play#6 1 Total expenses......................................................1665
Play#6 output Play#6 1 Income from taxes 4000 civs, 0 uws +1750
Play#6 output Play#6 1 Total income.......................................................+1750
Play#6 output Play#6 1 Balance forward 25000
Play#6 output Play#6 1 Estimated delta +82
Play#6 output Play#6 1 Estimated new treasury.............................................25082
Play#6 output Play#6 1 Estimated delta +85
Play#6 output Play#6 1 Estimated new treasury.............................................25085
Play#6 output Play#6 6 0 99
Play#6 input ctld
Play#6 output Play#6 1 Bye-bye
@ -532,8 +532,8 @@
Play#0 output Play#0 1 78 happiness, 178 education produced
Play#0 output Play#0 1 total pop was 28106, yielding 14.19 hap, 24.57 edu
Play#0 output Play#0 1 3.4330 tech, 3.3939 research produced
Play#0 output Play#0 1 Army delta $-2810, Navy delta $-3721, Air force delta $-2568
Play#0 output Play#0 1 money delta was $-11662 for this update
Play#0 output Play#0 1 Army delta $-2810, Navy delta $-3721, Air force delta $-2548
Play#0 output Play#0 1 money delta was $-11642 for this update
Play#0 output Play#0 6 0 640
Play#0 input nation 1
Play#0 command nation
@ -541,7 +541,7 @@
Play#0 output Play#0 1 (#1) 1 Nation Report Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 Nation status is ACTIVE Bureaucratic Time Units: 640
Play#0 output Play#0 1 100% eff capital at 0,0 has 650 civilians & 2 military
Play#0 output Play#0 1 The treasury has $13338.00 Military reserves: 0
Play#0 output Play#0 1 The treasury has $13358.00 Military reserves: 0
Play#0 output Play#0 1 Education.......... 21.09 Happiness....... 12.33
Play#0 output Play#0 1 Technology.........102.79 Research........ 3.37
Play#0 output Play#0 1 Technology factor : 50.46% Plague factor : 1.96%
@ -1692,8 +1692,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.7165 technology (0.0000 + 1.7165), 1.6969 research (0.0000 + 1.6969) produced
Play#0 output Play#0 1 Army delta $-240, Navy delta $-540, Air force delta $-267
Play#0 output Play#0 1 money delta was $-188 for this update
Play#0 output Play#0 1 Army delta $-240, Navy delta $-540, Air force delta $-264
Play#0 output Play#0 1 money delta was $-185 for this update
Play#0 output Play#0 6 0 640
Play#0 input nation 6
Play#0 command nation
@ -1701,7 +1701,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 $24812.00 Military reserves: 0
Play#0 output Play#0 1 The treasury has $24815.00 Military reserves: 0
Play#0 output Play#0 1 Education.......... 15.24 Happiness....... 4.44
Play#0 output Play#0 1 Technology.........101.08 Research........ 1.69
Play#0 output Play#0 1 Technology factor : 50.18% Plague factor : 1.98%