summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/source/fight.cc6
-rw-r--r--crawl-ref/source/food.cc2
-rw-r--r--crawl-ref/source/output.cc10
-rw-r--r--crawl-ref/source/player.cc16
-rw-r--r--crawl-ref/source/spells3.cc2
-rw-r--r--crawl-ref/source/tutorial.cc5
-rw-r--r--crawl-ref/source/view.cc5
7 files changed, 24 insertions, 22 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 35d8e4e1e0..9a650c722e 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -655,7 +655,7 @@ static bool _player_vampire_draws_blood(const int mons, const int damage,
}
// gain nutrition
- if (you.hunger_state < HS_ENGORGED)
+ if (you.hunger_state != HS_ENGORGED)
{
int food_value = 0;
if (chunk_type == CE_CLEAN)
@@ -1021,10 +1021,10 @@ bool melee_attack::player_aux_unarmed()
// prob of vampiric bite:
// 1/4 when non-thirsty, 1/2 when thirsty, 100% when
// bloodless
- if (you.hunger_state > HS_HUNGRY && coinflip())
+ if (you.hunger_state >= HS_SATIATED && coinflip())
break;
- if (you.hunger_state > HS_STARVING && coinflip())
+ if (you.hunger_state != HS_STARVING && coinflip())
break;
damage_brand = SPWPN_VAMPIRICISM;
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index e3706f971f..e3028e7187 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -1407,7 +1407,7 @@ bool can_ingest(int what_isit, int kindof_thing, bool suppress_msg, bool reqid,
// ur_chunkslover not defined in terms of ur_carnivorous because
// a player could be one and not the other IMHO - 13mar2000 {dlb}
bool ur_chunkslover = (
- (check_hunger? you.hunger_state <= HS_HUNGRY : true)
+ (check_hunger ? you.hunger_state < HS_SATIATED : true)
|| you.omnivorous()
|| player_mutation_level(MUT_CARNIVOROUS));
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index c04b47677b..87b252d1ee 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -260,7 +260,7 @@ static const char* _describe_hunger(int& color)
{
case HS_ENGORGED:
color = LIGHTGREEN;
- return (vamp? "Alive" : "Engorged");
+ return (vamp ? "Alive" : "Engorged");
case HS_VERY_FULL:
color = GREEN;
return ("Very Full");
@@ -272,17 +272,17 @@ static const char* _describe_hunger(int& color)
return NULL;
case HS_HUNGRY:
color = YELLOW;
- return (vamp? "Thirsty" : "Hungry");
+ return (vamp ? "Thirsty" : "Hungry");
case HS_VERY_HUNGRY:
color = YELLOW;
- return (vamp? "Very Thirsty" : "Very Hungry");
+ return (vamp ? "Very Thirsty" : "Very Hungry");
case HS_NEAR_STARVING:
color = YELLOW;
- return (vamp? "Near Bloodless" : "Near Starving");
+ return (vamp ? "Near Bloodless" : "Near Starving");
case HS_STARVING:
default:
color = RED;
- return (vamp? "Bloodless" : "Starving");
+ return (vamp ? "Bloodless" : "Starving");
}
}
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 2277fff151..864a4f798e 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1291,7 +1291,7 @@ int player_res_cold(bool calc_unid)
{
if (you.hunger_state <= HS_NEAR_STARVING)
rc += 2;
- else if (you.hunger_state <= HS_HUNGRY)
+ else if (you.hunger_state < HS_SATIATED)
rc++;
}
@@ -1473,7 +1473,7 @@ int player_res_poison(bool calc_unid, bool temp)
int rp = 0;
// only thirsty vampires are naturally poison resistant
- if (you.species == SP_VAMPIRE && you.hunger_state <= HS_HUNGRY)
+ if (you.species == SP_VAMPIRE && you.hunger_state < HS_SATIATED)
rp++;
/* rings of poison resistance */
@@ -1550,8 +1550,8 @@ int player_spec_death()
}
else if (you.species == SP_VAMPIRE)
{
- // Vampires get bonus only when hungry
- if (you.experience_level >= 13 && you.hunger_state <= HS_HUNGRY)
+ // Vampires get bonus only when thirsty
+ if (you.experience_level >= 13 && you.hunger_state < HS_SATIATED)
sd++;
}
@@ -3086,7 +3086,7 @@ void level_change(bool skip_attribute_increase)
{
mprf( MSGCH_INTRINSIC_GAIN,
"You feel %sin touch with the powers of death.",
- (you.hunger_state <= HS_HUNGRY ? "" : "strangely "));
+ (you.hunger_state < HS_SATIATED ? "" : "strangely "));
}
break;
case SP_NAGA:
@@ -3508,7 +3508,7 @@ int check_stealth(void)
stealth += (you.skills[SK_STEALTH] * 12);
break;
case SP_VAMPIRE:
- // Hungry/bat-form vampires are (much) more stealthy
+ // Thirsty/bat-form vampires are (much) more stealthy
if (you.hunger_state == HS_STARVING)
stealth += (you.skills[SK_STEALTH] * 21);
else if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT
@@ -3516,7 +3516,7 @@ int check_stealth(void)
{
stealth += (you.skills[SK_STEALTH] * 20);
}
- else if (you.hunger_state <= HS_HUNGRY)
+ else if (you.hunger_state < HS_SATIATED)
stealth += (you.skills[SK_STEALTH] * 19);
else
stealth += (you.skills[SK_STEALTH] * 18);
@@ -6311,7 +6311,7 @@ void player::drain_stat(int stat, int amount, actor* attacker)
void player::rot(actor *who, int rotlevel, int immed_rot)
{
if (you.is_undead
- && (you.species != SP_VAMPIRE || you.hunger_state <= HS_HUNGRY))
+ && (you.species != SP_VAMPIRE || you.hunger_state < HS_SATIATED))
{
return;
}
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index d3a29b2416..8f725bbf96 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -367,7 +367,7 @@ void sublimation(int power)
mpr( "A conflicting enchantment prevents the spell from "
"coming into effect." );
}
- else if (you.species == SP_VAMPIRE && you.hunger_state < HS_FULL)
+ else if (you.species == SP_VAMPIRE && you.hunger_state <= HS_SATIATED)
{
mpr("You don't have enough blood to draw power from your "
"own body.");
diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index 73c2a8bcd2..eea9634b97 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -795,7 +795,8 @@ void tutorial_dissection_reminder(bool healthy)
if (Options.tut_just_triggered || !Options.tutorial_left)
return;
- // when hungry, give appropriate message or at least don't suggest sacrifice
+ // when hungry, give appropriate message or at least don't suggest
+ // sacrifice
if (you.hunger_state < HS_SATIATED && healthy)
{
learned_something_new(TUT_MAKE_CHUNKS);
@@ -1697,7 +1698,7 @@ void learned_something_new(tutorial_event_type seen_what, int x, int y)
case TUT_OFFER_CORPSE:
if (!god_likes_butchery(you.religion)
- || you.hunger_state <= HS_HUNGRY)
+ || you.hunger_state < HS_SATIATED)
{
return;
}
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 28c70980bc..bca707a16c 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -1554,8 +1554,9 @@ bool noisy( int loudness, int nois_x, int nois_y, const char *msg )
static const char* _player_vampire_smells_blood(int dist)
{
- // non-hungry vampires get no clear indication of how close the smell is
- if (you.hunger_state > HS_HUNGRY)
+ // 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
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-18 10:05:24 +0000