diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2013-07-10 19:18:43 +0100 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2013-07-10 19:35:42 +0100 |
| commit | 405c76ce053f0ff52bdd9ec4e7f44a6e553644c3 (patch) | |
| tree | 64ae609fb69a22b9f55c7f8c6d4a812bf09c953a /crawl-ref/source/artefact.cc | |
| parent | 1addaaf8ee92de5060fdb436f93251843abd2035 (diff) | |
| download | crawl-ref-405c76ce053f0ff52bdd9ec4e7f44a6e553644c3.tar.gz crawl-ref-405c76ce053f0ff52bdd9ec4e7f44a6e553644c3.zip | |
Remove the orc slaying brand
It only ever generates on artefacts and is very unlikely to be relevant
even when it does.
Diffstat (limited to 'crawl-ref/source/artefact.cc')
| -rw-r--r-- | crawl-ref/source/artefact.cc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index 321e70cd67..ee12854c1e 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -135,12 +135,6 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item, switch (which_god) { - case GOD_BEOGH: - // Orc god: no orc slaying. - if (brand == SPWPN_ORC_SLAYING) - return false; - break; - case GOD_ELYVILON: // Peaceful healer god: no berserking. if (artefact_wpn_property(item, ARTP_ANGRY) @@ -708,13 +702,17 @@ static void _get_randart_properties(const item_def &item, if (aclass == OBJ_WEAPONS) // Only weapons get brands, of course. { +#if TAG_MAJOR_VERSION == 34 proprt[ARTP_BRAND] = SPWPN_FLAMING + random2(16); // brand +#else + proprt[ARTP_BRAND] = SPWPN_FLAMING + random2(15); // brand +#endif if (one_chance_in(6)) proprt[ARTP_BRAND] = SPWPN_FLAMING + random2(2); if (one_chance_in(6)) - proprt[ARTP_BRAND] = SPWPN_ORC_SLAYING + random2(5); + proprt[ARTP_BRAND] = SPWPN_DRAGON_SLAYING + random2(4); if (one_chance_in(6)) proprt[ARTP_BRAND] = SPWPN_VORPAL; @@ -722,6 +720,12 @@ static void _get_randart_properties(const item_def &item, if (proprt[ARTP_BRAND] == SPWPN_PROTECTION || proprt[ARTP_BRAND] == SPWPN_EVASION) proprt[ARTP_BRAND] = SPWPN_NORMAL; // no protection or evasion +#if TAG_MAJOR_VERSION == 34 + // orc slaying removed + if (proprt[ARTP_BRAND] == SPWPN_ORC_SLAYING) + proprt[ARTP_BRAND] = SPWPN_NORMAL; +#endif + if (is_range_weapon(item)) { proprt[ARTP_BRAND] = random_choose_weighted( |