forked from github/server
Änderung 1: Bauernwachstum
- Bauernwachstum um Faktor 10 reduziert. - Verluste durch Schlachten gefünftelt. - Bauernglück-Wirkung verstärkt. - #define REDUCED_PEASANTGROWTH 1
This commit is contained in:
parent
39829881c8
commit
e915e2b578
|
@ -475,11 +475,12 @@ peasants(region * r)
|
||||||
{
|
{
|
||||||
|
|
||||||
int glueck;
|
int glueck;
|
||||||
|
|
||||||
/* Das Geld, daß die Bauern erwirtschaftet haben unter expandwork, gibt
|
/* Das Geld, daß die Bauern erwirtschaftet haben unter expandwork, gibt
|
||||||
* den Bauern genug für 11 Bauern pro Ebene ohne Wald. Der Wald
|
* den Bauern genug für 11 Bauern pro Ebene ohne Wald. Der Wald
|
||||||
* breitet sich nicht in Gebiete aus, die bebaut werden. */
|
* breitet sich nicht in Gebiete aus, die bebaut werden. */
|
||||||
|
|
||||||
int peasants, money, n, dead, satiated;
|
int peasants, money, n, i, dead, satiated;
|
||||||
attrib * a;
|
attrib * a;
|
||||||
|
|
||||||
/* Bauern vermehren sich */
|
/* Bauern vermehren sich */
|
||||||
|
@ -509,8 +510,10 @@ peasants(region * r)
|
||||||
glueck++;
|
glueck++;
|
||||||
|
|
||||||
if (glueck > 0) { /* Doppelvermehrung */
|
if (glueck > 0) { /* Doppelvermehrung */
|
||||||
if (rand() % 100 < PEASANTGROWTH)
|
for(i=0; i<PEASANTLUCK; i++) {
|
||||||
peasants++;
|
if (rand() % 10000 < PEASANTGROWTH)
|
||||||
|
peasants++;
|
||||||
|
}
|
||||||
glueck--;
|
glueck--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2395,7 +2395,7 @@ aftermath(battle * b)
|
||||||
}
|
}
|
||||||
} next(df);
|
} next(df);
|
||||||
} next(s);
|
} next(s);
|
||||||
dead_peasants = min(rpeasants(r), is);
|
dead_peasants = min(rpeasants(r), (is*BATTLE_KILLS_PEASANTS)/100);
|
||||||
deathcounts(r, dead_peasants + is);
|
deathcounts(r, dead_peasants + is);
|
||||||
chaoscounts(r, dead_peasants / 2);
|
chaoscounts(r, dead_peasants / 2);
|
||||||
rsetpeasants(r, rpeasants(r) - dead_peasants);
|
rsetpeasants(r, rpeasants(r) - dead_peasants);
|
||||||
|
|
|
@ -219,8 +219,18 @@ extern void read_laen(struct region * r, int laen);
|
||||||
#define DMRISE 10
|
#define DMRISE 10
|
||||||
#define DMRISEHAFEN 20
|
#define DMRISEHAFEN 20
|
||||||
|
|
||||||
/* Vermehrungsrate Bauern (PEASANTDIE inklusive) */
|
/* Vermehrungsrate Bauern in 1/10000.
|
||||||
#define PEASANTGROWTH 1
|
* Evt. Berechnungsfehler, reale Vermehrungsraten scheinen höher. */
|
||||||
|
#if REDUCED_PEASANTGROWTH == 1
|
||||||
|
#define PEASANTGROWTH 10
|
||||||
|
#define BATTLE_KILLS_PEASANTS 20
|
||||||
|
#define PEASANTLUCK 10
|
||||||
|
#else
|
||||||
|
#define PEASANTGROWTH 100
|
||||||
|
#define BATTLE_KILLS_PEASANTS 100
|
||||||
|
#define PEASANTLUCK 1
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Vermehrung trotz 90% Auslastung */
|
/* Vermehrung trotz 90% Auslastung */
|
||||||
#define PEASANTFORCE 75
|
#define PEASANTFORCE 75
|
||||||
|
|
||||||
|
|
|
@ -21,3 +21,7 @@
|
||||||
#define REMOVENMRNEWBIE 1
|
#define REMOVENMRNEWBIE 1
|
||||||
#define REMOVENMRTIMEOUT 1
|
#define REMOVENMRTIMEOUT 1
|
||||||
#define HUNGER_DISABLES_LONGORDERS 1
|
#define HUNGER_DISABLES_LONGORDERS 1
|
||||||
|
#define REDUCED_PEASANTGROWTH 1
|
||||||
|
#define ELVES_NEWTREES 1
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -21,3 +21,6 @@
|
||||||
#define REMOVENMRNEWBIE 0
|
#define REMOVENMRNEWBIE 0
|
||||||
#define REMOVENMRTIMEOUT 0
|
#define REMOVENMRTIMEOUT 0
|
||||||
#define HUNGER_DISABLES_LONGORDERS 1
|
#define HUNGER_DISABLES_LONGORDERS 1
|
||||||
|
#define REDUCED_PEASANTGROWTH 0
|
||||||
|
#define ELVES_NEWTREES 0
|
||||||
|
|
||||||
|
|
|
@ -21,3 +21,6 @@
|
||||||
#define REMOVENMRNEWBIE 0
|
#define REMOVENMRNEWBIE 0
|
||||||
#define REMOVENMRTIMEOUT 0
|
#define REMOVENMRTIMEOUT 0
|
||||||
#define HUNGER_DISABLES_LONGORDERS 0
|
#define HUNGER_DISABLES_LONGORDERS 0
|
||||||
|
#define REDUCED_PEASANTGROWTH 0
|
||||||
|
#define ELVES_NEWTREES 0
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue