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

tribute: Wyrd Sisters

Browse Source 
I stumbled across why the Death Quotes hadn't been getting displayed
evenly before being recycled:  ones I've added since 3.6.0--probably
even before the release--were unintentionally missing their '%e passage'
directive, so attempted look-up for those returned the very last one
(terminated by '%e title').  The recent change to read_passage() has
made '%e passage' be optional for one-line death quote passages, so
this patch doesn't bother putting them in.
This commit is contained in:
PatR
2016-01-23 00:20:15 -08:00
parent 7e86003367
commit 0ee4611f8f
2 changed files with 297 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

331
dat/tribute
View File

@@ -12,8 +12,8 @@
%title The Colour of Magic (14)
# p. 67 (Signet edition; 'Morpork': initially Ankh and Morpork were twin
# cities with distinct characteristics on opposite sides of the Ankh
# river--they were soon consolidated into Ankh-Morpork without regard
# to which area was where)
# river--they were eventually consolidated into Ankh-Morpork without
# regard to which area was where)
%passage 1
It has been remarked before that those who are sensitive to radiations in
the far octarine--the eighth colour, the pigment of the Imagination--can
@@ -1260,42 +1260,293 @@ They are not necessarily very good at it.
#
#
#
%title Wyrd Sisters (2)
%title Wyrd Sisters (15)
# p. 318 (ROC edition; passage starts mid-paragraph;
# speaker is Granny Weatherwax)
%passage 1
Destiny is important, see, but people go wrong when they think it controls
them. It's the other way around.
"[...] Destiny /is/ important, see, but people go wrong when they think it
controls them. It's the other way around."
[Wyrd Sisters, by Terry Pratchett]
%e passage
# pp. 105-106
%passage 2
#submitted by Boudewijn
Verence tried to avoid walking through walls. A man had his dignity.
He became aware that he was being watched.
He turned his head.
There was a cat sitting in the doorway, subjecting him to a slow blink.
It was a mottled grey and extremely fat...
No. It was extremely /big/. It was covered with so much scar tissue
that it looked like a fist with fur on it. Its ears were a couple of
perforated stubs, its eyes two yellow slits of easy-going malevolence,
its tail a twitching series of question marks as it stared at him.
Greebo had heard that Lady Felmet had a small white female cat and had
strolled up to pay his respects. Verence had never seen an animal with
so much built-in villainy. He didn't resist as it waddled across the
floor and dried to rub itself against his legs, purring like a
waterfall.
Verence tried to avoid walking through walls. A man had his dignity.
'Well, well,' said the king, vaguely. He reached down and made an
effort to scratch it behind the two ragged bits on top of its head.
It was a relief to find someone else besides another ghost who could
see him, and Greebo, he couldn't help feeling, was a distinctly unusual
cat. Most of the castle cats were either pampered pets or flat-eared
kitchen and stable habitues who generally resembled the very rodents
they lived on. This cat, on the other hand, was its own animal. All
cats give that impression, of course, but instead of the mindless
animal self-absorption that passes for secret wisdom in the creatures,
Greebo radiated genuime intelligence. He also radiated a smell that
would have knocked over a wall and caused sinus trouble in a dead fox.
He became aware that he was being watched.
He turned his head.
There was a cat sitting in the doorway, subjecting him to a slow blink. It
was a mottled grey and extremely fat...
No. It was extremely /big/. It was covered with so much scar tissue that
it looked like a fist with fur on it. Its ears were a couple of perforated
stubs, its eyes two yellow slits of easy-going malevolence, its tail a
twitching series of question marks as it stared at him.
Greebo had heard that Lady Felmet had a small white female cat and had
strolled up to pay his respects.
Verence had never seen an animal with so much built-in villainy. He didn't
resist as it waddled across the floor and dried to rub itself against his
legs, purring like a waterfall.
"Well, well," said the king, vaguely. He reached down and made an effort
to scratch it behind the two ragged bits on top of its head. It was a
relief to find someone else besides another ghost who could see him, and
Greebo, he couldn't help feeling, was a distinctly unusual cat. Most of
the castle cats were either pampered pets or flat-eared kitchen and stable
habitues who generally resembled the very rodents they lived on. This cat,
on the other hand, was its own animal. All cats give that impression, of
course, but instead of the mindless animal self-absorption that passes for
secret wisdom in the creatures, Greebo radiated genuime intelligence. He
also radiated a smell that would have knocked over a wall and caused sinus
trouble in a dead fox.
[Wyrd Sisters, by Terry Pratchett]
%e passage
# pp. 14-15
%passage 3
He wondered if ghosts hunted. Almost certainly not, he imagined. Or ate,
or drank either for that matter, and that was really depressing. He liked
a big noisy banquet and had quaffed(1) many a pint of good ale. And bad
ale, come to that. He'd never been able to tell the difference till the
following morning, usually.
(1) Quaffing is like drinking, but you spill more.
[Wyrd Sisters, by Terry Pratchett]
%e passage
# pp. 60-61 (dwarfish mechanics: see /Equal Rites/)
%passage 4
Granny Weatherwax milked and fed the goats, banked the fire, and put a
cloth over the mirror and pulled her broomstick out from behind the door.
She went out, locked the door behind her, and hung the key on its nail in
the privy.
This was quite sufficient. Only once, in the entire history of witchery
in the Ramtops, had a thief broken into a witch's cottage. The witch
concerned visited the most terrible punishment on him.(1)
Granny sat on the broom and muttered a few words, but without much
conviction. After a further couple of tries, she got off, fiddled with
the binding, and had another go. There was a suspicion of glitter from
one end of the stick, which quickly died away.
"Drat," she said, under her breath.
She looked around carefully, in case anyone was watching. In fact it was
only a hunting badger who, hearing the thumping of running feet, poked its
head out from the bushes and saw Granny hurtling down the path with the
broomstick held stiff-armed beside her. At last the magic caught, and she
managed to vault clumsily on to it before it trundled into the night sky
as gracefully as a duck with one wing missing.
From above the trees came a muffled cursd against all dwarfish mechanics.
(1) She did nothing, although sometimes when she saw him in the village
she'd smile in a faint, puzzled way. After three weeks of this the
suspense was too much for him and he took his own life; in fact he took it
all the way across the continent, where he became a reformed character and
never went home again.
[Wyrd Sisters, by Terry Pratchett]
%e passage
# p. 76 (passage starts mid-paragraph)
%passage 5
And, with alarming suddenness, nothing happened.
[Wyrd Sisters, by Terry Pratchett]
%e passage
# p. 82 ('/Good/ fool': lowercase 'fool' is accurate)
%passage 6
"Is this a dagger I see before me?" he mumbled.
"Um. No, my lord. It's my hankerchief, you see. You can sort of tell the
difference if you look closely. It doesn't have as many sharp edges."
"/Good/ fool," said the duke, vaguely.
Totally mad, the Fool thought. Several bricks short of a bundle. So far
round the twist you could use him to open wine bottles.
"Kneel beside me," my Fool.
The Fool did so. The duke laid a soiled bandage on his shoulder.
"Are you loyal, Fool?" he said. "Are you trustworthy?"
"I swore to follow my lord until death," said the Fool hoarsely.
The duke pressed his mad face close to the Fool, who looked up into a pair
of bloodshot eyes.
"I didn't want to," he hissed conspiratorially. "They made me do it. I
didn't want--"
The door swung open. The dutchess filled the doorway. In fact, she was
nearly the same shape.
"Leonal!" she barked.
The fool was fascinated by what happened to the duke's eyes. The mad red
flame vanished, was sucked backwards, and replaced by the hard blue stare
he had come to recognize. It didn't mean, he realized, that the duke was
any less mad. Even the coldness of his sanity was madness in a way. The
duke had a mind that ticked like a clock and, like a clock, it regularly
went cuckoo.
[Wyrd Sisters, by Terry Pratchett]
%e passage
# p. 85
%passage 7
On the crest of the moor, where in the summer partridges lurked among the
bushes like small, whirring idiots, was a standing stone. It stood roughly
where the witches' territories met, although the boundaries were never
formally marked out.
The stone was about the same height as a tall man, and made of a bluish
tinted rock. It was considered intensely magical because, although there
was only one of it, /no-one had ever been able to count it/; if it saw
anyone looking at it speculatively, it shuffled behind them. It was the
most self-effacing monolith ever discovered.
[Wyrd Sisters, by Terry Pratchett]
%e passage
# p. 92 (passage starts mid-paragraph)
%passage 8
Demons were like genies or philosophy professors--if you didn't word things
/exactly/ right, they delighted in giving you absolutely accurate and
completely misleading answers.
[Wyrd Sisters, by Terry Pratchett]
%e passage
# p. 121
%passage 9
Nanny Ogg was also out early. She hadn't been able to get any sleep
anyway, and besides, she was worried about Greebo. Greebo was one of her
few blind spots. While intellectually she would concede that he was
indeed a fat, cunning, evil-smelling multiple rapist, she nevertheless
instinctively pictured him as the small fluffy kitten he had been decades
before. The fact that he had once chased a female wolf up a tree and
seriously surprised a she-bear who had been innocently digging for roots
didn't stop her worrying that something bad might happen to him. It was
generally considered by everyone else in the kingdom that the only thing
that might slow Greebo down was a direct meteorite strike.
[Wyrd Sisters, by Terry Pratchett]
%e passage
# p. 133 (the duke has locked Nanny Ogg in the castle dungeon)
%passage 10
"I really advise you all to return home," said Granny Weatherwax. "There
has probably been a misunderstanding. Everyone knows a witch cannot be
held against her will."
"It's gone too far this time," said a peasant. "All this burning and
taxing and now this. I blame you witches. It's got to stop. I know my
rights."
"What rights are they?" said Granny.
"Dunnage, cowhage-in-ordinary, badinage, leftovers, scrommidge, clary and
spunt." said the peasant promptly. "And acornage, every other year, and
the right to keep two-thirds of a goat on the common. Until he set fire to
it. It was a bloody good goat, too."
"A man could go far, knowing his rights like you do," said Granny. "But
right now he should go home."
[Wyrd Sisters, by Terry Pratchett]
%e passage
# p. 164
%passage 11
"Whatever happened to the rule about not meddling in politics?" said Magrat,
watching her retreating back.
Nanny Ogg massaged some like back into her fingers.
"By Hoki, that woman's got a jaw like an anvil," she said. "What was that?"
"I said, what about this rule about not meddling?" said Magrat.
"Ah," said Nanny. She took the girl's arm. "The thing is," she explained,
"as you advance in the Craft, you'll learn there is another rule. Esme's
obeyed it all her life."
"And what's that?"
"When you break rules, break 'em good and hard," said Nanny, and grinned a
set of gums that were more menacing than teeth.
[Wyrd Sisters, by Terry Pratchett]
%e passage
# p. 238
%passage 12
"I mean it. Look at me. I wasn't supposed to be writing plays. Dwarfs
aren't even supposed to be able to /read/. I shouldn't worry too much
about destiny, if I was you. I was destined to be a miner. Destiny gets
it wrong half the time."
"But you said he looks like the Fool person. I can't see it myself, mark
you."
"The light's got to be right."
"Could be some destiny at work there."
Hwel shrugged. Destiny was funny stuff, he knew. You couldn't trust it.
Often you couldn't even see it. Just when you knew you had it cornered, it
turned out to be something else--coincidence, maybe, or providence. You
barred the door against it, and it was standing behind you. Then just when
you thought you had it nailed down it walked away with the hammer.
He used destiny a lot. As a tool for his plays it was even better than a
ghost. There was nothing like a bit of destiny to get the old plot rolling.
But it was a mistake to think you could spot the shape of it. And as for
thinking it could be controlled...
[Wyrd Sisters, by Terry Pratchett]
%e passage
# p. 242 (passage starts mid-paragraph; Lancre has recently come out of a
# magic-induced 15-year stasis; 'things ... is': 'things' plural is
# accurate, though probably a typo)
%passage 13
On top of the general suspicion of witches, it was dawning on the few people
in Lancre who had any dealings with the outside world that a) either more
things had been happening than they had heard about before or b) time was
out of joint. It wasn't easy to prove(1) but the few traders who came along
the mountain tracks after the winter seemed to be rather older than they
should have been. Unexplained happenings were always more or less expected
in the Ramtops because of the high magical potential, but several years
disappearing overnight was a bit of a first.
(1) Because of the way time was recorded among the various states, kingdoms
and cities. After all, when over an area of a hundred square miles the same
year is variously the Year of the Small Bat, the Anticipated Monkey, the
Hunting Cloud, Fat Cows, Three Bright Stallions and at least nine numbers
recording the time since(2) assorted kings, prohets, and strange events were
either crowned, born or happened, and each year was a different number of
months, and some of them don't have weeks, and one of them refuses to accept
the day as a measure of time, the only things it is possible to be sure of
is that good sex doesn't last long enough.(3)
(2) The calendar of the Theocracy of Muntab counts /down/, not up. No-one
knows why, but it might not be a good idea to hang around and find out.
(3) Except for the Zapingo tribe of the Great Nef, of course.
[Wyrd Sisters, by Terry Pratchett]
%e passage
# p. 250 (passage starts mid-paragraph)
%passage 14
It was a land of describable beauty.
[Wyrd Sisters, by Terry Pratchett]
%e passage
# p. 265 (passage starts mid-paragraph)
%passage 15
The past used to be a lot better than it is now.
[Wyrd Sisters, by Terry Pratchett]
%e passage
@@ -6818,8 +7069,10 @@ IF YOU ASK ME, said Death, NOBODY COULD DO ANY BETTER THAN THAT...
#-----------------------------------------------------
# Used for interaction with Death.
#
# Death Quotes are always one line, and '%e passage' can be omitted.
#
%section Death
%title Death Quotes (20)
%title Death Quotes (22)
%passage 1
WHERE THE FIRST PRIMAL CELL WAS, THERE WAS I ALSO. WHERE MAN IS, THERE AM I. WHEN THE LAST LIFE CRAWLS UNDER FREEZING STARS, THERE WILL I BE.
%e passage
@@ -6865,11 +7118,13 @@ IT WON'T HURT A BIT.
# p. 177
%passage 12
SHALL WE GO?
# p. 251
# p. 251 (speaker is actually a demon named 'Scrofula' filling in for Death)
%passage 13
I HAVE COME FOR THEE.
# The Light Fantastic, p. 52 (Signet edition; quote has quotation marks but
# including them here wouldn't fit with the rest)
# including them here wouldn't fit with the rest;
# Death is addressing an elderly wizard who went
# to extreme measures to hide himself [from Death])
%passage 14
DARK IN HERE, ISN'T IT?
# Equal Rites, p. 14 (Signet edition; second sentence continues
@@ -6892,6 +7147,12 @@ I HAVEN'T GOT A SINGLE FRIEND. EVEN CATS FIND ME AMUSING.
# Sourcery, p. 12 (Signet edition)
%passage 20
YOU'RE ONLY PUTTING OFF THE INEVITABLE.
# Wyrd Sisters, p. 11 (ROC edition)
%passage 21
I SAID WAS. IT'S CALLED THE PAST TENSE. YOU'LL SOON GET USED TO IT.
# p. 13
%passage 22
DON'T LET IT UPSET YOU.
%e title
%e section
#

2
doc/fixes36.1
View File

@@ -167,7 +167,7 @@ poison breath leaves a trail of poison gas
allow knife and stiletto as possible tin opening tools
wizard mode #wizintrinsic command
additional tribute passages for The Colour of Magic, The Light Fantastic,
Equal Rites, Mort, Sourcery, Snuff, and Raising Steam
Equal Rites, Mort, Sourcery, Wyrd Sisters, Snuff, and Raising Steam
compile-time options SIMPLE_MAIL and SERVER_ADMIN_MSG for public server use
database entries for Cleaver, Sunsword, Frost and Fire brands, and
polymorph trap