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

- Bauern'glättung' 

- Läuft nicht durch: Fehler beim Initialisieren der Schiffstypen?
This commit is contained in:
Christian Schlittchen 2002-02-02 14:55:14 +00:00
parent af9e7d2282
commit 52b2a396f0
3 changed files with 86 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/settings-eressea.h
View File

@ -24,3 +24,5 @@
#define REDUCED_PEASANTGROWTH 1
#define RACE_ADJUSTMENTS 1
/* Einmalig! */
#define PEASANT_ADJUSTMENT 1

70
src/eressea/korrektur.c
View File

@ -2815,6 +2815,73 @@ heal_all(void)
return 0;
}
#if PEASANT_ADJUSTMENT == 1
static int
peasant_adjustment(void)
{
terrain_t ter;
int sum, avg, c;
long long freeall, pool;
for(ter = 0; ter < MAXTERRAINS; ter++) {
region *r;
if(terrain[ter].production_max <= 0) continue;
sum = 0;
pool = 0;
freeall = 0;
for(r=regions; r; r=r->next) if(rterrain(r) == ter) {
unit *u;
c++;
sum += rpeasants(r);
for(u = r->units; u; u=u->next) {
if(lifestyle(u) > 0) sum += u->number;
}
}
avg = sum/c;
for(r=regions; r; r=r->next) if(rterrain(r) == ter) {
unit *u;
int playerp = 0;
int p_weg;
for(u = r->units; u; u=u->next) {
if(lifestyle(u) > 0) playerp += u->number;
}
p_weg = min((playerp + rpeasants(r)) - avg, rpeasants(r));
pool += p_weg;
rsetpeasants(r, rpeasants(r) - p_weg);
freeall += max(0,production(r) * MAXPEASANTS_PER_AREA
- ((rtrees(r,2)+rtrees(r,1)/2) * TREESIZE) - playerp);
}
for(r=regions; r; r=r->next) if(rterrain(r) == ter) {
unit *u;
long long free;
int newp;
int playerp = 0;
for(u = r->units; u; u=u->next) {
if(lifestyle(u) > 0) playerp += u->number;
}
free = max(0,production(r) * MAXPEASANTS_PER_AREA
- ((rtrees(r,2)+rtrees(r,1)/2) * TREESIZE) - playerp);
newp = (pool * free)/freeall;
rsetpeasants(r, rpeasants(r)+newp);
}
}
return 0;
}
#endif
static int
fix_astralplane(void)
{
@ -2873,6 +2940,9 @@ korrektur(void)
do_once("idlo", fix_idleout());
do_once("szip", set_zip());
do_once("heal", heal_all());
#if PEASANT_ADJUSTMENT == 1
do_once("peas", peasant_adjustment());
#endif
/* trade_orders(); */
if (global.data_version < NEWROAD_VERSION) {

15
src/res/de/messages.xml
View File

@ -3480,7 +3480,7 @@
</type>
<locale name="de">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - Die Partei muß mindestens 100 Wochen alt sein."</text>
<text>"$unit($unit) in $region($region): '$command' - Die Partei muß mindestens 81 Wochen alt sein, um einen Neustart mit einer anderen Rasse zu versuchen."</text>
</nr>
</locale>
</message>
@ -4300,6 +4300,19 @@
<text locale="en">"$unit($unit) in $region($region): '$command' - options ZIP and BZIP2 can only be switched, not turned off."</text>
</message>
<message name="error305">
<type>
<arg name="unit" type="unit"></arg>
<arg name="region" type="region"></arg>
<arg name="command" type="string"></arg>
</type>
<locale name="de">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - Die Partei muß mindestens 9 Wochen alt sein, um einen Neustart zu versuchen."</text>
</nr>
</locale>
</message>
<message name="drown_on_ship">
<type>
<arg name="unit" type="unit"></arg>