From 20c12ffb9765cb79fc8483ee7651f060d8ac129e Mon Sep 17 00:00:00 2001 From: haranp Date: Tue, 30 Oct 2007 23:01:30 +0000 Subject: Slightly better message when zapping identifies a wand [1817031] git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2695 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/item_use.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'crawl-ref/source/item_use.cc') diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index d5707703d0..552e905ab8 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -2995,6 +2995,14 @@ void zap_wand(void) zapping( static_cast(type_zapped), 30 + roll_dice(2, you.skills[SK_EVOCATIONS]), beam ); + // take off a charge + wand.plus--; + + // increment zap count + if ( wand.plus2 >= 0 ) + wand.plus2++; + + // identify if necessary if ((beam.obvious_effect || type_zapped == ZAP_FIREBALL) && !alreadyknown) { @@ -3006,13 +3014,6 @@ void zap_wand(void) set_ident_type( wand.base_type, wand.sub_type, ID_TRIED_TYPE ); } - // take off a charge - wand.plus--; - - // increment zap count - if ( wand.plus2 >= 0 ) - wand.plus2++; - if (item_type_known(wand) && (item_ident( wand, ISFLAG_KNOW_PLUSES ) || you.skills[SK_EVOCATIONS] > 5 + random2(15))) -- cgit v1.2.3-54-g00ecf