diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-27 12:50:24 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-27 12:50:24 +0000 |
| commit | f6b3e40c7790de69a40c425e21368f17c9b181fb (patch) | |
| tree | 52caad60b2b63d35cff02a166eaf7de906ad48b8 | |
| parent | b19f925267a1ee3e3a96382220c87a8ea0efd20e (diff) | |
| download | crawl-ref-f6b3e40c7790de69a40c425e21368f17c9b181fb.tar.gz crawl-ref-f6b3e40c7790de69a40c425e21368f17c9b181fb.zip | |
Trunk->0.3 merge (2497): Monster pickup fix for blademasters and master archers.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2626 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index c80e119850..ac1a2f54ed 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2856,6 +2856,15 @@ bool monsters::wants_weapon(const item_def &weap) const if (is_fixed_artefact( weap )) return (false); + // Blademasters and master archers like their starting weapon and + // don't want another, thank you. + if (type == MONS_DEEP_ELF_BLADEMASTER + || type == MONS_DEEP_ELF_MASTER_ARCHER) + { + return (false); + } + + // XXX: Make this check dependent on creature size. // wimpy monsters (Kob, gob) shouldn't pick up halberds etc // of course, this also block knives {dlb}: if ((::mons_species(type) == MONS_KOBOLD |