Uniques's weights.

Make default weight for uniques 10 (again).
Use dummy uniques with different weights for Slime, Lair and rest.

1 files changed, 79 insertions, 69 deletions

diff --git a/crawl-ref/source/dat/uniques.des b/crawl-ref/source/dat/uniques.des
index b3cc58dacd..9c7de3a0c2 100644
--- a/crawl-ref/source/dat/uniques.des
+++ b/crawl-ref/source/dat/uniques.des
@@ -8,7 +8,7 @@
 # Boris vault.
 #
 # If you want to weight uniques differently for some vaults, the weights for
-# these vaults should all add up to 100 (the default weight for uniques).
+# these vaults should all add up to 10 (the default weight for uniques).
 # You can use multiple vaults that are tagged "uniq_<name>", with different 
 # weights for each of the vaults.
 #
@@ -23,9 +23,28 @@
 # NOTE: Does not deal with fixed-place uniques such as the Royal Jelly, the Hell
 # bosses, and the Pan bosses.
 ################################################################################
-# Dummy, weight will need eventual adjustment.
+
+################################################################################
+# Dummy, these are used to weight uniques per branch.
+################################################################################
 NAME:   uniq_dummy
-DEPTH:  1-50
+DEPTH:  1-50, !Lair, !Slime
+WEIGHT: 20
+TAGS:   place_unique dummy
+MAP
+.
+ENDMAP
+
+NAME:   uniq_dummy_lair
+DEPTH:  Lair
+WEIGHT: 80
+TAGS:   place_unique dummy
+MAP
+.
+ENDMAP
+
+NAME:   uniq_dummy_slime
+DEPTH:  Slime
 WEIGHT: 200
 TAGS:   place_unique dummy
 MAP
@@ -37,7 +56,7 @@ ENDMAP
 ################################################################################
 NAME:   uniq_terence
 DEPTH:  1-3
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Terence
 MAP
@@ -46,7 +65,7 @@ ENDMAP
 
 NAME:   uniq_jessica
 DEPTH:  1-3
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Jessica
 MAP
@@ -55,7 +74,7 @@ ENDMAP
 
 NAME:   uniq_iyjb
 DEPTH:  1-3, 4-7
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Ijyb
 MAP
@@ -64,7 +83,7 @@ ENDMAP
 
 NAME:   uniq_sigmund
 DEPTH:  1-3, 4-7
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Sigmund
 MAP
@@ -73,7 +92,7 @@ ENDMAP
 
 NAME:   uniq_blork_the_orc
 DEPTH:  4-7, 8-9, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Blork the orc
 MAP
@@ -82,7 +101,7 @@ ENDMAP
 
 NAME:   uniq_edmund
 DEPTH:  4-7, 8-9, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 MONS:   Edmund
 MAP
 1
@@ -90,7 +109,7 @@ ENDMAP
 
 NAME:   uniq_prince_ribbit1
 DEPTH:  4-7, 8-9, !Lair
-WEIGHT: 70
+WEIGHT: 7
 TAGS:   place_unique uniq_ribbit
 MONS:   Prince Ribbit
 MAP
@@ -99,7 +118,7 @@ ENDMAP
 
 NAME:   uniq_prince_ribbit2
 DEPTH:  Lair:1-3
-WEIGHT: 30
+WEIGHT: 3
 TAGS:   place_unique uniq_ribbit
 MONS:   Prince Ribbit, blink frog band
 MAP
@@ -108,7 +127,7 @@ ENDMAP
 
 NAME:   uniq_purgy
 DEPTH:  3-4
-WEIGHT: 10
+WEIGHT: 1
 TAGS:   place_unique
 MONS:   Purgy
 MAP
@@ -117,7 +136,7 @@ ENDMAP
 
 NAME:   uniq_menkaure
 DEPTH:  4-7
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Menkaure
 MAP
@@ -126,7 +145,7 @@ ENDMAP
 
 NAME:   uniq_duvessa
 DEPTH:  4-7, 8-9, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Duvessa band
 MAP
@@ -135,7 +154,7 @@ ENDMAP
 
 NAME:   uniq_pikel
 DEPTH:  4-7, 8-9, !Lair, !Slime, !Orc
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Pikel band
 MAP
@@ -144,7 +163,7 @@ ENDMAP
 
 NAME:   uniq_psyche
 DEPTH:  8-9, 10-13, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Psyche
 MAP
@@ -154,7 +173,7 @@ ENDMAP
 NAME:   uniq_gastronok_1
 DEPTH:  8-9, 10-13, !Lair, !Slime
 TAGS:   place_unique uniq_gastronok
-WEIGHT: 50
+WEIGHT: 5
 MONS:   Gastronok
 MAP
 1
@@ -163,7 +182,7 @@ ENDMAP
 NAME:   uniq_gastronok_2
 DEPTH:  Lair:4-8
 TAGS:   place_unique uniq_gastronok
-WEIGHT: 150
+WEIGHT: 15
 MONS:   Gastronok
 MAP
 1
@@ -171,7 +190,7 @@ ENDMAP
 
 NAME:   uniq_erolcha
 DEPTH:  8-9, 10-13, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Erolcha
 MAP
@@ -180,7 +199,7 @@ ENDMAP
 
 NAME:   uniq_grum
 DEPTH:  8-9, 10-13, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Grum band
 MAP
@@ -189,7 +208,7 @@ ENDMAP
 
 NAME:   uniq_maurice
 DEPTH:  8-9, 10-13, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Maurice
 MAP
@@ -198,7 +217,7 @@ ENDMAP
 
 NAME:   uniq_donald
 DEPTH:  10-13, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Donald
 MAP
@@ -207,7 +226,7 @@ ENDMAP
 
 NAME:   uniq_urug
 DEPTH:  10-13, 14-16, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Urug
 MAP
@@ -216,7 +235,7 @@ ENDMAP
 
 NAME:   uniq_eustachio
 DEPTH:  10-13, 14-16, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Eustachio
 MAP
@@ -225,7 +244,7 @@ ENDMAP
 
 NAME:   uniq_sonja
 DEPTH:  10-13, 14-16, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Sonja
 MAP
@@ -234,7 +253,7 @@ ENDMAP
 
 NAME:   uniq_joseph
 DEPTH:  10-13, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Joseph
 MAP
@@ -243,7 +262,7 @@ ENDMAP
 
 NAME:   uniq_erica
 DEPTH:  10-13, 14-16, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Erica
 MAP
@@ -252,7 +271,7 @@ ENDMAP
 
 NAME:   uniq_josephine
 DEPTH:  10-13, 14-16, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Josephine band
 MAP
@@ -261,7 +280,7 @@ ENDMAP
 
 NAME:   uniq_jozef
 DEPTH:  10-13, 14-16, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Jozef
 MAP
@@ -270,7 +289,7 @@ ENDMAP
 
 NAME:   uniq_harold
 DEPTH:  10-13, 14-16, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Harold
 MAP
@@ -279,7 +298,7 @@ ENDMAP
 
 NAME:   uniq_norbert
 DEPTH:  10-13, 14-16, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Norbert
 MAP
@@ -288,7 +307,7 @@ ENDMAP
 
 NAME:   uniq_snorg
 DEPTH:  14-16, 17-19, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Snorg
 MAP
@@ -297,7 +316,7 @@ ENDMAP
 
 NAME:   uniq_roxanne
 DEPTH:  14-16, 17-19, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Roxanne
 MAP
@@ -306,7 +325,7 @@ ENDMAP
 
 NAME:   uniq_rupert
 DEPTH:  14-16, 17-19, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Rupert
 MAP
@@ -315,7 +334,7 @@ ENDMAP
 
 NAME:   uniq_azrael
 DEPTH:  14-16, 17-19, !Lair, !Slime, !Swamp, !Shoal
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Azrael band
 MAP
@@ -324,7 +343,7 @@ ENDMAP
 
 NAME:   uniq_nessos
 DEPTH:  14-16, 17-19, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Nessos
 MAP
@@ -333,7 +352,7 @@ ENDMAP
 
 NAME:   uniq_agnes
 DEPTH:  14-16, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Agnes
 MAP
@@ -342,7 +361,7 @@ ENDMAP
 
 NAME:   uniq_nikola
 DEPTH:  14-16, 17-19, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Nikola
 MAP
@@ -350,17 +369,8 @@ MAP
 ENDMAP
 
 NAME:   uniq_maud
-DEPTH:  14-16, !Lair, !Slime
-WEIGHT: 100
-TAGS:   place_unique uniq_maud
-MONS:   Maud
-MAP
-1
-ENDMAP
-
-NAME:   uniq_maud_exploring
-DEPTH:  Lair, Slime
-WEIGHT: 1
+DEPTH:  14-16
+WEIGHT: 10
 TAGS:   place_unique uniq_maud
 MONS:   Maud
 MAP
@@ -369,7 +379,7 @@ ENDMAP
 
 NAME:   uniq_louise
 DEPTH:  14-16, 17-19, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Louise
 MAP
@@ -378,7 +388,7 @@ ENDMAP
 
 NAME:   uniq_nergalle
 DEPTH:  14-16, 17-19, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Nergalle
 MAP
@@ -387,7 +397,7 @@ ENDMAP
 
 NAME:   uniq_kirke
 DEPTH:  14-16, 17-19, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Kirke band
 MAP
@@ -396,7 +406,7 @@ ENDMAP
 
 NAME:   uniq_francis
 DEPTH:  17-19, 20-27, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Francis
 MAP
@@ -405,7 +415,7 @@ ENDMAP
 
 NAME:   uniq_frances
 DEPTH:  17-19, 20-27, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Frances
 MAP
@@ -414,7 +424,7 @@ ENDMAP
 
 NAME:   uniq_wayne
 DEPTH:  17-19, 20-27, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Wayne
 MAP
@@ -423,7 +433,7 @@ ENDMAP
 
 NAME:   uniq_duane
 DEPTH:  17-19, 20-27, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Duane
 MAP
@@ -432,7 +442,7 @@ ENDMAP
 
 NAME:   uniq_norris
 DEPTH:  17-19, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Norris
 MAP
@@ -441,7 +451,7 @@ ENDMAP
 
 NAME:   uniq_saint_roka
 DEPTH:  17-19, 20-27, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Saint Roka band
 MAP
@@ -450,7 +460,7 @@ ENDMAP
 
 NAME:   uniq_xtahua
 DEPTH:  20-27, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Xtahua
 MAP
@@ -459,7 +469,7 @@ ENDMAP
 
 NAME:   uniq_frederick
 DEPTH:  20-27, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Frederick
 MAP
@@ -468,7 +478,7 @@ ENDMAP
 
 NAME:   uniq_margery
 DEPTH:  20-27, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Margery band
 MAP
@@ -482,7 +492,7 @@ ENDMAP
 # remove the tag in monstuff.cc:monster_die.
 NAME:   uniq_boris
 DEPTH:  20-27, !Lair, !Slime
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Boris
 MAP
@@ -491,7 +501,7 @@ ENDMAP
 
 NAME:   uniq_aizul
 DEPTH:  16-25, !Lair, !Slime, Snake:2-5
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Aizul
 MAP
@@ -512,7 +522,7 @@ ENDMAP
 
 NAME:   uniq_murray
 DEPTH:  Hell
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Murray
 MAP
@@ -521,7 +531,7 @@ ENDMAP
 
 NAME:   uniq_polyphemus
 DEPTH:  Shoal:1-5
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Polyphemus band
 MAP
@@ -530,7 +540,7 @@ ENDMAP
 
 NAME:   uniq_ilsuiw
 DEPTH:  Shoal:1-5
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Ilsuiw band
 MAP
@@ -539,7 +549,7 @@ ENDMAP
 
 NAME:   uniq_khufu
 DEPTH:  Tomb, Crypt
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Khufu band
 MAP
@@ -548,7 +558,7 @@ ENDMAP
 
 NAME:   uniq_tiamat
 DEPTH:  Zot
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique
 MONS:   Tiamat band
 MAP
@@ -559,7 +569,7 @@ ENDMAP
 # Crazy Yiuf! Only in his cottage.
 NAME:   uniq_crazy_yiuf_cottage
 DEPTH:  D:2-7
-WEIGHT: 100
+WEIGHT: 10
 TAGS:   place_unique no_monster_gen no_item_gen
 MONS:   Crazy Yiuf
 ITEM:   hammer