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

fairland: Make planned island sizes fair

Browse source 
The previous two commits put the same number of islands closest to
each continent.  This one makes their planned sizes match: instead of
rolling dice separately for each island's size, we roll dice only for
the first continent's islands.  The other continent's islands get the
same sizes.

Actual island sizes still differ when islands can't be grown to their
planned size.  To be addressed next.

fairland-test needs a tweak to avoid loss of test coverage.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-08-11 15:39:31 +02:00
parent 00bfeb833e
commit ae988c00ba
11 changed files with 3891 additions and 3893 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/util/fairland.c
View file

@ -67,8 +67,10 @@
* in one such sphere, and each sphere contains the same number of
* islands.
*
* Place and grow islands in spheres in turn. Place the first sector
* randomly, pick an island size, then grow the island to that size.
* Pick an island size, then place and grow one island of that size in
* each sphere. Place the first sector randomly, then grow the island
* to the intended size. Repeat until the specified number of islands
* has been grown.
*
* If placement fails due to lack of room, start over, just like for
* continents.
@ -1122,13 +1124,15 @@ grow_islands(void)
for (c = nc; c < nc + ni; ++c) {
isecs[c] = 0;
if (c % nc == 0)
isiz = roll(is) + roll0(is);
assert(isiz > 0);
if (!place_island(c)) {
qprint("\nNo room for island #%d", c - nc + 1);
break;
}
isiz = roll(is) + roll0(is);
for (secs = 1; secs < isiz; secs++) {
if (!grow_one_sector(c)) {
stunted_islands++;