diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c index 685507562..0f3eb9545 100644 --- a/src/common/gamecode/economy.c +++ b/src/common/gamecode/economy.c @@ -357,6 +357,13 @@ recruit(region * r, unit * u, strlist * S, request *o; int recruitcost; +#if GUARD_DISABLES_RECRUIT == 1 + if(is_guarded(r, u, GUARD_RECRUIT)) { + cmistake(u, S->s, 70, MSG_EVENT); + return; + } +#endif + if (u->faction->race == new_race[RC_INSECT]) { if (month_season[month(0)] == 0 && rterrain(r) != T_DESERT) { #ifdef INSECT_POTION diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h index bb864d9ee..bcbb5eceb 100644 --- a/src/common/kernel/eressea.h +++ b/src/common/kernel/eressea.h @@ -1121,6 +1121,8 @@ extern struct attrib_type at_lighthouse; /* Verhindert Ausstieg + Weiterreise */ #define GUARD_CREWS 32 /* Verhindert Unterhaltung auf Schiffen */ +#define GUARD_RECRUIT 64 + /* Verhindert Rekrutieren */ #define GUARD_ALL 0xFFFF extern void setguard(struct unit * u, unsigned int flags); diff --git a/src/common/kernel/karma.c b/src/common/kernel/karma.c index f50a9ef04..992dfc494 100644 --- a/src/common/kernel/karma.c +++ b/src/common/kernel/karma.c @@ -211,7 +211,8 @@ struct fspecialdata fspecials[MAXFACTIONSPECIALS] = { "Erdelementarist", "Alle Gebäude dieser Partei sind von Erdelementaren beseelt und können " "sich mit Hilfe eines speziellen Befehls jede Woche um eine Region " - "bewegen. Dies macht es den Bewohnern jedoch unmöglich, in dieser " + "bewegen. Dies macht es den Bewohnern - welche alle einer Partei mit " + "dieser Eigenschaft angehören müssen - jedoch unmöglich, in dieser " "Woche ihren normalen Tätigkeiten nachzugehen.", 1 }, diff --git a/src/common/kernel/magic.c b/src/common/kernel/magic.c index f2d46bcd1..54425d71f 100644 --- a/src/common/kernel/magic.c +++ b/src/common/kernel/magic.c @@ -1551,7 +1551,7 @@ regeneration_magiepunkte(void) reg_aura = (double)regeneration(u); /* Magierturm erhöht die Regeneration um 75% */ - if (btype) reg_aura*=btype->auraregen; + if (btype) reg_aura *= btype->auraregen; /* Bonus/Malus durch Zauber */ n = get_curseeffect(u->attribs, C_AURA, 0); diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index 406229300..9d48340a6 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -30,3 +30,5 @@ #define SKILLPOINTS 0 #define NEW_MIGRATION 1 #define PEASANTS_DO_NOT_STARVE 0 +#define GUARD_DISABLES_RECRUIT 0 + diff --git a/src/common/settings-vinyambar-classic.h b/src/common/settings-vinyambar-classic.h index c0091c5a5..400570e4e 100644 --- a/src/common/settings-vinyambar-classic.h +++ b/src/common/settings-vinyambar-classic.h @@ -30,3 +30,5 @@ #define TEACHDIFFERENCE 1 #define PEASANT_ADJUSTMENT 0 +#define GUARD_DISABLES_RECRUIT 0 + diff --git a/src/common/settings-vinyambar-murder.h b/src/common/settings-vinyambar-murder.h index 4d022a34e..58e8c3d08 100644 --- a/src/common/settings-vinyambar-murder.h +++ b/src/common/settings-vinyambar-murder.h @@ -30,6 +30,7 @@ #define SKILLPOINTS 0 #define NEW_MIGRATION 1 #define PEASANTS_DO_NOT_STARVE 0 +#define GUARD_DISABLES_RECRUIT 1 #define VICTORY_CONDITION VICTORY_MURDER #define VICTORY_DELAY 4 diff --git a/src/common/settings-vinyambar.h b/src/common/settings-vinyambar.h index bd1412c5a..229a4389e 100644 --- a/src/common/settings-vinyambar.h +++ b/src/common/settings-vinyambar.h @@ -30,4 +30,5 @@ #define TEACHDIFFERENCE 1 #define PEASANT_ADJUSTMENT 0 +#define GUARD_DISABLES_RECRUIT 0