A bunch of no_monster_gen KMASK for fountains, mainly the temple entries mentioned in BR#2833297.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10508 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 46 insertions, 30 deletions

diff --git a/crawl-ref/source/dat/altar.des b/crawl-ref/source/dat/altar.des
index 6ce08ac758..ec2499f79b 100644
--- a/crawl-ref/source/dat/altar.des
+++ b/crawl-ref/source/dat/altar.des
@@ -1,5 +1,5 @@
 ###############################################################################
-# altar.des: This is the place where minivaults (and floating vaults) 
+# altar.des: This is the place where minivaults (and floating vaults)
 #            containing altars should go. Vaults particular to a specific
 #            branch (Beogh altar minivaults for Orc:*, for example), may
 #            go in the corresponding des-file. A few entry vaults contain
@@ -122,17 +122,17 @@ TAGS:   no_monster_gen no_rotate
 TAGS:   no_monster_gen no_pool_fixup no_rotate
 : end
 MAP
-   .........   
-  ...wwwww...  
- ..wwwwwwwww.. 
+   .........
+  ...wwwww...
+ ..wwwwwwwww..
 ..wwwwwwwwwww..
 .wwwwwwwwwwwww.
 .wwwwwwCwwwwww.
 .wwwwwwwwwwwww.
 ..wwwwwwwwwww..
  .wwwwwwwww..
- ...wwwww... 
-   ........  
+ ...wwwww...
+   ........
 ENDMAP
 
 NAME:   lemuel_altar_in_water2
@@ -208,7 +208,7 @@ xxxxxxxxxxx
 ENDMAP
 
 NAME:  lemuel_tele_altar
-DEPTH: D:2-18, Vault 
+DEPTH: D:2-18, Vault
 SUBST: Y = X x
 KFEAT: X = teleport trap
 MAP
@@ -258,6 +258,7 @@ NAME:   lemuel_upstairs_altar
 DEPTH:  D:2-12, Vault, Elf, Crypt
 ORIENT: float
 SUBST:  T:T., )=)}], c:ccx
+KMASK:  T = no_monster_gen
 MAP
 ccccccc
 cT...Tc
@@ -282,14 +283,14 @@ MONS:  patrolling Angel
 KFEAT: C = altar_elyvilon / altar_zin / altar_shining_one
 MAP
    .....
-  ..xmx..  
- ..xx>xx.. 
+  ..xmx..
+ ..xx>xx..
 ..xxx.xxx..
 .xxxx1xxxx.
 .m>..C..>m.
 .xxxx.xxxx.
 ..xxx.xxx..
- ..xx>xx.. 
+ ..xx>xx..
   ..xmx..
    .....
 ENDMAP
@@ -308,17 +309,17 @@ SUBST: C = C P:1
 KFEAT: C = altar_lugonu/altar_yredelemnul/altar_kikubaaqudgha/altar_makhleb
 KFEAT: P = enter_abyss
 MAP
-  ..LLllLL.... 
+  ..LLllLL....
   .LllllllLLL..
 ..Lll323lllLLL.
 .LLl32123lllLL.
 .LLl33C33llLL..
 ..Lll323llLL...
 ..LLll3llL.....
-...LLlllL...   
-....LLLL....   
-   ..LLLLL..   
-   ....LLLL.   
+...LLlllL...
+....LLLL....
+   ..LLLLL..
+   ....LLLL.
 ENDMAP
 
 NAME:  david_defended_altar_orc
@@ -377,12 +378,12 @@ xxxxwwwwwwwwxxxx
 xxxxxxxxxxxxxxxx
 ENDMAP
 
-# The mix of deep and shallow water is intended to keep the centaurs from 
+# The mix of deep and shallow water is intended to keep the centaurs from
 # escaping without requiring the player to be able to cross deep water.
 NAME:  lemuel_centaur_altar
 DEPTH: D:7-20, Shoal, Lair
 TAGS:  no_pool_fixup no_monster_gen
-MONS:  centaur
+MONS:  patrolling centaur
 MAP
 xxxxxxxxxxxxx
 xxxxxxxxxxwxx
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index b3938eff36..129e298ea2 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -1261,6 +1261,8 @@ NAME:  solitary_fountain
 DEPTH: D, Elf, Vault
 TAGS:  allow_dup extra luniq_mini
 SUBST: ?=TUV
+KMASK: T = no_monster_gen
+KMASK: U = no_monster_gen
 MAP
 .....
 .....
@@ -1622,6 +1624,7 @@ SHUFFLE: 1?T
 SUBST:   T : T V:2
 SUBST:   ? : 1:2 .
 MONS:    hound / w:1 nothing / w:2 jackal
+KMASK:   T = no_monster_gen
 MAP
 .......
 .xx+xx.
diff --git a/crawl-ref/source/dat/temple.des b/crawl-ref/source/dat/temple.des
index c57d22a2ef..c8501857d9 100644
--- a/crawl-ref/source/dat/temple.des
+++ b/crawl-ref/source/dat/temple.des
@@ -65,6 +65,8 @@ NAME:   temple_fountains
 TAGS:   temple_entry
 ORIENT: float
 SUBST:  ? : T:30 U
+KMASK:  T = no_monster_gen
+KMASK:  U = no_monster_gen
 MAP
 ...?...
 .......
@@ -109,6 +111,8 @@ TAGS:   temple_entry
 ORIENT: float
 SUBST:  c:cxxx
 SUBST:  ? : ?:40 T:30 U, ? = T:30 U
+KMASK:  T = no_monster_gen
+KMASK:  U = no_monster_gen
 MAP
 cccccccccc
 ccccmmmmmc
@@ -126,6 +130,8 @@ ORIENT: float
 SUBST:  ? : ?:40 T:30 U, ? = T:30 U
 SUBST:  c:cxxx
 NSUBST: X = 1:= / *=m=
+KMASK:  T = no_monster_gen
+KMASK:  U = no_monster_gen
 MAP
 ccccccccccc
 cccmmmmmccc
@@ -143,6 +149,8 @@ ORIENT: float
 SUBST:  ? : ?:40 T:30 U, ? = T:30 U
 SUBST:  c:cxxx
 NSUBST: X = 1:= / *=m=
+KMASK:  T = no_monster_gen
+KMASK:  U = no_monster_gen
 MAP
 ccccccccc
 cccmmmmmc
@@ -157,11 +165,13 @@ ENDMAP
 
 NAME:   temple_secret_doors_d
 WEIGHT: 1
-TAGS:   temple_entry 
+TAGS:   temple_entry
 ORIENT: float
 SUBST:  ? : ?:40 T:30 U, ? = T:30 U
 SUBST:  c:cxxx
 NSUBST: X = 1:= / *=m=
+KMASK:  T = no_monster_gen
+KMASK:  U = no_monster_gen
 MAP
 ccccccccccc
 cccmmmmmccc
@@ -181,6 +191,8 @@ ORIENT: float
 SUBST:  ? : ?:40 T:30 U, ? = T:30 U
 SUBST:  c:cxxx
 NSUBST: X = 1:= / *=m=
+KMASK:  T = no_monster_gen
+KMASK:  U = no_monster_gen
 MAP
 cccccc@cccccc
 cccccc.cccccc
@@ -264,16 +276,16 @@ MAP
 .......''''!!!!!!!!!???????!!!!!!!!!''''........
 .......'''!!!!!!!!!????O????!!!!!!!!!'''........
 .......''''!!!!!!!!!???????!!!!!!!!!''''........
-.......'''''!!!!!!!!!?????!!!!!!!!!'''''....... 
-x.......'''''!!!!!!!!!???!!!!!!!!!'''''........ 
-x........'''''!!!!!!!!!?!!!!!!!!!'''''......... 
-xx._......'''''!!!!!!!!!!!!!!!!!'''''.........  
-xxxxm......'''''''!!!!!!!!!!!'''''''..........  
-xxxxxm......''''''''!!!!!!!''''''''..........   
-xxxx1m_........'''''''!!!'''''''.............   
-xxxxxxm_..........'''''''''''...............    
-xxxxxxxxxx...........'''''................      
-xxxxxxxxxxxx...........................         
+.......'''''!!!!!!!!!?????!!!!!!!!!'''''.......
+x.......'''''!!!!!!!!!???!!!!!!!!!'''''........
+x........'''''!!!!!!!!!?!!!!!!!!!'''''.........
+xx._......'''''!!!!!!!!!!!!!!!!!'''''.........
+xxxxm......'''''''!!!!!!!!!!!'''''''..........
+xxxxxm......''''''''!!!!!!!''''''''..........
+xxxx1m_........'''''''!!!'''''''.............
+xxxxxxm_..........'''''''''''...............
+xxxxxxxxxx...........'''''................
+xxxxxxxxxxxx...........................
 ENDMAP
 
 ##############################################################################
@@ -281,7 +293,7 @@ ENDMAP
 #
 # To reach the Temple, you just have to walk straight. Note that the
 # frequency of the flames is low enough that you have to spend a fair
-# amount of time off the path to get hit by one. And at this depth 
+# amount of time off the path to get hit by one. And at this depth
 # they should not be fatal to anyone. -LP
 #
 NAME:    temple_firewalk
@@ -324,7 +336,7 @@ ENDMAP
 ###############################################################################
 # Firewalk II (Lemuel)
 #
-# A second version, with the safe path marked. Personally I don't think 
+# A second version, with the safe path marked. Personally I don't think
 # it's necessary, but it does make it harder to kill yourself. -LP
 #
 NAME:    temple_firewalk_marked