Apply r10508 to 0.5: use no_monster_gen KMASK to get rid of ood eels in fountains, mainly for temple entries.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10509 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 48 insertions, 32 deletions

diff --git a/crawl-ref/source/dat/altar.des b/crawl-ref/source/dat/altar.des
index bdad59b1fe..b4509aeb57 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
@@ -256,6 +256,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
@@ -280,14 +281,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
@@ -306,17 +307,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
@@ -375,12 +376,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
@@ -391,7 +392,7 @@ xwwWwwwwwwxxx
 xxwWwWWwwWxxx
 xxxwWwwWwxxxx
 xxxwwwWwWxxxx
-xxx......xxxx
+xxx...@..xxxx
 ENDMAP
 
 NAME:   lemuel_mausoleum_altar
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 6eb04d415c..26939924f8 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -848,8 +848,8 @@ xxxx  xxxx
 x**x  x**x
 x**+..+**x
 xx+x..x+xx
-  ......  
-  ......  
+  ......
+  ......
 xx+x..x+xx
 x**+..+**x
 x**x  x**x
@@ -1255,6 +1255,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
 .....
 .....
@@ -1614,6 +1616,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.
@@ -1690,7 +1693,7 @@ TAGS:   mini_float patrolling
 DEPTH:  5-26, !Lair, !Orc, !Tomb
 NSUBST: k = 4=k / *= .:19 k:1
 KITEM:  S = good_item long sword / good_item great sword / good_item katana /\
-            good_item triple sword / good_item double sword 
+            good_item triple sword / good_item double sword
 KFEAT:  S = teleport trap
 NSUBST: n = n/cbn
 : if you.absdepth() < 10 then
@@ -1758,7 +1761,7 @@ MAP
 ENDMAP
 
 ################################################################################
-# Some earlyish demon minivaults by Eino. 
+# Some earlyish demon minivaults by Eino.
 # The difficulty of most low-tier demons is severely inflated by the time the
 # player gets to meet them. Here (using default depth) they aspire to be both
 # challenging and flavourful.
diff --git a/crawl-ref/source/dat/temple.des b/crawl-ref/source/dat/temple.des
index 089e5b9a57..92135dcfb9 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,13 +276,13 @@ MAP
 .......''''!!!!!!!!!???????!!!!!!!!!''''........
 .......'''!!!!!!!!!????O????!!!!!!!!!'''........
 .......''''!!!!!!!!!???????!!!!!!!!!''''........
-.......'''''!!!!!!!!!?????!!!!!!!!!'''''....... 
-x.......'''''!!!!!!!!!???!!!!!!!!!'''''........ 
-x........'''''!!!!!!!!!?!!!!!!!!!'''''......... 
-xx._......'''''!!!!!!!!!!!!!!!!!'''''.........  
-xxxxm......'''''''!!!!!!!!!!!'''''''..........  
-xxxxxm......''''''''!!!!!!!''''''''..........   
-xxxx1m_........'''''''!!!'''''''.............   
+.......'''''!!!!!!!!!?????!!!!!!!!!'''''.......
+x.......'''''!!!!!!!!!???!!!!!!!!!'''''........
+x........'''''!!!!!!!!!?!!!!!!!!!'''''.........
+xx._......'''''!!!!!!!!!!!!!!!!!'''''.........
+xxxxm......'''''''!!!!!!!!!!!'''''''..........
+xxxxxm......''''''''!!!!!!!''''''''..........
+xxxx1m_........'''''''!!!'''''''.............
 xxxxxxm_..........'''''''''''...............
 xxxxxxxxxx...........'''''................
 xxxxxxxxxxxx...........................
@@ -682,8 +694,8 @@ cwwwwwwww..B.........B..wwwwwwwwc
 cwwwwwwwww...www.......wwwwwwwwwc
 cwwwwwwwwwwwwwwww...wwwwwwwwwwwwc
 cwwwwwwwwwwwwwwwww...wwwwwwwwwwwc
-cwqwwwwwwwwwwwwwwww...wwwwwwwwwwc
-cqwwwwwwwwwwwwwwwww...wwwwwwwwwwc
+cwwwwwwwwwwwwwwwwww...wwwwwwwwwwc
+cwwwwwwwwwwwwwwwwww...wwwwwwwwwwc
 cwwwwwwwwwwwwwwwww...wwwwwwwwwwwc
 cwwwwwwwwwwwwwwww...wwwwwwwwwwwwc
 cwwwwwwwwww...........wwwwwwwwwwc