diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-18 18:02:50 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-18 18:02:50 +0000 |
| commit | f0f421c33bf731481df19d98b4c24c57a007d9f7 (patch) | |
| tree | 08b009dc8d903bb1a1d6fadf04137a79a33494de /crawl-ref/source/effects.cc | |
| parent | 0c2b9c3ea74546bf1046df0a107188c768dfa324 (diff) | |
| download | crawl-ref-f0f421c33bf731481df19d98b4c24c57a007d9f7.tar.gz crawl-ref-f0f421c33bf731481df19d98b4c24c57a007d9f7.zip | |
* Force ?immolation to never burn scrolls, whether in inventory or on
the floor.
* List new amount of charges when recharging identified wands.
* Tweak some checks for travel_path to be on the safe side.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6834 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
| -rw-r--r-- | crawl-ref/source/effects.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 8b3ccc5e31..1b4833d3a3 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1777,9 +1777,18 @@ bool recharge_wand(int item_slot) 1 + random2avg( ((charge_gain - 1) * 3) + 1, 3 ))); const bool charged = new_charges > wand.plus; - mprf("%s %s for a moment.", + + std::string desc = ""; + if (charged && item_ident(wand, ISFLAG_KNOW_PLUSES)) + { + snprintf(info, INFO_SIZE, " and now has %d charges", new_charges); + desc = info; + } + mprf("%s %s for a moment%s.", wand.name(DESC_CAP_YOUR).c_str(), - charged? "glows" : "flickers"); + charged? "glows" : "flickers", + desc.c_str()); + wand.plus = new_charges; } else // It's a rod. @@ -2086,7 +2095,7 @@ bool vitrify_area(int radius) for ( radius_iterator ri(you.pos(), radius, false, false); ri; ++ri ) { const dungeon_feature_type grid = grd(*ri); - + if (grid == DNGN_ROCK_WALL || grid == DNGN_STONE_WALL || grid == DNGN_PERMAROCK_WALL ) |