diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-15 16:03:26 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-15 16:03:26 +0100 |
| commit | b6f7e68151f210120e62f30e5a923514ffe7af84 (patch) | |
| tree | b97f1c863cbf1187b752259c0fcdf8daa1152da1 /crawl-ref | |
| parent | 7fa010c5fe03aee772cdfbc2b6e42fc1b492b57d (diff) | |
| download | crawl-ref-b6f7e68151f210120e62f30e5a923514ffe7af84.tar.gz crawl-ref-b6f7e68151f210120e62f30e5a923514ffe7af84.zip | |
Explicitely forbid fire res, cold res and resistance brands on da, ida and gda.
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 32e7454bc8..c6dec74d41 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -2291,6 +2291,12 @@ bool is_armour_brand_ok(int type, int brand) case SPARM_FIRE_RESISTANCE: case SPARM_COLD_RESISTANCE: case SPARM_RESISTANCE: + if (type == ARM_DRAGON_ARMOUR + || type == ARM_ICE_DRAGON_ARMOUR + || type == ARM_GOLD_DRAGON_ARMOUR) + { + return (false); // contradictory or redundant + } return (true); // in portal vaults, these can happen on every slot case SPARM_MAGIC_RESISTANCE: |