diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 20:15:03 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 20:15:03 +0000 |
| commit | 8cbb227becdc172839b901aedf972022dc73118d (patch) | |
| tree | 0bd26e8356d53ebe455ae21bdc391e7adb79beb9 /crawl-ref/source/effects.cc | |
| parent | 504342b26a04cf2e33cb49b61d721ee483f5c68b (diff) | |
| download | crawl-ref-8cbb227becdc172839b901aedf972022dc73118d.tar.gz crawl-ref-8cbb227becdc172839b901aedf972022dc73118d.zip | |
Apply a bunch of trunk commits, mostly by Haran, namely:
6766 (partly), 6834 (partly), 6867, 6892, 6903, 6906, 6908, 6909,
6927, 6928, 6929, 6943, 6945, 6946
* Message/description tweaks.
* Fix enchanting hides not updating AC.
* Fix incorrect score calculation.
* All 't' commands now take a turn.
* Don't prompt when swapping into dangerous terrain.
* Fix backwards stealth check.
* Fix off-by-1 error when selecting starting weapon.
* Lichform discards holy wrath weapons.
* Reinitialise zap counter for recharged wands, mention charges.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7786 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
| -rw-r--r-- | crawl-ref/source/effects.cc | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 869c00756e..dfd013c784 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1830,8 +1830,8 @@ bool recharge_wand(int item_slot) break; } - // Don't display zap counts any more. - wand.plus2 = ZAPCOUNT_UNKNOWN; + // Reinitialize zap counts. + wand.plus2 = ZAPCOUNT_RECHARGED; const int new_charges = std::max<int>( @@ -1841,9 +1841,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. @@ -1972,7 +1981,7 @@ void yell(bool force) if (!you.duration[DUR_BERSERKER]) { - std::string previous = ""; + std::string previous; if (!(you.prev_targ == MHITNOT || you.prev_targ == MHITYOU)) { monsters *target = &menv[you.prev_targ]; @@ -2077,6 +2086,7 @@ void yell(bool force) return; } + you.turn_is_over = true; you.pet_target = mons_targd; // Allow patrolling for "Stop fighting!" and "Wait here!" _set_friendly_foes(keyn == 's' || keyn == 'w'); |