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

Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource

Browse Source
This commit is contained in:
nhmall
2015-03-05 20:52:37 -05:00
parent e9a03fd094 44c0534a97
commit 06b7534af3
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dat/data.base
+25 -3
View File
@@ -429,6 +429,7 @@ barbed devil
Barbed devils lack any real special abilities, though they Barbed devils lack any real special abilities, though they
are quite difficult to kill. are quite difficult to kill.
# takes "bat or bird" when specifying 'B' # takes "bat or bird" when specifying 'B'
~combat
*bat *bat
bat or bird bat or bird
A bat, flitting in the darkness outside, took the wrong turn 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. own. Several were currently hovering above the table.
[ The Colour of Magic, by Terry Pratchett ] [ The Colour of Magic, by Terry Pratchett ]
* blob * blob
gelatinous cube
ooze ooze
* ooze * ooze
*pudding *pudding
@@ -548,6 +548,7 @@ candelabrum*
Because it is Saint Peter's holy day. Because it is Saint Peter's holy day.
(Enter all the Friars to sing the dirge) (Enter all the Friars to sing the dirge)
[ Doctor Faustus and Other Plays, by Christopher Marlowe ] [ Doctor Faustus and Other Plays, by Christopher Marlowe ]
~*jack*boot*
*boot* *boot*
In Fantasyland these are remarkable in that they seldom or In Fantasyland these are remarkable in that they seldom or
never wear out and are suitable for riding or walking in never wear out and are suitable for riding or walking in
@@ -1101,7 +1102,7 @@ cyclops
Proceeding from the heat-oppressed brain? Proceeding from the heat-oppressed brain?
I see thee yet, in form as palpable I see thee yet, in form as palpable
As this which now I draw. As this which now I draw.
[ Macbeth, by William Shakespeare ] [ Macbeth, by William Shakespeare ]
dark one dark one
... But he ruled rather by force and fear, if they might ... But he ruled rather by force and fear, if they might
avail; and those who perceived his shadow spreading over the avail; and those who perceived his shadow spreading over the
@@ -1570,6 +1571,12 @@ eyes of the overworld
Usually, there is nothing to be seen. However, the wearer Usually, there is nothing to be seen. However, the wearer
is also able to look back and see the area around herself, is also able to look back and see the area around herself,
much like looking on a map. Why anyone would want to ... 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* figurine*
Then it appeared in Paris at just about the time that Paris 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 was full of Carlists who had to get out of Spain. One of
@@ -2767,6 +2774,12 @@ lance
evil plight. evil plight.
[ Don Quixote of La Mancha, by Miquel de [ Don Quixote of La Mancha, by Miquel de
Cervantes Saavedra ] 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 *lantern
While pretending to be a fancy safety lamp, it is in fact While pretending to be a fancy safety lamp, it is in fact
battery powered. A discreet little switch is marked "on/off" battery powered. A discreet little switch is marked "on/off"
@@ -4502,6 +4515,15 @@ shrieker
its fetid bulk looming overhead... The monster was some kind of its fetid bulk looming overhead... The monster was some kind of
great dark worm, but that was about all they were sure of. great dark worm, but that was about all they were sure of.
[ The Adventurers, Epic IV, by Thomas A. Miller ] [ 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.
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, by Steven Brust ]
skeleton skeleton
A skeleton is a magically animated undead creature. Unlike A skeleton is a magically animated undead creature. Unlike
shades, only a humanoid creature can be used to create a shades, only a humanoid creature can be used to create a
@@ -5157,7 +5179,7 @@ valkyrie
Nations, by Herbert Robinson and Knox Nations, by Herbert Robinson and Knox
Wilson ] Wilson ]
vampire vampire
vampire bat ~vampire bat
vampire lord vampire lord
The Oxford English Dictionary is quite unequivocal: The Oxford English Dictionary is quite unequivocal:
_vampire_ - "a preternatural being of a malignant nature (in _vampire_ - "a preternatural being of a malignant nature (in