Separate CHANCE and WEIGHT. CHANCE is a probability, WEIGHT is a raw number used as a generation weight (i.e. WEIGHT is what the old CHANCE used to be).

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

16 files changed, 180 insertions, 177 deletions

diff --git a/crawl-ref/source/dat/altar.des b/crawl-ref/source/dat/altar.des
index 76b7b8981e..d02c6001f6 100644
--- a/crawl-ref/source/dat/altar.des
+++ b/crawl-ref/source/dat/altar.des
@@ -17,7 +17,7 @@
 NAME:   minitemple
 TAGS:   allow_dup
 # More common than the others.
-CHANCE: 20
+WEIGHT: 20
 MAP
 cccccccccc
 cBcBcBcBcc
@@ -113,7 +113,7 @@ ENDMAP
 
 NAME:   lemuel_altar_in_water
 DEPTH:  D:2-18, Swamp, Shoal
-CHANCE: 9
+WEIGHT: 9
 : local brnd = crawl.random2(13)
 : if brnd > 10 then
 TAGS:   no_monster_gen no_rotate
@@ -138,7 +138,7 @@ ENDMAP
 NAME:   lemuel_altar_in_water2
 TAGS:   no_pool_fixup no_monster_gen
 DEPTH:  D:2-18, Lair, Snake, Swamp, Shoal
-CHANCE: 1
+WEIGHT: 1
 MAP
    www
   wwwww
@@ -176,7 +176,7 @@ MAP
 ENDMAP
 
 NAME:   lemuel_sealed_altar_a
-CHANCE: 3
+WEIGHT: 3
 DEPTH:  D:2-18, Vault, Elf, Crypt
 MAP
 xxxxxxxxxxxxx
@@ -194,7 +194,7 @@ xxxxxxxxxxxxx
 ENDMAP
 
 NAME: lemuel_sealed_altar_b
-CHANCE: 7
+WEIGHT: 7
 DEPTH: D:2-18, Vault, Elf, Crypt
 MAP
 xxxxxxxxxxx
diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
index 6ea205b1bc..500160406e 100644
--- a/crawl-ref/source/dat/bazaar.des
+++ b/crawl-ref/source/dat/bazaar.des
@@ -209,7 +209,7 @@ ENDMAP
 NAME:   bazaar_general_marketplace
 TAGS:   bazaar allow_dup no_rotate
 ORIENT: encompass
-CHANCE: 5
+WEIGHT: 5
 KFEAT:  A = any shop
 : bazaar_message(_G)
 MAP
@@ -236,7 +236,7 @@ ENDMAP
 NAME:    bazaar_outfitter
 TAGS:    bazaar allow_dup
 ORIENT:  encompass
-CHANCE:  5
+WEIGHT:  5
 KFEAT:   A = any shop
 SHUFFLE: ABC, de
 KFEAT:   A = weapon shop / armour shop
@@ -262,7 +262,7 @@ ENDMAP
 # 4 random shops
 NAME:    bazaar_oval
 TAGS:    bazaar allow_dup no_rotate
-CHANCE:  5
+WEIGHT:  5
 ORIENT:  encompass
 SUBST:   A = TVBG
 KFEAT:   B = any shop
@@ -282,7 +282,7 @@ ENDMAP
 # 2 shops
 NAME:    bazaar_mystics
 TAGS:    bazaar allow_dup
-CHANCE:  5
+WEIGHT:  5
 ORIENT:  encompass
 SUBST:   w : wlx
 SHUFFLE: AB, def
@@ -452,7 +452,7 @@ ENDMAP
 # circle bazaar
 # 5 shops
 NAME:    bazaar_circle_1
-CHANCE:  2
+WEIGHT:  2
 TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 SHUFFLE: ABCD, EFGH
@@ -492,7 +492,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_circle_2
-CHANCE:  2
+WEIGHT:  2
 TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 SHUFFLE: EFGH
@@ -532,7 +532,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_circle_3
-CHANCE:  2
+WEIGHT:  2
 TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 SHUFFLE: EFGH
@@ -572,7 +572,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_circle_4
-CHANCE:  1
+WEIGHT:  1
 TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 SHUFFLE: ABCDEF
@@ -611,7 +611,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_circle_5
-CHANCE:  2
+WEIGHT:  2
 TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 KFEAT:   C = any shop
@@ -649,7 +649,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_circle_6
-CHANCE:  1
+WEIGHT:  1
 TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 KFEAT:   A = any shop / antique armour shop
@@ -796,7 +796,7 @@ ENDMAP
 # ~3 shops
 NAME:    bazaar_cross1
 TAGS:    bazaar allow_dup no_rotate
-CHANCE:  2
+WEIGHT:  2
 ORIENT:  encompass
 SHUFFLE: ABCD
 SUBST:   A = <, B = >
@@ -827,7 +827,7 @@ ENDMAP
 
 NAME:    bazaar_cross2
 TAGS:    bazaar allow_dup no_rotate
-CHANCE:  3
+WEIGHT:  3
 ORIENT:  encompass
 SHUFFLE: ABCD
 SUBST:   A = T E, B = >
@@ -909,7 +909,7 @@ ENDMAP
 # 5 shops
 NAME:    bazaar_ninerooms1
 TAGS:    bazaar allow_dup no_rotate
-CHANCE:  2
+WEIGHT:  2
 ORIENT:  encompass
 SUBST:   k : . x
 NSUBST:  A = 2=T:30 V / *:C
@@ -946,7 +946,7 @@ ENDMAP
 
 NAME:    bazaar_ninerooms2
 TAGS:    bazaar allow_dup no_rotate
-CHANCE:  2
+WEIGHT:  2
 ORIENT:  encompass
 SUBST:   k : . x
 NSUBST:  A = 2=T:30 V / *:C
@@ -983,7 +983,7 @@ ENDMAP
 
 NAME:    bazaar_ninerooms3
 TAGS:    bazaar allow_dup no_rotate
-CHANCE:  2
+WEIGHT:  2
 ORIENT:  encompass
 SUBST:   z = .:50 +
 SUBST:   k : . x
@@ -1021,7 +1021,7 @@ ENDMAP
 
 NAME:    bazaar_ninerooms4
 TAGS:    bazaar allow_dup no_rotate
-CHANCE:  2
+WEIGHT:  2
 ORIENT:  encompass
 SUBST:   z = .:50 +
 SUBST:   k : . x
@@ -1059,7 +1059,7 @@ ENDMAP
 
 NAME:    bazaar_ninerooms5
 TAGS:    bazaar allow_dup no_rotate
-CHANCE:  2
+WEIGHT:  2
 ORIENT:  encompass
 SUBST:   k : . x
 NSUBST:  A = 1:< / 1:> / 1:T C / 3=T:30 V / *:C
@@ -1100,7 +1100,7 @@ ENDMAP
 NAME:    bazaar_triangles
 TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
-CHANCE:  1
+WEIGHT:  1
 SHUFFLE: ACD
 SUBST:   A = <
 KFEAT:   B = any shop / antique armour shop / jewellery shop
@@ -1122,7 +1122,7 @@ ENDMAP
 NAME:    bazaar_hexagon
 TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
-CHANCE:  4
+WEIGHT:  4
 SHUFFLE: AC, BD
 KFEAT:   A = armour shop / weapon shop / wand shop
 KFEAT:   B = general shop / food shop
@@ -1152,7 +1152,7 @@ ENDMAP
 NAME:    bazaar_triangle_bulge
 TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
-CHANCE:  5
+WEIGHT:  5
 SHUFFLE: ABC
 SUBST:   A = <, B = >
 KFEAT:   C = any shop
diff --git a/crawl-ref/source/dat/clua/loadmaps.lua b/crawl-ref/source/dat/clua/loadmaps.lua
index 0e12ed4313..2f6b617635 100644
--- a/crawl-ref/source/dat/clua/loadmaps.lua
+++ b/crawl-ref/source/dat/clua/loadmaps.lua
@@ -7,10 +7,13 @@
 ------------------------------------------------------------------------------
 
 local des_files = {
-   "altar.des", "bazaar.des", "entry.des", "elf.des", "float.des", "hells.des",
-   "hive.des", "lab.des", "lair.des", "large.des", "layout.des", "mini.des", 
-   "orc.des", "pan.des", "sewer.des", "temple.des", "vaults.des", "crypt.des",
-   "zot.des"
+  -- The dummy vaults that define global vault generation odds.
+  "dummy.des", 
+  
+  "altar.des", "bazaar.des", "entry.des", "elf.des", "float.des",
+  "hells.des", "hive.des", "lab.des", "lair.des", "large.des", "layout.des",
+  "mini.des", "orc.des", "pan.des", "sewer.des", "temple.des", "vaults.des",
+  "crypt.des", "zot.des"
 }
 
 for _, file in ipairs(des_files) do
diff --git a/crawl-ref/source/dat/elf.des b/crawl-ref/source/dat/elf.des
index 19b962335b..ee2b093303 100644
--- a/crawl-ref/source/dat/elf.des
+++ b/crawl-ref/source/dat/elf.des
@@ -37,7 +37,7 @@
 NAME:   elf_arrival_dummy
 TAGS:   dummy
 PLACE:  Elf:1
-CHANCE: 50
+WEIGHT: 50
 ORIENT: float
 MAP
 {
@@ -378,7 +378,7 @@ PLACE:   Elf:7
 TAGS:    no_pool_fixup no_rotate
 LFLAGS:  no_tele_control
 ORIENT:  float
-CHANCE:  5
+WEIGHT:  5
 MONS:    deep elf high priest, deep elf demonologist
 MONS:    deep elf annihilator, deep elf sorcerer
 MONS:    deep elf death mage, deep elf blademaster
@@ -432,7 +432,7 @@ NAME:    elf_hall_gauntlet_narrow
 PLACE:   Elf:7
 TAGS:    no_pool_fixup no_rotate
 ORIENT:  float
-CHANCE:  5
+WEIGHT:  5
 MONS:    deep elf high priest, deep elf demonologist
 MONS:    deep elf annihilator, deep elf sorcerer
 MONS:    deep elf death mage, deep elf master archer
diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index 932f09a06e..aac7791fcc 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -114,7 +114,7 @@ ENDMAP
 # good luck! (Shiori)
 NAME:    shiawase
 TAGS:    entry no_monster_gen no_rotate no_vmirror
-CHANCE:  5
+WEIGHT:  5
 ORIENT:  float
 ITEM:    bread ration, meat ration, apple, orange, banana, choko, pear
 SUBST:   . = .:100 $ % d
@@ -142,7 +142,7 @@ ENDMAP
 # Angband town! (Shiori)
 NAME:    angband_town
 ORIENT:  float
-CHANCE:  1
+WEIGHT:  1
 TAGS:    entry no_rotate
 NSUBST:  { = { / > / .
 NSUBST:  = = 3== / *=x
@@ -295,7 +295,7 @@ ENDMAP
 NAME:    zelgadis_glass_entry_002
 TAGS:    entry
 ORIENT:  float
-CHANCE:  1
+WEIGHT:  1
 SHUFFLE: {[(<
 SUBST:   < = .
 NSUBST:  X = 4:+ / *:x
@@ -502,7 +502,7 @@ NAME:    lemuel_entry_005_a
 TAGS:    entry no_monster_gen
 ORIENT:  float
 SHUFFLE: {}
-CHANCE:  2
+WEIGHT:  2
 MAP
 xxxxxxxxxxxxxxxxxxx
 xxxxx{.......}xxxxx
@@ -527,7 +527,7 @@ ENDMAP
 NAME:    lemuel_entry_005_b
 TAGS:    entry no_monster_gen
 ORIENT:  float
-CHANCE:  7
+WEIGHT:  7
 SHUFFLE: {}, XYZ
 SUBST:   X=W, Y=w, Z=w
 MAP
@@ -558,7 +558,7 @@ TAGS:    entry no_monster_gen
 ORIENT:  float
 SHUFFLE: {}, ABC
 SUBST:   A:=, B:x, C:x
-CHANCE:  1
+WEIGHT:  1
 MAP  
 xxxxxxxxxxxxxxxxxxx  
 xxxWA{.......}xxxxx  
@@ -674,7 +674,7 @@ TAGS:    entry no_monster_gen
 ORIENT:  float
 SHUFFLE: {[(
 SUBST:   ? : xxcvG.
-CHANCE:  4
+WEIGHT:  4
 MAP
 xxxxxxxxxxx
 x{...(...[x
@@ -700,7 +700,7 @@ SUBST:   ? : xxcvG.
 ITEM:    meat ration / bread ration / beef jerky / spear / potion of water / \
          apple / club / hammer / knife
 SHUFFLE: {[(
-CHANCE:  3
+WEIGHT:  3
 MAP
 xxxxxxxxxxxx
 x{...(...[xx
@@ -726,7 +726,7 @@ SUBST:   ? : xxcvG.
 ITEM:    meat ration / bread ration / beef jerky / spear / potion of water / \
          apple / club / hammer / knife
 SHUFFLE: {[(
-CHANCE:  3
+WEIGHT:  3
 MAP
 xxxxxxxxxxxx
 x{...(...[xx
@@ -750,7 +750,7 @@ ENDMAP
 
 NAME:    lemuel_entry_010_a
 TAGS:    entry no_monster_gen
-CHANCE:  5
+WEIGHT:  5
 ORIENT:  float
 SHUFFLE: {(
 SUBST:   b : bcvxxx
@@ -770,7 +770,7 @@ ENDMAP
 
 NAME:    lemuel_entry_010_b
 TAGS:    entry no_monster_gen
-CHANCE:  5
+WEIGHT:  5
 ORIENT:  float
 SHUFFLE: {(
 SUBST:   b : bcvxxx
@@ -817,7 +817,7 @@ ENDMAP
 NAME:    david_entry_001_a
 TAGS:    entry no_rotate
 ORIENT:  float
-CHANCE:  5
+WEIGHT:  5
 SHUFFLE: {[(
 MAP
    xxxxx  x@x  xxxxx
@@ -843,7 +843,7 @@ ENDMAP
 NAME:    david_entry_001_b
 TAGS:    entry no_rotate no_monster_gen
 ORIENT:  float
-CHANCE:  5
+WEIGHT:  5
 SHUFFLE: {[, }>
 MAP
          xxxxx
@@ -1112,7 +1112,7 @@ ENDMAP
 #
 NAME:   david_entry_011_a
 TAGS:   entry no_monster_gen no_rotate
-CHANCE: 3
+WEIGHT: 3
 ORIENT: float
 NSUBST: . = 1:d / *:.
 ITEM:   stone / dart
@@ -1144,7 +1144,7 @@ ENDMAP
 
 NAME:   david_entry_011_b
 TAGS:   entry no_monster_gen no_rotate
-CHANCE: 1
+WEIGHT: 1
 ORIENT: float
 NSUBST: . = 1:d / *:.
 ITEM:   stone / dart
@@ -1176,7 +1176,7 @@ ENDMAP
 
 NAME:    david_entry_011_c
 TAGS:    entry no_monster_gen no_rotate
-CHANCE:  6
+WEIGHT:  6
 ORIENT:  float
 SHUFFLE: ab, cd, ef, gh, ij, kl, mn
 SUBST:   a=., c=., e=., g=., i=., k=., m=.
@@ -1303,7 +1303,7 @@ ENDMAP
 # (but commented out). All water is deep.
 # NAME: water_fire_template
 # TAGS: entry no_monster_gen no_pool_fixup no_rotate
-# CHANCE: 1
+# WEIGHT: 1
 # ORIENT: float
 # MONS: plant
 # MAP
@@ -1333,7 +1333,7 @@ ENDMAP
 
 NAME: david_entry_015_a_water_fire
 TAGS: entry no_monster_gen no_pool_fixup no_rotate
-CHANCE: 1
+WEIGHT: 1
 MONS: plant
 ORIENT: float
 MAP
@@ -1363,7 +1363,7 @@ ENDMAP
 
 NAME: david_entry_015_b_water_fire
 TAGS: entry no_monster_gen no_pool_fixup no_rotate
-CHANCE: 1
+WEIGHT: 1
 NSUBST: . = 1:d / *:.
 ITEM: stone/dart
 MONS: plant
@@ -1395,7 +1395,7 @@ ENDMAP
 
 NAME: david_entry_015_c_water_fire
 TAGS: entry no_monster_gen no_pool_fixup no_rotate
-CHANCE: 1
+WEIGHT: 1
 NSUBST: . = 1:d / *:.
 ITEM: stone/dart
 MONS: plant
@@ -1427,7 +1427,7 @@ ENDMAP
 
 NAME: david_entry_015_d_water_fire
 TAGS: entry no_monster_gen no_pool_fixup no_rotate
-CHANCE: 1
+WEIGHT: 1
 NSUBST: . = 1:d / *:.
 ITEM: stone/dart
 MONS: plant
@@ -1459,7 +1459,7 @@ ENDMAP
 
 NAME: david_entry_015_e_water_fire
 TAGS: entry no_monster_gen no_pool_fixup no_rotate
-CHANCE: 1
+WEIGHT: 1
 NSUBST: . = 1:d / *:.
 ITEM: stone/dart
 MONS: plant
@@ -1491,7 +1491,7 @@ ENDMAP
 
 NAME: david_entry_015_f_water_fire
 TAGS: entry no_monster_gen no_pool_fixup no_rotate
-CHANCE: 1
+WEIGHT: 1
 NSUBST: . = 1:d / *:.
 ITEM: stone/dart
 MONS: plant
@@ -1523,7 +1523,7 @@ ENDMAP
 
 NAME: david_entry_015_g_water_fire
 TAGS: entry no_monster_gen no_pool_fixup no_rotate
-CHANCE: 1
+WEIGHT: 1
 NSUBST: . = 1:d / *:.
 ITEM: stone/dart
 MONS: plant
@@ -1555,7 +1555,7 @@ ENDMAP
 
 NAME: david_entry_015_h_water_fire
 TAGS: entry no_monster_gen no_pool_fixup no_rotate
-CHANCE: 1
+WEIGHT: 1
 NSUBST: . = 1:d / *:.
 ITEM: stone/dart
 MONS: plant
@@ -1587,7 +1587,7 @@ ENDMAP
 
 NAME: david_entry_015_i_water_fire
 TAGS: entry no_monster_gen no_pool_fixup no_rotate
-CHANCE: 1
+WEIGHT: 1
 NSUBST: . = 1:d / *:.
 ITEM: stone/dart
 MONS: plant
@@ -1619,7 +1619,7 @@ ENDMAP
 
 NAME: david_entry_015_j_water_fire
 TAGS: entry no_monster_gen no_pool_fixup no_rotate
-CHANCE: 1
+WEIGHT: 1
 NSUBST: . = 1:d / *:.
 ITEM: stone/dart
 MONS: plant
@@ -1678,7 +1678,7 @@ ENDMAP
 #
 NAME:    david_entry_017_a
 TAGS:    entry no_monster_gen no_rotate
-CHANCE:  2
+WEIGHT:  2
 ORIENT:  float
 SHUFFLE: {[(
 MAP
@@ -1700,7 +1700,7 @@ ENDMAP
 NAME:    david_entry_017_b
 TAGS:    entry no_monster_gen no_rotate
 ORIENT:  float
-CHANCE:  8
+WEIGHT:  8
 SHUFFLE: cv
 MAP
 x@xxxxxxxxxxxxxxxxxxxx@x
@@ -2128,7 +2128,7 @@ NAME:    david_entry_033_a
 TAGS:    entry
 ORIENT:  float
 SHUFFLE: TV
-CHANCE:  5
+WEIGHT:  5
 MAP
   xx..@..xx
  xx...x...xx
@@ -2148,7 +2148,7 @@ ENDMAP
 NAME:   david_entry_033_b
 TAGS:   entry
 ORIENT: float
-CHANCE: 5
+WEIGHT: 5
 MAP
   xx..@..xx
  xx...x...xx
@@ -2211,7 +2211,7 @@ ENDMAP
 NAME:    david_entry_036_a
 TAGS:    entry
 ORIENT:  float
-CHANCE:  2
+WEIGHT:  2
 SHUFFLE: {[(
 MAP
 @.......xxxxx..@
@@ -2229,7 +2229,7 @@ ENDMAP
 NAME:    david_entry_036_b
 TAGS:    entry
 ORIENT:  float
-CHANCE:  2
+WEIGHT:  2
 SHUFFLE: {[(
 MAP
 @.......xxxxx..@
@@ -2248,7 +2248,7 @@ NAME:    david_entry_036_c
 TAGS:    entry
 ORIENT:  float
 SHUFFLE: {[(
-CHANCE:  2
+WEIGHT:  2
 MAP
 @.......xxxxx..@
 .[......xxxxx...
@@ -2266,7 +2266,7 @@ NAME:    david_entry_036_d
 TAGS:    entry
 ORIENT:  float
 SHUFFLE: {[(
-CHANCE:  2
+WEIGHT:  2
 MAP
 @.......xxxxx..@
 .[......xxxxx...
@@ -2284,7 +2284,7 @@ NAME:    david_entry_036_e
 TAGS:    entry
 ORIENT:  float
 SHUFFLE: {[(
-CHANCE:  2
+WEIGHT:  2
 MAP
 @.......xxxxx..@
 .[......xxxxx...
@@ -2321,7 +2321,7 @@ ENDMAP
 NAME:   david_entry_038_a
 TAGS:   entry
 ORIENT: float
-CHANCE: 1
+WEIGHT: 1
 MAP
 xxxxxxxxxxxxx
 x%.x%.=..=.[x
@@ -2337,7 +2337,7 @@ ENDMAP
 NAME:   david_entry_038_b
 TAGS:   entry
 ORIENT: float
-CHANCE: 2
+WEIGHT: 2
 MAP
 xxxxxxxxxxxxx
 x.%x%.x..=.[x
@@ -2353,7 +2353,7 @@ ENDMAP
 NAME:   david_entry_038_c
 TAGS:   entry
 ORIENT: float
-CHANCE: 1
+WEIGHT: 1
 MAP
 xxxxxxxxxxxxx
 x.%x%%x..=.[x
@@ -2369,7 +2369,7 @@ ENDMAP
 NAME:   david_entry_038_d
 TAGS:   entry
 ORIENT: float
-CHANCE: 1
+WEIGHT: 1
 MAP
 xxxxxxxxxxxxx
 x%.=..=.%x.[x
@@ -2385,7 +2385,7 @@ ENDMAP
 NAME:   david_entry_038_e
 TAGS:   entry
 ORIENT: float
-CHANCE: 1
+WEIGHT: 1
 MAP
 xxxxxxxxxxxxx
 x..=..=..x%[x
@@ -2401,7 +2401,7 @@ ENDMAP
 NAME:   david_entry_038_f
 TAGS:   entry
 ORIENT: float
-CHANCE: 2
+WEIGHT: 2
 MAP
 xxxxxxxxxxxxx
 x..=..x%.=%[x
@@ -2417,7 +2417,7 @@ ENDMAP
 NAME:   david_entry_038_g
 TAGS:   entry
 ORIENT: float
-CHANCE: 2
+WEIGHT: 2
 MAP
 xxxxxxxxxxxxx
 x%.x..x..x%[x
@@ -2564,7 +2564,7 @@ ENDMAP
 NAME:    david_entry_045_a
 TAGS:    entry
 ORIENT:  float
-CHANCE:  5
+WEIGHT:  5
 SHUFFLE: {[(
 MAP
 xxxxxx@.xxx
@@ -2582,7 +2582,7 @@ ENDMAP
 NAME:    david_entry_045_b
 TAGS:    entry
 ORIENT:  float
-CHANCE:  5
+WEIGHT:  5
 SHUFFLE: {[(
 MAP
 xxxxxx@.xxx
@@ -2644,7 +2644,7 @@ ENDMAP
 NAME:    david_entry_048_a
 TAGS:    entry no_monster_gen no_rotate
 ORIENT:  float
-CHANCE:  5
+WEIGHT:  5
 SHUFFLE: cvba
 NSUBST:  . = 1:d / *:.
 ITEM:    stone / dart
@@ -2663,7 +2663,7 @@ ENDMAP
 NAME:    david_entry_048_b
 TAGS:    entry no_monster_gen no_rotate
 ORIENT:  float
-CHANCE:  5
+WEIGHT:  5
 SHUFFLE: cvba
 NSUBST:  . = 1:d / *:.
 ITEM:    stone / dart
@@ -2830,7 +2830,7 @@ ENDMAP
 NAME:    david_entry_055_a
 TAGS:    entry no_monster_gen no_rotate
 ORIENT:  float
-CHANCE:  5
+WEIGHT:  5
 SHUFFLE: lw
 MAP
       xxxxxxxxxxx
@@ -2855,7 +2855,7 @@ ENDMAP
 NAME:    david_entry_055_b
 TAGS:    entry no_monster_gen
 ORIENT:  float
-CHANCE:  5
+WEIGHT:  5
 SHUFFLE: {(, lw
 MAP
       xxxxx@xxxxx
@@ -2883,7 +2883,7 @@ ENDMAP
 NAME:    david_entry_056_a
 TAGS:    entry no_rotate
 ORIENT:  float
-CHANCE:  3
+WEIGHT:  3
 ITEM:    nothing, nothing, nothing
 SHUFFLE: cccbvxxx, def}
 MAP
@@ -2911,7 +2911,7 @@ ENDMAP
 NAME:    david_entry_056_b
 TAGS:    entry no_rotate
 ORIENT:  float
-CHANCE:  7
+WEIGHT:  7
 SHUFFLE: cccbvxxx
 MAP
    ....................   
@@ -2941,7 +2941,7 @@ ORIENT:  float
 SHUFFLE: {[AB
 MONS:    gnoll
 SUBST:   A=., B=.
-CHANCE:  3
+WEIGHT:  3
 MAP
 @....B........@
 ..............[
@@ -2964,7 +2964,7 @@ ORIENT:  float
 SHUFFLE: {[AB
 SUBST:   A=., B=.
 MONS:    gnoll
-CHANCE:  3
+WEIGHT:  3
 MAP
 @...B.........@
 ..............[
@@ -2987,7 +2987,7 @@ ORIENT:  float
 SHUFFLE: {[AB
 SUBST:   A=., B=.
 MONS:    gnoll
-CHANCE:  2
+WEIGHT:  2
 MAP
 @.....B.......@
 ..............[
@@ -3010,7 +3010,7 @@ ORIENT:  float
 SHUFFLE: {[AB
 SUBST:   A=., B=.
 MONS:    gnoll
-CHANCE:  2
+WEIGHT:  2
 MAP
 @......A......@
 ..............[
@@ -3100,7 +3100,7 @@ TAGS:    entry no_monster_gen
 ORIENT:  northwest
 SHUFFLE: Cc, {Y
 SUBST:   ?=l. , Y=.
-CHANCE:  6
+WEIGHT:  6
 MAP
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
@@ -3125,7 +3125,7 @@ ENDMAP
 NAME:    david_entry_061_b_altar
 TAGS:    entry no_monster_gen
 ORIENT:  northwest
-CHANCE:  4
+WEIGHT:  4
 SHUFFLE: Cc, {Y
 SUBST:   Y=.
 MAP
@@ -3176,7 +3176,7 @@ ENDMAP
 #
 NAME:   david_entry_063_tiny
 TAGS:   entry
-CHANCE: 10
+WEIGHT: 10
 ORIENT: float
 MAP
 {
@@ -3187,7 +3187,7 @@ ENDMAP
 #
 NAME:   david_entry_064_a_tiny
 TAGS:   entry
-CHANCE: 2
+WEIGHT: 2
 ORIENT: float
 MAP
 xxx
@@ -3197,7 +3197,7 @@ ENDMAP
 
 NAME:   david_entry_064_b_tiny
 TAGS:   entry
-CHANCE: 4
+WEIGHT: 4
 ORIENT: float
 MAP
 @....
@@ -3208,7 +3208,7 @@ ENDMAP
 
 NAME:   david_entry_064_c_tiny
 TAGS:   entry
-CHANCE: 4
+WEIGHT: 4
 ORIENT: float
 MAP
 @....
@@ -3223,7 +3223,7 @@ ENDMAP
 #
 NAME:   david_entry_065_a_tiny
 TAGS:   entry
-CHANCE: 1
+WEIGHT: 1
 ORIENT: float
 MAP
 xxxxx
@@ -3235,7 +3235,7 @@ ENDMAP
 
 NAME:   david_entry_065_b_tiny
 TAGS:   entry
-CHANCE: 3
+WEIGHT: 3
 ORIENT: float
 MAP
 @......
@@ -3248,7 +3248,7 @@ ENDMAP
 
 NAME:   david_entry_065_c_tiny
 TAGS:   entry
-CHANCE: 3
+WEIGHT: 3
 ORIENT: float
 MAP
 @...xx
@@ -3261,7 +3261,7 @@ ENDMAP
 
 NAME:   david_entry_065_d_tiny
 TAGS:   entry
-CHANCE: 3
+WEIGHT: 3
 ORIENT: float
 MAP
 @xxxxxx
@@ -3277,7 +3277,7 @@ ENDMAP
 #
 NAME:   david_entry_066_a_tiny
 TAGS:   entry
-CHANCE: 4
+WEIGHT: 4
 ORIENT: float
 MAP
 xxxxx
@@ -3287,7 +3287,7 @@ ENDMAP
 
 NAME:   david_entry_066_b_tiny
 TAGS:   entry
-CHANCE: 3
+WEIGHT: 3
 ORIENT: float
 SUBST:  v : vcbxxx
 MAP
@@ -3300,7 +3300,7 @@ ENDMAP
 
 NAME:   david_entry_066_d_tiny
 TAGS:   entry
-CHANCE: 3
+WEIGHT: 3
 ORIENT: float
 MAP
 xxxx
@@ -3373,7 +3373,7 @@ ENDMAP
 NAME:    david_entry_069_a
 TAGS:    entry no_monster_gen no_rotate
 ORIENT:  float
-CHANCE:  3
+WEIGHT:  3
 SHUFFLE: bxxxx
 MAP
  .......    .......
@@ -3392,7 +3392,7 @@ ENDMAP
 NAME:    david_entry_069_b
 TAGS:    entry no_monster_gen no_rotate
 ORIENT:  float
-CHANCE:  3
+WEIGHT:  3
 SHUFFLE: bxxxx
 MAP
  .......    .......
@@ -3411,7 +3411,7 @@ ENDMAP
 NAME: david_entry_069_c
 TAGS: entry no_monster_gen no_rotate
 ORIENT: float
-CHANCE: 3
+WEIGHT: 3
 SHUFFLE: bxxxx
 MAP
  .......    .......
@@ -3430,7 +3430,7 @@ ENDMAP
 NAME:    david_entry_069_d
 TAGS:    entry no_monster_gen no_rotate
 ORIENT:  float
-CHANCE:  1
+WEIGHT:  1
 SHUFFLE: bxxxx
 MAP
  .......    .......
@@ -3568,7 +3568,7 @@ ENDMAP
 NAME:    erik_entry_001_a
 TAGS:    entry
 ORIENT:  float
-CHANCE:  1
+WEIGHT:  1
 SHUFFLE: {[(
 SUBST:   X : x:20 G:4 l:1
 SUBST:   c : cxxx
@@ -3596,7 +3596,7 @@ NAME:    erik_entry_001_b
 TAGS:    entry
 ORIENT:  float
 MONS:    gnoll
-CHANCE:  3
+WEIGHT:  3
 SHUFFLE: {[(
 SUBST:   c : cxxx
 MAP
@@ -3623,7 +3623,7 @@ NAME:    erik_entry_001_c
 TAGS:    entry
 ORIENT:  float
 MONS:    centaur, orc
-CHANCE:  3
+WEIGHT:  3
 SHUFFLE: {[(
 SUBST:   c : cxxx
 MAP
@@ -3648,7 +3648,7 @@ ENDMAP
 
 NAME:    erik_entry_001_d
 TAGS:    entry
-CHANCE:  3
+WEIGHT:  3
 ORIENT:  float
 MONS:    orc
 SHUFFLE: {[(
@@ -3956,7 +3956,7 @@ ENDMAP
 NAME: matt_entry_007_a
 TAGS: entry no_monster_gen
 ORIENT:  float
-CHANCE:  1
+WEIGHT:  1
 SHUFFLE: {[(<
 MAP
 xxx@xxx@xxx
@@ -3975,7 +3975,7 @@ ENDMAP
 NAME: matt_entry_007_b
 TAGS: entry no_monster_gen
 ORIENT:  float
-CHANCE:  3
+WEIGHT:  3
 SHUFFLE: {[(<
 MAP
 xxx@xxx@xxx
@@ -3994,7 +3994,7 @@ ENDMAP
 NAME: matt_entry_007_c
 TAGS: entry no_monster_gen
 ORIENT:  float
-CHANCE:  6
+WEIGHT:  6
 SHUFFLE: {[(<
 MAP
 xxx@xxx@xxx
@@ -4313,7 +4313,7 @@ ENDMAP
 # Mini maze
 NAME:    onia_ninara_004_a_mini_maze
 TAGS:    entry
-CHANCE:  5
+WEIGHT:  5
 ORIENT:  float
 ITEM:    apple / sausage / nothing / stone / potion of water
 SHUFFLE: ({[, Aa, Bb, Cc, Ee, Ff
@@ -4338,7 +4338,7 @@ ENDMAP
 
 NAME:    onia_ninara_004_b_mini_maze
 TAGS:    entry
-CHANCE:  5
+WEIGHT:  5
 ORIENT:  float
 ITEM:    apple / sausage / nothing / stone / potion of water / w:30 nothing
 SHUFFLE: ({[ , AB
@@ -4447,7 +4447,7 @@ TAGS:     entry no_monster_gen no_rotate
 ORIENT:   northwest
 SUBST:    V = V T:2
 SUBST:    ' : x.
-CHANCE:   5
+WEIGHT:   5
 MAP
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
@@ -4479,7 +4479,7 @@ ENDMAP
 NAME:     entry_eino_001_b
 TAGS:     entry no_monster_gen no_rotate
 ORIENT:   northwest
-CHANCE:   5
+WEIGHT:   5
 MAP
 xxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxx
@@ -4512,7 +4512,7 @@ TAGS:     entry no_monster_gen no_rotate
 ORIENT:   northwest
 NSUBST:   A = 1:= / x
 SUBST:    % = % .:5
-CHANCE:   2
+WEIGHT:   2
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4538,7 +4538,7 @@ TAGS:     entry no_rotate
 ORIENT:   northeast
 SHUFFLE:  bvc
 SUBST:    ' : x.
-CHANCE:   4
+WEIGHT:   4
 MAP
 xxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxx
@@ -4567,7 +4567,7 @@ NAME:     entry_eino_002_c
 TAGS:     entry no_monster_gen no_rotate
 ORIENT:   northeast
 SUBST:    ' : x. , " : x. , ? = x.
-CHANCE:   4
+WEIGHT:   4
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 11b9d752ef..ad49cbb487 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -27,7 +27,7 @@ DEPTH: D:1-11
 # by depth.
 TAGS: dummy
 ORIENT: float
-CHANCE: 100
+WEIGHT: 100
 MAP
 x
 ENDMAP
@@ -41,7 +41,7 @@ DEPTH: 1-, !D
 # by depth.
 TAGS: dummy
 ORIENT: float
-CHANCE: 60
+WEIGHT: 60
 MAP
 x
 ENDMAP
@@ -51,7 +51,7 @@ ENDMAP
 #
 NAME:   erik_1
 ORIENT: float
-CHANCE: 5
+WEIGHT: 5
 TAGS:   no_monster_gen
 DEPTH:  D:7-11, Lair
 #
@@ -431,7 +431,7 @@ ENDMAP
 #
 NAME:    oklob_3
 DEPTH:   D:18-27, Lair:2-10, Elf:2-7
-CHANCE:  2
+WEIGHT:  2
 ORIENT:  float
 SHUFFLE: ab" / AB'
 SUBST:   a=[, b=(, A=., B=., '=., "=>
diff --git a/crawl-ref/source/dat/hive.des b/crawl-ref/source/dat/hive.des
index 745403bfe9..db65754621 100644
--- a/crawl-ref/source/dat/hive.des
+++ b/crawl-ref/source/dat/hive.des
@@ -11,7 +11,7 @@
 NAME: hive_0
 TAGS: hive_entry
 ORIENT: float
-CHANCE: 60
+WEIGHT: 60
 MAP
 O
 ENDMAP
@@ -260,7 +260,7 @@ ENDMAP
 NAME:   Hive_Balancer
 DEPTH:  Hive:*
 TAGS:   dummy
-CHANCE: 200
+WEIGHT: 200
 MAP
 x
 ENDMAP
@@ -397,7 +397,7 @@ ENDMAP
 NAME:   lemuel_wasp_nest
 DEPTH:  Hive:2-3
 MONS:   yellow wasp / weight:2 red wasp
-CHANCE: 1
+WEIGHT: 1
 SUBST:  1=1 .:15
 SUBST:  ?=a.
 MAP
@@ -420,7 +420,7 @@ ENDMAP
 
 NAME:   lemuel_hive_grid_a
 DEPTH:  Hive:*
-CHANCE: 4
+WEIGHT: 4
 MAP
 a.a.a.a.a.a.a.a.a
 aa.a.a.a.a.a.a.aa
@@ -437,7 +437,7 @@ ENDMAP
 
 NAME:   lemuel_hive_grid_b
 DEPTH:  Hive:*
-CHANCE: 6
+WEIGHT: 6
 MAP
 a.a.a.a.aa
 aa.a.a.a.a
@@ -450,7 +450,7 @@ ENDMAP
 
 NAME:   lemuel_hive_grid_c
 DEPTH:  Hive:*
-CHANCE: 10
+WEIGHT: 10
 MAP
      aa.aa
     aa.a.aa
diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des
index 3aed292afa..9e40008913 100644
--- a/crawl-ref/source/dat/lab.des
+++ b/crawl-ref/source/dat/lab.des
@@ -42,7 +42,7 @@ ENDMAP
 # Dummy balancer
 NAME: labyrinth_0
 TAGS: minotaur dummy
-CHANCE: 20
+WEIGHT: 20
 MAP
 x
 ENDMAP
@@ -164,7 +164,7 @@ NSUBST:  D = 1:. / *:D
 KFEAT:   d = axe trap / dart trap / needle trap / blade trap
 KFEAT:   D = teleport trap
 SUBST:   c : vvc
-CHANCE:  2
+WEIGHT:  2
 MAP
 ..............
 .cccccccccccc.
@@ -194,7 +194,7 @@ SUBST:   Y=*, Z=*
 KFEAT:   X = <
 KMONS:   X = patrolling minotaur
 KFEAT:   S = granite_statue
-CHANCE:  2
+WEIGHT:  2
 MAP
 .............
 .vvvvvvvvvvv.
@@ -226,7 +226,7 @@ ENDMAP
 # Labyrinth dummy decorator
 NAME: lab_dummy
 TAGS: lab dummy
-CHANCE: 90
+WEIGHT: 90
 MAP
 x
 ENDMAP
@@ -292,7 +292,7 @@ ENDMAP
 
 NAME:   labyrinth_glass_2
 TAGS:   lab allow_dup
-CHANCE: 1
+WEIGHT: 1
 MAP
 ......
 .nnnn.
@@ -324,7 +324,7 @@ TAGS:    lab allow_dup
 KFEAT:   Y = teleport trap
 KITEM:   Y = any good_item
 SHUFFLE: cxv
-CHANCE:  1
+WEIGHT:  1
 MAP
 .....
 .x=x.
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index 5d103a529e..7588ea89f5 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -9,7 +9,7 @@
 # Dummy Lair entry
 NAME:   lair_0_dummy
 TAGS:   lair_entry dummy
-CHANCE: 30
+WEIGHT: 30
 ORIENT: float
 MAP
 O
@@ -220,7 +220,7 @@ NAME:    RatsNest_Lair
 ORIENT:  northeast
 TAGS:    uniq_rats_nest
 DEPTH:   Lair
-CHANCE:  5
+WEIGHT:  5
 SHUFFLE: 23, 34
 MONS:    rat / green rat / nothing, grey rat / orange rat / nothing
 MONS:    green rat / orange rat / nothing, orange rat / rat
@@ -295,7 +295,7 @@ ENDMAP
 #
 NAME:   strawberry_fields_big
 ORIENT: float
-CHANCE: 1
+WEIGHT: 1
 DEPTH:  Lair
 SUBST:  .= d .:150 1:8 2:4
 MONS:   plant, butterfly
@@ -323,7 +323,7 @@ ENDMAP
 
 NAME:   strawberry_fields_big_rounded
 ORIENT: float
-CHANCE: 1
+WEIGHT: 1
 DEPTH:  Lair
 SUBST:  .= d .:140 1:8 2:4
 MONS:   plant, butterfly
@@ -351,7 +351,7 @@ ENDMAP
 
 NAME:   strawberry_fields_round
 ORIENT: float
-CHANCE: 4
+WEIGHT: 4
 TAGS:   allow_dup
 DEPTH:  Lair
 SUBST:  .= d .:50 1:8 2:4
@@ -372,7 +372,7 @@ ENDMAP
 
 NAME:   strawberry_fields_patches_spacepadded
 ORIENT: float
-CHANCE: 4
+WEIGHT: 4
 DEPTH:  Lair
 SUBST:  .= d .:50 1:8 2:4 
 MONS:   plant, butterfly
@@ -408,7 +408,7 @@ SUBST:  . = .:90 a:10 2:1
 KITEM:  a : apple / apricot / pear / orange / banana / strawberry q:1 w:5 /\
             strawberry q:2 w:5 / lemon
 KFEAT:  a = .
-CHANCE: 8
+WEIGHT: 8
 MAP
  ..... 
 .......
@@ -429,7 +429,7 @@ SUBST:  _ = .:90 a:4
 KITEM:  a : apple / apricot / pear / orange / banana / strawberry q:1 w:5 /\
             strawberry q:2 w:5 / lemon
 KFEAT:  a = .
-CHANCE: 2
+WEIGHT: 2
 MAP
    ________   
   _........_  
@@ -650,7 +650,7 @@ ENDMAP
 #
 NAME:   Shoal_1
 PLACE:  Shoal:5
-CHANCE: 0
+WEIGHT: 0
 MONS:   cyclops, yaktaur, yaktaur captain
 MAP
 wwwwwwwwcccccccccccccwwwwwww
@@ -689,7 +689,7 @@ ENDMAP
 #
 NAME:   Shoal_2
 PLACE:  Shoal:5
-CHANCE: 0
+WEIGHT: 0
 MONS:   cyclops,stone giant
 SUBST:  1 = 1.
 SUBST:  W = W:2 w
@@ -727,7 +727,7 @@ ENDMAP
 #
 NAME:   Shoal_3
 PLACE:  Shoal:5
-CHANCE: 0
+WEIGHT: 0
 KMONS:  x : ice statue / orange crystal statue / silver statue
 KFEAT:  x : O
 MAP
@@ -741,7 +741,7 @@ ENDMAP
 #
 NAME:   Shoal_4
 PLACE:  Shoal:5
-CHANCE: 0
+WEIGHT: 0
 KFEAT:  O = w
 ### KITEM: O = liquid rune of Zot
 MAP
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index 0992a9c7f0..bea59e0766 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -16,7 +16,7 @@ default-depth: D:12-26
 NAME:    RatsNest_Dungeon
 ORIENT:  northeast
 TAGS:    uniq_rats_nest
-CHANCE:  5
+WEIGHT:  5
 DEPTH:   D:5-9
 SHUFFLE: 23, 34
 MONS:    rat / nothing, grey rat / nothing
@@ -1255,7 +1255,7 @@ NAME:    erik_rubicon_a
 DEPTH:   D:10-16
 ORIENT:  south
 TAGS:    no_pool_fixup no_rotate uniq_rubicon
-CHANCE:  6
+WEIGHT:  6
 ITEM:    ring of levitation / potion of levitation / nothing
 ITEM:    potion of levitation / nothing, nothing, nothing, nothing
 SHUFFLE: {[(, )gh
@@ -1290,7 +1290,7 @@ NAME:    erik_rubicon_b
 DEPTH:   D:10-16
 ORIENT:  south
 TAGS:    no_rotate uniq_rubicon
-CHANCE:  4
+WEIGHT:  4
 ITEM:    ring of levitation / potion of levitation / nothing
 ITEM:    potion of levitation, nothing, nothing, nothing, nothing
 SHUFFLE: {[(, fgW, )hi
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index e03d932937..54a2d49c52 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -37,7 +37,7 @@ default-depth: D:8-27
 NAME: mini_dummy
 DEPTH: 1-50, !D:8-27
 TAGS: dummy
-CHANCE: 90
+WEIGHT: 90
 MAP
 .
 ENDMAP
@@ -48,7 +48,7 @@ ENDMAP
 # still see you
 NAME:  glass_columns_a
 DEPTH: D, Elf, Crypt
-CHANCE: 5
+WEIGHT: 5
 MAP
 .....
 .m.m.
@@ -59,7 +59,7 @@ ENDMAP
 
 NAME:  glass_columns_b
 DEPTH: D, Elf, Crypt
-CHANCE: 3
+WEIGHT: 3
 MAP
 .......
 .m.m.m.
@@ -72,7 +72,7 @@ ENDMAP
 
 NAME:  glass_columns_c
 DEPTH: D, Elf, Crypt
-CHANCE: 2
+WEIGHT: 2
 MAP
 .........
 .m.m.m.m.
@@ -103,7 +103,7 @@ ENDMAP
 # An item encased in glass.  If the player wants it, it can be dug out.
 NAME:   item_on_display_a
 DEPTH:  D, Elf, Crypt, Vault
-CHANCE: 9
+WEIGHT: 9
 SUBST:  % = %%%*
 TAGS:   no_monster_gen no_item_gen
 MAP
@@ -118,7 +118,7 @@ ENDMAP
 # A good item encased in transparent stone.
 NAME:   item_on_display_b
 DEPTH:  D, Elf, Crypt, Vault
-CHANCE: 1
+WEIGHT: 1
 SUBST:  * = ***|
 TAGS:   no_monster_gen no_item_gen
 MAP
@@ -406,7 +406,7 @@ TAGS:    allow_dup
 NSUBST:  Z = 4=. / z
 KFEAT:   z = zot trap
 SUBST:   *: *$
-CHANCE:  3
+WEIGHT:  3
 MAP
 xxxxxxxxxx
 xxxxxxx**x
@@ -639,7 +639,7 @@ ENDMAP
 # Greed's colour
 
 NAME:    david_greed
-CHANCE:  4
+WEIGHT:  4
 DEPTH:   D:10-26, Vault, Elf
 ITEM:    nothing / any good_item
 MONS:    silver statue / orange crystal statue / ice statue
@@ -926,7 +926,7 @@ ENDMAP
 
 NAME:    minivault_16
 TAGS:    allow_dup
-CHANCE:  40
+WEIGHT:  40
 # as this replaces the former statue only minivaults
 SHUFFLE: G111
 MONS:    orange crystal statue / silver statue / ice statue
@@ -1522,7 +1522,7 @@ ENDMAP
 NAME:   small_statue_alley_a
 TAGS:   uniq_statue_alley
 DEPTH:  D:10-20
-CHANCE: 7
+WEIGHT: 7
 MAP
 xxxcccccx
 ...G...G@
@@ -1535,7 +1535,7 @@ ENDMAP
 NAME:   small_statue_alley_b
 TAGS:   uniq_statue_alley
 DEPTH:  D:3-10
-CHANCE: 2
+WEIGHT: 2
 MAP
 xxxcccccx
 ...G...G@
@@ -1548,7 +1548,7 @@ ENDMAP
 NAME:   small_statue_alley_c
 TAGS:   uniq_statue_alley
 DEPTH:  Orc
-CHANCE: 1
+WEIGHT: 1
 MAP
 xxxcccccx
 ...I...I@
diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des
index 69a90229dd..14cacecff2 100644
--- a/crawl-ref/source/dat/orc.des
+++ b/crawl-ref/source/dat/orc.des
@@ -11,7 +11,7 @@
 
 NAME:   orc_0_dummy
 TAGS:   orc_entry
-CHANCE: 50
+WEIGHT: 50
 ORIENT: float
 MAP
 O
@@ -438,7 +438,7 @@ default-depth: Orc:*
 #
 NAME: mines_dummy
 TAGS: dummy
-CHANCE: 60
+WEIGHT: 60
 MAP
 x
 ENDMAP
@@ -486,7 +486,7 @@ ENDMAP
 NAME:   mines1_david
 TAGS:   allow_dup
 KFEAT:  C = altar_beogh
-CHANCE: 20
+WEIGHT: 20
 MAP
 ...........
 .xxxx.xxxx.
@@ -508,7 +508,7 @@ TAGS:   allow_dup
 KFEAT:  C = altar_beogh
 MONS:   orc / orc warrior w:1
 SUBST:  . = . 1:2
-CHANCE: 20
+WEIGHT: 20
 MAP
 .......
 .......
diff --git a/crawl-ref/source/dat/sewer.des b/crawl-ref/source/dat/sewer.des
index 03f7f4913e..1cc3422ca1 100644
--- a/crawl-ref/source/dat/sewer.des
+++ b/crawl-ref/source/dat/sewer.des
@@ -95,7 +95,7 @@ ENDMAP
 # The easiest one, so most probable (5 out of 9 sewers).
 NAME:     sewer_kobolds
 TAGS:     sewer no_item_gen no_monster_gen no_pool_fixup
-CHANCE:   40
+WEIGHT:   40
 ORIENT:   encompass
 KFEAT:    < = exit_portal_vault
 COLOUR:   < = darkgrey
diff --git a/crawl-ref/source/dat/temple.des b/crawl-ref/source/dat/temple.des
index b24ec5af41..e220f4c1e4 100644
--- a/crawl-ref/source/dat/temple.des
+++ b/crawl-ref/source/dat/temple.des
@@ -12,7 +12,7 @@
 #
 NAME:   temple_hall_a
 TAGS:   temple_entry
-CHANCE: 9
+WEIGHT: 9
 ORIENT: float
 SUBST:  ? : c:20 x v b G:5
 MAP
@@ -35,7 +35,7 @@ ENDMAP
 
 NAME:   temple_hall_b
 TAGS:   temple_entry no_pool_fixup no_monster_gen
-CHANCE: 1
+WEIGHT: 1
 ORIENT: float
 SUBST:  ? : v b G:5
 MAP
@@ -104,7 +104,7 @@ ENDMAP
 # Where's the entry to the temple?
 #
 NAME:   temple_secret_doors_a
-CHANCE: 1
+WEIGHT: 1
 TAGS:   temple_entry
 ORIENT: float
 SUBST:  c:cxxx
@@ -120,7 +120,7 @@ cccccccccc
 ENDMAP
 
 NAME:   temple_secret_doors_b
-CHANCE: 1
+WEIGHT: 1
 TAGS:   temple_entry
 ORIENT: float
 SUBST:  ? : ?:40 T:30 U, ? = T:30 U
@@ -137,7 +137,7 @@ ccccccccccc
 ENDMAP
 
 NAME:   temple_secret_doors_c
-CHANCE: 1
+WEIGHT: 1
 TAGS:   temple_entry
 ORIENT: float
 SUBST:  ? : ?:40 T:30 U, ? = T:30 U
@@ -156,7 +156,7 @@ ccccc@ccc
 ENDMAP
 
 NAME:   temple_secret_doors_d
-CHANCE: 1
+WEIGHT: 1
 TAGS:   temple_entry 
 ORIENT: float
 SUBST:  ? : ?:40 T:30 U, ? = T:30 U
@@ -175,7 +175,7 @@ ccccc@ccccc
 ENDMAP
 
 NAME:   temple_secret_doors_e
-CHANCE: 6
+WEIGHT: 6
 TAGS:   temple_entry no_rotate
 ORIENT: float
 SUBST:  ? : ?:40 T:30 U, ? = T:30 U
@@ -200,7 +200,7 @@ ENDMAP
 #
 NAME:    temple_pool_a
 TAGS:    temple_entry no_monster_gen no_pool_fixup no_rotate
-CHANCE:  3
+WEIGHT:  3
 ORIENT:  float
 SHUFFLE: XY
 SUBST:   Y=w, X=.
@@ -220,7 +220,7 @@ ENDMAP
 
 NAME:    temple_pool_b
 TAGS:    temple_entry no_monster_gen no_rotate
-CHANCE:  7
+WEIGHT:  7
 ORIENT:  float
 SHUFFLE: ABCDEFGHIJKL
 SUBST:   A=W, B=W, C=W, D=w, E=w, F=w, G=w, H=w, I=w, J=w, K=w, L=w
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index f50f8dd7b0..cdf365c456 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -14,7 +14,7 @@
 
 NAME:   vaults_0_dummy
 TAGS:   vault_entry
-CHANCE: 60
+WEIGHT: 60
 ORIENT: float
 MAP
 O
diff --git a/crawl-ref/source/dat/zot.des b/crawl-ref/source/dat/zot.des
index f21af392e3..d8de119f9e 100644
--- a/crawl-ref/source/dat/zot.des
+++ b/crawl-ref/source/dat/zot.des
@@ -10,7 +10,7 @@
 #
 NAME:   lemuel_baited_zot_trap
 DEPTH:  Zot:*
-CHANCE: 20
+WEIGHT: 20
 TAGS:   allow_dup
 KFEAT:  * = Zot trap
 KITEM:  * = any good_item