Better messages for Genie effects.

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

4 files changed, 16 insertions, 3 deletions

diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index ef905bd040..7efe93fd90 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -1948,9 +1948,20 @@ static void trowel_card(int power, deck_rarity_type rarity)
 static void genie_card(int power, deck_rarity_type rarity)
 {
     if ( coinflip() )
+    {
+        mpr("A genie takes forms and thunders: "
+            "\"Choose your reward, mortal!\"");
+        more();
         acquirement( OBJ_RANDOM, AQ_CARD_GENIE );
+    }
     else
-        potion_effect( coinflip() ? POT_DEGENERATION : POT_DECAY, 40 );
+    {
+        mpr("A genie takes form and thunders: "
+            "\"You disturbed me, fool!\"");
+        // use 41 not 40 to tell potion_effect() that this isn't
+        // a real potion
+        potion_effect( coinflip() ? POT_DEGENERATION : POT_DECAY, 41 );
+    }
 }
 
 static void godly_wrath()
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 1d1a31cdb3..6e7a0a7b5e 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1304,7 +1304,6 @@ bool acquirement(object_class_type class_wanted, int agent)
     while (class_wanted == OBJ_RANDOM)
     {
         mesclr();
-        mpr("This is a scroll of acquirement!");
         mpr( "[a] Weapon  [b] Armour  [c] Jewellery      [d] Book" );
         mpr( "[e] Staff   [f] Food    [g] Miscellaneous  [h] Gold" );
         mpr("What kind of item would you like to acquire? ", MSGCH_PROMPT);
diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc
index 568a6c24a4..2d88e96d3d 100644
--- a/crawl-ref/source/it_use2.cc
+++ b/crawl-ref/source/it_use2.cc
@@ -215,7 +215,8 @@ bool potion_effect( potion_type pot_eff, int pow )
         break;
 
     case POT_DEGENERATION:
-        mpr("There was something very wrong with that liquid!");
+        if ( pow == 40 )
+            mpr("There was something very wrong with that liquid!");
         if (lose_stat(STAT_RANDOM, 1 + random2avg(4, 2), false,
                       "drinking a potion of degeneration"))
             xom_is_stimulated(64);
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 14e8c3a3ee..29d371fd83 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -3719,6 +3719,8 @@ void read_scroll(void)
         break;
 
     case SCR_ACQUIREMENT:
+        mpr("This is a scroll of acquirement!");
+        more();
         acquirement(OBJ_RANDOM, AQ_SCROLL);
         break;