nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Knights get no metal armor penalty for clerical spells

Browse Source 
Originally from SporkHack by Derek Ray.
This commit is contained in:
Pasi Kallinen
2021-05-18 17:00:16 +03:00
parent 2288452278
commit f057ef573c
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes37.0
View File

@@ -520,6 +520,7 @@ prediscovered weapons adjustmens: only knights and samurai know polearms;
rangers know launchers (bows), ammo (arrows), and spears regardless
of their race/species; likewise, rogues know all daggers
if the move counter ever reaches 1000000000, end the game
knights get no metal armor penalty for clerical spells
Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

19
src/spell.c
View File

@@ -1729,6 +1729,9 @@ percent_success(int spell)
int chance, splcaster, special, statused;
int difficulty;
int skill;
/* Knights don't get metal armor penalty for clerical spells */
boolean paladin_bonus = Role_if(PM_KNIGHT)
&& spell_skilltype(spellid(spell)) == P_CLERIC_SPELL;
/* Calculate intrinsic ability (splcaster) */
@@ -1736,7 +1739,7 @@ percent_success(int spell)
special = g.urole.spelheal;
statused = ACURR(g.urole.spelstat);
if (uarm && is_metallic(uarm))
if (uarm && is_metallic(uarm) && !paladin_bonus)
splcaster += (uarmc && uarmc->otyp == ROBE) ? g.urole.spelarmr / 2
: g.urole.spelarmr;
else if (uarmc && uarmc->otyp == ROBE)
@@ -1744,12 +1747,14 @@ percent_success(int spell)
if (uarms)
splcaster += g.urole.spelshld;
if (uarmh && is_metallic(uarmh) && uarmh->otyp != HELM_OF_BRILLIANCE)
splcaster += uarmhbon;
if (uarmg && is_metallic(uarmg))
splcaster += uarmgbon;
if (uarmf && is_metallic(uarmf))
splcaster += uarmfbon;
if (!paladin_bonus) {
if (uarmh && is_metallic(uarmh) && uarmh->otyp != HELM_OF_BRILLIANCE)
splcaster += uarmhbon;
if (uarmg && is_metallic(uarmg))
splcaster += uarmgbon;
if (uarmf && is_metallic(uarmf))
splcaster += uarmfbon;
}
if (spellid(spell) == g.urole.spelspec)
splcaster += g.urole.spelsbon;