From 612f495b38845763f43bb1c0b52061359a0b3f6a Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Wed, 4 Nov 2009 20:15:04 +0100 Subject: Simplify by reusing commin brand vetoing code. --- crawl-ref/source/artefact.cc | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) (limited to 'crawl-ref/source/artefact.cc') 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)) -- cgit v1.2.3-54-g00ecf