diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-31 12:11:22 -0500 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-31 12:11:22 -0500 |
| commit | 13408c6a52cbe87573cecf5f5afaf2fe047fa7c8 (patch) | |
| tree | 840c53f9d8f4c470a2fa592c99831cb08d0fe413 /crawl-ref/source/artefact.cc | |
| parent | 756f57690d1f05b741ffdc929f2d0b0550ddb288 (diff) | |
| download | crawl-ref-13408c6a52cbe87573cecf5f5afaf2fe047fa7c8.tar.gz crawl-ref-13408c6a52cbe87573cecf5f5afaf2fe047fa7c8.zip | |
For consistency, make the previous check generic to the good gods, since
chaos weapons are potentially evil weapons.
Diffstat (limited to 'crawl-ref/source/artefact.cc')
| -rw-r--r-- | crawl-ref/source/artefact.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index 7426432b3f..4f73531791 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -128,6 +128,7 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item, else if (is_good_god(which_god) && (brand == SPWPN_DRAINING || brand == SPWPN_PAIN || brand == SPWPN_VAMPIRICISM || brand == SPWPN_REAPING + || brand == SPWPN_CHAOS || is_demonic(item) || artefact_wpn_property(item, ARTP_CURSED) != 0)) { @@ -152,10 +153,7 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item, break; case GOD_ZIN: - // Lawful god: no chaos, no mutagenics. - if (brand == SPWPN_CHAOS) - return (false); - + // Lawful god: no mutagenics. if (artefact_wpn_property(item, ARTP_MUTAGENIC)) return (false); break; |