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

Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

Browse Source
This commit is contained in:
nhmall
2018-09-20 18:45:08 -04:00
parent 5f551553db 49e4330cb2
commit 2ea332544b
68 changed files with 765 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
dat/data.base
View File

@@ -534,6 +534,7 @@ ooze
kind had swept so evilly free of all litter.
[ At the Mountains of Madness, by H.P. Lovecraft ]
blue jelly
spotted jelly
I'd planned how to prevent the lock from sealing behind me; it
required a temporary sacrifice, not cleverness. I used the door
itself to help me cut off a portion of my body, after shunting all
@@ -892,6 +893,20 @@ tiamat
extremely vain.
citrine*
A pale yellow variety of crystalline quartz resembling topaz.
clay golem
It was a warm spring night when a fist knocked at the door so
hard that the hinges bent.
A man opened it and peered out into the street. There was
mist coming off the river and it was a cloudy night. He might
as well have tried to see through white velvet.
But he thought afterwards that there had been shapes out
there, just beyond the light spilling out into the road. A
lot of shapes, watching him carefully. He thought maybe
there'd been very faint points of light...
There was no mistaking the shape right in front of him,
though. It was big and dark red and looked like a child's
clay model of a man. Its eyes were two embers.
[ Feet of Clay, by Terry Pratchett ]
cleaver
Hither came Conan, the Cimmerian, black-haired, sullen-eyed,
sword in hand, a thief, a reaver, a slayer, with gigantic
@@ -1994,6 +2009,7 @@ gold golem
~gold golem
~straw golem
~wood golem
~clay golem
*golem
"The original story harks back, so they say, to the sixteenth
century. Using long-lost formulas from the Kabbala, a rabbi is
@@ -2305,7 +2321,8 @@ cornucopia
And scatters corn and wine, and fruits and flowers.
[ Os Lusiadas, by Luis Vaz de Camoes ]
horned devil
Horned devils lack any real special abilities, though they
barbed devil
These devils lack any real special abilities, though they
are quite difficult to kill.
~horsem*
*horse
@@ -4001,6 +4018,7 @@ pony
continent and to and from our own world. The precise manner
of their working is a Management secret.
[ The Tough Guide to Fantasyland, by Diana Wynne Jones ]
trident
poseido*n
Poseido(o)n, lord of the seas and father of rivers and
fountains, was the son of Chronos and Rhea, brother of Zeus,
@@ -5152,6 +5170,7 @@ tripe ration
often, alas, because the heat has not been kept low enough,
it has the consistency of wet shoe leather.
[ Joy of Cooking, by I Rombauer and M Becker ]
~water troll
*troll
The troll shambled closer. He was perhaps eight feet tall,
perhaps more. His forward stoop, with arms dangling past
@@ -5420,6 +5439,21 @@ water demon
and drink, I will enjoy eating you, the biggest monkey, most
of all!" He grinned, and saliva dripped down his hairy chin.
[ Buddhist Tales for Young and Old, Vol. 1 ]
water troll
It wasn't that the troll was _horrifying_. Instead of the
rotting, betentacled monstrosity he had been expecting
Rincewind found himself looking at a rather squat but not
particularly ugly old man who would quite easily have passed
for normal on any city street, always provided that other
people on the street were used to seeing old men who were
apparently composed of water and very little else. It was as
if the ocean had decided to create life without going through
all that tedious business of evolution, and had simply formed
a part of itself into a biped and sent it walking squishily up
the beach. The troll was a pleasant translucent blue color.
As Rincewind stared a small shoal of silver fish flashed
across its chest.
[ The Colour of Magic, by Terry Pratchett ]
weapon
A weapon is a device for making your enemy change his mind.
[ The Vor Game, by Lois McMaster Bujold ]
@@ -5428,17 +5462,17 @@ web
When first we practise to deceive!
[ Marmion, by Sir Walter Scott ]
whistle
There were legends both on the front and on the back of the
There were legends both on the front and on the back of the
whistle. The one read thus:
FLA FUR BIS FLE The other: QUIS EST ISTE QUI VENIT
'I ought to be able to make it out,' he thought;
'but I suppose I am a little rusty in my Latin.
When I come to think of it, I don't believe I even
know the word for a whistle. The long one does seem
simple enough. It ought to mean, "Who is this who is coming?"
FLA FUR BIS FLE The other: QUIS EST ISTE QUI VENIT
'I ought to be able to make it out,' he thought;
'but I suppose I am a little rusty in my Latin.
When I come to think of it, I don't believe I even
know the word for a whistle. The long one does seem
simple enough. It ought to mean, "Who is this who is coming?"
Well, the best way to find out is evidently to whistle
Well, the best way to find out is evidently to whistle
for him.'
[Ghost Stories of an Antiquary, by Montague Rhodes James

2
dat/hh
View File

@@ -96,7 +96,7 @@ M-2 twoweapon toggle two-weapon combat (unless number_pad is enabled)
M-a adjust adjust inventory letters
M-A annotate add a one-line note to the current dungeon level (see M-O)
M-c chat talk to someone
M-C conduct view optional challanges
M-C conduct view optional challenges
M-d dip dip an object into something
M-e enhance advance or check weapon and spell skills
M-f force force a lock

4
dat/opthelp
View File

@@ -104,7 +104,7 @@ preload_tiles control whether tiles get pre-loaded into RAM at [TRUE]
of the tile graphics, but uses more memory.
Boolean option if TTY_TILES_ESCCODES was set at compile time (tty only):
vt_tiledata insert extra data escae code markers into output [FALSE]
vt_tiledata insert extra data escape code markers into output [FALSE]
Any Boolean option can be negated by prefixing it with a '!' or 'no'.
@@ -159,7 +159,7 @@ paranoid_confirmation space separated list [paranoid_confirmation:pray]
pray -- y to confirm an attempt to pray; on by default
Remove -- always pick from inventory for 'R' and 'T' even when
wearing just one applicable item to remove or take off
pickup_burden when you pick up an item that exceeds this encumberance [S]
pickup_burden when you pick up an item that exceeds this encumbrance [S]
level (Unencumbered, Burdened, streSsed, straiNed, overTaxed,
or overLoaded), you will be asked if you want to continue.
pickup_types a list of default symbols for kinds of objects to []

8
dat/quest.txt
View File

@@ -1668,7 +1668,7 @@ to %ns lair. If you can manage to defeat %n and return
undead that befoul the land.
"Go with %d as your guide, %p."
%E [%nC invaded %H and captured %o. Defeat %ni and retrive %oh.]
%E [%nC invaded %H and captured %o. Defeat %ni and retrieve %oh.]
%Cp Pri 00025
"You can prevail, if you rely on %d."
%E
@@ -2056,7 +2056,7 @@ the Amulet."
%E [You have succeeded. Take %o with you as you go to find the Amulet.]
# assumes The Longbow of Diana
%Cc Ran 00082
%l flexs %o reverently.
%l flexes %o reverently.
"With this wondrous bow, one need never run out of arrows.
You are its keeper now, and the time has come to resume your
@@ -2707,7 +2707,7 @@ and you may be able to defeat him."
"If you are %a at all times you may succeed, %p."
%E
%Cp Tou 00034
"Let all who meet you on your journey know that you are on an quest for
"Let all who meet you on your journey know that you are on a quest for
%l and grant safe passage."
%E
%Cc Tou 00035
@@ -2967,7 +2967,7 @@ The ice and snow gives way to a valley floor. You %x ahead of you
a huge round hill surrounded by pools of lava. This then is the entrance
to %i. It looks like you're not going to get in without
a fight though.
%E [This is the entrace to %i.]
%E [This is the entrance to %i.]
%Cp Val 00036
Once again, you stand before the entrance to %i.
%E