Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

growing code, improved again

Browse source
This commit is contained in:
Enno Rehling 2009-07-19 16:04:13 +00:00
parent 3248d11618
commit eac7f5ee91
1 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/common/gamecode/laws.c
View file

@ -735,33 +735,36 @@ growing_trees_e3(region * r, const int current_season, const int last_weeks_seas
int src = rtrees(r, src_type); int src = rtrees(r, src_type);
int dst = rtrees(r, dst_type); int dst = rtrees(r, dst_type);
int grow = src/transform[current_season][2]; int grow = src/transform[current_season][2];
if (grow>0) {
if (src_type!=TREE_TREE) {
rsettrees(r, src_type, src-grow); rsettrees(r, src_type, src-grow);
}
rsettrees(r, dst_type, dst+grow); rsettrees(r, dst_type, dst+grow);
if (dst_type==TREE_SEED && r->terrain->size) { if (dst_type==TREE_SEED && r->terrain->size) {
region * rn[MAXDIRECTIONS]; region * rn[MAXDIRECTIONS];
int d, total_size = 0; int d;
double fgrow = grow/(double)MAXDIRECTIONS;
get_neighbours(r, rn); get_neighbours(r, rn);
for (d=0;d!=MAXDIRECTIONS;++d) {
if (rn[d] && rn[d]->land) {
total_size += rn[d]->terrain->size;
}
}
if (total_size>0) {
double scale = 1.0;
if (total_size<r->terrain->size) {
scale = total_size/(double)r->terrain->size;
}
for (d=0;d!=MAXDIRECTIONS;++d) { for (d=0;d!=MAXDIRECTIONS;++d) {
region * rx = rn[d]; region * rx = rn[d];
if (rx && rx->land) { if (rx && rx->land) {
int size = rx->terrain->size; double scale = 1.0;
int d = rtrees(rx, dst_type); int g;
double fg = grow * scale * size / MAXDIRECTIONS / total_size; double fg, ch;
int g = (int)fg; int seeds = rtrees(rx, dst_type);
double ch = fg - g;
if (r->terrain->size>rx->terrain->size) {
scale = (scale * rx->terrain->size)/r->terrain->size;
}
fg = scale * fgrow;
g = (int)fg;
ch = fg - g;
if (chance(ch)) ++g; if (chance(ch)) ++g;
rsettrees(rx, dst_type, d + g); if (g>0) {
rsettrees(rx, dst_type, seeds + g);
}
} }
} }
} }