polyself changes (trunk only)

Several polymorph tweaks, most dealing with specifying form under
polymorph control or for wizard #polyself:
1) allow "were<critter>" and "human were<critter>" for your type of
   <critter> when you're inflicted with lycanthropy; now you'll toggle
   shape rather than be told "you cannot polymorph into that".
2) allow your own role; now you'll become a new man (or whatever race)
   rather than get "you can't".
3) allow "human" to force a new man (or whatever) regardless of race.
   No change for human characters, but elves, dwarves, and such can now
   use either their own race or "human".  (They never become humans.)
4) for wizard #polyself only, override the 20% chance of becoming a new
   man instead of taking on the selected form.  (This implicitly prevents
   the annoying "your new form isn't healthy enough to survive" death
   since your experience level won't drop below 1.)
5) remove a redundant drowning check in polyself(); it's already handled
   in polymon() and polyman(for newman()) via spoteffects().

     This also gets rid of an old use of 0 as not-a-valid-monster (not
responisble for any bugs though since giant ants aren't lycanthropes).
This commit is contained in:
nethack.rankin
2006-06-11 06:09:35 +00:00
parent 94ea00a1a3
commit 8edb0772d8
3 changed files with 39 additions and 31 deletions

View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)were.c 3.5 2002/11/07 */
/* SCCS Id: @(#)were.c 3.5 2006/05/27 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -33,9 +33,7 @@ register struct monst *mon;
}
}
STATIC_DCL int FDECL(counter_were,(int));
STATIC_OVL int
int
counter_were(pm)
int pm;
{
@@ -46,7 +44,7 @@ int pm;
case PM_HUMAN_WEREJACKAL: return(PM_WEREJACKAL);
case PM_WERERAT: return(PM_HUMAN_WERERAT);
case PM_HUMAN_WERERAT: return(PM_WERERAT);
default: return(0);
default: return NON_PM;
}
}
@@ -57,7 +55,7 @@ register struct monst *mon;
register int pm;
pm = counter_were(monsndx(mon->data));
if(!pm) {
if (pm < LOW_PM) {
impossible("unknown lycanthrope %s.", mon->data->mname);
return;
}