From b74b8ffccbd0e5658403a78c1364388ed1dc3642 Mon Sep 17 00:00:00 2001 From: Christian Schlittchen Date: Tue, 23 Apr 2002 17:13:45 +0000 Subject: [PATCH] - Anteil rekrutierbarer Bauern in die Settings. --- src/common/gamecode/economy.c | 6 +++--- src/common/gamecode/economy.h | 5 ----- src/common/settings-eressea.h | 3 +-- src/common/settings-tutorial.h | 2 +- src/common/settings-vinyambar-classic.h | 4 +--- src/common/settings-vinyambar-murder.h | 1 + src/common/settings-vinyambar.h | 5 ++--- 7 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c index 6e0630f45..9c4a56278 100644 --- a/src/common/gamecode/economy.c +++ b/src/common/gamecode/economy.c @@ -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) { if (fval(itype->rtype, RTF_LIMITED)) { -#if GUARD_DISABLE_PRODUCTION == 1 - if(is_guarded(r, u, GUARD_PRODUCE)) { +#if GUARD_DISABLES_PRODUCTION == 1 + if(is_guarded(u->region, u, GUARD_PRODUCE)) { cmistake(u, findorder(u, u->thisorder), 70, MSG_EVENT); return; } diff --git a/src/common/gamecode/economy.h b/src/common/gamecode/economy.h index 6679190f6..7d9496770 100644 --- a/src/common/gamecode/economy.h +++ b/src/common/gamecode/economy.h @@ -22,11 +22,6 @@ #ifndef 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 * wiviel Silber ein Unterhalter pro Talentpunkt bekommt. */ diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index ab74229d4..f35460e07 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -32,6 +32,5 @@ #define PEASANTS_DO_NOT_STARVE 0 #define GUARD_DISABLES_RECRUIT 1 #define GUARD_DISABLES_PRODUCTION 1 - #define RESOURCE_QUANTITY 1.0 - +#define RECRUITFRACTION 5 diff --git a/src/common/settings-tutorial.h b/src/common/settings-tutorial.h index d494bea02..274b0dd46 100644 --- a/src/common/settings-tutorial.h +++ b/src/common/settings-tutorial.h @@ -30,8 +30,8 @@ #define SKILLPOINTS 0 #define NEW_MIGRATION 1 #define PEASANTS_DO_NOT_STARVE 0 - #define GUARD_DISABLES_RECRUIT 0 #define GUARD_DISABLES_PRODUCTION 0 #define RESOURCE_QUANTITY 1.0 +#define RECRUITFRACTION 20 diff --git a/src/common/settings-vinyambar-classic.h b/src/common/settings-vinyambar-classic.h index d61e87ba7..aea3262a3 100644 --- a/src/common/settings-vinyambar-classic.h +++ b/src/common/settings-vinyambar-classic.h @@ -25,13 +25,11 @@ #define HUNGER_DISABLES_LONGORDERS 1 #define REDUCED_PEASANTGROWTH 0 #define RACE_ADJUSTMENTS 0 - #define SKILLPOINTS 1 #define TEACHDIFFERENCE 1 - #define PEASANT_ADJUSTMENT 0 #define GUARD_DISABLES_RECRUIT 0 #define GUARD_DISABLES_PRODUCTION 0 - #define RESOURCE_QUANTITY 1.0 +#define RECRUITFRACTION 20 diff --git a/src/common/settings-vinyambar-murder.h b/src/common/settings-vinyambar-murder.h index 81ea9c9e9..001061ce7 100644 --- a/src/common/settings-vinyambar-murder.h +++ b/src/common/settings-vinyambar-murder.h @@ -33,6 +33,7 @@ #define GUARD_DISABLES_RECRUIT 1 #define GUARD_DISABLES_PRODUCTION 1 #define RESOURCE_QUANTITY 1.0 +#define RECRUITFRACTION 20 #define VICTORY_CONDITION VICTORY_MURDER #define VICTORY_DELAY 4 diff --git a/src/common/settings-vinyambar.h b/src/common/settings-vinyambar.h index 1a2250db2..51eca8858 100644 --- a/src/common/settings-vinyambar.h +++ b/src/common/settings-vinyambar.h @@ -25,12 +25,11 @@ #define HUNGER_DISABLES_LONGORDERS 0 #define REDUCED_PEASANTGROWTH 0 #define RACE_ADJUSTMENTS 0 - #define SKILLPOINTS 1 #define TEACHDIFFERENCE 1 - #define PEASANT_ADJUSTMENT 0 #define GUARD_DISABLES_RECRUIT 0 #define GUARD_DISABLES_PRODUCTION 0 - #define RESOURCE_QUANTITY 1.0 +#define RECRUITFRACTION 20 +