Discworld: Sourcery

Include the page number for Sourcery's second passage.  While
in there, add another passage.

For wishing, recognize "sorcery" as an alternate spelling.

diff --git a/dat/tribute b/dat/tribute
index 658f3071afcf223d6782dbca27178d2a53145a8b..9f75ca2857f0473a6ec9c7082c59b87085e10360 100644 (file)
--- a/dat/tribute
+++ b/dat/tribute
@@ -1,4 +1,4 @@
-# NetHack 3.7  tribute       $NHDT-Date: 1614206487 2021/02/24 22:41:27 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.94 $
+# NetHack 3.7  tribute       $NHDT-Date: 1614818317 2021/03/04 00:38:37 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.95 $
 # Copyright (c) 2017 by Robert Patrick Rankin
 # NetHack may be freely redistributed.  See license for details.
 # A tribute introduced in NetHack 3.6.0 to:
@@ -1064,7 +1064,7 @@ The bursar scowled at him.  "No need to get carried away," he said.
 #
 #
 #
-%title Sourcery (10)
+%title Sourcery (11)
 # p. 9 (Signet edition; passage starts mid-paragraph and ends mid-paragraph)
 %passage 1
 "[...]  And what would humans be without love?"
@@ -1073,6 +1073,7 @@ RARE, said Death.  [...]
 
   [Sourcery, by Terry Pratchett]
 %e passage
+# p. 180 (passage starts mid-paragraph)
 %passage 2
 They suffered from the terrible delusion that something could be done.
 They seemed prepared to make the world the way they wanted it or die in the
@@ -1261,6 +1262,24 @@ They are not necessarily very good at it.
 
   [Sourcery, by Terry Pratchett]
 %e passage
+# additional passage added for 3.7.0
+# p. 164 (passage begins mid-sentence)
+%passage 11
+[...] killing a brother wizard with magic was well-nigh impossible on
+account of the layers of protective spells that any cautious wizard
+maintained about his person at all times.(1)  The first thing a young
+wizard learns at Unseen University--apart from where his peg is, and
+which way to the lavatory--is that he must protect himself at all times.
+
+Some people think this is paranoia, but it isn't.  Paranoids only think
+everyone is out to get them.  Wizards /know/ it.
+
+(1) Of course, wizards often killed one another by ordinary, non-magical
+means, but this was perfectly allowable and death by assassination was
+considered natural causes for a wizard.
+
+  [Sourcery, by Terry Pratchett]
+%e passage
 %e title
 #
 #

diff --git a/src/do_name.c b/src/do_name.c
index 3d756d6d727dbfd134b5b3afdada0d02cec78427..534cc25996ec6894bb5f14232040f5fbdb29a10e 100644 (file)
--- a/src/do_name.c
+++ b/src/do_name.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7 do_name.c       $NHDT-Date: 1608749030 2020/12/23 18:43:50 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.186 $ */
+/* NetHack 3.7 do_name.c       $NHDT-Date: 1614818323 2021/03/04 00:38:43 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.198 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Pasi Kallinen, 2018. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -2319,14 +2319,22 @@ noveltitle(int *novidx)
     return sir_Terry_novels[j];
 }
 
+/* figure out canonical novel title from player-specified one */
 const char *
 lookup_novel(const char *lookname, int *idx)
 {
     int k;
 
-    /* Take American or U.K. spelling of this one */
+    /*
+     * Accept variant spellings:
+     * _The_Colour_of_Magic_ uses British spelling, and American
+     * editions keep that, but we also recognize American spelling;
+     * _Sourcery_ is a joke rather than British spelling of "sorcery".
+     */
     if (!strcmpi(The(lookname), "The Color of Magic"))
         lookname = sir_Terry_novels[0];
+    else if (!strcmpi(lookname, "Sorcery"))
+        lookname = "Sourcery"; /* [4] */
 
     for (k = 0; k < SIZE(sir_Terry_novels); ++k) {
         if (!strcmpi(lookname, sir_Terry_novels[k])