diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-03 19:12:35 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-03 19:12:35 +0000 |
| commit | f965ee9d68e6b4d674897117f1711b1d439b3689 (patch) | |
| tree | 76dee79218cb856a4d0dc83892172830c9e5e99e /crawl-ref/source/itemprop.cc | |
| parent | a6ba15c18bfc465daecb5390ad73f0a0f3df940b (diff) | |
| download | crawl-ref-f965ee9d68e6b4d674897117f1711b1d439b3689.tar.gz crawl-ref-f965ee9d68e6b4d674897117f1711b1d439b3689.zip | |
Fix 2483722: EQ_ALL_ARMOUR not skipping melded armour.
Fix 2483708: Transformations regarding wielded non-weapons as meldable.
Fix 2483528: Disallow randart book names like "Sif Muna's Lost Book of
Boris"
Fix 2483332: Silly logic error that only offered fully recharged wands
for recharging
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8175 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 1d3dcc353b..f0eab908dd 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -1332,9 +1332,10 @@ bool item_is_rechargeable(const item_def &it, bool known) // These are obvious... if (it.base_type == OBJ_WANDS) { - if (known && (it.plus == ZAPCOUNT_MAX_CHARGED + // Don't offer wands already maximally charged. + if (known && (it.plus2 == ZAPCOUNT_MAX_CHARGED || item_ident(it, ISFLAG_KNOW_PLUSES) - && it.plus < 3 * wand_charge_value(it.sub_type))) + && it.plus >= 3 * wand_charge_value(it.sub_type))) { return (false); } |