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

Merge pull request #34 from CTD1/Hunger 

Hunger und Segeltalent
This commit is contained in:
Enno Rehling 2014-10-01 13:48:51 +02:00
parent 232b935e0f c937f59536
commit a78daad4d8
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/kernel/unit.c
View File

@ -1280,12 +1280,11 @@ static int att_modification(const unit * u, skill_t sk)
return (int)result;
}
int
get_modifier(const unit * u, skill_t sk, int level, const region * r,
bool noitem)
int get_modifier(const unit * u, skill_t sk, int level, const region * r, bool noitem)
{
int bskill = level;
int skill = bskill;
int hunger_red_skill = -1;
if (r && sk == SK_STEALTH) {
plane *pl = rplane(r);
@ -1302,11 +1301,18 @@ bool noitem)
}
skill = skillmod(u->attribs, u, r, sk, skill, SMF_ALWAYS);
#ifdef HUNGER_REDUCES_SKILL
if (fval(u, UFL_HUNGER)) {
skill = skill / 2;
if (hunger_red_skill == -1) {
hunger_red_skill = get_param_int(global.parameters, "rules.hunger.reduces_skill", 2);
}
if (fval(u, UFL_HUNGER) && hunger_red_skill) {
if (sk == SK_SAILING && skill > 2 && hunger_red_skill == 2) {
skill = skill - 1;
}
else {
skill = skill / 2;
}
}
#endif
return skill - bskill;
}

3
src/settings.h
View File

@ -29,9 +29,6 @@
#define BATTLE_KILLS_PEASANTS 20
#define PEASANTLUCK 10
#define HUNGER_REDUCES_SKILL /* Hunger reduziert den Talentwert
auf die Hälfte */
#define ASTRAL_ITEM_RESTRICTIONS /* keine grossen dinge im astralraum */
#define NEW_DAEMONHUNGER_RULE
#define NEW_COMBATSKILLS_RULE