diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-07 22:39:30 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-07 22:39:30 +0000 |
commit | 5fc42c09027a4f29b5e7ff14eeb386aa57b882e4 (patch) | |
tree | b45cf3637c33bca06fe92683e58d6aaae99ba904 /crawl-ref | |
parent | a51cc596c69f2f6a46d79c8b9d499fe528390451 (diff) | |
download | crawl-ref-5fc42c09027a4f29b5e7ff14eeb386aa57b882e4.tar.gz crawl-ref-5fc42c09027a4f29b5e7ff14eeb386aa57b882e4.zip |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10632 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/mon-util.cc | 5 | ||||
-rw-r--r-- | crawl-ref/source/monstuff.cc | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index c94c7d204d..9c728d72f3 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1723,11 +1723,8 @@ int exper_value(const monsters *monster) // Monsters who can use equipment (even if only the equipment // they are given) can be considerably enhanced because of // the way weapons work for monsters. -- bwr - if (item_usage == MONUSE_STARTING_EQUIPMENT - || item_usage == MONUSE_WEAPONS_ARMOUR) - { + if (item_usage >= MONUSE_STARTING_EQUIPMENT) diff += 30; - } // Set a reasonable range on the difficulty modifier... // Currently 70% - 200%. -- bwr diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 0f3197c72f..a75dfe58f1 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -7509,7 +7509,7 @@ static void _handle_monster_move(monsters *monster) } if (igrd(monster->pos()) != NON_ITEM - && (mons_itemuse(monster) == MONUSE_WEAPONS_ARMOUR + && (mons_itemuse(monster) >= MONUSE_WEAPONS_ARMOUR || mons_itemeat(monster) > MONEAT_NOTHING)) { // Keep neutral and charmed monsters from picking up stuff. |