diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-10 13:10:43 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-10 16:56:46 -0400 |
| commit | 92cf7ad39a9b562528c658f8457966d2616c8a1d (patch) | |
| tree | d3ef724dba3a5a6786f800b647441b4585a27e04 /crawl-ref/source/religion.cc | |
| parent | dd24ea8036ebe4356d444bd7787329e57651151f (diff) | |
| download | crawl-ref-92cf7ad39a9b562528c658f8457966d2616c8a1d.tar.gz crawl-ref-92cf7ad39a9b562528c658f8457966d2616c8a1d.zip | |
Give mercs better items.
They automatically get their items set as MAKE_GOOD_ITEM, which
might not be enough to make up for the mediocre weapon types they
tend to start with, but it's the simplest solution for now. They're
also marked as MF_HARD_RESET so that you can't not pay and then take
their stuff.
Also, fix compilation: I'll fix this (so that git bisect works) while
merging into master.
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 6b37221756..26a61c4d09 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1723,7 +1723,7 @@ static void _upgrade_body_armour(item_def &arm) if (arm.sub_type >= ARM_FIRST_MUNDANE_BODY && arm.sub_type < ARM_LAST_MUNDANE_BODY // These are supposed to be robe-only. - && arm.special != SPARM_ARCHAMGI + && arm.special != SPARM_ARCHMAGI && arm.special != SPARM_RESISTANCE) { arm.sub_type++; |