Remove Michael. (dpeg, pointless)

With 30 kills to 5696 deaths, Michael just isn't unique enough.

7 files changed, 7 insertions, 57 deletions

diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
index 78c0f659af..593431bf25 100644
--- a/crawl-ref/source/dat/database/monspeak.txt
+++ b/crawl-ref/source/dat/database/monspeak.txt
@@ -2666,42 +2666,6 @@ VISUAL:@The_monster@ gestures ominously @at_foe@.
 VISUAL:@The_monster@ draws the symbol "Udjat" in the dust.
 ## END Menkaure ##
 %%%%
-############ MICHAEL ### Loner spell-caster
-Michael
-
-@_Michael_common_@
-
-w:5
-@_Michael_rare_@
-%%%%
-_Michael_common_
-
-SPELL:@The_monster@ mumbles some strange words.
-
-SPELL:@The_monster@ gestures wildly.
-
-VISUAL SPELL:@The_monster@ points at @foe@.
-VISUAL:__YOU_RESIST
-
-VISUAL:@The_monster@ looks very angry.
-
-VISUAL:@The_monster@ frowns.
-
-VISUAL:@The_monster@ looks angry.
-
-@The_monster@ screams @at_foe@, "Get away!  Or better yet, die!"
-%%%%
-_Michael_rare_
-
-VISUAL:@The_monster@ drinks a potion.
-
-VISUAL:@The_monster@ shakes with wrath.
-
-@The_monster@ says @to_foe@, "You really are a nuisance."
-
-@The_monster@ screams @at_foe@, "I want to be alone!"
-
-%%%%
 ############ MURRAY ### A disembodied skull.
 Murray
 
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index 4130cc33d9..5966f0c157 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -246,10 +246,6 @@ Maurice
 
 A sly, conniving thief
 %%%%
-Michael
-
-A powerful spellcaster, dressed in a long robe.
-%%%%
 Mnoleg
 
 A weirdly glowing figure, dancing through the twisted air of Pandemonium.
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 3402eba9e0..3de2a91a5c 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -77,7 +77,7 @@ SUBST: u=x, v=x, w=x, y=x, z=x
 SUBST: U=x, V=x, W=x, Y=x, Z=x
 #
 SUBST: 1 = 1:20 ., 2=2., 3=23, 4=24
-MONS:  jackal/hound, human, Edmund/Jessica/Sigmund, Michael/Ijyb/Psyche
+MONS:  jackal/hound, human, Edmund/Jessica/Sigmund, Ijyb/Psyche
 MONS:  sheep/nothing
 MAP
          xSxxxxx    xxxxxxxxxxUx
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index da3db7bd69..f4f932f371 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -1762,7 +1762,7 @@ SUBST: k = HIJKL
 SUBST: k = KLMNO
 : end
 KMONS: A = Blork the Orc / human; long sword | falchion . chain mail . shield
-KMONS: B = Michael / human; great sword . banded mail|plate mail
+KMONS: B = human / human; great sword . banded mail|plate mail
 KMONS: C = Urug / elf; sabre | long sword . leather armour . buckler | nothing
 KMONS: D = Joseph / elf; long sword | scimitar . chain mail . shield
 KMONS: E = Erica / orc knight
diff --git a/crawl-ref/source/dat/uniques.des b/crawl-ref/source/dat/uniques.des
index 7e398ecf55..83bcfbad9c 100644
--- a/crawl-ref/source/dat/uniques.des
+++ b/crawl-ref/source/dat/uniques.des
@@ -188,14 +188,6 @@ MAP
 1
 ENDMAP
 
-NAME:   uniq_michael
-DEPTH:  10-13, 14-16, !Lair
-TAGS:   place_unique
-MONS:   Michael
-MAP
-1
-ENDMAP
-
 NAME:   uniq_eustachio
 DEPTH:  10-13, 14-16, !Lair
 TAGS:   place_unique
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index f7e3c13fda..04b809e7ba 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -70,7 +70,7 @@ ENDMAP
 NAME:    david_vaults_3
 TAGS:    vault_entry
 ORIENT:  float
-MONS:    human, human / Donald, human / Michael, human / Norris, human / Wayne
+MONS:    human, human / Donald, human / human / Norris, human / Wayne
 SHUFFLE: 2345
 MAP
 @..........@
@@ -244,8 +244,8 @@ MONS:   big kobold / kobold demonologist
 MONS:   deep elf fighter / w:5 deep elf knight / w:3 deep elf mage /\
         w:2 deep elf priest
 MONS:   Ijyb / Blork the Orc / Urug / Erolcha / Snorg / Terence / Jessica /\
-        Sigmund / Psyche / Michael / Erica / Norbert / Agnes / Maud /\
-        Louise / Rupert / Wayne / Duane / Norris / goblin
+        Sigmund / Psyche / Erica / Norbert / Agnes / Maud / Louise / Rupert /\
+        Wayne / Duane / Norris / goblin
 KITEM:  ! = any potion / potion of confusion, \
             any potion / potion of paralysis, any potion / potion of slowing
 KITEM:  $ = q:132 gold / q:66 gold / q:33 gold
diff --git a/crawl-ref/source/dat/volcano.des b/crawl-ref/source/dat/volcano.des
index db0a8bb924..a9bdddab9e 100644
--- a/crawl-ref/source/dat/volcano.des
+++ b/crawl-ref/source/dat/volcano.des
@@ -270,8 +270,7 @@ end
 --  orc warrior, orc warrior, orc warrior, Urug; orc warrior, orc warrior,
 --  orc warrior, Blork the orc; orc warrior, orc warrior, orc warrior,
 --  orc warrior/orc knight.
---  human, human, human, Edmund; human, human, human, Michael; human,
---  human, human, human.
+--  human, human, human, Edmund; human, human, human, human.
 --  big kobold, big kobold, big kobold, Sonja; big kobold, big kobold, 
 --  big kobold, big kobold.
 --  gnoll, gnoll, gnoll, Grum + war dogs; gnoll, gnoll, gnoll, gnoll.
@@ -298,7 +297,6 @@ end
 local urug = "Urug ; spear ego:flaming race:orcish . leather armour ego:fire_resistance race:orcish"
 local blork = "Blork the orc ; short sword race:orcish ego:flaming . leather armour ego:fire_resistance race:orcish"
 local edmund = "Edmund ; flail ego:flaming . leather armour ego:fire_resistance"
-local michael = "Michael ; dagger ego:flaming . robe ego:fire_resistance"
 local grum  = "Grum ; animal skin ego:fire_resistance"
 local hellknight = "hell knight w:1 ; hand axe ego:flaming . ring mail ego:fire_resistance"
 
@@ -334,7 +332,7 @@ function fiery_guardians (e)
         local unq_weight = crawl.random2(40)
         if unq_weight < 10 then
             e.mons("human ; scimitar ego:flaming . leather armour ego:fire_resistance")
-            e.mons(edmund .. " / " .. michael .. " / human ; falchion ego:flaming . scale mail ego:fire_resistance")
+            e.mons(edmund .. " / human ; falchion ego:flaming . scale mail ego:fire_resistance")
         elseif unq_weight < 20 then
             e.mons("big kobold ; short sword ego:flaming . leather armour ego:fire_resistance")
             e.mons("Sonja / big kobold ; long sword ego:flaming . ring mail ego:fire_resistance")