[FR 1903593] Change identification process of

             ?recharging, ?enchant armour and ?identify.

If you read one of these scrolls and the type isn't known yet you are
prompted with "Modify which item?" (better message needed!) and get to
choose from the entire inventory.
If the chosen item can be usefully "modified" by the scroll (unID'd item
for identify, wand for recharging, enchantable armour for EA) the usual
effect takes place and the scroll is identified. (Reading other scrolls 
of the same type will then only offer a more sensible selection of items.) 
Otherwise, nothing happens.

Further, recharging and enchant armour now allow direct choice of the 
item in question, and it doesn't even have to be wielded or worn.

I think this change actually makes the id game more interesting and also
improves the interface. Gameplay might dictate that we reintroduce the
"armour needs to be worn" rule, but that remains to be seen until after 
some more playtesting.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3514 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 1 deletions

diff --git a/crawl-ref/source/item_use.h b/crawl-ref/source/item_use.h
index 0efea498a3..07de89103d 100644
--- a/crawl-ref/source/item_use.h
+++ b/crawl-ref/source/item_use.h
@@ -160,7 +160,8 @@ void use_randart(item_def &item);
 
 bool puton_item(int slot, bool prompt_finger = true);
 
-bool enchant_weapon( enchant_stat_type which_stat, bool quiet = false );
+bool enchant_weapon( enchant_stat_type which_stat, bool quiet = false,
+                     int wpn = -1 );
 
 bool throw_it(bolt &pbolt, int throw_2, bool teleport=false, int acc_bonus=0,
               dist *target = NULL);