From: PatR Date: Thu, 25 Feb 2021 22:11:03 +0000 (-0800) Subject: partly fix github issue #446 - monk gender X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6a30e7b05c9e45b58a8410afb9daf6b7c599180;p=nethack partly fix github issue #446 - monk gender The monk role can be either male or female but the monk fake player monster was flagged as male-only. Allow both genders. The male and female monk tiles are identical though and this doesn't address that. Fixes #466 --- diff --git a/doc/fixes37.0 b/doc/fixes37.0 index 3f32841f2..415efcc7f 100644 --- a/doc/fixes37.0 +++ b/doc/fixes37.0 @@ -1,4 +1,4 @@ -NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.462 $ $NHDT-Date: 1614076940 2021/02/23 10:42:20 $ +NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.463 $ $NHDT-Date: 1614291055 2021/02/25 22:10:55 $ General Fixes and Modified Features ----------------------------------- @@ -381,12 +381,12 @@ prevent wish request "death wand" from matching Death monster and producing a random wand instead of a wand of death grammar bit: "you hear a [AEF] note squeak in the distance" (should be "an") curses interface failed to honor menu_xxx option settings for menu interaction -during engraving, spaces were counted instead of non-spaces when an explosion scatters objects, make any that fly over sinks stop there output message when changing fastmove mode while cursor targetting messages when Minetown watchmen become angry could report "you see an angry guard approaching" even if he was invisible and hero can't see invis when autopickup is on but disabled due to being inside a shop, have ^X say so +don't force fake player monks to always be male Fixes to 3.7.0-x Problems that Were Exposed Via git Repository @@ -515,6 +515,7 @@ change to can_reach_floor() resulted in hero being unable to reach the floor panic if lua init fails change wizard mode command #wizmgender to wizard mode option 'wizmgender' engraving with non-blade dulled the weapon anyway (pr #464) +during engraving, spaces were counted instead of non-spaces curses: 'msg_window' option wasn't functional for curses unless the binary also included tty support diff --git a/src/monst.c b/src/monst.c index 1db5cf978..c837a851c 100644 --- a/src/monst.c +++ b/src/monst.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 monst.c $NHDT-Date: 1605726850 2020/11/18 19:14:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.78 $ */ +/* NetHack 3.7 monst.c $NHDT-Date: 1614291055 2021/02/25 22:10:55 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.84 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2006. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2799,7 +2799,7 @@ struct permonst _mons2[] = { NO_ATTK, NO_ATTK, NO_ATTK), SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), 0, 0, M1_HUMANOID | M1_HERBIVORE, - M2_NOPOLY | M2_HUMAN | M2_STRONG | M2_COLLECT | M2_MALE, + M2_NOPOLY | M2_HUMAN | M2_STRONG | M2_COLLECT, M3_INFRAVISIBLE, 11, HI_DOMESTIC), MON3("priest", "priestess", "cleric", S_HUMAN, LVL(10, 12, 10, 2, 0), G_NOGEN,