summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-14 12:29:29 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-14 12:29:29 +0000
commit9eff4a73889f90cea1f4d5c869205f9e127c20c5 (patch)
treedb8a7412bd3132f56ec023c3b1fe826b06377be0 /crawl-ref/source/player.cc
parent4efe1cbf594c4dc47e67a1ed30f038202d21dc8a (diff)
downloadcrawl-ref-9eff4a73889f90cea1f4d5c869205f9e127c20c5.tar.gz
crawl-ref-9eff4a73889f90cea1f4d5c869205f9e127c20c5.zip
Player and monster naga no longer flounder or lose stealth in shallow water, and water creatures do not get double damage vs naga in shallow water. This is on account of naga being very clever at keeping themselves stable with their tails :P The reduced movement speed in shallow water still applies, and invisible naga in shallow water are still revealed.
Removed Cerebov's shock resistance - he no longer uses lightning bolt. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6920 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 799b038380..fe0e26a6fc 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3636,7 +3636,7 @@ int check_stealth(void)
// Merfolk can sneak up on monsters underwater -- bwr
if (you.species == SP_MERFOLK)
stealth += 50;
- else if ( !player_can_swim() )
+ else if ( !player_can_swim() && !you.extra_balanced() )
stealth /= 2; // splashy-splashy
}
else if (player_mutation_level(MUT_HOOVES))
@@ -5724,9 +5724,14 @@ bool player::has_spell(spell_type spell) const
return (false);
}
+bool player::extra_balanced() const
+{
+ return (species == SP_NAGA);
+}
+
bool player::floundering() const
{
- return in_water() && !can_swim();
+ return in_water() && !can_swim() && !extra_balanced();
}
bool player::can_pass_through_feat(dungeon_feature_type grid) const