[Pkg-nethack-devel] nethack/dat data.base,1.1.1.1,1.2 mines.des,1.1.1.1,1.2 oracles.txt,1.1.1.1,1.2 quest.txt,1.1.1.1,1.2

[Joshua Kwan]

Update of /cvsroot/pkg-nethack/nethack/dat
In directory quantz:/tmp/cvs-serv9687/dat

Modified Files:
	data.base mines.des oracles.txt quest.txt 
Log Message:
Merge Nethack 3.4.3 upstream source.


Index: mines.des
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/dat/mines.des,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- mines.des	7 Oct 2003 19:00:01 -0000	1.1.1.1
+++ mines.des	9 Dec 2003 16:14:43 -0000	1.2
@@ -526,7 +526,7 @@
 
 REGION:(00,00,38,15),lit,"ordinary"
 STAIR:levregion(01,03,20,19),(0,0,39,15),up
-STAIR:levregion(21,03,75,19),(0,0,39,15),down
+STAIR:levregion(61,03,75,19),(0,0,39,15),down
 FOUNTAIN:(22,07)
 FOUNTAIN:(09,13)
 REGION:(13,5,14,6),unlit,"ordinary"
@@ -948,6 +948,7 @@
 NON_DIGGABLE:(67,3,73,7)
 NON_DIGGABLE:(0,12,2,16)
 FOUNTAIN:(12,08)
+FOUNTAIN:(51,15)
 REGION:(0,0,75,16),unlit,"ordinary"
 REGION:(38,6,46,10),lit,"ordinary"
 DOOR:closed,(37,8)

Index: quest.txt
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/dat/quest.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- quest.txt	7 Oct 2003 19:00:01 -0000	1.1.1.1
+++ quest.txt	9 Dec 2003 16:14:43 -0000	1.2
@@ -1445,7 +1445,7 @@
 "Call upon %d when your need is greatest.  You will be answered."
 %E
 %Cp Mon 00032
-"Remember that use the elementals' strength against them!"
+"Remember to use the elementals' strength against them!"
 %E
 %Cp Mon 00033
 "Do not lose faith, %p.  If you do so, %n will grow stronger."
@@ -1527,17 +1527,12 @@
 as possible.
 %E
 %Cc Mon 00080
-You feel a wrenching shift in the ether as %ns body dissolves
-into a cloud of noxious gas.
-
-Suddenly, a voice booms out:
+%nC gasps:
 
-    Thou hast defeated the least of my minions, %r.
-    Know now that Moloch is aware of thy presence.
-    As for thee, %n, I shall deal with thy failure
-    at my leisure.
+    "You have only defeated this mortal body.  Know this: my spirit
+    is strong.  I shall return and reclaim what is mine!"
 
-You then hear the voice of %n, screaming in terror...
+With that, %n expires.
 %E
 %Cc Mon 00081
 "You have returned, %p.  And with %o, I see.

Index: oracles.txt
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/dat/oracles.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- oracles.txt	7 Oct 2003 19:00:01 -0000	1.1.1.1
+++ oracles.txt	9 Dec 2003 16:14:43 -0000	1.2
@@ -89,7 +89,7 @@
 If thou wouldst gain entry, bear with thee an instrument of music, for the
 pontlevis may be charmed down with the proper melody.  What notes comprise
 it only the gods know, but a musical mastermind may yet succeed by witful
-improvization.  However, the less perspicacious are not without recourse,
+improvisation.  However, the less perspicacious are not without recourse,
 should they be prepared to circumambulate the castle to the postern.
 ----- ELBERETH
 The name of Elbereth may strike fear into the hearts of thine enemies, if

Index: data.base
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/dat/data.base,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- data.base	7 Oct 2003 19:00:00 -0000	1.1.1.1
+++ data.base	9 Dec 2003 16:14:43 -0000	1.2
@@ -901,6 +901,8 @@
 	reddish- or yellowish-brown coat, believed to have been
 	introduced by the aborigines.
 	[Webster's Encyclopedic Unabridged Dictionary of the English Language]
+disenchanter
+	Ask not, what your magic can do to it. Ask what it can do to your magic.
 dispater
 	Dispater is an arch-devil who rules the city of Dis.  He is
 	a powerful mage.
@@ -1676,6 +1678,29 @@
 	The ninety-nine years is nearly up, so trouble may soon be
 	heard of on the road between Hurworth and Neasham.
 		[ A Dictionary of Fairies, by Katharine Briggs ]
+holy water
+	"We want a word with you," said Ligur (in a tone of voice
+	intended to imply that "word" was synonymous with "horrifically
+	painful eternity"), and the squat demon pushed open the office
+	door.
+	The bucket teetered, then fell neatly on Ligur's head.
+	Drop a lump of sodium in water.  Watch it flame and burn and
+	spin around crazily, flaring and sputtering.  This was like
+	that, just nastier.
+	The demon peeled and flared and flickered.  Oily brown smoke
+	oozed from it, and it screamed and it screamed and it screamed.
+	Then it crumpled, folded in on itself, and what was left lay
+	glistening on the burnt and blackened circle of carpet, looking
+	like a handful of mashed slugs.
+	"Hi," said Crowley to Hastur, who had been walking behind Ligur,
+	and had unfortunately not been so much as splashed.
+	There are some things that are unthinkable; there are some
+	depths that not even demons would believe other demons would
+	stoop to.
+	". . . Holy water.  You bastard," said Hastur.  "You complete
+	_bastard_.  He hadn't never done nothing to _you_."
+	"Yet," corrected Crowley.
+		[ Good Omens, by Neil Gaiman and Terry Pratchett ]
 hom*nculus
 	A homunculus is a creature summoned by a mage to perform some
 	particular task.  They are particularly good at spying.  They
@@ -2898,6 +2923,20 @@
 	can't find out what it is like unless you can get to that
 	country and taste it for yourself.
 		[ The Last Battle, by C.S. Lewis ]
+pyrolisk
+	At first glance around the corner, I thought it was another 
+	cockatrice. I had encountered the wretched creatures two or
+	three times since leaving the open area. I quickly ducked my 
+	head back and considered what to do next. My heart had begun
+	to thump audibly as I patted my pack to make sure I still had 
+	the dead lizards at close reach. A check of my attire showed
+	no obvious holes or damage. I had to keep moving. One deep
+	breath, and a count of three, two, one, and around the corner 
+	I bolted. But it was no cockatrice! I felt a sudden intense 
+	searing of the skin around my face, and flames began to leap
+	from my pack. I tossed it to the ground, and quickly retreated
+	back, around that corner, desperately striving to get out of 
+	its sight.
 *orb of detection
 	This Orb is a crystal ball of exceptional powers.  When
 	carried, it grants ESP, limits damage done by spells, and
@@ -3792,7 +3831,7 @@
 	legend.  Part bird and part man, with red beak for a nose
 	and flashing eyes, the tengu was notorious for stirring up
 	feuds and prolonging enmity between families.  Indeed, the
-	belligerent tengus were supposed to have been man's first
+	belligerent tengu were supposed to have been man's first
 	instructors in the use of arms.
 	[ Mythical Beasts, by Deirdre Headon (The Leprechaun Library) ]
 thoth