From 55f3390e5b11f0ef506ba24c6268be8f273809a5 Mon Sep 17 00:00:00 2001
From: "nethack.rankin" <nethack.rankin>
Date: Fri, 3 May 2002 08:05:56 +0000
Subject: [PATCH] special level fountain fix

     Add FOUNTAIN directives to the maps that just had '{' symbols.
Without them, the special level loader sets up those maps in a way
that prevents nethack from keeping the fountain counter accurately,
resulting in lack of fountain noises when they haven't been touched
yet and persistent noises after at least one of them has been dried
up.  (It would be better to fix lev_comp's map handling code to do
this automatically.)
---
 dat/Valkyrie.des |  3 ++-
 dat/castle.des   |  3 ++-
 dat/mines.des    | 13 ++++++++++++-
 doc/fixes34.1    |  1 +
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/dat/Valkyrie.des b/dat/Valkyrie.des
index e371b1bc3..58116d512 100644
--- a/dat/Valkyrie.des
+++ b/dat/Valkyrie.des
@@ -1,4 +1,4 @@
-#	SCCS Id: @(#)Valkyrie.des	3.4	1997/01/31
+#	SCCS Id: @(#)Valkyrie.des	3.4	2002/05/02
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991-2 by M. Stephenson
 # NetHack may be freely redistributed.  See license for details.
@@ -40,6 +40,7 @@ REGION:(27,08,42,12),lit,"ordinary"
 BRANCH:(66,17,66,17),(0,0,0,0)
 # Stairs
 STAIR:(18,01),down
+FOUNTAIN:(53,02)
 # Doors
 DOOR:locked,(26,10)
 DOOR:locked,(43,10)
diff --git a/dat/castle.des b/dat/castle.des
index 9c6bca1ba..346eecc11 100644
--- a/dat/castle.des
+++ b/dat/castle.des
@@ -1,4 +1,4 @@
-#	SCCS Id: @(#)castle.des	3.4	1995/11/19
+#	SCCS Id: @(#)castle.des	3.4	2002/05/02
 #	Copyright (c) 1989 by Jean-Christophe Collet
 # NetHack may be freely redistributed.  See license for details.
 #
@@ -47,6 +47,7 @@ RANDOM_MONSTERS:'L','N','E','H','M','O','R','T','X','Z'
 TELEPORT_REGION:levregion(01,00,10,20),(1,1,61,15),down
 TELEPORT_REGION:levregion(69,00,79,20),(1,1,61,15),up
 STAIR:levregion(01,00,10,20),(0,0,62,16),up
+FOUNTAIN:(10,08)
 # Doors
 DOOR:closed,(07,03)
 DOOR:closed,(55,03)
diff --git a/dat/mines.des b/dat/mines.des
index 5afb83055..65fa3b552 100644
--- a/dat/mines.des
+++ b/dat/mines.des
@@ -1,4 +1,4 @@
-#	SCCS Id: @(#)mines.des	3.4	2002/01/01
+#	SCCS Id: @(#)mines.des	3.4	2002/05/02
 #	Copyright (c) 1989-95 by Jean-Christophe Collet
 #	Copyright (c) 1991-95 by M. Stephenson
 # NetHack may be freely redistributed.  See license for details.
@@ -423,8 +423,12 @@ MAP
 |...|  ----       ------|....|     -----       -----.....----........|..|.|
 -----                   ------                     -------  ---------------
 ENDMAP
+
 STAIR:(01,01),up
 STAIR:(46,03),down
+FOUNTAIN:(50,09)
+FOUNTAIN:(10,15)
+FOUNTAIN:(66,18)
 
 REGION:(00,00,74,20),unlit,"ordinary"
 REGION:(09,13,11,17),lit,"ordinary"
@@ -519,9 +523,11 @@ MAP
 ...--..-....T.....--------....|......|-.
 .......--.....................----------
 ENDMAP
+
 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
+FOUNTAIN:(22,07)
 REGION:(13,5,14,6),unlit,"ordinary"
 REGION:(9,7,11,9),lit,"candle shop"
 REGION:(16,4,18,6),lit,"tool shop"
@@ -704,6 +710,7 @@ MAP
 | |....S..          |...............-..|         ..S...........|          |
 --------            --------------------           ------------------------
 ENDMAP
+
 # Dungeon Description
 RANDOM_PLACES:(08,16),(13,07),(21,08),(41,14),(50,04),(50,16),(66,01)
 REGION:(26,01,32,01),unlit,"ordinary",filled,true
@@ -814,7 +821,9 @@ MAP
 |.................|                    |.....................|........    |
 ---------------------------------------------------------------------------
 ENDMAP
+
 # Dungeon Description
+FOUNTAIN:(14,13)
 REGION:(23,03,48,06),lit,"ordinary"
 REGION:(21,06,22,06),lit,"ordinary"
 REGION:(14,04,14,04),unlit,"ordinary"
@@ -933,9 +942,11 @@ MAP
 -.S..|--------.---.---       -...---------------...{.---------   ---------  
 --|. - - - - - - - -- - - - -- . - - - --- - - - . . - - - - -- - - - - - - 
 ENDMAP
+
 RANDOM_PLACES:(1,15),(68,6),(1,13)
 NON_DIGGABLE:(67,3,73,7)
 NON_DIGGABLE:(0,12,2,16)
+FOUNTAIN:(12,08)
 REGION:(0,0,75,16),unlit,"ordinary"
 REGION:(38,6,46,10),lit,"ordinary"
 DOOR:closed,(37,8)
diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 10bbe5da6..8aa048d27 100644
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -97,6 +97,7 @@ boulder was not displayed if blind and discovered with a monster known via
 don't claim that statue comes to life if the monster it turns into is invisible
 fix goodpos() so worm segments don't get placed on top of each other (causing
 	a possible display problem if the worm is cut in two)
+fix fountain noises on some special levels (castle, valk home, various mines)
 
 
 Platform- and/or Interface-Specific Fixes
-- 
2.49.0