diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-29 20:16:20 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-29 20:16:20 +0000 |
commit | cfb38140ddbee1685812b7de838b17711afe7a9d (patch) | |
tree | 11ef14236bf1e30754603cad12ebd49890a8d375 /crawl-ref | |
parent | 20c29369a5f55034fec620f6d6c93ef4a68a593a (diff) | |
download | crawl-ref-cfb38140ddbee1685812b7de838b17711afe7a9d.tar.gz crawl-ref-cfb38140ddbee1685812b7de838b17711afe7a9d.zip |
Genie message fix for 0.3.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2671 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/decks.cc | 13 | ||||
-rw-r--r-- | crawl-ref/source/effects.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/it_use2.cc | 3 | ||||
-rw-r--r-- | crawl-ref/source/item_use.cc | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 17af073173..0623d9e417 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -1173,9 +1173,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 c209ae1c2c..7a0f9c5b60 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1122,7 +1122,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 6e61dcfd30..0d4b6ca36a 100644 --- a/crawl-ref/source/it_use2.cc +++ b/crawl-ref/source/it_use2.cc @@ -214,7 +214,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))) xom_is_stimulated(64); break; diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 5a81140f0d..bb49bc6600 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3653,6 +3653,8 @@ void read_scroll(void) break; case SCR_ACQUIREMENT: + mpr("This is a scroll of acquirement!"); + more(); acquirement(OBJ_RANDOM, AQ_SCROLL); break; |