summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-29 12:43:34 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-29 12:43:34 +0000
commit996361d167065bc29bef5da248e3d18bd0d9cbab (patch)
treebac3e756a6c0a8d10988563761cdb297652cd9c6 /crawl-ref/source/effects.cc
parent262fc856ccb0dbc4462aa71cfb7f56d81cd9b03d (diff)
downloadcrawl-ref-996361d167065bc29bef5da248e3d18bd0d9cbab.tar.gz
crawl-ref-996361d167065bc29bef5da248e3d18bd0d9cbab.zip
* When Xom decides to cast Magic Mapping or send you on a teleportation
journey, use a random sample of level grids as a guesstimate of the explored portion of the level, and reduce chances for mostly explored levels. * Don't attempt to cast spells you wouldn't be able to cast (e.g. the transformations for undead). * Tweak random uselessness messages as per FR 2595700. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9565 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc21
1 files changed, 11 insertions, 10 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 76477d6331..d236f38719 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -806,7 +806,8 @@ void random_uselessness(int scroll_slot)
break;
case 1:
- mpr("The scroll reassembles itself in your hands!");
+ mprf("The scroll reassembles itself in your %s!",
+ your_hand(true).c_str());
inc_inv_item_quantity(scroll_slot, 1);
break;
@@ -825,12 +826,10 @@ void random_uselessness(int scroll_slot)
break;
case 3:
- if (player_can_smell())
- mprf("You smell %s.", weird_smell().c_str());
- else if (you.species == SP_MUMMY)
+ if (you.species == SP_MUMMY)
mpr("Your bandages flutter.");
- else // currently not ever used
- canned_msg(MSG_NOTHING_HAPPENS);
+ else // if (player_can_smell())
+ mprf("You smell %s.", weird_smell().c_str());
break;
case 4:
@@ -839,10 +838,12 @@ void random_uselessness(int scroll_slot)
case 5:
temp_rand = random2(3);
- mprf("Your %s",
- (temp_rand == 0) ? "ears itch!" :
- (temp_rand == 1) ? "brain hurts!"
- : "nose twitches suddenly!");
+ if (player_mutation_level(MUT_BEAK) || one_chance_in(3))
+ mpr("Your brain hurts!");
+ else if (you.species == SP_MUMMY || coinflip())
+ mpr("Your ears itch!");
+ else
+ mpr("Your nose twitches suddenly!");
break;
case 6: