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

more fixes via monsym()

Browse Source
This commit is contained in:
nhmall
2023-12-07 09:55:37 -05:00
parent e639c4bdaa
commit 12ca2be5b4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mon.c
View File

@@ -4760,7 +4760,7 @@ select_newcham_form(struct monst* mon)
} while (--tryct > 0 && !validspecmon(mon, mndx) } while (--tryct > 0 && !validspecmon(mon, mndx)
/* try harder to select uppercase monster on rogue level */ /* try harder to select uppercase monster on rogue level */
&& (tryct > 40 && Is_rogue_level(&u.uz) && (tryct > 40 && Is_rogue_level(&u.uz)
&& !isupper((uchar) mons[mndx].mlet))); && !isupper(monsym(&mons[mndx]))));
} }
return mndx; return mndx;
} }
@@ -4865,7 +4865,7 @@ newcham(
/* for the first several tries we require upper-case on /* for the first several tries we require upper-case on
the rogue level (after that, we take whatever we get) */ the rogue level (after that, we take whatever we get) */
if (tryct > 15 && Is_rogue_level(&u.uz) if (tryct > 15 && Is_rogue_level(&u.uz)
&& mdat && !isupper((uchar) mdat->mlet)) && mdat && !isupper(monsym(mdat)))
mdat = 0; mdat = 0;
if (mdat) if (mdat)
break; break;

2
src/wizard.c
View File

@@ -522,7 +522,7 @@ pick_nasty(
* but we don't try very hard. * but we don't try very hard.
*/ */
if (Is_rogue_level(&u.uz) if (Is_rogue_level(&u.uz)
&& !('A' <= mons[res].mlet && mons[res].mlet <= 'Z')) && !('A' <= monsym(&mons[res]) && monsym(&mons[res]) <= 'Z'))
res = ROLL_FROM(nasties); res = ROLL_FROM(nasties);
/* if genocided or too difficult or out of place, try a substitute /* if genocided or too difficult or out of place, try a substitute