forked from github/server
- Anteil rekrutierbarer Bauern in die Settings.
This commit is contained in:
parent
0615485bc7
commit
b74b8ffccb
|
@ -1845,12 +1845,12 @@ create_potion(unit * u, const potion_type * ptype, int want)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
create_item(unit * u, const item_type * itype, int want)
|
create_item(unit * u, const item_type * itype, int want)
|
||||||
{
|
{
|
||||||
if (fval(itype->rtype, RTF_LIMITED)) {
|
if (fval(itype->rtype, RTF_LIMITED)) {
|
||||||
#if GUARD_DISABLE_PRODUCTION == 1
|
#if GUARD_DISABLES_PRODUCTION == 1
|
||||||
if(is_guarded(r, u, GUARD_PRODUCE)) {
|
if(is_guarded(u->region, u, GUARD_PRODUCE)) {
|
||||||
cmistake(u, findorder(u, u->thisorder), 70, MSG_EVENT);
|
cmistake(u, findorder(u, u->thisorder), 70, MSG_EVENT);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,11 +22,6 @@
|
||||||
#ifndef ECONOMY_H
|
#ifndef ECONOMY_H
|
||||||
#define ECONOMY_H
|
#define ECONOMY_H
|
||||||
|
|
||||||
/* Wieviel ein Rekrut kostet, und welcher Teil (1/4) der Bauern rekrutiert
|
|
||||||
* werden kann. */
|
|
||||||
|
|
||||||
#define RECRUITFRACTION 20
|
|
||||||
|
|
||||||
/* Welchen Teil des Silbers die Bauern fuer Unterhaltung ausgeben (1/20), und
|
/* Welchen Teil des Silbers die Bauern fuer Unterhaltung ausgeben (1/20), und
|
||||||
* wiviel Silber ein Unterhalter pro Talentpunkt bekommt. */
|
* wiviel Silber ein Unterhalter pro Talentpunkt bekommt. */
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,5 @@
|
||||||
#define PEASANTS_DO_NOT_STARVE 0
|
#define PEASANTS_DO_NOT_STARVE 0
|
||||||
#define GUARD_DISABLES_RECRUIT 1
|
#define GUARD_DISABLES_RECRUIT 1
|
||||||
#define GUARD_DISABLES_PRODUCTION 1
|
#define GUARD_DISABLES_PRODUCTION 1
|
||||||
|
|
||||||
#define RESOURCE_QUANTITY 1.0
|
#define RESOURCE_QUANTITY 1.0
|
||||||
|
#define RECRUITFRACTION 5
|
||||||
|
|
|
@ -30,8 +30,8 @@
|
||||||
#define SKILLPOINTS 0
|
#define SKILLPOINTS 0
|
||||||
#define NEW_MIGRATION 1
|
#define NEW_MIGRATION 1
|
||||||
#define PEASANTS_DO_NOT_STARVE 0
|
#define PEASANTS_DO_NOT_STARVE 0
|
||||||
|
|
||||||
#define GUARD_DISABLES_RECRUIT 0
|
#define GUARD_DISABLES_RECRUIT 0
|
||||||
#define GUARD_DISABLES_PRODUCTION 0
|
#define GUARD_DISABLES_PRODUCTION 0
|
||||||
#define RESOURCE_QUANTITY 1.0
|
#define RESOURCE_QUANTITY 1.0
|
||||||
|
#define RECRUITFRACTION 20
|
||||||
|
|
||||||
|
|
|
@ -25,13 +25,11 @@
|
||||||
#define HUNGER_DISABLES_LONGORDERS 1
|
#define HUNGER_DISABLES_LONGORDERS 1
|
||||||
#define REDUCED_PEASANTGROWTH 0
|
#define REDUCED_PEASANTGROWTH 0
|
||||||
#define RACE_ADJUSTMENTS 0
|
#define RACE_ADJUSTMENTS 0
|
||||||
|
|
||||||
#define SKILLPOINTS 1
|
#define SKILLPOINTS 1
|
||||||
#define TEACHDIFFERENCE 1
|
#define TEACHDIFFERENCE 1
|
||||||
|
|
||||||
#define PEASANT_ADJUSTMENT 0
|
#define PEASANT_ADJUSTMENT 0
|
||||||
#define GUARD_DISABLES_RECRUIT 0
|
#define GUARD_DISABLES_RECRUIT 0
|
||||||
#define GUARD_DISABLES_PRODUCTION 0
|
#define GUARD_DISABLES_PRODUCTION 0
|
||||||
|
|
||||||
#define RESOURCE_QUANTITY 1.0
|
#define RESOURCE_QUANTITY 1.0
|
||||||
|
#define RECRUITFRACTION 20
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#define GUARD_DISABLES_RECRUIT 1
|
#define GUARD_DISABLES_RECRUIT 1
|
||||||
#define GUARD_DISABLES_PRODUCTION 1
|
#define GUARD_DISABLES_PRODUCTION 1
|
||||||
#define RESOURCE_QUANTITY 1.0
|
#define RESOURCE_QUANTITY 1.0
|
||||||
|
#define RECRUITFRACTION 20
|
||||||
|
|
||||||
#define VICTORY_CONDITION VICTORY_MURDER
|
#define VICTORY_CONDITION VICTORY_MURDER
|
||||||
#define VICTORY_DELAY 4
|
#define VICTORY_DELAY 4
|
||||||
|
|
|
@ -25,12 +25,11 @@
|
||||||
#define HUNGER_DISABLES_LONGORDERS 0
|
#define HUNGER_DISABLES_LONGORDERS 0
|
||||||
#define REDUCED_PEASANTGROWTH 0
|
#define REDUCED_PEASANTGROWTH 0
|
||||||
#define RACE_ADJUSTMENTS 0
|
#define RACE_ADJUSTMENTS 0
|
||||||
|
|
||||||
#define SKILLPOINTS 1
|
#define SKILLPOINTS 1
|
||||||
#define TEACHDIFFERENCE 1
|
#define TEACHDIFFERENCE 1
|
||||||
|
|
||||||
#define PEASANT_ADJUSTMENT 0
|
#define PEASANT_ADJUSTMENT 0
|
||||||
#define GUARD_DISABLES_RECRUIT 0
|
#define GUARD_DISABLES_RECRUIT 0
|
||||||
#define GUARD_DISABLES_PRODUCTION 0
|
#define GUARD_DISABLES_PRODUCTION 0
|
||||||
|
|
||||||
#define RESOURCE_QUANTITY 1.0
|
#define RESOURCE_QUANTITY 1.0
|
||||||
|
#define RECRUITFRACTION 20
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue