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

1 files changed, 5 insertions, 2 deletions

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 9d16c2914a..32be70e0d3 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -3554,6 +3554,9 @@ void zap_wand( int slot )
     // Take off a charge.
     wand.plus--;
 
+    // Zap counts count from the last recharge.
+    if (wand.plus2 == ZAPCOUNT_RECHARGED)
+        wand.plus2 = 0;
     // Increment zap count.
     if (wand.plus2 >= 0)
         wand.plus2++;
@@ -4057,9 +4060,9 @@ bool enchant_armour( int &ac_change, bool quiet, item_def &arm )
                  arm.name(DESC_CAP_YOUR).c_str());
         }
 
-        ac_change = arm.plus;
+        ac_change = property(arm, PARM_AC);
         hide2armour(arm);
-        ac_change = arm.plus - ac_change;
+        ac_change = property(arm, PARM_AC) - ac_change;
 
         if (is_cursed)
             do_uncurse_item( arm );