From: Pasi Kallinen <paxed@alt.org>
Date: Thu, 5 Mar 2015 12:03:56 +0000 (+0200)
Subject: Fix data.base entries
X-Git-Tag: NetHack-3.6.0_RC01~627^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e37d4224b3decfc78937b09ab6a88865f4fc6ba8;p=nethack

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.
---

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