Reorder weapon speech to make some messages appear more rarely

than others, and increase variation.
Add a number of new speech, mostly for the Singing Sword.


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

3 files changed, 336 insertions, 98 deletions

diff --git a/crawl-ref/docs/monster_speech.txt b/crawl-ref/docs/monster_speech.txt
index 2fdfed7bcc..84b61a5ff2 100644
--- a/crawl-ref/docs/monster_speech.txt
+++ b/crawl-ref/docs/monster_speech.txt
@@ -487,12 +487,14 @@ If this specific search doesn't yield any results, i.e., such an
 entry hasn't been defined for the species in question, the general
 replacements are used instead.
 
-Weapon noises are handled differently in that all of the above
+Weapon noises are handled differently in that most of the above
 replacements don't hold. Instead you can use @The_weapon@,
 @the_weapon@, @Your_weapon@, @your_weapon@ and @weapon@ which will get
 replaced by "The (weapon name)", "the (weapon name)", "Your (weapon
 name)", "your (weapon name)", and the plain weapon name,
 respectively.
+@player_name@ is expanded as above, as is @player_god@, though for 
+atheists it returns "atheism".
 
 Note that the Singing Sword, being unique, cannot be referred to by
 the possessive variants, so they will be replaced with the appropriate
diff --git a/crawl-ref/source/dat/database/wpnnoise.txt b/crawl-ref/source/dat/database/wpnnoise.txt
index a61a5df8fa..b296fa9727 100644
--- a/crawl-ref/source/dat/database/wpnnoise.txt
+++ b/crawl-ref/source/dat/database/wpnnoise.txt
@@ -17,7 +17,7 @@
 ############################################################
 singing sword
 
-w:4
+w:6
 @weapon_sings@
 
 w:1
@@ -28,7 +28,7 @@ w:1
 ############################################################
 noisy weapon
 
-w:2
+w:3
 @weapon_talks@
 
 w:1
@@ -39,32 +39,66 @@ SOUND:You hear @weapon_noise@
 ############################################################
 weapon_sings
 
-#sings
-@The_weapon@ hums a little @tune_or_melody@.
+#plain sings (58)
+w:60
+@singing@
 
-@The_weapon@ breaks into glorious song!
+#instrumental sounds (19)
+w:15
+@singing_sword_instruments@
 
-@The_weapon@ sings.
+#speaks (30)
+w:25
+@speaking@
+
+# These should be really rare. (12)
+w:2
+@real_song@
+
+%%%%
+singing
 
-@The_weapon@ sings loudly.
+# sings what?
+@The_weapon@ @sings_hums_whistles@ a @what_kind@ @tune_or_melody@.
 
-@The_weapon@ sings off-key.
+@The_weapon@ @sings_or_hums@ an eerie @tune_or_melody@.
+
+w:5
+@The_weapon@ @sings_or_hums@ a slow and mournful tune.
+
+w:25
+@The_weapon@ strikes up @strikes_up_what@.
+
+In a hysterical voice, @the_weapon@ strikes up a march.
 
 @The_weapon@ sings, "Tra-la-la..."
 
 @The_weapon@ sings a lullaby.
 
-@The_weapon@ whines plaintively.
+@The_weapon@ sings a folk song.
 
-@The_weapon@ wails mournfully.
+@The_weapon@ chants a little melody.
 
-@The_weapon@ practices its scales.
+@The_weapon@ sings a deeply moving song.
 
-@The_weapon@ lilts tunefully.
+@The_weapon@ plays a requiem for the unknown sword.
 
-@The_weapon@ yodels.
+@The_weapon@ hums a slow waltz.
 
-@The_weapon@ hums tunelessly.
+@The_weapon@ sings a little jingle.
+
+@The_weapon@ plays an overture.
+
+@The_weapon@ @composes_or_sings@ a @hymn_or_song@ about @song_theme@.
+
+@The_weapon@ @composes_or_sings@ a hymn praising @player_god@.
+
+@The_weapon@ launches into a @hymn_or_song@ on @song_theme@.
+
+@The_weapon@ @composes_or_sings@ a ballad about your adventures.
+
+# practising
+@The_weapon@ practices its scales.
 
 @The_weapon@ makes a painfully high-pitched squeak.
 
@@ -72,102 +106,127 @@ weapon_sings
 
 @The_weapon@ sings a sudden staccato note.
 
-@The_weapon@ @sings_or_hums@ a catchy @tune_or_melody@.
+@The_weapon@ sings a quivering drawn-out note.
 
-@The_weapon@ hums a slow waltz.
+@The_weapon@ trains the @kind_of_scales@ scales.
 
-@The_weapon@ whistles merrily.
+@The_weapon@ plays a couple of bars.
 
-#Beethoven
-@The_weapon@ goes "Da-da-da-dum".
+@The_weapon@ @nearly_or_clearly@ @hits_or_misses@ the concert pitch.
 
-@The_weapon@ chants serenely.
+@The_weapon@ repeatedly practises the high pitch.
 
-@The_weapon@ trills happily.
+@The_weapon@ sings @several@ chords at once.
 
-@The_weapon@ chants a little melody.
+# more singing
+@The_weapon@ breaks into glorious song!
 
-@The_weapon@ sings a deeply moving song.
+@The_weapon@ sings.
 
-@The_weapon@ hums an eerie @tune_or_melody@.
+@The_weapon@ @sings_or_whistles@ loudly.
 
-@The_weapon@ @sings_or_hums@ a slow and mournful tune.
+@The_weapon@ sings off-key.
 
-@The_weapon@ launches into yet another solo.
+@The_weapon@ whines plaintively.
 
-@The_weapon@ strikes up a merry @tune_or_melody@.
+@The_weapon@ wails mournfully.
 
-@The_weapon@ emits a series of high-pitched trills.
+@The_weapon@ lilts tunefully.
 
-@The_weapon@ composes a new song.
+@The_weapon@ yodels.
 
-@The_weapon@ makes a sound as if to clear its throat.
+@The_weapon@ hums tunelessly.
 
-@The_weapon@ sings a quivering drawn-out note.
+@The_weapon@ keens wildly.
 
-@The_weapon@ sings a little jingle.
+@The_weapon@ whistles merrily.
 
-@The_weapon@ raucously launches into song.
+#Beethoven
+@The_weapon@ goes "Da-da-da-dum".
 
-@The_weapon@ strikes up a funeral march.
+@The_weapon@ chants serenely.
 
-@The_weapon@ merrily whistles a melody.
+@The_weapon@ trills happily.
 
-In a hysterical voice, @the_weapon@ strikes up a march.
+@The_weapon@ launches into yet another solo.
 
-@The_weapon@ sings @several@ chords at once.
+@The_weapon@ emits a series of high-pitched trills.
 
-@The_weapon@ trains the @kind_of_scales@ scales.
+@The_weapon@ tries to sing in harmony with itself.
+
+@The_weapon@ provides the musical accompaniment for each of your actions.
+
+@The_weapon@ composes a new song.
+
+@The_weapon@ raucously launches into song.
+
+@The_weapon@ merrily whistles a melody.
 
 @The_weapon@ pulls out all the stops.
 
 @The_weapon@ sets up a furious crescendo.
 
-@The_weapon@ plays a requiem for the unknown sword.
-
 @The_weapon@ strikes up a @dance@.
 
 @The_weapon@ intones @an_aria_or_fugue@.
 
-@The_weapon@ @nearly_or_clearly@ @hits_or_misses@ the concert pitch.
-
-@The_weapon@ sings a song about @song_theme@.
+@The_weapon@ gives you a private @audition@.
 
-@The_weapon@ composes a hymn about @song_theme@.
+@The_weapon@ @sings_or_hums@ away to itself.
 
-@The_weapon@ composes a ballad about your adventures.
+@The_weapon@ lets out a series of bird calls.
 
-#imitates instruments
-@The_weapon@ makes a twanging sound.
-
-@The_weapon@ chimes melodiously.
+%%%%
+# instruments and other noises
+singing_sword_instruments
 
-@The_weapon@ chimes harmoniously.
+w:140
+@instrumental_noises@
 
 @The_weapon@ makes beautiful music.
 
 @The_weapon@ produces a loud orchestral chord.
 
-@The_weapon@ tinkles.
+@The_weapon@ holds a dissonant chord.
 
-@The_weapon@ rings like a bell.
+@The_weapon@ tunes itself.
 
-@The_weapon@ imitates a saxophone.
+@The_weapon@ beats time.
 
-@The_weapon@ chimes like a gong.
+%%%%
+# also used by noisy weapons
+instrumental_noises
 
-@The_weapon@ applauds itself.
+@Your_weapon@ makes a sound as if to clear its throat.
 
-@The_weapon@ goes toot-toot!
+@Your_weapon@ makes a twanging sound.
 
-@The_weapon@ does a drum roll.
+@Your_weapon@ chimes melodiously.
 
-@The_weapon@ holds a dissonant chord.
+@Your_weapon@ chimes harmoniously.
 
-@The_weapon@ beats time.
+@Your_weapon@ tinkles.
+
+@Your_weapon@ rings like a bell.
+
+@Your_weapon@ imitates a saxophone.
+
+@Your_weapon@ imitates the bagpipes.
+
+@Your_weapon@ emits a flourish of trumpets.
+
+@Your_weapon@ tootles away.
+
+@Your_weapon@ chimes like a gong.
 
-#speaks
-@The_weapon@ says, "Hi! I'm the Singing Sword!"
+@Your_weapon@ applauds itself.
+
+@Your_weapon@ goes toot-toot!
+
+@Your_weapon@ does a drum roll.
+
+%%%%
+speaking
 
 @The_weapon@ shouts, "Sing along with me!"
 
@@ -175,35 +234,102 @@ In a hysterical voice, @the_weapon@ strikes up a march.
 
 @The_weapon@ spouts musical wisdom.
 
-@The_weapon@ chants, "I am golden and pointed, and with blood well anointed."
-
-@The_weapon@ dictates a lengthy tome entitled 'The Well-Tempered Blade'.
-
 @The_weapon@ @points_out@ the lack of singing @not_swords@. 
 
 @The_weapon@ embarks on a lenghty monologue about murderous music.
 
-@The_weapon@ curses its smith: "I was supposed to be the Stinging Sword!"
+@The_weapon@ compliments itself on its singing voice.
+
+@The_weapon@ asks you about your opinion on @musical_topic@.
 
 @The_weapon@ muses how they don't make such fine swords anymore.
 
 @The_weapon@ tries to improvise rhymes, and fails miserably.
 
+@The_weapon@ offers to sing all your favourite songs.
+
 @The_weapon@ asks you for a rhyme on '@rhyme_word@'.
 
 @The_weapon@ complains about @double_or_triple@ swords.
 
 @The_weapon@ derides short swords.
 
-@The_weapon@ yells, "Ploughshares to swords!" and giggles.
+@The_weapon@ muses on the connection between 'duet' and 'duel'.
 
-@The_weapon@ chants, "Rather stab than club, rather slice than rub!"
+@The_weapon@ wails, "I am too young to rust!"
+
+@The_weapon@ comments about your taste in music.
+
+@The_weapon@ complains about your lack of musical enthusiasm.
+
+@The_weapon@ tries to entice you into a canon.
+
+@The_weapon@ tells you about its plans for a grandiose opera.
+
+@The_weapon@ grumbles, "I guess an audience of one is better than none..."
+
+@The_weapon@ brightly asks, "How about a duet?"
+
+# These should happen about half as often.
+w:50
+@rare_speaking@
+
+%%%%
+rare_speaking
+
+@The_weapon@ says, "Hi!  I'm the Singing Sword!"
+
+@The_weapon@ chants, "I am golden and pointed, and with blood well anointed."
+
+@The_weapon@ dictates a lengthy tome entitled 'The Well-Tempered Blade'.
 
 @The_weapon@ says, "Whips just don't cut it for me, don't you agree?"
 
-@The_weapon@ muses on the connection between 'duet' and 'duel'.
+@The_weapon@ chants, "Rather stab than club, rather slice than rub!"
+
+w:5
+@The_weapon@ explains all about @musical_topic@.
 
-@Your_weapon@ wails, "I am too young to rust!"
+w:5
+@The_weapon@ gives a lengthy lecture on @musical_topic@.
+
+@The_weapon@ curses its smith, "I was supposed to be the Stinging Sword!"
+
+@The_weapon@ yells, "Ploughshares to swords!" and giggles.
+
+@The_weapon@ asks, "What song would you like to be played for your funeral?"
+
+@The_weapon@ announces, "I dedicate these songs to @player_name@!"
+
+@The_weapon@ says, "Hey!  Are you even listening?"
+
+%%%%
+real_song
+
+@The_weapon@ roars, "Silence is golden, golden ..."
+
+@The_weapon@ happily sings, "... another one bites the dust!"
+
+@The_weapon@ @sings_or_whistles@, "Always look on the bright side of death ..."
+
+@The_weapon@ sings, "Where have all the monsters gone?"
+
+@The_weapon@ sings, "Song sung blue, everybody knows one ..."
+
+@The_weapon@ sings, "Thank you for the music..."
+
+@The_weapon@ wails, "Look what they done to my song!"
+
+@The_weapon@ sings, "Pop! Goes the weasel."
+
+@The_weapon@ sings, "Obladi oblada, life goes on ..."
+
+@The_weapon@ sings, "Ain't no stopping us now ..."
+
+@The_weapon@ sings, "Ninety-nine potions of booze on the wall ..."
+
+# Jingle Bells, misunderstood
+@The_weapon@ sings, "What fun it is to ride and sing a slaying song tonight!"
 
 # end Singing Sword
 %%%%
@@ -213,7 +339,15 @@ In a hysterical voice, @the_weapon@ strikes up a march.
 ############################################################
 weapon_talks
 
-#speaks
+#speaks (48)
+@weapon_chatter@
+
+#makes noises (48)
+@weapon_noises@
+
+%%%%
+weapon_chatter
+
 @Your_weapon@ shouts, "Whoopee!"
 
 @Your_weapon@ argues with itself.
@@ -238,6 +372,10 @@ weapon_talks
 
 @Your_weapon@ prattles on and on.
 
+@Your_weapon@ inquires about your family.
+
+@Your_weapon@ comments on the weather.
+
 @Your_weapon@ regales you with its life story.
 
 @Your_weapon@ speaks gibberish.
@@ -255,8 +393,6 @@ weapon_talks
 #song by the Misfits
 @Your_weapon@ asks plaintively, "Mommy, can I go out and kill tonight?"
 
-@Your_weapon@ cries, "Don't ditch me yet!  I promise to be forever silent."
-
 @Your_weapon@ amuses itself with detailed descriptions of past executions.
 
 @Your_weapon@ wishes everyone in the dungeon @unpleasant_or_sudden@ @demise_or_death@.
@@ -265,8 +401,6 @@ weapon_talks
 
 @Your_weapon@ yells, "No battle, no fun!"
 
-@Your_weapon@ shouts, "This level is mine!  Um, ours."
-
 @Your_weapon@ cracks jokes of @questionable@ humour.
 
 @Your_weapon@ dwells on sagas on the glory of old.
@@ -275,10 +409,6 @@ weapon_talks
 
 @Your_weapon@ gleefully confesses its misdeeds.
 
-@Your_weapon@ groans, "That's what you call fighting?"
-
-@Your_weapon@ shouts, "Left! No, no, right!".
-
 @Your_weapon@ sighs, "How I wish you were a better fighter."
 
 @Your_weapon@ grouses, "Could you please kill something?  I'm itching all over."
@@ -297,19 +427,42 @@ weapon_talks
 
 @Your_weapon@ complains, "Are you always this @silent@?"
 
-@Your_weapon@ says, "Why don't you say something for a change?"
-
-@Your_weapon@ asks, "Did you take a vow of silence?"
-
 @Your_weapon@ shouts a battle cry!
 
 @Your_weapon@ shouts, "Onwards!  It's kill or die!"
 
+@Your_weapon@ grouses, "Silence can be so depressing."
+
+@Your_weapon@ compliments you on your taste in weapons.
+
+@Your_weapon@ attempts to teach you some tongue twisters.
+
+@Your_weapon@ compares you unfavourably to its previous owner.
+
+w:30
+@rare_chatter@
+%%%%
+rare_chatter
+
+@Your_weapon@ shouts, "This level is mine!  Um, ours."
+
+@Your_weapon@ cries, "Don't ditch me yet!  I promise to be forever silent."
+
+@Your_weapon@ groans, "That's what you call fighting?"
+
+@Your_weapon@ shouts, "Left! No, no, right!".
+
+@Your_weapon@ says, "Why don't you say something for a change?"
+
+@Your_weapon@ asks, "Did you take a vow of silence?"
+
 @Your_weapon@ says, "You can tell me everything!  I can keep a secret!"
 
-@Your_weapon@ grouses, "Silence can be so depressing."
+@Your_weapon@ prematurely composes your obituary.
+
+%%%%
+weapon_noises
 
-#makes noises
 @Your_weapon@ growls menacingly.
 
 @Your_weapon@ sputters and hisses.
@@ -326,6 +479,22 @@ weapon_talks
 
 @Your_weapon@ howls with laughter!
 
+@Your_weapon@ howls like a wolf.
+
+@Your_weapon@ whimpers.
+
+@Your_weapon@ screams hysterically.
+
+@Your_weapon@ hiccups loudly.
+
+@Your_weapon@ erupts into laughter!
+
+@Your_weapon@ starts to sob noisily.
+
+@Your_weapon@ goes tick-tock.
+
+@Your_weapon@ starts beeping.
+
 @Your_weapon@ laughs crazily.
 
 @Your_weapon@ burps!
@@ -354,8 +523,6 @@ weapon_talks
 
 @Your_weapon@ swears loudly.
 
-@Your_weapon@ inquires about your family.
-
 @Your_weapon@ coughs loudly.
 
 @Your_weapon@ burbles away merrily.
@@ -372,8 +539,6 @@ weapon_talks
 
 @Your_weapon@ snorts.
 
-@Your_weapon@ comments on the weather.
-
 @Your_weapon@ makes a deep, guttural noise.
 
 @Your_weapon@ gives off a sizzling sound.
@@ -386,9 +551,12 @@ weapon_talks
 
 @Your_weapon@ cheers!
 
-@Your_weapon@ lets out a series of bird calls.
+@Your_weapon@ makes a tutting noise.
 
-# end weapon chatter
+@Your_weapon@ parrots the noises around you.
+
+w:20
+@instrumental_noises@
 %%%%
 ############################################################
 # noises for weapons with NOISES property (not Singing Sword!)
@@ -473,9 +641,59 @@ a flourish of trumpets!
 
 # end weapon noises
 %%%%
+
 ############################################################
 # synonyms for weapon noises
 ############################################################
+sings_or_hums
+
+sings
+
+hums
+%%%%
+sings_or_whistles
+
+sings
+
+whistles
+%%%%
+sings_hums_whistles
+
+sings
+
+hums
+
+whistles
+%%%%
+composes_or_sings
+
+composes
+
+sings
+%%%%
+what_kind
+
+little
+
+catchy
+
+merry
+%%%%
+strikes_up_what
+
+w:5
+a slow and mournful tune
+
+a merry @tune_or_melody@
+
+a funeral march
+%%%%
+hymn_or_song
+
+hymn
+
+song
+%%%%
 several
 
 several
@@ -514,12 +732,6 @@ waltz
 
 menuet
 %%%%
-sings_or_hums
-
-sings
-
-hums
-%%%%
 an_aria_or_fugue
 
 an aria
@@ -568,6 +780,12 @@ double
 
 triple
 %%%%
+audition
+
+audition
+
+concerto
+%%%%
 rhyme_word
 
 fountain of blood
@@ -575,6 +793,7 @@ fountain of blood
 killing spree
 
 battlefield
+
 %%%%
 song_theme
 
@@ -584,6 +803,18 @@ death and destruction
 
 the glory of death
 %%%%
+musical_topic
+
+acoustics
+
+voice harmonics
+
+the history of music
+
+the theory of melody
+
+rhythms and time
+%%%%
 silent
 
 uncommunicative
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc
index 6cb1db63e2..e3fe7f923d 100644
--- a/crawl-ref/source/it_use3.cc
+++ b/crawl-ref/source/it_use3.cc
@@ -156,6 +156,11 @@ void special_wielded()
             msg = replace_all(msg, "@The_weapon@", "The @weapon@");
             msg = replace_all(msg, "@the_weapon@", "the @weapon@");
             msg = replace_all(msg, "@weapon@", you.inv[wpn].name(DESC_BASENAME));
+            // replace references to player name and god
+            msg = replace_all(msg, "@player_name@", you.your_name);
+            msg = replace_all(msg, "@player_god@",
+                              you.religion == GOD_NO_GOD ? "atheism"
+                                : god_name(you.religion, coinflip()));
 
             mpr(msg.c_str(), channel);