Applying patch #2842856 by ?:

* Much better descriptions for several uniques (including removal of "evil" if not really evil)
* Jessica gets Pain instead of Magic Dart (so she's actually evil now, in the Crawl sense of the word) - might make her more dangerous
* More diverse eating habits for Prince Ribbit

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

5 files changed, 49 insertions, 12 deletions

diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
index 3e9c702174..41b1768161 100644
--- a/crawl-ref/source/dat/database/monspeak.txt
+++ b/crawl-ref/source/dat/database/monspeak.txt
@@ -2404,16 +2404,37 @@ _Prince_Ribbit_rare_
 @The_monster@ sighs @at_foe@, "It's not easy being green!"
 
 @The_monster@ says @to_foe@, "You're just another fly to me."
+
+VISUAL:@The_monster@ winks @at_foe@ and puckers @possessive@ lips.
 %%%%
 _frog_food_
 
 fly
 
 w:5
-bug
+butterfly
+
+moth
+
+mosquito
+
+w:2
+spider
+
+wasp
+
+centipede
+
+millipede
 
 w:1
 small bird
+
+mouse
+
+baby bat
+
+blue-tailed skink
 ## END Prince Ribbit ##
 %%%%
 ############ PSYCHE ### An insane sorceress
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index 460523f4c1..a00b77bcdc 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -78,7 +78,7 @@ A beautiful but vain elf with an aptitude for magic and little else. His skills
 %%%%
 Duane
 
-An evil mercenary with unusually large ears.
+A mercenary with unusually large ears. He has been hired by someone to guard something; exactly who and what are not exactly clear.
 %%%%
 Duvessa
 
@@ -150,7 +150,7 @@ These nagas are often used as guardians by powerful creatures.
 %%%%
 Harold
 
-An evil human bounty hunter.
+A middle aged bounty hunter, hired to kill you. He is in a hurry.
 %%%%
 harpy
 
@@ -166,7 +166,7 @@ A cunning merfolk water-witch, who uses her beauty and spellcraft to draw unwitt
 %%%%
 Jessica
 
-An evil apprentice sorceress.
+An evil apprentice sorceress. She entered the dungeon hoping to find a quiet, secluded place where she could study the darker arts without being disturbed.
 %%%%
 Joseph
 
@@ -210,7 +210,7 @@ A lithe spellcaster.
 %%%%
 Maud
 
-An evil warrior who looks inexplicably like a rodent.  Looking into her eyes, you feel yourself forgetting everything else.
+A mysterious warrior princess from a far-off kingdom, on a quest to retrieve the legendary sword 'Entarex'. Countless have been the admirers who, thinking about Maud, forgot everything else.
 %%%%
 Michael
 
@@ -234,11 +234,11 @@ A black centaur warrior with a malicious look in the eyes.
 %%%%
 Norbert
 
-A skilled warrior.
+A skilled warrior, looking to further develop his reputation as a great slayer of monsters. Be warned: he defines 'monster' rather more liberally than most dictionaries.
 %%%%
 Norris
 
-A tan, fit and thoroughly evil surfer.
+A professional beach bum, all about surfing, free love and crystal healing; he has seen things that would, like, totally blow your mind, bro.
 %%%%
 Orb Guardian
 
@@ -274,7 +274,7 @@ A beautiful sapphire statue of a famous earth mage who disappeared after a catas
 %%%%
 Rupert
 
-An evil crusader.
+A mighty crusader, far less interested in converting heathens than killing them.
 %%%%
 Saint Roka
 
@@ -302,7 +302,7 @@ A graceful kobold assassin.  Admire her graceful pirouettes, thrill at her darin
 %%%%
 Terence
 
-An evil human fighter.
+A mean-looking human fighter who likes to kill, and not much else.
 %%%%
 Tiamat
 
@@ -314,7 +314,7 @@ A rude orc.
 %%%%
 Wayne
 
-A fat, evil wizard in a stupid-looking hat.
+A fat wizard wearing a stupid-looking hat.
 %%%%
 Xtahua
 
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 550c677fab..634ef4fca6 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2296,6 +2296,7 @@ enum mon_spellbook_type
     MST_LOM_LOBON,
     MST_CEREBOV,
     MST_GLOORX_VLOQ,
+    MST_JESSICA,
 
     MST_TEST_SPAWNER = 170,
     NUM_MSTYPES,
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index df9779739e..f71a8637e6 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -4216,12 +4216,13 @@ static monsterentry mondata[] = {
 
 {
     MONS_JESSICA, '@', LIGHTGREY, "Jessica",
-    M_UNIQUE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS,
+    M_UNIQUE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS
+        | M_EVIL,
     MR_NO_FLAGS,
     550, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3,
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 0, 0, 10 },
-    0, 10, MST_ORC_WIZARD_I, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL,
+    0, 10, MST_JESSICA, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL,
     HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index 8cc058d3de..89da74e873 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -33,6 +33,7 @@
        SPELL_BLINK
       }
     },
+
     {  MST_ORC_WIZARD_II,
       {
        SPELL_THROW_FLAME,
@@ -963,6 +964,19 @@
     // uniques' "spellbooks"
     // ---------------------
 
+    // Jessica is now a bit more evil-themed than before.
+    {  MST_JESSICA,
+      {
+       SPELL_PAIN, // Formerly Magic Dart.
+       SPELL_SLOW,
+       SPELL_HASTE,
+       SPELL_PAIN, // Formerly Magic Dart.
+       SPELL_BLINK,
+       SPELL_BLINK
+      }
+    },
+
+
     // Crusader theme.
     {  MST_RUPERT,
       {