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

magic cancellation/Protection revamp (trunk only)

Browse Source 
Optimize yesterday's new code.  When calculating magic cancellation,
avoid calling protects() for hero's inventory; the information it's
providing is already available via u.uprops[PROTECTION].  That part of
the inventory scan is only needed for monsters.
This commit is contained in:
nethack.rankin
2011-04-09 00:05:06 +00:00
parent aa382329dd
commit 6df18e20be
1 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/mhitu.c
View File

@@ -822,7 +822,10 @@ struct monst *mon;
struct obj *o; struct obj *o;
long wearmask; long wearmask;
int armpro, mc = 0; int armpro, mc = 0;
boolean is_you = (mon == &youmonst), gotprot = FALSE; boolean is_you = (mon == &youmonst),
gotprot = is_you ? (EProtection != 0L) :
/* high priests have innate protection */
(mon->data == &mons[PM_HIGH_PRIEST]);
for (o = is_you ? invent : mon->minvent; o; o = o->nobj) { for (o = is_you ? invent : mon->minvent; o; o = o->nobj) {
/* a_can field is only applicable for armor (which must be worn) */ /* a_can field is only applicable for armor (which must be worn) */
@@ -831,7 +834,7 @@ struct monst *mon;
if (armpro > mc) mc = armpro; if (armpro > mc) mc = armpro;
} }
/* if we've already confirmed Protection, skip additional checks */ /* if we've already confirmed Protection, skip additional checks */
if (gotprot) continue; if (is_you || gotprot) continue;
/* omit W_SWAPWEP+W_QUIVER; W_ART+W_ARTI handled by protects() */ /* omit W_SWAPWEP+W_QUIVER; W_ART+W_ARTI handled by protects() */
wearmask = W_ARMOR | W_RING | W_AMUL | W_TOOL; wearmask = W_ARMOR | W_RING | W_AMUL | W_TOOL;
@@ -840,31 +843,17 @@ struct monst *mon;
gotprot = TRUE; gotprot = TRUE;
} }
/* extrinsic Protection increases mc factor */ if (gotprot) {
if (!gotprot) { /* extrinsic Protection increases mc by 1 */
/* in case hero has extrinsic protection from some other source */ if (mc < 3) mc += 1;
if (is_you && EProtection) gotprot = TRUE; } else if (mc < 1) {
/* high priests have innate intrinsic protection which is as /* intrinsic Protection is weaker (play balance; obtaining divine
strong as extrinsic protection */ protection is too easy); it confers minimum mc 1 instead of 0 */
if (mon->data == &mons[PM_HIGH_PRIEST]) gotprot = TRUE; if ((is_you && ((HProtection && u.ublessed) || u.uspellprot)) ||
/* aligned priests and angels have innate intrinsic Protection */
(mon->data == &mons[PM_ALIGNED_PRIEST] || is_minion(mon->data)))
mc = 1;
} }
/* extrinsic Protection increases mc by 1 */
if (gotprot && mc < 3)
mc += 1;
/* intrinsic Protection is weaker than Extrinsic (play balance;
obtaining divine protection is too easy) */
if (!gotprot) {
if (is_you && ((HProtection && u.ublessed > 0) || u.uspellprot))
gotprot = TRUE;
/* aligned priests and angels have innate intrinsic Protection */
if (mon->data == &mons[PM_ALIGNED_PRIEST] || is_minion(mon->data))
gotprot = TRUE;
}
/* intrinsic Protection confers minimum mc 1 instead of 0 */
if (gotprot && mc < 1)
mc = 1;
return mc; return mc;
} }