diff options
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r-- | crawl-ref/source/item_use.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 607a49cbeb..d280ff5309 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -2939,7 +2939,15 @@ void zap_wand(void) zapping( static_cast<zap_type>(type_zapped), 30 + roll_dice(2, you.skills[SK_EVOCATIONS]), beam ); - if ((beam.obvious_effect || type_zapped == WAND_FIREBALL) && + // 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) { set_ident_type( wand.base_type, wand.sub_type, ID_KNOWN_TYPE ); @@ -2950,13 +2958,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))) |