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

move NEWATSROI out of item_modification

This commit is contained in:
Enno Rehling 2015-08-26 19:59:11 +02:00
parent 4c32fe19ee
commit bc1c3dd712
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/unit.c
View File

@ -1254,25 +1254,23 @@ static int item_invis(const unit *u) {
+ (rsphere ? i_get(u->items, rsphere->itype) * 100 : 0); + (rsphere ? i_get(u->items, rsphere->itype) * 100 : 0);
} }
#ifdef NEWATSROI
static int item_modification(const unit * u, skill_t sk, int val) static int item_modification(const unit * u, skill_t sk, int val)
{ {
if (sk == SK_STEALTH) { if (sk == SK_STEALTH) {
#if NEWATSROI == 1
if (item_invis(u) >= u->number) { if (item_invis(u) >= u->number) {
val += ROIBONUS; val += ROIBONUS;
} }
#endif
} }
#if NEWATSROI == 1
if (sk == SK_PERCEPTION) { if (sk == SK_PERCEPTION) {
const struct resource_type *rtype = get_resourcetype(R_AMULET_OF_TRUE_SEEING); const struct resource_type *rtype = get_resourcetype(R_AMULET_OF_TRUE_SEEING);
if (i_get(u->items, rtype->itype) >= u->number) { if (i_get(u->items, rtype->itype) >= u->number) {
val += ATSBONUS; val += ATSBONUS;
} }
} }
#endif
return val; return val;
} }
#endif
static int att_modification(const unit * u, skill_t sk) static int att_modification(const unit * u, skill_t sk)
{ {
@ -1345,9 +1343,11 @@ int get_modifier(const unit * u, skill_t sk, int level, const region * r, bool n
skill += rc_skillmod(u_race(u), r, sk); skill += rc_skillmod(u_race(u), r, sk);
skill += att_modification(u, sk); skill += att_modification(u, sk);
#ifdef NEWATSROI
if (!noitem) { if (!noitem) {
skill = item_modification(u, sk, skill); skill = item_modification(u, sk, skill);
} }
#endif
skill = skillmod(u->attribs, u, r, sk, skill, SMF_ALWAYS); skill = skillmod(u->attribs, u, r, sk, skill, SMF_ALWAYS);
if (hunger_red_skill == -1) { if (hunger_red_skill == -1) {
@ -1398,7 +1398,7 @@ int eff_skill_study(const unit * u, skill_t sk, const region * r)
int invisible(const unit * target, const unit * viewer) int invisible(const unit * target, const unit * viewer)
{ {
#if NEWATSROI == 1 #ifdef NEWATSROI
return 0; return 0;
#else #else
if (viewer && viewer->faction == target->faction) if (viewer && viewer->faction == target->faction)

2
src/settings.h
View File

@ -21,7 +21,7 @@
#define RESOURCE_QUANTITY 0.5 #define RESOURCE_QUANTITY 0.5
#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ #define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
#define COMBAT_TURNS 5 #define COMBAT_TURNS 5
#define NEWATSROI 0 #undef NEWATSROI
/* Vermehrungsrate Bauern in 1/10000. /* Vermehrungsrate Bauern in 1/10000.
* TODO: Evt. Berechnungsfehler, reale Vermehrungsraten scheinen höher. */ * TODO: Evt. Berechnungsfehler, reale Vermehrungsraten scheinen höher. */