tribute update: Maskerade

Accept "novel named Masquerade" when wishing for Maskerade.

Add four new passages, bringing total to 13.

diff --git a/dat/tribute b/dat/tribute
index d67bce0ddced8c15b9b735cfccb9696dd840ac94..26f8b89f76c4c60759e8df713b47755d0bb15821 100644 (file)
--- a/dat/tribute
+++ b/dat/tribute
@@ -4206,7 +4206,7 @@ REALLY?  WHAT IS SO SURPRISING ABOUT BACON?
 #
 #
 #
-%title Maskerade (9)
+%title Maskerade (13)
 # pp. 81-82, continued on pp. 87-89 (Harper Torch edition; apparently
 #       transcribed from some other edition based on quote marks used;
 #       a great number of very short paragraphs--it stretches a long way
@@ -4321,7 +4321,9 @@ barely noticeable even to the closest observation, one winked off.
 
   [Maskerade, by Terry Pratchett]
 %e passage
-# p. 67 (Harper Torch edition; as above, transcribed from some other edition)
+# p. 67 (Harper Torch edition; as above, transcribed from some other edition;
+#        passage ends mid-paragraph; the text of the note uses irregular
+#        indentation and a distinct font that hints at cursive handwriting)
 %passage 2
 The letter inside was on a sheet of the Opera House's own note paper.
 In neat, copperplate writing, it said:
@@ -4460,6 +4462,75 @@ Come on.  I want to try a leg of the elephant that bit me."
 
   [Maskerade, by Terry Pratchett]
 %e passage
+# pp. 51-52 (Granny Weatherwax and Nanny Ogg are traveling to Ankh-Morpork
+#            and Nanny feels that the weather is too chilly for flying;
+#            Cando Cutoff is a bystander who has told them that the next
+#            stagecoach won't stop here; they stand in the road to block it)
+%passage 10
+"Why've you got broomsticks?" shouted the driver.  "Are you witches?"
+
+"Yes.  Have you got any special low terms for witches?"
+
+"Yeah, how about 'meddling, interfering old baggages'?"
+
+Cutoff felt that he must have missed part of the conversation, because the
+next exchange went like this:
+
+"What was that again, young man?"
+
+"Two complimentary tickets to Ankh-Morpork, ma'am.  No problem."
+
+"Inside seats, mind.  No traveling on the top."
+
+"Certainly, ma'am.  Excuse me while I just kneel in the dirt so's you can
+step up, ma'am."
+
+Cutoff nodded happily to himself as the coach pulled away again.  It was
+nice to see that good manners and courtesy were still alive.
+
+  [Maskerade, by Terry Pratchett]
+%e passage
+# p. 69 (passage starts mid-paragraph)
+%passage 11
+"[...]  If you wanted a quiet retirement, Mr. Bucket, you shouldn't have
+bought the Opera House.  You should have done something peaceful, like
+alligator dentistry."
+
+  [Maskerade, by Terry Pratchett]
+%e passage
+# pp. 108-109 (Mr. Pounder, the Opera House rat catcher, has been murdered;
+#              instead of Death coming to release his soul, the Death of Rats
+#              is attending; we skip a couple of very short paragraphs)
+%passage 12
+"Er... I'm dead, aren't I...?"
+
+SQUEAK.
+
+[...]
+
+The soul of Mr. Pounder looked at his hands.  They seemed to be elongating,
+and getting hairier.  He could feel his ears growing, and a certain rather
+embarrassing elongation at the base of his spine.  He'd spent most of his
+life in a single-minded activity in dark places, yet even so...
+
+"But I don't /believe/ in reincarnation!" he protested.
+
+SQUEAK.
+
+And this, Mr. Pounder understood with absolute rodent clarity, meant:
+reincarnation believes in /you/.
+
+  [Maskerade, by Terry Pratchett]
+%e passage
+# p. 198 (Nanny has come into a substantial sum of money and has grumbled
+#         about Granny spending so much of it)
+%passage 13
+"Money don't buy happiness, Gytha."
+
+"I only wanted to rent it for a few weeks."
+
+  [Maskerade, by Terry Pratchett]
+%e passage
 %e title
 #
 #

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 97c416874d149d8e75b0784e89a83dfc418ee5e9..c279fbe4b94668a6fcc1952d04fcb374510aba0a 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -1008,7 +1008,8 @@ using 'f' while quiver is empty and 'autoquiver' is Off when wielding a
        thrown-and-return weapon will throw that weapon instead of filling
        the quiver (inspired by xNetHack)
 3.6's tribute: add one new passage to Sourcery, three to Small Gods, one to
-       Lords and Ladies, two to Soul Music, three to Interesting Times
+       Lords and Ladies, two to Soul Music, three to Interesting Times, four
+       to Maskerade
 monsters can see and remember hero resistances
 monsters can gain resistances by eating corpses
 

diff --git a/src/do_name.c b/src/do_name.c
index 780dca393f37de73d521c2bdd31f56bf093960b1..5bf731736f576f3b11f62284fd596c9c6b0b3b2a 100644 (file)
--- a/src/do_name.c
+++ b/src/do_name.c
@@ -2344,6 +2344,8 @@ lookup_novel(const char *lookname, int *idx)
         lookname = sir_Terry_novels[0];
     else if (!strcmpi(lookname, "Sorcery"))
         lookname = "Sourcery"; /* [4] */
+    else if (!strcmpi(lookname, "Masquerade"))
+        lookname = "Maskerade"; /* [17] */
 
     for (k = 0; k < SIZE(sir_Terry_novels); ++k) {
         if (!strcmpi(lookname, sir_Terry_novels[k])