diff options
author | Chris Campbell <chriscampbell89@gmail.com> | 2014-03-14 21:31:40 +0000 |
---|---|---|
committer | Chris Campbell <chriscampbell89@gmail.com> | 2014-03-14 22:13:43 +0000 |
commit | 68e01d929e894c7283823920f3b54a13b91d2aa1 (patch) | |
tree | d8f56289a76837213ca59f444e785c06236a943e /crawl-ref/source/shout.cc | |
parent | 75cfc520b85ee3c3bdc62d8f8c0ef95213cc2135 (diff) | |
download | crawl-ref-68e01d929e894c7283823920f3b54a13b91d2aa1.tar.gz crawl-ref-68e01d929e894c7283823920f3b54a13b91d2aa1.zip |
Remove player blood/web sense of out-of-sight monsters
It was very unlikely to ever trigger - caused by a monster somehow being
made to bleed just out of your LOS in the blood sense case, or a monster
being caught in a web while you are in spider form in the web sense case,
and even less likely to actually be useful if it did somehow trigger.
Diffstat (limited to 'crawl-ref/source/shout.cc')
-rw-r--r-- | crawl-ref/source/shout.cc | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/crawl-ref/source/shout.cc b/crawl-ref/source/shout.cc index b55550024e..bf60676162 100644 --- a/crawl-ref/source/shout.cc +++ b/crawl-ref/source/shout.cc @@ -546,70 +546,6 @@ bool fake_noisy(int loudness, const coord_def& where) return noisy(loudness, where, NULL, -1, false, false, true); } -static const char* _player_vampire_smells_blood(int dist) -{ - // non-thirsty vampires get no clear indication of how close the - // smell is - if (you.hunger_state >= HS_SATIATED) - return ""; - - if (dist < 16) // 4*4 - return " near-by"; - - if (you.hunger_state <= HS_NEAR_STARVING && dist > los_radius2) - return " in the distance"; - - return ""; -} - -static const char* _player_spider_senses_web(int dist) -{ - if (dist < 4) - return " near-by"; - - if (dist > LOS_RADIUS) - return " in the distance"; - - return ""; -} - -void check_player_sense(sense_type sense, int range, const coord_def& where) -{ - const int player_distance = distance2(you.pos(), where); - - if (player_distance <= range) - { - switch (sense) - { - case SENSE_SMELL_BLOOD: - dprf("Player smells blood, pos: (%d, %d), dist = %d)", - you.pos().x, you.pos().y, player_distance); - you.check_awaken(range - player_distance); - // Don't message if you can see the square. - if (!you.see_cell(where)) - { - mprf("You smell fresh blood%s.", - _player_vampire_smells_blood(player_distance)); - } - break; - - case SENSE_WEB_VIBRATION: - // Spider form - if (you.can_cling_to_walls()) - { - you.check_awaken(range - player_distance); - // Don't message if you can see the square. - if (!you.see_cell(where)) - { - mprf("You hear a 'twang'%s.", - _player_spider_senses_web(player_distance)); - } - } - break; - } - } -} - void check_monsters_sense(sense_type sense, int range, const coord_def& where) { for (monster_iterator mi; mi; ++mi) @@ -709,18 +645,6 @@ void blood_smell(int strength, const coord_def& where) dprf("blood stain at (%d, %d), range of smell = %d", where.x, where.y, range); - // Of the player species, only Vampires can smell blood. - if (you.species == SP_VAMPIRE) - { - // Whether they actually do so, depends on their hunger state. - int vamp_strength = strength - 2 * (you.hunger_state - 1); - if (vamp_strength > 0) - { - int vamp_range = vamp_strength * vamp_strength; - check_player_sense(SENSE_SMELL_BLOOD, vamp_range, where); - } - } - check_monsters_sense(SENSE_SMELL_BLOOD, range, where); } |