Make STEED unconditional.

This commit is contained in:
Sean Hunt
2015-02-13 21:23:56 -05:00
committed by Pasi Kallinen
parent aba6ecb7b3
commit 9759f5bf6d
62 changed files with 98 additions and 641 deletions

View File

@@ -43,9 +43,7 @@ STATIC_VAR NEARDATA const short skill_names_indices[P_NUM_SKILLS] = {
PN_CLERIC_SPELL, PN_ESCAPE_SPELL,
PN_MATTER_SPELL,
PN_BARE_HANDED, PN_TWO_WEAPONS,
#ifdef STEED
PN_RIDING
#endif
};
/* note: entry [0] isn't used */
@@ -1184,7 +1182,6 @@ struct obj *weapon;
bonus = ((bonus + 2) * (martial_bonus() ? 2 : 1)) / 2;
}
#ifdef STEED
/* KMH -- It's harder to hit while you are riding */
if (u.usteed) {
switch (P_SKILL(P_RIDING)) {
@@ -1196,7 +1193,6 @@ struct obj *weapon;
}
if (u.twoweap) bonus -= 2;
}
#endif
return bonus;
}
@@ -1253,7 +1249,6 @@ struct obj *weapon;
bonus = ((bonus + 1) * (martial_bonus() ? 3 : 1)) / 2;
}
#ifdef STEED
/* KMH -- Riding gives some thrusting damage */
if (u.usteed && type != P_TWO_WEAPON_COMBAT) {
switch (P_SKILL(P_RIDING)) {
@@ -1264,7 +1259,6 @@ struct obj *weapon;
case P_EXPERT: bonus += 2; break;
}
}
#endif
return bonus;
}
@@ -1326,10 +1320,8 @@ const struct def_skill *class_skill;
P_SKILL(P_BARE_HANDED_COMBAT) = P_BASIC;
/* Roles that start with a horse know how to ride it */
#ifdef STEED
if (urole.petnum == PM_PONY)
P_SKILL(P_RIDING) = P_BASIC;
#endif
/*
* Make sure we haven't missed setting the max on a skill