diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-29 18:37:38 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-29 18:37:38 +0000 |
| commit | fca2ba3fa41951c7337c13a7a147bcbe5ba8f671 (patch) | |
| tree | d0fda56ba3ab7ba87b542bf61a65e4c2f4988b90 /crawl-ref/source/describe.cc | |
| parent | a8624b062fb70d41a42c0d23f720ce57f9e8e080 (diff) | |
| download | crawl-ref-fca2ba3fa41951c7337c13a7a147bcbe5ba8f671.tar.gz crawl-ref-fca2ba3fa41951c7337c13a7a147bcbe5ba8f671.zip | |
* Nerf Dwarfs' Evocations aptitude 45 -> 67 (as e.g. Grey Elf).
* Correct Evoc aptitude listed in aptitudes.txt for High Elf.
* List max charges for wands in their descriptions.
* Mention waypoint number when creating waypoints.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8020 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 25a95d3f45..11892384bf 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1878,8 +1878,23 @@ std::string get_item_description( const item_def &item, bool verbose, break; case OBJ_WANDS: - if (item_ident( item, ISFLAG_KNOW_PLUSES ) && item.plus == 0) - description << "Unfortunately, it has no charges left."; + if (item_type_known(item)) + { + const int max_charges = 3 * wand_charge_value(item.sub_type); + if (item.plus < max_charges) + { + description << "$It can have at most " << max_charges + << " charges."; + } + else + description << "$It is fully charged."; + } + + if (item_ident( item, ISFLAG_KNOW_PLUSES ) && item.plus == 0 + || item.plus2 == ZAPCOUNT_EMPTY) + { + description << "$Unfortunately, it has no charges left."; + } description << "$"; break; |