diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-26 16:31:22 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-26 16:31:22 +0000 |
commit | c96ad74301106bbc2163c96ae96590c23feb4a59 (patch) | |
tree | f75dc7bee9ed7ebe65990b1a01ce2a61e243f9f9 /crawl-ref/source/food.cc | |
parent | 2f6db23aaa3fcd1984982e0962151ef2003a9b4a (diff) | |
download | crawl-ref-c96ad74301106bbc2163c96ae96590c23feb4a59.tar.gz crawl-ref-c96ad74301106bbc2163c96ae96590c23feb4a59.zip |
Split potions of blood and potions of coagulated blood into two
distinct potion types to make stacking easier. Coagulated blood
is not created randomly, and aging potions of blood turn into
potions of coagulated blood, so none of that changed. Well,
except the name: congealed -> coagulated. This also means that
they now have distinct descriptions, though seeing potions in
your inventory coagulate will identify both of them.
And I checked: potions in shops will coagulate as well and
disappear. Coagulated blood is cheaper, but if you need it you
won't want to wait around, right?
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3884 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
-rw-r--r-- | crawl-ref/source/food.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index c2d929401a..79b577551a 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -1324,16 +1324,18 @@ bool can_ingest(int what_isit, int kindof_thing, bool suppress_msg, bool reqid, if (you.species == SP_VAMPIRE) { - if (what_isit == OBJ_CORPSES && kindof_thing == CORPSE_BODY - || what_isit == OBJ_POTIONS && kindof_thing == POT_BLOOD) + if (what_isit == OBJ_CORPSES && kindof_thing == CORPSE_BODY) + return true; + + if (what_isit == OBJ_POTIONS && (kindof_thing == POT_BLOOD + || kindof_thing == POT_BLOOD_COAGULATED)) { return (true); } - else - { - if (!suppress_msg) - mpr("Blech - you need blood!"); - } + + if (!suppress_msg) + mpr("Blech - you need blood!"); + return (false); } @@ -1430,6 +1432,7 @@ bool can_ingest(int what_isit, int kindof_thing, bool suppress_msg, bool reqid, switch (kindof_thing) { case POT_BLOOD: + case POT_BLOOD_COAGULATED: if (ur_herbivorous) { if (!suppress_msg) |