diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-11-04 20:15:04 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-11-04 20:15:04 +0100 |
| commit | 612f495b38845763f43bb1c0b52061359a0b3f6a (patch) | |
| tree | 542d3a74d14ba2e0918d7efc3ddfc17e3ea9fdcf /crawl-ref/source/artefact.cc | |
| parent | 99aa489a8d75c3c23395a61ae7a34c79fc37f7e0 (diff) | |
| download | crawl-ref-612f495b38845763f43bb1c0b52061359a0b3f6a.tar.gz crawl-ref-612f495b38845763f43bb1c0b52061359a0b3f6a.zip | |
Simplify by reusing commin brand vetoing code.
Diffstat (limited to 'crawl-ref/source/artefact.cc')
| -rw-r--r-- | crawl-ref/source/artefact.cc | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index 4d4cd828a2..1e15b149ca 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -735,34 +735,12 @@ void static _get_randart_properties(const item_def &item, if (one_chance_in(6)) proprt[ARTP_BRAND] = SPWPN_ORC_SLAYING + random2(5); - if (proprt[ARTP_BRAND] == SPWPN_DRAGON_SLAYING - && weapon_skill(item) != SK_POLEARMS) - { - proprt[ARTP_BRAND] = SPWPN_NORMAL; - } - - if (proprt[ARTP_BRAND] == SPWPN_VENOM - && get_vorpal_type(item) == DVORP_CRUSHING) - { - proprt[ARTP_BRAND] = SPWPN_NORMAL; - } - if (one_chance_in(6)) proprt[ARTP_BRAND] = SPWPN_VORPAL; - if (proprt[ARTP_BRAND] == SPWPN_FLAME - || proprt[ARTP_BRAND] == SPWPN_FROST) - { - proprt[ARTP_BRAND] = SPWPN_NORMAL; // missile wpns - } - if (proprt[ARTP_BRAND] == SPWPN_PROTECTION) proprt[ARTP_BRAND] = SPWPN_NORMAL; // no protection - // If this happens, things might get broken. - bwr - if (proprt[ARTP_BRAND] == SPWPN_SPEED && atype == WPN_QUICK_BLADE) - proprt[ARTP_BRAND] = SPWPN_NORMAL; - if (is_range_weapon(item)) { proprt[ARTP_BRAND] = SPWPN_NORMAL; @@ -828,7 +806,11 @@ void static _get_randart_properties(const item_def &item, else power_level++; - ASSERT(is_weapon_brand_ok(atype, proprt[ARTP_BRAND])); + if (!is_weapon_brand_ok(atype, proprt[ARTP_BRAND])) + { + proprt[ARTP_BRAND] = SPWPN_NORMAL; + power_level--; + } } if (!one_chance_in(5)) |