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

- Wenn REDUCED_PEASANTGROWTH an, dann haben neue Regionen 

(20+6W10)% ihres maximalen Bauernbesatzes.
This commit is contained in:
Christian Schlittchen 2002-01-27 17:22:04 +00:00
parent f98661fcae
commit 51348305ae
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/gamecode/laws.c
View File

@ -1107,7 +1107,7 @@ quit(void)
remove("inactive"); remove("inactive");
for (f = factions; f; f = f->next) if(!fval(f, FL_NOIDLEOUT)) { for (f = factions; f; f = f->next) if(!fval(f, FL_NOIDLEOUT)) {
#if REMOVENMRTIMEOUT #if REMOVENMRTIMEOUT == 1
if (turn - f->lastorders >= ORDERGAP) { if (turn - f->lastorders >= ORDERGAP) {
destroyfaction(f); destroyfaction(f);
continue; continue;
@ -1118,7 +1118,7 @@ quit(void)
continue; continue;
} }
} }
#if REMOVENMRNEWBIE #if REMOVENMRNEWBIE == 1
puts(" - beseitige Spieler, die sich nach der Anmeldung nicht " puts(" - beseitige Spieler, die sich nach der Anmeldung nicht "
"gemeldet haben..."); "gemeldet haben...");

11
src/common/kernel/region.c
View File

@ -44,6 +44,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
extern int dice_rand(const char *s);
static int g_maxluxuries = 0; static int g_maxluxuries = 0;
const int delta_x[MAXDIRECTIONS] = const int delta_x[MAXDIRECTIONS] =
@ -989,8 +991,13 @@ terraform(region * r, terrain_t t)
#endif #endif
if (terrain[t].production_max && !fval(r, RF_CHAOTIC)) { if (terrain[t].production_max && !fval(r, RF_CHAOTIC)) {
int np = MAXPEASANTS_PER_AREA * (rand() % (terrain[t].production_max / 2)); int peasants;
rsetpeasants(r, max(100, np)); #if REDUCED_PEASANTGROWTH == 1
peasants = (maxworkingpeasants(r) * (20+dice_rand("6d10")))/100;
#else
peasants = MAXPEASANTS_PER_AREA * (rand() % (terrain[t].production_max / 2));
#endif
rsetpeasants(r, max(100, peasants));
rsetmoney(r, rpeasants(r) * ((wage(r, NULL, false)+1) + rand() % 5)); rsetmoney(r, rpeasants(r) * ((wage(r, NULL, false)+1) + rand() % 5));
} }
} }