* in one such sphere, and each sphere contains the same number of
* islands with the same sizes.
*
- * Pick an island size, and place one island's first sector into each
- * sphere, randomly. Then add one sector to each island in turn,
+ * First, split the specified number of island sectors per continent
+ * randomly into the island sizes. Sort by size so that larger
+ * islands are grown before smaller ones, to give the large ones the
+ * best chance to grow to their planned size.
+ *
+ * Then place one island's first sector into each sphere, using
+ * weighted random sampling with weights favoring sectors away from
+ * land and other spheres. Add one sector to each island in turn,
* until they have the intended size. Repeat until the specified
* number of islands has been grown.
*
*
* Growing works as for continents, except the minimum distance for
* additional islands applies, and growing simply stops when any of
- * the islands being grown lacks the room to grow further.
+ * the islands being grown lacks the room to grow further. The number
+ * of sectors not grown carries over to the next island size.
*
* 4. Compute elevation
*
/*
* Closest continent and "distance"
* closest[XYOFFSET(x, y)] is the closest continent's number.
- * distance[] is complicated; see init_spheres_of_influence().
+ * distance[] is complicated; see init_spheres_of_influence() and
+ * init_distance_to_coast().
*/
static natid *closest;
static unsigned short *distance;
static int **elev; /* elevation of the sectors */
static int **sectx, **secty; /* the sectors for each continent */
-static int **sectc; /* which sectors are on the coast? */
static int *weight; /* used for placing mountains */
static int *dsea, *dmoun; /* the dist to the ocean and mountain */
static int stable(int);
static void elevate_land(void);
static void elevate_sea(void);
-static void set_coastal_flags(void);
static void print_vars(void);
static void fl_move(int);
}
sectx = calloc(nc + ni, sizeof(int *));
secty = calloc(nc + ni, sizeof(int *));
- sectc = calloc(nc + ni, sizeof(int *));
isecs = calloc(nc + ni, sizeof(int));
weight = calloc(MAX(sc, is * 2), sizeof(int));
dsea = calloc(MAX(sc, is * 2), sizeof(int));
for (i = 0; i < nc; ++i) {
sectx[i] = calloc(sc, sizeof(int));
secty[i] = calloc(sc, sizeof(int));
- sectc[i] = calloc(sc, sizeof(int));
}
for (i = nc; i < nc + ni; ++i) {
sectx[i] = calloc(is * 2, sizeof(int));
secty[i] = calloc(is * 2, sizeof(int));
- sectc[i] = calloc(is * 2, sizeof(int));
}
}
GROW THE CONTINENTS
****************************************************************************/
-/* Look for a coastal sector of continent c
-*/
-
-static void
-find_coast(int c)
+static int
+is_coastal(int x, int y)
{
- int i, dir, nx, ny;
-
- for (i = 0; i < isecs[c]; ++i) {
- sectc[c][i] = 0;
- for (dir = DIR_FIRST; dir <= DIR_LAST; dir++) {
- nx = new_x(sectx[c][i] + diroff[dir][0]);
- ny = new_y(secty[c][i] + diroff[dir][1]);
- if (own[nx][ny] == -1)
- sectc[c][i] = 1;
- }
- }
+ return adj_land[XYOFFSET(x, y)]
+ != (1u << (DIR_LAST + 1)) - (1u << DIR_FIRST);
}
struct hexagon_iter {
int i;
for (i = 0; i < isecs[c]; i++) {
- if (sectc[c][i])
+ if (is_coastal(sectx[c][i], secty[c][i]))
bfs_enqueue(c, sectx[c][i], secty[c][i], 0);
}
}
+/*
+ * Enqueue spheres of influence borders for breadth-first search.
+ */
+static void
+bfs_enqueue_border(void)
+{
+ int x, y, off, dir, nx, ny, noff;
+
+ for (y = 0; y < WORLD_Y; y++) {
+ for (x = y % 2; x < WORLD_X; x += 2) {
+ off = XYOFFSET(x, y);
+ if (distance[off] <= id + 1)
+ continue;
+ if (closest[off] == (natid)-1)
+ continue;
+ for (dir = DIR_FIRST; dir <= DIR_LAST; dir++) {
+ nx = new_x(x + diroff[dir][0]);
+ ny = new_y(y + diroff[dir][1]);
+ noff = XYOFFSET(nx, ny);
+ if (closest[noff] != closest[off]) {
+ bfs_enqueue(closest[off], x, y, id + 1);
+ break;
+ }
+ }
+ }
+ }
+}
+
/*
* Compute spheres of influence
* A continent's sphere of influence is the set of sectors closer to
* it than to any other continent.
* Set closest[XYOFFSET(x, y)] to the closest continent's number,
* -1 if no single continent is closest.
- * Set distance[XYOFFSET(x, y)] to the distance to the closest coastal
- * land sector.
+ * Set distance[XYOFFSET(x, y)] to the minimum of the distance to the
+ * closest coastal land sector and the distance to just outside the
+ * sphere of influence plus @id. For sea sectors within a continent's
+ * sphere of influence, distance[off] - id is the distance to the
+ * border of the area where additional islands can be placed.
*/
static void
init_spheres_of_influence(void)
for (c = 0; c < nc; c++)
bfs_enqueue_island(c);
bfs_run_queue();
+ bfs_enqueue_border();
+ bfs_run_queue();
+}
+
+/*
+ * Precompute distance to coast
+ * Set distance[XYOFFSET(x, y)] to the distance to the closest coastal
+ * land sector.
+ * Set closest[XYOFFSET(x, y)] to the closest continent's number,
+ * -1 if no single continent is closest.
+ */
+static void
+init_distance_to_coast(void)
+{
+ int c;
+
+ bfs_init();
+ for (c = 0; c < nc + ni; c++)
+ bfs_enqueue_island(c);
+ bfs_run_queue();
}
/*
}
}
- for (c = 0; c < nc; ++c)
- find_coast(c);
-
if (!done)
qprint("Only managed to grow %d out of %d sectors.\n",
secs - 1, sc);
* Return 1 on success, 0 on error.
*/
static int
-place_island(int c)
+place_island(int c, int isiz)
{
- int n, x, y, newx, newy;
+ int n, x, y, d, w, newx, newy;
n = 0;
for (y = 0; y < WORLD_Y; y++) {
for (x = y % 2; x < WORLD_X; x += 2) {
if (can_grow_at(c, x, y)) {
- n++;
- if (!roll0(n)) {
+ d = distance[XYOFFSET(x, y)];
+ assert(d > id);
+ w = (d - id) * (d - id);
+ n += MIN(w, (isiz + 2) / 3);
+ if (roll0(n) < w) {
newx = x;
newy = y;
}
return n;
}
+static int
+int_cmp(const void *a, const void *b)
+{
+ return *(int *)b - *(int *)a;
+}
+
+static int *
+size_islands(void)
+{
+ int n = ni / nc;
+ int *isiz = malloc(n * sizeof(*isiz));
+ int r0, r1, i;
+
+ isiz[0] = n * is;
+ r1 = roll0(is);
+ for (i = 1; i < n; i++) {
+ r0 = r1;
+ r1 = roll0(is);
+ isiz[i] = is + r1 - r0;
+ isiz[0] -= isiz[i];
+ }
+
+ qsort(isiz, n, sizeof(*isiz), int_cmp);
+ return isiz;
+}
+
/*
* Grow the additional islands.
* Return 1 on success, 0 on error.
static int
grow_islands(void)
{
- int n = ni / nc;
- int stunted_islands = 0;
+ int *island_size = size_islands();
int xzone_valid = 0;
+ int carry = 0;
int i, j, c, done, secs, isiz, x, y;
init_spheres_of_influence();
- for (i = 0; i < n; i++) {
+ for (i = 0; i < ni / nc; i++) {
c = nc + i * nc;
if (!xzone_valid)
xzone_init(c);
- isiz = roll(is) + roll0(is);
+ carry += island_size[i];
+ isiz = MIN(2 * is, carry);
for (j = 0; j < nc; j++) {
isecs[c + j] = 0;
- if (!place_island(c + j)) {
+ if (!place_island(c + j, isiz)) {
qprint("\nNo room for island #%d\n", c - nc + j + 1);
+ free(island_size);
return 0;
}
}
xzone_valid = 0;
}
- for (j = 0; j < nc; j++)
- stunted_islands += isecs[c + j] != isiz;
-
for (j = 0; j < nc; j++)
qprint(" %d(%d)", c - nc + j + 1, isecs[c + j]);
+
+ carry -= secs;
}
+ free(island_size);
qprint("\n");
- if (stunted_islands)
- qprint("%d stunted island%s\n",
- stunted_islands, splur(stunted_islands));
-
- for (c = nc; c < nc + ni; c++)
- find_coast(c);
+ if (carry)
+ qprint("Only managed to grow %d out of %d island sectors.\n",
+ is * ni - carry * nc, is * ni);
return 1;
}
static void
create_elevations(void)
{
- int i, j;
-
- for (i = 0; i < WORLD_X; i++) {
- for (j = 0; j < WORLD_Y; j++)
- elev[i][j] = -INFINITE_ELEVATION;
- }
+ init_distance_to_coast();
elevate_land();
elevate_sea();
}
return d;
}
-#define ELEV elev[sectx[c][i]][secty[c][i]]
-#define distance_to_sea() (sectc[c][i]?1:distance_to_what(sectx[c][i], secty[c][i], 0))
#define distance_to_mountain() distance_to_what(sectx[c][i], secty[c][i], 2)
/* Decide where the mountains go
static void
elevate_land(void)
{
- int i, mountain_search, k, c, total, ns, nm, highest, where, h, newk,
- r, dk;
+ int i, off, mountain_search, k, c, total, ns, nm, r, x, y;
+ int highest, where, h, newk, dk;
for (c = 0; c < nc + ni; ++c) {
total = 0;
/* Place the mountains */
for (i = 0; i < ns; ++i) {
- dsea[i] = distance_to_sea();
+ off = XYOFFSET(sectx[c][i], secty[c][i]);
+ dsea[i] = MIN(5, distance[off] + 1);
weight[i] = (total += (dsea[i] * dsea[i]));
}
k && mountain_search < MOUNTAIN_SEARCH_MAX;
++mountain_search) {
r = roll0(total);
- for (i = 0; i < ns; ++i)
- if (r < weight[i] && ELEV == -INFINITE_ELEVATION &&
+ for (i = 0; i < ns; ++i) {
+ x = sectx[c][i];
+ y = secty[c][i];
+ if (r < weight[i] && !elev[x][y] &&
(c >= nc ||
((!(capx[c] == sectx[c][i] &&
capy[c] == secty[c][i])) &&
(!(new_x(capx[c] + 2) == sectx[c][i] &&
capy[c] == secty[c][i]))))) {
- ELEV = INFINITE_ELEVATION;
+ elev[x][y] = INFINITE_ELEVATION;
break;
}
+ }
--k;
}
highest = 0;
where = -1;
for (i = 0; i < ns; ++i) {
- if (ELEV == -INFINITE_ELEVATION &&
+ x = sectx[c][i];
+ y = secty[c][i];
+ if (!elev[x][y] &&
(c >= nc || ((!(capx[c] == sectx[c][i] &&
capy[c] == secty[c][i])) &&
(!(new_x(capx[c] + 2) == sectx[c][i] &&
/* Elevate the mountains and capitals */
for (i = 0; i < ns; ++i) {
- if (ELEV == INFINITE_ELEVATION) {
+ x = sectx[c][i];
+ y = secty[c][i];
+ if (elev[x][y] == INFINITE_ELEVATION) {
if (dsea[i] == 1)
- ELEV = HILLMIN + roll0(PLATMIN - HILLMIN);
+ elev[x][y] = HILLMIN + roll0(PLATMIN - HILLMIN);
else
- ELEV = HIGHMIN + roll0((256 - HIGHMIN) / 2) +
+ elev[x][y] = HIGHMIN + roll0((256 - HIGHMIN) / 2) +
roll0((256 - HIGHMIN) / 2);
} else if (c < nc &&
(((capx[c] == sectx[c][i] && capy[c] == secty[c][i])) ||
((new_x(capx[c] + 2) == sectx[c][i] &&
capy[c] == secty[c][i]))))
- ELEV = PLATMIN;
+ elev[x][y] = PLATMIN;
}
}
}
-#define distance_to_land() distance_to_what(x, y, 1)
-
static void
elevate_sea(void)
{
- int x, y;
+ int x, y, off;
for (y = 0; y < WORLD_Y; ++y) {
for (x = y % 2; x < WORLD_X; x += 2) {
- if (elev[x][y] == -INFINITE_ELEVATION)
- elev[x][y] = -roll(distance_to_land() * 20 + 27);
+ off = XYOFFSET(x, y);
+ if (own[x][y] == -1)
+ elev[x][y] = -roll(MIN(5, distance[off]) * 20 + 27);
}
}
}
sct->sct_type = elev_to_sct_type(elev[x][y]);
sct->sct_newtype = sct->sct_type;
sct->sct_dterr = own[sct->sct_x][y] + 1;
+ sct->sct_coastal = is_coastal(sct->sct_x, sct->sct_y);
add_resources(sct);
}
}
- set_coastal_flags();
}
/****************************************************************************
va_end(ap);
}
}
-
-static void
-set_coastal_flags(void)
-{
- int i, j;
- struct sctstr *sp;
-
- for (i = 0; i < nc + ni; ++i) {
- for (j = 0; j < isecs[i]; j++) {
- sp = getsectp(sectx[i][j], secty[i][j]);
- sp->sct_coastal = sectc[i][j];
- }
- }
-}
projects / empserver / blobdiff