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

update: Make ships produce after eating and building

Browse source 
People in sectors first eat, then build the sector, then produce.
People in ships produce, eat, then build.

The starvation command can be off for fishing vessels, because it
doesn't consider the food they produce.

Change ships to match sectors.  "Fixes" starvation.  Fishing boats and
oil derricks being repaired at sea become a bit more productive.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-21 22:25:20 +02:00
parent da14a03231
commit 391778e09c
7 changed files with 88 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/smoke/final.xdump
View file

@ -1030,7 +1030,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
0 1 18 -12 6 100 127 0 0 0 0 none 0 "" 0 25 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 10 -14 1 () ""
1 1 10 -14 2 100 127 0 31 0 0 none 0 "" 300 25 0 0 0 0 0 0 0 0 100 100 0 0 healthy 0 0 "" 10 -14 1 () ""
2 1 10 -14 15 100 127 0 44 0 0 none 0 "" 30 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 10 -14 1 () ""
3 1 11 -13 8 100 127 0 51 0 0 none 0 "" 990 0 0 0 0 0 0 0 0 450 0 0 0 0 healthy 0 0 "" 10 -14 1 () ""
3 1 11 -13 8 100 127 0 51 0 0 none 0 "" 990 0 0 0 0 0 0 0 0 449 0 0 0 0 healthy 0 0 "" 10 -14 1 () ""
4 1 11 -13 1 100 127 0 51 0 0 none 0 "" 300 0 0 0 0 0 0 0 900 0 0 0 0 0 healthy 0 0 "" 10 -14 1 () ""
49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
/config

4
tests/smoke/journal.log
View file

@ -13946,7 +13946,7 @@
Play#0 output Play#0 1 0 1 18 -12 6 100 127 0 0 0 0 0 0 "" 0 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 10 -14 1 0 ""
Play#0 output Play#0 1 1 1 10 -14 2 100 127 0 31 0 0 0 0 "" 300 25 0 0 0 0 0 0 0 0 100 100 0 0 0 0 0 "" 10 -14 1 0 ""
Play#0 output Play#0 1 2 1 10 -14 15 100 127 0 44 0 0 0 0 "" 30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 10 -14 1 0 ""
Play#0 output Play#0 1 3 1 11 -13 8 100 127 0 51 0 0 0 0 "" 990 0 0 0 0 0 0 0 0 450 0 0 0 0 0 0 0 "" 10 -14 1 0 ""
Play#0 output Play#0 1 3 1 11 -13 8 100 127 0 51 0 0 0 0 "" 990 0 0 0 0 0 0 0 0 449 0 0 0 0 0 0 0 "" 10 -14 1 0 ""
Play#0 output Play#0 1 4 1 11 -13 1 100 127 0 51 0 0 0 0 "" 300 0 0 0 0 0 0 0 900 0 0 0 0 0 0 0 0 "" 10 -14 1 0 ""
Play#0 output Play#0 1 /5
Play#0 output Play#0 6 0 640
@ -14096,7 +14096,7 @@
Play#1 output Play#1 1 0 1 13 1 6 100 127 0 0 -5 13 0 0 "" 0 25 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 0 ""
Play#1 output Play#1 1 1 1 5 -1 2 100 127 0 31 -5 13 0 0 "" 300 25 0 0 0 0 0 0 0 0 100 100 0 0 0 "" 0 ""
Play#1 output Play#1 1 2 1 5 -1 15 100 127 0 44 -5 13 0 0 "" 30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 0 ""
Play#1 output Play#1 1 3 1 6 0 8 100 127 0 51 -5 13 0 0 "" 990 0 0 0 0 0 0 0 0 450 0 0 0 0 0 "" 0 ""
Play#1 output Play#1 1 3 1 6 0 8 100 127 0 51 -5 13 0 0 "" 990 0 0 0 0 0 0 0 0 449 0 0 0 0 0 "" 0 ""
Play#1 output Play#1 1 4 1 6 0 1 100 127 0 51 -5 13 0 0 "" 300 0 0 0 0 0 0 0 900 0 0 0 0 0 0 "" 0 ""
Play#1 output Play#1 1 /5
Play#1 output Play#1 6 0 640