diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-08-12 23:10:14 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-08-12 23:10:14 +0000 |
| commit | 995e9fc728b24c9dd5a821c6e9c490b3d4682177 (patch) | |
| tree | 97c663d36d6e1456b6e8b9d35bdefc495db4f7e2 /crawl-ref/source/artefact.cc | |
| parent | 3e1bc33f1ea93a6eb20afa216a15ca562c707ab4 (diff) | |
| download | crawl-ref-995e9fc728b24c9dd5a821c6e9c490b3d4682177.tar.gz crawl-ref-995e9fc728b24c9dd5a821c6e9c490b3d4682177.zip | |
FR 2823234: Note getting the Blessed Blade right away
FR 2433928: Holy wrath weapons cannot be cursed.
The message could stand to be improved.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10530 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/artefact.cc')
| -rw-r--r-- | crawl-ref/source/artefact.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index e170ce540b..a1deb2c363 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -1815,6 +1815,13 @@ static bool _randart_is_redundant( const item_def &item, static bool _randart_is_conflicting( const item_def &item, artefact_properties_t &proprt ) { + if (item.base_type == OBJ_WEAPONS + && get_weapon_brand(item) == SPWPN_HOLY_WRATH + && proprt[ARTP_CURSED] != 0) + { + return (true); + } + if (item.base_type != OBJ_JEWELLERY) return (false); |