summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
authorreaverb <reaverb.Crawl@gmail.com>2014-06-08 13:11:53 -0400
committerreaverb <reaverb.Crawl@gmail.com>2014-06-08 13:24:45 -0400
commit3a02dd4f168d34c99e94778b031e715403cee31e (patch)
tree9004815ed5aac1a74cdfd41a8d3286504162f9cb /crawl-ref/source/effects.cc
parent5ae3ab29b17d9e43663801d7f3d1c07f4484edbe (diff)
downloadcrawl-ref-3a02dd4f168d34c99e94778b031e715403cee31e.tar.gz
crawl-ref-3a02dd4f168d34c99e94778b031e715403cee31e.zip
Remove mummy stabbing
Monsters falling asleep tended to promote scumming because it gives an advantage for simply waiting. It also had a couple arguably good effects, like letting players leave a difficult level and come back later once things have cooled down, but these aren't really significant enough to make this a good mechanic. Monsters still begin wandering if enough time passes. If there are unseen consequences this commit can easily be reverted.
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc17
1 files changed, 6 insertions, 11 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 1c07db2562..cae82005d1 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -2381,9 +2381,8 @@ static void _catchup_monster_moves(monster* mon, int turns)
return;
// After x turns, half of the monsters will have forgotten about the
- // player, and a quarter has gone to sleep. A given monster has a
- // 95% chance of forgetting the player after 4*x turns, and going to
- // sleep after 10*x turns.
+ // player. A given monster has a 95% chance of forgetting the player after
+ // 4*x turns.
int x = 0; // Quiet unitialized variable compiler warning.
switch (mons_intel(mon))
{
@@ -2412,14 +2411,10 @@ static void _catchup_monster_moves(monster* mon, int turns)
if (coinflip())
{
changed = true;
- if (coinflip())
- mon->behaviour = BEH_SLEEP;
- else
- {
- mon->behaviour = BEH_WANDER;
- mon->foe = MHITNOT;
- mon->target = random_in_bounds();
- }
+
+ mon->behaviour = BEH_WANDER;
+ mon->foe = MHITNOT;
+ mon->target = random_in_bounds();
}
}