Allow a few uniques to show up in Lair or Slime.

For some of the adventurer type uniques. Also added a bit of unique speech.

2 files changed, 94 insertions, 86 deletions

diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
index a81f7240f6..2ac6d4712c 100644
--- a/crawl-ref/source/dat/database/monspeak.txt
+++ b/crawl-ref/source/dat/database/monspeak.txt
@@ -1040,11 +1040,14 @@ _player_ghost_rare_
 @The_monster@ whispers, "It is all a dream - a grotesque and foolish dream."
 
 @The_monster@ whispers, "Soon you will have time, lots of time..."
+
+@The_monster@ @wails@, "You must not fail where I succeded!"
 ## END player ghost ##
 #######################################
 # Unique monsters
 #######################################
 %%%%
+############ AIZUL ### Renegade Guardian Naga Crusader whose vault got raided
 Aizul
 
 @_Aizul_common_@
@@ -2034,7 +2037,7 @@ Frances
 
 @_mercenary_guard_@
 %%%%
-# A wizard looking for body-parts as spell components
+############ FRANCIS ### A wizard looking for body-parts as spell components
 Francis
 
 @_Francis_common_@
@@ -2208,46 +2211,6 @@ _Grum_rare_
 @The_monster@ says, "You're dog chow, @player_name@!"
 ## END Grum ##
 %%%%
-############ IJYB ### A twisted goblin
-Ijyb
-
-@_Ijyb_common_@
-
-w:5
-@_Ijyb_rare_@
-
-%%%%
-_Ijyb_common_
-
-VISUAL:@The_monster@ grins evilly.
-
-@The_monster@ screams @at_foe@, "Die!"
-
-@The_monster@ screams @at_foe@, "Me kill you!"
-
-@The_monster@ screams @at_foe@, "Me stronger than you!"
-
-@The_monster@ screams @at_foe@, "It's all mine!"
-
-@The_monster@ screams @at_foe@, "Get away!"
-
-@The_monster@ screams @at_foe@, "Level is mine! All mine!"
-
-@The_monster@ screams @at_foe@, "You nasty! Big nasty!"
-%%%%
-_Ijyb_rare_
-
-@The_monster@ screams @at_foe@, "I cut your head off!"
-
-@The_monster@ screams @at_foe@, "I dance on your bones!"
-
-@The_monster@ screams @at_foe@, "Me very upset!"
-
-@The_monster@ screams @at_foe@, "No! No, no, no, no!"
-
-@The_monster@ screams @at_foe@, "I no like you!"
-## END Ijyb ##
-%%%%
 ############ HAROLD ### A middle aged man, hired to kill you. He is in a hurry.
 Harold
 
@@ -2291,6 +2254,46 @@ _Harold_rare_
 @The_monster@ says @to_foe@, "Mine is not to reason why.  Mine's to do, yours to die."
 ## END Harold ##
 %%%%
+############ IJYB ### A twisted goblin
+Ijyb
+
+@_Ijyb_common_@
+
+w:5
+@_Ijyb_rare_@
+
+%%%%
+_Ijyb_common_
+
+VISUAL:@The_monster@ grins evilly.
+
+@The_monster@ screams @at_foe@, "Die!"
+
+@The_monster@ screams @at_foe@, "Me kill you!"
+
+@The_monster@ screams @at_foe@, "Me stronger than you!"
+
+@The_monster@ screams @at_foe@, "It's all mine!"
+
+@The_monster@ screams @at_foe@, "Get away!"
+
+@The_monster@ screams @at_foe@, "Level is mine! All mine!"
+
+@The_monster@ screams @at_foe@, "You nasty! Big nasty!"
+%%%%
+_Ijyb_rare_
+
+@The_monster@ screams @at_foe@, "I cut your head off!"
+
+@The_monster@ screams @at_foe@, "I dance on your bones!"
+
+@The_monster@ screams @at_foe@, "Me very upset!"
+
+@The_monster@ screams @at_foe@, "No! No, no, no, no!"
+
+@The_monster@ screams @at_foe@, "I no like you!"
+## END Ijyb ##
+%%%%
 ############ ILSUIW ### a pretty merfolk witch
 Ilsuiw
 
@@ -2491,7 +2494,7 @@ SPELL:@The_monster@ smites.
 
 @The_monster@ declares, "When I'm finished with you, I will take on the gods!"
 
-@The_monster@ queries, "My people built me a pyramid -- what did your people build for you?"
+@The_monster@ queries, "My people built me a pyramid - what did your people build for you?"
 
 @The_monster@ says, "This hit and run is way beneath me."
 
@@ -2868,6 +2871,12 @@ Nikola
 @The_monster@ raves, "Can you feel it? Can you feel it? CAN YOU FEEL IT?"
 
 @The_monster@ warns, "If you see one of my golems, approach with caution, they bite."
+
+@The_monster@ asks, "Are you insulated?"
+
+@The_monster@ says, "You don't like like a good isolator."
+
+@The_monster@ mumbles, "Hm, I wonder if you're conductive."
 %%%%
 ############ NORBERT ### A skilled warrior looking for some fame.  More kills = more fame.
 Norbert
@@ -3241,41 +3250,6 @@ VISUAL:@The_monster@ clenches @possessive@ claws.
 
 VISUAL:@The_monster@ looks very sad for a moment.
 %%%%
-############ RUPERT ### A crazy adventurer
-Rupert
-
-@_Rupert_common_@
-
-w:5
-@_Rupert_rare_@
-%%%%
-_Rupert_common_
-
-VISUAL:@The_monster@ looks excited.
-
-VISUAL:@The_monster@ looks confused.
-
-@The_monster@ screams @at_foe@, "Die, monster!"
-
-@The_monster@ screams @at_foe@, "Give me the Holy Grail!"
-
-@The_monster@ screams @at_foe@, "You killed all those lovely monsters, you murderer!"
-
-@The_monster@ screams @at_foe@, "Hurray!"
-%%%%
-_Rupert_rare_
-
-@The_monster@ asks @foe,@ "You're a monster, aren't you?"
-
-@The_monster@ says @to_foe@, "My Mum always said: 'Kill them all'."
-
-@The_monster@ shouts @at_foe@, "I'm a great and powerful hero!"
-
-@The_monster@ screams @at_foe@, "Get ready!  I'll kill you!  Or something like that..."
-
-@The_monster@ screams @at_foe@, "Red!  No, blue!"
-## END Rupert ##
-%%%%
 ############ ROXANNE ### a sapphire statue of an earth mage
 Roxanne
 
@@ -3341,6 +3315,41 @@ w:5
 @The_monster@ says @to_foe@, "Don't just stand there! You can move, can't you?"
 ## END Roxanne ##
 %%%%
+############ RUPERT ### A crazy adventurer
+Rupert
+
+@_Rupert_common_@
+
+w:5
+@_Rupert_rare_@
+%%%%
+_Rupert_common_
+
+VISUAL:@The_monster@ looks excited.
+
+VISUAL:@The_monster@ looks confused.
+
+@The_monster@ screams @at_foe@, "Die, monster!"
+
+@The_monster@ screams @at_foe@, "Give me the Holy Grail!"
+
+@The_monster@ screams @at_foe@, "You killed all those lovely monsters, you murderer!"
+
+@The_monster@ screams @at_foe@, "Hurray!"
+%%%%
+_Rupert_rare_
+
+@The_monster@ asks @foe,@ "You're a monster, aren't you?"
+
+@The_monster@ says @to_foe@, "My Mum always said: 'Kill them all'."
+
+@The_monster@ shouts @at_foe@, "I'm a great and powerful hero!"
+
+@The_monster@ screams @at_foe@, "Get ready!  I'll kill you!  Or something like that..."
+
+@The_monster@ screams @at_foe@, "Red!  No, blue!"
+## END Rupert ##
+%%%%
 ############ SAINT ROKA ### orc warlord
 # Only used if the player is not a Hill Orc.
 Saint Roka
diff --git a/crawl-ref/source/dat/uniques.des b/crawl-ref/source/dat/uniques.des
index beb3c81b7d..e45d0ee4c6 100644
--- a/crawl-ref/source/dat/uniques.des
+++ b/crawl-ref/source/dat/uniques.des
@@ -120,7 +120,7 @@ DEPTH:  20-27, !Lair, !Slime
 : place_unique(_G, "Boris")
 
 NAME:   uniq_donald
-DEPTH:  10-13, !Lair, !Slime
+DEPTH:  10-13
 : place_unique(_G, "Donald")
 
 NAME:   uniq_duane
@@ -136,7 +136,7 @@ DEPTH:  4-7, 8-9, !Lair, !Slime
 : place_unique(_G, "Edmund")
 
 NAME:   uniq_erica
-DEPTH:  10-13, 14-16, !Lair, !Slime
+DEPTH:  10-13, 14-16
 : place_unique(_G, "Erica")
 
 NAME:   uniq_erolcha
@@ -176,7 +176,7 @@ DEPTH:  8-9, 10-13, !Lair, !Slime
 : place_unique(_G, "Grum band")
 
 NAME:   uniq_harold
-DEPTH:  10-13, 14-16, !Lair, !Slime
+DEPTH:  10-13, 14-16, !Slime
 : place_unique(_G, "Harold")
 
 NAME:   uniq_iyjb
@@ -188,7 +188,7 @@ DEPTH:  1-3
 : place_unique(_G, "Jessica")
 
 NAME:   uniq_joseph
-DEPTH:  10-13, !Lair, !Slime
+DEPTH:  10-13, !Slime
 : place_unique(_G, "Joseph")
 
 NAME:   uniq_josephine
@@ -196,7 +196,7 @@ DEPTH:  10-13, 14-16, !Lair, !Slime
 : place_unique(_G, "Josephine band")
 
 NAME:   uniq_jozef
-DEPTH:  10-13, 14-16, !Lair, !Slime
+DEPTH:  10-13, 14-16, !Slime
 : place_unique(_G, "Jozef")
 
 NAME:   uniq_kirke
@@ -224,7 +224,7 @@ DEPTH:  4-7
 : place_unique(_G, "Menkaure")
 
 NAME:   uniq_nergalle
-DEPTH:  14-16, 17-19, !Lair, !Slime
+DEPTH:  14-16, 17-19, Orc:3-4, !Lair, !Slime
 : place_unique(_G, "Nergalle")
 
 NAME:   uniq_nessos
@@ -282,11 +282,11 @@ MAP
 ENDMAP
 
 NAME:   uniq_rupert
-DEPTH:  14-16, 17-19, !Lair, !Slime
+DEPTH:  14-16, 17-19
 : place_unique(_G, "Rupert")
 
 NAME:   uniq_saint_roka
-DEPTH:  17-19, 20-27, !Lair, !Slime
+DEPTH:  17-19, 20-27, Orc:4, !Lair, !Slime
 : place_unique(_G, "Saint Roka band")
 
 NAME:   uniq_sigmund
@@ -333,7 +333,6 @@ DEPTH:  Hell
 
 NAME:   uniq_polyphemus
 DEPTH:  Shoal:1-5
-
 : place_unique(_G, "Polyphemus band")
 
 NAME:   uniq_ilsuiw