Merge branch 'NetHack-3.6'

diff --cc include/monst.h
Simple merge

diff --cc src/minion.c
index de6018a8db5bb33746634c1fa22b5248c962ca7f,85acbe51c37dabe5288d3593a1b767a576a6a501..7619352f40212cff58320390f18045b6c9dbf80b
--- 1/src/minion.c
--- 2/src/minion.c
+++ b/src/minion.c
@@@ -253,19 -257,21 +257,21 @@@ register struct monst *mtmp
          }
          newsym(mtmp->mx, mtmp->my);
      }
 -    if (youmonst.data->mlet == S_DEMON) { /* Won't blackmail their own. */
 +    if (g.youmonst.data->mlet == S_DEMON) { /* Won't blackmail their own. */
-         pline("%s says, \"Good hunting, %s.\"", Amonnam(mtmp),
-               flags.female ? "Sister" : "Brother");
+         if (!Deaf)
+             pline("%s says, \"Good hunting, %s.\"", Amonnam(mtmp),
+                   flags.female ? "Sister" : "Brother");
+         else if (canseemon(mtmp))
+             pline("%s says something.", Amonnam(mtmp));
          if (!tele_restrict(mtmp))
              (void) rloc(mtmp, TRUE);
          return 1;
      }
 -    cash = money_cnt(invent);
 +    cash = money_cnt(g.invent);
-     demand =
-         (cash * (rnd(80) + 20 * Athome))
-         / (100 * (1 + (sgn(u.ualign.type) == sgn(mtmp->data->maligntyp))));
+     demand = (cash * (rnd(80) + 20 * Athome))
+            / (100 * (1 + (sgn(u.ualign.type) == sgn(mtmp->data->maligntyp))));
  
 -    if (!demand || multi < 0) { /* you have no gold or can't move */
 +    if (!demand || g.multi < 0) { /* you have no gold or can't move */
          mtmp->mpeaceful = 0;
          set_malign(mtmp);
          return 0;

diff --cc src/muse.c
Simple merge

diff --cc src/objnam.c
index fc26bdff5bc54f403364cc84815e2f08dca16e2a,0992fb518ef4d5411fe4dc5d29c2428c2efdd4be..d864368b15f7670e2cdad031b0077c68c07c8c10
--- 1/src/objnam.c
--- 2/src/objnam.c
+++ b/src/objnam.c
@@@ -2812,10 -2818,10 +2812,10 @@@ int xtra_prob; /* to force 0% random ge
       * probabilities are not very useful because they don't take
       * the class generation probability into account.  [If 10%
       * of spellbooks were blank and 1% of scrolls were blank,
-      * "blank" would have 10/11 chance to yield a blook even though
+      * "blank" would have 10/11 chance to yield a book even though
       * scrolls are supposed to be much more common than books.]
       */
 -    for (i = oclass ? bases[(int) oclass] : STRANGE_OBJECT + 1;
 +    for (i = oclass ? g.bases[(int) oclass] : STRANGE_OBJECT + 1;
           i < NUM_OBJECTS && (!oclass || objects[i].oc_class == oclass);
           ++i) {
          /* don't match extra descriptions (w/o real name) */

diff --cc src/pray.c
index 5bc7e6ebaea66da7e45a8851b6308c79323f6c53,d5958ac52fa8c0ce6dd5594102aa3579527999f3..8604c94ba1cd25e38a21ef967e505ca17f537347
--- 1/src/pray.c
--- 2/src/pray.c
+++ b/src/pray.c
@@@ -716,8 -721,9 +716,9 @@@ aligntyp resp_god
                    (on_altar() && (a_align(u.ux, u.uy) != resp_god))
                        ? "scorn"
                        : "call upon");
+         /* [why isn't this using verbalize()?] */
          pline("\"Then die, %s!\"",
-               g.youmonst.data->mlet == S_HUMAN ? "mortal" : "creature");
 -              (youmonst.data->mlet == S_HUMAN) ? "mortal" : "creature");
++              (g.youmonst.data->mlet == S_HUMAN) ? "mortal" : "creature");
          summon_minion(resp_god, FALSE);
          break;