First part of .des changes (courtesy of David). These should be

safe, and I'll have a look into the other diffs right away.

What he did:
- replace granite statue with glass walls
- correct mistakes
- add information


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

5 files changed, 51 insertions, 39 deletions

diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
index 1d77eb5648..e35f5c6d23 100644
--- a/crawl-ref/source/dat/bazaar.des
+++ b/crawl-ref/source/dat/bazaar.des
@@ -168,7 +168,6 @@ TAGS:    bzr_entry allow_dup
 ORIENT:  float
 FLAGS:   no_rotate
 MONS:    plant
-#SUBST:   w = W w
 SHUFFLE: XY
 SUBST:   a = W .
 SUBST:   X : T 1
@@ -199,6 +198,10 @@ ENDMAP
 # You can force a particular colour for the rock walls or floor using
 # ROCKCOL and FLOORCOL directives.
 #
+
+########################################
+# General marketplace
+# 4 random shops
 NAME:   bazaar_general_marketplace
 TAGS:   bazaar allow_dup
 FLAGS:  no_rotate
@@ -223,6 +226,9 @@ xxxxxxx>xxxxxxx
 xxxxxxxxxxxxxxx
 ENDMAP
 
+########################################
+# Outfitter
+# 3 weapon/armour shops, potentially antique
 NAME:    bazaar_outfitter
 TAGS:    bazaar allow_dup
 ORIENT:  encompass
@@ -248,6 +254,7 @@ ENDMAP
 
 ########################################
 # Another simple one (jpeg)
+# 4 random shops
 NAME:    bazaar_oval
 TAGS:    bazaar allow_dup
 ORIENT:  encompass
@@ -265,7 +272,9 @@ xxxB.....Bxxx
 xxxxxxxxxxxxx
 ENDMAP
 
-
+########################################
+# Mystics
+# 2 shops
 NAME:    bazaar_mystics
 TAGS:    bazaar allow_dup
 ORIENT:  encompass
@@ -300,6 +309,9 @@ xxxxxxxxxxxxxwwwwwxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
+########################################
+# Wands
+# 2 wand shops, 2 jewellery shops
 NAME:    bazaar_wands
 TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
@@ -347,7 +359,7 @@ ENDMAP
 
 ########################################
 # bazaars in a row
-#
+# ~4 shops
 NAME:    bazaar_row
 TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
@@ -392,7 +404,7 @@ ENDMAP
 
 ########################################
 # bazaars in a row v2
-#
+# ~4.5 shops
 NAME:    bazaar_row_2
 TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
@@ -435,7 +447,7 @@ ENDMAP
 
 #######################################
 # circle bazaar
-#
+# 5 shops
 NAME:    bazaar_circle_1
 CHANCE:  2
 TAGS:    bazaar allow_dup
@@ -678,7 +690,7 @@ ENDMAP
 
 #######################################
 # bazaar in honeycomb form (jpeg)
-#
+# 4 shops
 NAME:    bazaar_honeycomb
 TAGS:    bazaar allow_dup
 ORIENT:  encompass
@@ -719,6 +731,7 @@ ENDMAP
 
 ##########################################
 # bazaar lakeside with goldfish (jpeg)
+# 5 shops
 NAME:    bazaar_lake
 TAGS:    bazaar allow_dup
 ORIENT:  encompass
@@ -785,7 +798,7 @@ ENDMAP
 
 ##########################################
 # Bazaars in cross form (jpeg)
-#
+# 2.25 shops
 NAME:    bazaar_cross1
 TAGS:    bazaar allow_dup
 CHANCE:  5
@@ -793,8 +806,8 @@ FLAGS:   no_rotate
 ORIENT:  encompass
 SHUFFLE: ABCD
 SUBST:   A = <, B = >
-KFEAT:   C = any shop / jewellery shop / wand shop
-KFEAT:   D = any shop / book shop / scroll shop
+KFEAT:   C = jewellery shop / wand shop
+KFEAT:   D = antique armour shop / book shop
 : bazaar_message(_G)
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -825,9 +838,9 @@ FLAGS:   no_rotate
 ORIENT:  encompass
 SHUFFLE: ABCD
 SUBST:   A = T E, B = >
-KFEAT:   C = any shop / antique weapon shop / distillery shop
-KFEAT:   D = any shop / antique armour shop
-KFEAT:   E = general shop
+KFEAT:   C = antique weapon shop
+KFEAT:   D = antique armour shop
+KFEAT:   E = general shop / distillery shop
 : bazaar_message(_G)
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -853,7 +866,7 @@ ENDMAP
 
 ###################################
 # strange pattern (jpeg) 
-#
+# 4 shops
 NAME:    bazaar_ribbon
 TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
@@ -900,8 +913,8 @@ ENDMAP
 
 
 #######################################
-# Five bazaars in nine rooms (jpeg)
-#
+# Nine rooms (jpeg)
+# 5 shops
 NAME:    bazaar_ninerooms1
 TAGS:    bazaar allow_dup
 CHANCE:  2
@@ -1096,7 +1109,7 @@ ENDMAP
 
 #############################################
 # some more bazaars based on triangles (jpeg)
-
+# 4.4 shops
 NAME:    bazaar_triangles
 TAGS:    bazaar allow_dup
 ORIENT:  encompass
@@ -1104,7 +1117,7 @@ CHANCE:  1
 FLAGS:   no_rotate
 SHUFFLE: ACD
 SUBST:   A = <
-KFEAT:   B = any shop
+KFEAT:   B = any shop / antique armour shop / jewellery shop
 SUBST:   C = >
 SUBST:   D = T
 : bazaar_message(_G)
@@ -1172,7 +1185,7 @@ xxA.......................Axx
 xxxxxxxxxxxxx...xxxxxxxxxxxxx
 xxxxxxxxxxxxx...xxxxxxxxxxxxx
 xxxxxxxxxxxx.....xxxxxxxxxxxx 
-xxxxxxxxxxx...A...xxxxxxxxxxx
+xxxxxxxxxxx...C...xxxxxxxxxxx
 xxxxxxxxxxxx.....xxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
diff --git a/crawl-ref/source/dat/glass.des b/crawl-ref/source/dat/glass.des
index 7d7bd28039..bf420b76c1 100644
--- a/crawl-ref/source/dat/glass.des
+++ b/crawl-ref/source/dat/glass.des
@@ -55,7 +55,7 @@ ENDMAP
 #######################################################################
 # An item encased in glass.  If the player wants it, it can be dug out.
 NAME:  item_on_display_a
-DEPTH:
+CHANCE: 9
 TAGS:  no_monster_gen no_item_gen
 MAP
 .....
@@ -66,10 +66,10 @@ MAP
 ENDMAP
 
 #####################################################################
-# A good item encased in *permanent* glass.  If the player wants it,
-# teleport control will be needed.
+# A good item encased in transparent stone or (rarely) permanent glass.
 NAME:  item_on_display_b
-DEPTH:
+CHANCE: 1
+SUBST: o : n o:1
 TAGS:  no_monster_gen no_item_gen
 MAP
 .....
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index b383380f26..9622f587f8 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -261,7 +261,7 @@ DEPTH: Lair
 SUBST: .= d .:150 1:8 2:4
 MONS: plant, butterfly
 ITEM: strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
-CHANCE: 2
+CHANCE: 1
 COLOUR: . = green:20 / brown:15 / none
 MAP
 .....................
@@ -288,7 +288,7 @@ DEPTH: Lair
 SUBST: .= d .:140 1:8 2:4
 MONS: plant, butterfly
 ITEM: strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
-CHANCE: 2
+CHANCE: 1
 COLOUR: . = green:20 / brown:15 / none
 MAP
        .......
@@ -316,7 +316,7 @@ DEPTH: Lair
 SUBST: .= d .:50 1:8 2:4
 MONS: plant, butterfly
 ITEM: strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
-CHANCE: 3
+CHANCE: 4
 COLOUR: . = green:20 / brown:15 / none
 MAP
    ....
@@ -335,7 +335,7 @@ DEPTH: Lair
 SUBST: .= d .:50 1:8 2:4 
 MONS: plant, butterfly
 ITEM: strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
-CHANCE: 3
+CHANCE: 4
 COLOUR: . = green:20 / brown:15 / none
 MAP
    ..
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index 4a5eccd4e3..e038792d45 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -128,7 +128,7 @@ ENDMAP
 #
 # This is intended mainly for Orc Mines. Can it appear there?
 #
-# Yes, it's a bit tough for the levles where it appears. But it has good loot.
+# Yes, it's a bit tough for the levels where it appears. But it has good loot.
 # And be thankful I got rid of the version with a titan!
 #
 # Lemuel
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 952641c300..9bb3979212 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -158,7 +158,7 @@ ENDMAP
 
 #############################################################################
 # Oklob assault
-#
+# statistically, three oklobs
 NAME:    oklob_1
 DEPTH:   D:16-27, Lair:4-
 TAGS:    allow_dup
@@ -309,24 +309,23 @@ ENDMAP
 NAME: water_boxes_lemuel
 TAGS: no_pool_fixup uniq_water_maze_lemuel
 DEPTH: 5-27
-SHUFFLE: abcd, efgh, ijkl, mnop
 KMONS: * = fungus
 KFEAT: * = *
-SUBST: a = =, b = x, c = x, d = x
-SUBST: e = =, f = x, g = x, h = x
-SUBST: i = =, j = x, k = x, l = x
-SUBST: m = =, n = x, o = x, p = x
+NSUBST: a = 1:= / *:x
+NSUBST: b = 1:= / *:x
+NSUBST: c = 1:= / *:x
+NSUBST: d = 1:= / *:x
 MAP
   wwwwwwww
  wwwwwwwwww
-wwxaxwwxexww
-wwb*cwwf*gww
-wwxdxwwxhxww
+wwxaxwwxbxww
+wwa*awwb*bww
+wwxaxwwxbxww
 wwwwwwwwwwww
 wwwwwwwwwwww
-wwxixwwxmxww
-wwj*kwwn*oww
-wwxlxwwxpxww
+wwxdxwwxcxww
+wwd*dwwc*cww
+wwxdxwwxcxww
  wwwwwwwwww
   wwwwwwww
 ENDMAP