From e37d4224b3decfc78937b09ab6a88865f4fc6ba8 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Thu, 5 Mar 2015 14:03:56 +0200 Subject: [PATCH 1/6] Fix data.base entries -"bat" overrode later "combat" entry. -"gelatinous cube" and "jack boot" have their own entries. -"vampire bat" matched twice; use the bat entry. -dagger attribution started with spaces instead of tabs. --- dat/data.base | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dat/data.base b/dat/data.base index 67fca7aba..0c9f493b0 100644 --- a/dat/data.base +++ b/dat/data.base @@ -429,6 +429,7 @@ barbed devil Barbed devils lack any real special abilities, though they are quite difficult to kill. # takes "bat or bird" when specifying 'B' +~combat *bat bat or bird A bat, flitting in the darkness outside, took the wrong turn @@ -511,7 +512,6 @@ blind io own. Several were currently hovering above the table. [ The Colour of Magic, by Terry Pratchett ] * blob -gelatinous cube ooze * ooze *pudding @@ -548,6 +548,7 @@ candelabrum* Because it is Saint Peter's holy day. (Enter all the Friars to sing the dirge) [ Doctor Faustus and Other Plays, by Christopher Marlowe ] +~*jack*boot* *boot* In Fantasyland these are remarkable in that they seldom or never wear out and are suitable for riding or walking in @@ -1101,7 +1102,7 @@ cyclops Proceeding from the heat-oppressed brain? I see thee yet, in form as palpable As this which now I draw. - [ Macbeth, by William Shakespeare ] + [ Macbeth, by William Shakespeare ] dark one ... But he ruled rather by force and fear, if they might avail; and those who perceived his shadow spreading over the @@ -5157,7 +5158,7 @@ valkyrie Nations, by Herbert Robinson and Knox Wilson ] vampire -vampire bat +~vampire bat vampire lord The Oxford English Dictionary is quite unequivocal: _vampire_ - "a preternatural being of a malignant nature (in From 40851d2e6931288010bf83ae336d7d5e739dc3d0 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Thu, 5 Mar 2015 14:21:21 +0200 Subject: [PATCH 2/6] Add database entry for shuriken --- dat/data.base | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dat/data.base b/dat/data.base index 0c9f493b0..31d9360be 100644 --- a/dat/data.base +++ b/dat/data.base @@ -4503,6 +4503,14 @@ shrieker its fetid bulk looming overhead... The monster was some kind of great dark worm, but that was about all they were sure of. [ The Adventurers, Epic IV, by Thomas A. Miller ] +shuriken + You know, that's what I hate most about fighting against magic: + you never know what they're trying to do to you until it hits. + The sorceress knew what hit her, however. Two of the shuriken + got past whatever defenses she had. One caught her just below + the throat, the other in the middle of her chest. It wouldn't + kill her, but she wouldn't be fighting anyone for a while. + [ Jhereg, Steven Brust ] skeleton A skeleton is a magically animated undead creature. Unlike shades, only a humanoid creature can be used to create a From c427f450ca73b5b2ba77beae7910425d8ce20c45 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Thu, 5 Mar 2015 14:22:19 +0200 Subject: [PATCH 3/6] Fix shuriken attribution --- dat/data.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dat/data.base b/dat/data.base index 31d9360be..1da1c54dd 100644 --- a/dat/data.base +++ b/dat/data.base @@ -4510,7 +4510,7 @@ shuriken got past whatever defenses she had. One caught her just below the throat, the other in the middle of her chest. It wouldn't kill her, but she wouldn't be fighting anyone for a while. - [ Jhereg, Steven Brust ] + [ Jhereg, by Steven Brust ] skeleton A skeleton is a magically animated undead creature. Unlike shades, only a humanoid creature can be used to create a From cc25d29490b79690cfc0c1b1b713a33d928c51f8 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Thu, 5 Mar 2015 14:23:23 +0200 Subject: [PATCH 4/6] Make shuriken entry also match throwing star. --- dat/data.base | 1 + 1 file changed, 1 insertion(+) diff --git a/dat/data.base b/dat/data.base index 1da1c54dd..409d5eba4 100644 --- a/dat/data.base +++ b/dat/data.base @@ -4503,6 +4503,7 @@ shrieker its fetid bulk looming overhead... The monster was some kind of great dark worm, but that was about all they were sure of. [ The Adventurers, Epic IV, by Thomas A. Miller ] +throwing star shuriken You know, that's what I hate most about fighting against magic: you never know what they're trying to do to you until it hits. From 4cc13161631fb50e0ee35c8c4a957846eeda18f0 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Thu, 5 Mar 2015 16:15:40 +0200 Subject: [PATCH 5/6] Add database entry for fedora --- dat/data.base | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dat/data.base b/dat/data.base index 409d5eba4..9fa99e08f 100644 --- a/dat/data.base +++ b/dat/data.base @@ -1571,6 +1571,12 @@ eyes of the overworld Usually, there is nothing to be seen. However, the wearer is also able to look back and see the area around herself, much like looking on a map. Why anyone would want to ... +fedora + Some hats can only be worn if you're willing to be jaunty, to set + them at an angle and to walk beneath them with a spring in your + stride as if you're only a step away from dancing. They demand a + lot of you. + [ Anansi Boys, by Neil Gaiman ] figurine* Then it appeared in Paris at just about the time that Paris was full of Carlists who had to get out of Spain. One of From 44c0534a97028dfc86634c1a7868bbdce8793658 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Thu, 5 Mar 2015 16:34:16 +0200 Subject: [PATCH 6/6] Add database entry for land mine --- dat/data.base | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dat/data.base b/dat/data.base index 9fa99e08f..6bca23177 100644 --- a/dat/data.base +++ b/dat/data.base @@ -2774,6 +2774,12 @@ lance evil plight. [ Don Quixote of La Mancha, by Miquel de Cervantes Saavedra ] +land mine + Your heart is intact, your brain is not badly damaged, but the rest + of your injuries are comparable to stepping on a land mine. You'd + never walk again, and you'd be in great pain. You would come to + wish you had not survived. + [ Steel Beach, by John Varley ] *lantern While pretending to be a fancy safety lamp, it is in fact battery powered. A discreet little switch is marked "on/off"