summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/fight.cc6
-rw-r--r--crawl-ref/source/it_use2.cc2
-rw-r--r--crawl-ref/source/mutation.cc4
3 files changed, 7 insertions, 5 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 82543ee2ad..d6700faa1e 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -180,10 +180,11 @@ static int calc_your_to_hit_unarmed(int uattack = UNAT_NO_ATTACK,
if (wearing_amulet(AMU_INACCURACY))
your_to_hit -= 5;
- // vampires know how to bite and aim better when hungry
+ // vampires know how to bite and aim better when thirsty
if (you.species == SP_VAMPIRE && uattack == UNAT_BITE)
{
your_to_hit += 1;
+
if (vampiric)
{
if (you.hunger_state <= HS_STARVING)
@@ -1018,7 +1019,8 @@ bool melee_attack::player_aux_unarmed()
if (_vamp_wants_blood_from_monster(def))
{
// prob of vampiric bite:
- // 1/4 when non-hungry, 1/2 when hungry, 100% when starving
+ // 1/4 when non-thirsty, 1/2 when thirsty, 100% when
+ // bloodless
if (you.hunger_state > HS_HUNGRY && coinflip())
break;
diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc
index f1ab3b3d40..cdcafa1a69 100644
--- a/crawl-ref/source/it_use2.cc
+++ b/crawl-ref/source/it_use2.cc
@@ -99,7 +99,7 @@ bool potion_effect( potion_type pot_eff, int pow, bool was_known )
lessen_hunger(1000, true);
- // healing depends on hunger
+ // healing depends on thirst
if (you.hunger_state <= HS_HUNGRY) // !heal wounds
{
inc_hp((10 + random2avg(30,2)) / factor, false);
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 03425262d6..3fb3576c78 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -1411,7 +1411,7 @@ static void _display_vampire_attributes()
{" ", "<lightgreen>Alive</lightgreen> ", "<green>Full</green> ",
"Satiated ", "<yellow>Thirsty</yellow> ", "<yellow>Near...</yellow> ",
"<lightred>Bloodless</lightred>"},
- //Alive Full Satiated Thirsty Near... Bloodless
+ //Alive Full Satiated Thirsty Near... Bloodless
{"Metabolism ", "very fast ", "fast ", "fast ", "normal ", "slow ", "none"},
{"Regeneration ", "very fast ", "fast ", "normal ", "normal ", "slow ", "none"},
@@ -1879,7 +1879,7 @@ bool mutate(mutation_type which_mutation, bool failMsg, bool force_mutation,
if (mutat == MUT_BIG_WINGS && !player_genus(GENPC_DRACONIAN))
return false;
- // Vampires' hunger rate depends on their blood level.
+ // Vampires' thirst rate depends on their blood level.
if (you.species == SP_VAMPIRE
&& (mutat == MUT_SLOW_METABOLISM || mutat == MUT_FAST_METABOLISM
|| mutat == MUT_CARNIVOROUS || mutat == MUT_HERBIVOROUS))