New Norris description and speech. (dpeg, ##crawl-dev)

Signed-off-by: Eino Keskitalo <evktalo@users.sourceforge.net>

1 files changed, 43 insertions, 17 deletions

diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
index 1ed51315bc..b5d2359096 100644
--- a/crawl-ref/source/dat/database/monspeak.txt
+++ b/crawl-ref/source/dat/database/monspeak.txt
@@ -2861,53 +2861,79 @@ SPELL:@The_monster@ mumbles some mantras.
 
 VISUAL:@The_monster@ is surrounded with an aura of peace.
 
-VISUAL:@The_monster@ smiles at @foe@.
+VISUAL:@The_monster@ smiles @at_foe@.
 
 VISUAL:@The_monster@ looks relaxed.
 
 @The_monster@ sings, "Peace now, freedom now! Peace now, freedom now!"
 
-@The_monster@ says @to_foe@, "Life is just suffering. I'll help you."
+@The_monster@ @Norris_verb@ @to_foe@, "Life is just suffering. I'll help you."
 
-@The_monster@ says @to_foe@, "Death is just a liberation!"
+@The_monster@ @Norris_verb@ @to_foe@, "Death is just a liberation!"
 
 @The_monster@ says @to_foe@, "Feel free to die. It's a great thing."
 
 @The_monster@ says @to_foe@, "Breathe deeply."
 
-@The_monster@ says @to_foe@, "It's all maya."
+@The_monster@ @Norris_verb@ @to_foe@, "Peace! I bring you eternal peace!"
+
+@The_monster@ @Norris_verb@ @to_foe@, "Free your soul! Die!"
+
+@The_monster@ @Norris_verb@ @to_foe@, "Let's die."
 
-@The_monster@ says @to_foe@, "Drop out!"
+@The_monster@ @Norris_verb@ @to_foe@, "Why delay the inevitable?"
 
-@The_monster@ screams @at_foe@, "Peace! I bring you eternal peace!"
+@The_monster@ @Norris_verb@ @to_foe@, "Personally, I think you are better off dead."
+
+@The_monster@ looks @at_foe@ and intones, "So much life I see, so little death. Pity that!"
 
-@The_monster@ screams @at_foe@, "Free your soul! Die!"
 %%%%
 _Norris_rare_
 
 VISUAL:@The_monster@ looks very balanced.
 
-@The_monster@ sings, "Hare Rama, Hare Krishna!"
+@The_monster@ happily suggests, "Let's all die!"
 
-@The_monster@ says @to_foe@, "After death you'll find inner peace."
+@The_monster@ @Norris_verb@, "I think I should really try this state of death once."
 
-@The_monster@ says @to_foe@, "Don't resist. I'll do it for you."
+@The_monster@ @Norris_verb@ @to_foe@, "Aren't you the least bit curious about what happens next?"
 
-@The_monster@ says @to_foe@, "OHM MANI PADME HUM!"
+@The_monster@ @Norris_verb@ @to_foe@, "You know, I get a bit tired of life. Don't you?"
 
-@The_monster@ says @to_foe@, "The Orb is only a myth. Forget about it." @player_only@
+@The_monster@ @Norris_verb@, "Personally, I might be better off dead."
 
-@The_monster@ says @to_foe@, "This is called Combat Meditation."
+@The_monster@ @Norris_verb@ @to_foe@, "Only fools fear death. I embrace it."
 
-@The_monster@ asks @foe,@ "What is the sound of one hand?"
+@The_monster@ @Norris_verb@ @to_foe@, "After death you'll find inner peace."
+
+@The_monster@ @Norris_verb@ @to_foe@, "Don't resist. I'll do it for you."
+
+@The_monster@ says @to_foe@, "The Orb is only a myth. Forget about it." @player_only@
 
 @The_monster@ sighs @at_foe@, "Enlightenment is such responsibility."
 
-@The_monster@ screams @at_foe@, "Enter NIRVANA! Now!"
+@The_monster@ @Norris_verb@ @to_foe@, "If we die together, will our souls be bonded? Icky!"
+
+@The_monster@ @Norris_verb@ @to_foe@, "I've seen so many of you coming here and die. I'd rather die at home."
+%%%%
+Norris_verb
+
+hums
+
+laughs
+
+murmurs
+
+softly says
+
+sighs
+
+mumbles
+
+absently says
 
-@The_monster@ screams @at_foe@, "Love! Eternal love!"
+whispers
 
-@The_monster@ screams @at_foe@, "Blow your mind!"
 ## END Norris ##
 %%%%
 ############ Pikel ######## A big kobold slaver!