diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-05-11 00:23:27 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-05-28 11:01:26 -0400 |
| commit | 40715cc413a9ef3456fe1ca1356172a24a045c20 (patch) | |
| tree | 13eaca31a6db74f4ee5118540f90eb53e96a83e2 /crawl-ref/source/mon-act.cc | |
| parent | 76d6fdf29a3763ebd9e8c5b7c0c4ad7116e69670 (diff) | |
| download | crawl-ref-40715cc413a9ef3456fe1ca1356172a24a045c20.tar.gz crawl-ref-40715cc413a9ef3456fe1ca1356172a24a045c20.zip | |
Don't let friendlies pick up anything at all.
Since they can't pick up things you've seen, their only chance to
get anything would be some kind of madness with tw, which seems like
a bad thing to encourage. This only affects perma-allies, obviously,
since summons can't pick up anything anyway.
Diffstat (limited to 'crawl-ref/source/mon-act.cc')
| -rw-r--r-- | crawl-ref/source/mon-act.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index 5e37606751..2a4627cd58 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -2109,13 +2109,12 @@ void handle_monster_move(monster* mons) && (mons_itemuse(mons) >= MONUSE_WEAPONS_ARMOUR || mons_itemeat(mons) != MONEAT_NOTHING)) { - // Keep neutral, charmed, summoned monsters from picking up stuff. - // Same for friendlies if friendly_pickup is set to "none". + // Keep neutral, charmed, summoned, and friendly monsters from + // picking up stuff. if ((!mons->neutral() && !mons->has_ench(ENCH_CHARM) || (you_worship(GOD_JIYVA) && mons_is_slime(mons))) && !mons->is_summoned() && !mons->is_perm_summoned() - && (!mons->friendly() - || you.friendly_pickup != FRIENDLY_PICKUP_NONE)) + && !mons->friendly()) { if (_handle_pickup(mons)) { |