summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/shout.cc
diff options
context:
space:
mode:
authorreaverb <reaverb.Crawl@gmail.com>2014-07-03 18:38:03 -0400
committerreaverb <reaverb.Crawl@gmail.com>2014-07-12 16:31:58 -0400
commitc79dab4f1f31310c8ecce6b25c825dd97a329a50 (patch)
tree4ea1db80e8f3bd75e338488e4503a596dc218455 /crawl-ref/source/shout.cc
parent076df7997a8bc5e3f4a640888b79334b9a3227bf (diff)
downloadcrawl-ref-c79dab4f1f31310c8ecce6b25c825dd97a329a50.tar.gz
crawl-ref-c79dab4f1f31310c8ecce6b25c825dd97a329a50.zip
Remove sharks from the game
They had all the same problems as big fish or other melee liquid-only monsters.
Diffstat (limited to 'crawl-ref/source/shout.cc')
-rw-r--r--crawl-ref/source/shout.cc32
1 files changed, 1 insertions, 31 deletions
diff --git a/crawl-ref/source/shout.cc b/crawl-ref/source/shout.cc
index 105d3f68ff..ee24f7ee55 100644
--- a/crawl-ref/source/shout.cc
+++ b/crawl-ref/source/shout.cc
@@ -564,8 +564,7 @@ void check_monsters_sense(sense_type sense, int range, const coord_def& where)
// Let sleeping hounds lie.
if (mi->asleep()
- && mons_species(mi->type) != MONS_VAMPIRE
- && mi->type != MONS_SHARK)
+ && mons_species(mi->type) != MONS_VAMPIRE)
{
// 33% chance of sleeping on
// 33% of being disturbed (start BEH_WANDER)
@@ -587,35 +586,6 @@ void check_monsters_sense(sense_type sense, int range, const coord_def& where)
mi->pos().x, mi->pos().y);
behaviour_event(*mi, ME_ALERT, 0, where);
- if (mi->type == MONS_SHARK)
- {
- // Sharks go into a battle frenzy if they smell blood.
- monster_pathfind mp;
- if (mp.init_pathfind(*mi, where))
- {
- mon_enchant ench = mi->get_ench(ENCH_BATTLE_FRENZY);
- const int dist = 15 - (mi->pos() - where).rdist();
- const int dur = random_range(dist, dist*2)
- * speed_to_duration(mi->speed);
-
- if (ench.ench != ENCH_NONE)
- {
- int level = ench.degree;
- if (level < 4 && one_chance_in(2*level))
- ench.degree++;
- ench.duration = max(ench.duration, dur);
- mi->update_ench(ench);
- }
- else
- {
- mi->add_ench(mon_enchant(ENCH_BATTLE_FRENZY, 1, 0, dur));
- simple_monster_message(*mi, " goes into a frenzy at the "
- "smell of blood!");
- }
- }
- }
- break;
-
case SENSE_WEB_VIBRATION:
if (!mons_class_flag(mi->type, M_WEB_SENSE)
&& !mons_class_flag(get_chimera_legs(*mi), M_WEB_SENSE))