From 9b5bc8fd4f63dda5b587ab08b634d4f9cdf20a06 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Thu, 20 Sep 2007 11:51:22 +0000 Subject: Previous commit applied to trunk: * cleanup of weird_colour() * hooves mutation one level only * fixes for vampire food level checks * Xom gifts interrupt travel git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2164 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/fight.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crawl-ref/source/fight.cc') diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index e9e6370a61..ccc022ddb7 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -186,13 +186,13 @@ static int calc_your_to_hit_unarmed(int uattack = UNAT_NO_ATTACK, your_to_hit += 1; if (vampiric) { - if (you.hunger_state == HS_HUNGRY) - your_to_hit += 1; - else if (you.hunger_state == HS_STARVING) + if (you.hunger_state <= HS_STARVING) your_to_hit += 2; + else if (you.hunger_state <= HS_HUNGRY) + your_to_hit += 1; } } - else if (you.species != SP_VAMPIRE && you.hunger_state == HS_STARVING) + else if (you.species != SP_VAMPIRE && you.hunger_state <= HS_STARVING) your_to_hit -= 3; your_to_hit += slaying_bonus(PWPN_HIT); @@ -1089,7 +1089,7 @@ int melee_attack::player_apply_misc_modifiers(int damage) if (you.duration[DUR_MIGHT] > 1) damage += 1 + random2(10); - if (you.hunger_state == HS_STARVING && you.species != SP_VAMPIRE) + if (you.hunger_state <= HS_STARVING && you.species != SP_VAMPIRE) damage -= random2(5); return (damage); @@ -2335,7 +2335,7 @@ int melee_attack::player_to_hit(bool random_factor) your_to_hit += slaying_bonus(PWPN_HIT); // hunger penalty - if (you.hunger_state == HS_STARVING) + if (you.hunger_state <= HS_STARVING) your_to_hit -= 3; // armour penalty -- cgit v1.2.3-54-g00ecf