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

intrinsics revamp (trunk only)

Browse Source 
Simplify many of the intrinsics macros from
  #define xxx_resistance (Hxxx || Exxx || resists_xxx(&youmonst))
down to
  #define xxx_resistance (Hxxx || Exxx)
by setting or clearing an extra bit in Hxxx during polymorph so that the
resists_xxx() check becomes implicit.

     Unfornately there were lots of places in the code that treat Hxxx
as a timeout number--primarily for Stunned, Confused, and Hallucination;
Stunned happens to be one of the revised macros--rather than as a bit
mask, so this patch needed a lot more changes than originally antipated.
This commit is contained in:
nethack.rankin
2011-10-01 00:25:57 +00:00
parent cd8eefb622
commit 84f02bd336
24 changed files with 231 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/eat.c
View File

@@ -997,10 +997,10 @@ register int pm;
case PM_YELLOW_LIGHT:
/* fall into next case */
case PM_GIANT_BAT:
make_stunned(HStun + 30,FALSE);
make_stunned((HStun & TIMEOUT) + 30L, FALSE);
/* fall into next case */
case PM_BAT:
make_stunned(HStun + 30,FALSE);
make_stunned((HStun & TIMEOUT) + 30L, FALSE);
break;
case PM_GIANT_MIMIC:
tmp += 10;
@@ -1048,8 +1048,8 @@ register int pm;
}
break;
case PM_LIZARD:
if (HStun > 2) make_stunned(2L,FALSE);
if (HConfusion > 2) make_confused(2L,FALSE);
if ((HStun & TIMEOUT) > 2) make_stunned(2L, FALSE);
if ((HConfusion & TIMEOUT) > 2) make_confused(2L, FALSE);
break;
case PM_CHAMELEON:
case PM_DOPPELGANGER:
@@ -1090,7 +1090,8 @@ register int pm;
if (dmgtype(ptr, AD_STUN) || dmgtype(ptr, AD_HALU) ||
pm == PM_VIOLET_FUNGUS) {
pline("Oh wow! Great stuff!");
(void)make_hallucinated(HHallucination + 200L, FALSE, 0L);
(void)make_hallucinated((HHallucination & TIMEOUT) + 200L,
FALSE, 0L);
}
/* Check the monster for all of the intrinsics. If this
@@ -1785,7 +1786,7 @@ struct obj *otmp;
#endif
if (otmp->otyp == EGG && stale_egg(otmp)) {
pline("Ugh. Rotten egg."); /* perhaps others like it */
make_vomiting(Vomiting+d(10,4), TRUE);
make_vomiting((Vomiting & TIMEOUT) + (long)d(10,4), TRUE);
} else
give_feedback:
pline("This %s is %s", singular(otmp, xname),
@@ -2356,7 +2357,7 @@ doeat() /* generic "eat" command funtion (see cmd.c) */
pline("Ulch - that %s was rustproofed!", xname(otmp));
/* The regurgitated object's rustproofing is gone now */
otmp->oerodeproof = 0;
make_stunned(HStun + rn2(10), TRUE);
make_stunned((HStun & TIMEOUT) + (long)rn2(10), TRUE);
You("spit %s out onto the %s.", the(xname(otmp)),
surface(u.ux, u.uy));
if (carried(otmp)) {
@@ -2587,9 +2588,8 @@ gethungry() /* as time goes by - called by moveloop() and domove() */
if (moves % 2) { /* odd turns */
/* Regeneration uses up food, unless due to an artifact */
if (HRegeneration || ((ERegeneration & (~W_ART)) &&
(ERegeneration != W_WEP || !uwep->oartifact)))
u.uhunger--;
if ((HRegeneration & ~FROMFORM) ||
(ERegeneration & ~(W_ARTI|W_WEP))) u.uhunger--;
if (near_capacity() > SLT_ENCUMBER) u.uhunger--;
} else { /* even turns */
if (Hunger) u.uhunger--;