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

Guidebook update and SEDUCE runtime switch

Browse Source 
add SYSCF docs to the Guidebook because it's info needed in a binary distro
Guidebook.tex - also add some missing italics to some "NetHack" occurances
call nethack.org "official"
Guidebook.txt - didn't regenerate cleanly so no diff
add SEDUCE to SYSCF (only partly inspired by the recent email)
This commit is contained in:
keni
2010-05-13 00:54:13 +00:00
parent d55db3584e
commit bd1a922dae
12 changed files with 137 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/mhitu.c
View File

@@ -1251,6 +1251,17 @@ dopois:
if(!mtmp->mcan) stealgold(mtmp);
break;
#ifdef SEDUCE
case AD_SSEX:
if(SYSOPT_SEDUCE){
if(could_seduce(mtmp, &youmonst, mattk) == 1
&& !mtmp->mcan)
if (doseduce(mtmp))
return 3;
break;
}
/* else FALLTHRU */
#endif
case AD_SITM: /* for now these are the same */
case AD_SEDU:
if (is_animal(mtmp->data)) {
@@ -1259,7 +1270,7 @@ dopois:
/* Continue below */
} else if (dmgtype(youmonst.data, AD_SEDU)
#ifdef SEDUCE
|| dmgtype(youmonst.data, AD_SSEX)
|| (SYSOPT_SEDUCE && dmgtype(youmonst.data, AD_SSEX))
#endif
) {
pline("%s %s.", Monnam(mtmp), mtmp->minvent ?
@@ -1300,14 +1311,7 @@ dopois:
return 3;
}
break;
#ifdef SEDUCE
case AD_SSEX:
if(could_seduce(mtmp, &youmonst, mattk) == 1
&& !mtmp->mcan)
if (doseduce(mtmp))
return 3;
break;
#endif
case AD_SAMU:
hitmsg(mtmp, mattk);
/* when the Wiz hits, 1/20 steals the amulet */
@@ -2196,7 +2200,7 @@ struct attack *mattk;
if(agrinvis && !defperc
#ifdef SEDUCE
&& mattk && mattk->adtyp != AD_SSEX
&& (!SYSOPT_SEDUCE || ( mattk && mattk->adtyp != AD_SSEX))
#endif
)
return 0;
@@ -2204,7 +2208,7 @@ struct attack *mattk;
if(pagr->mlet != S_NYMPH
&& ((pagr != &mons[PM_INCUBUS] && pagr != &mons[PM_SUCCUBUS])
#ifdef SEDUCE
|| (mattk && mattk->adtyp != AD_SSEX)
|| (SYSOPT_SEDUCE && mattk && mattk->adtyp != AD_SSEX)
#endif
))
return 0;