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

more #U1233 - specifying mon class instead type for polyself (trunk only)

Browse Source 
Another item from the Dec'04 report sent in by <email deleted>.  When prompted for a type of monster to polymorph
into, giving a monster class description like "dog or other canine" (or
single letter like 'd'), triggered "I've never heard of such monsters".
Instead of adjusting the message, this chooses a member from the class.

     I put this into the fixes file as a new feature.
This commit is contained in:
nethack.rankin
2007-04-10 03:39:52 +00:00
parent a8913c2366
commit 4777c898f8
5 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/polyself.c
View File

@@ -255,7 +255,7 @@ polyself(psflags)
int psflags;
{
char buf[BUFSZ];
int old_light, new_light, mntmp, tryct;
int old_light, new_light, mntmp, class, tryct;
boolean forcecontrol = (psflags == 1),
monsterpoly = (psflags == 2),
draconian = (uarm && Is_dragon_armor(uarm)),
@@ -286,9 +286,18 @@ int psflags;
do {
getlin("Become what kind of monster? [type the name]",
buf);
class = 0;
mntmp = name_to_mon(buf);
if (mntmp < LOW_PM) {
class = name_to_monclass(buf, &mntmp);
if (class && mntmp == NON_PM)
mntmp = mkclass_poly(class);
}
if (mntmp < LOW_PM)
if (!class)
pline("I've never heard of such monsters.");
else
You_cant("polymorph into any of those.");
else if (iswere && (were_beastie(mntmp) == u.ulycn ||
mntmp == counter_were(u.ulycn) ||
(Upolyd && mntmp == PM_HUMAN)))
@@ -301,7 +310,7 @@ int psflags;
your_race(&mons[mntmp]) ||
mntmp == urole.malenum ||
mntmp == urole.femalenum))
You("cannot polymorph into that.");
You_cant("polymorph into that.");
else break;
} while (--tryct > 0);
if (!tryct) pline(thats_enough_tries);