diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-13 23:05:12 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-13 23:05:12 +0000 |
commit | f01463de3abf61a8c3057b7aa70841e000cf55f4 (patch) | |
tree | fdfd3e692097c5a6ce0531a33cd591bd7655367c /crawl-ref/source/makeitem.cc | |
parent | 2f4c72e5d1f2a84ddc6ac24b3b4628edc4e43dc3 (diff) | |
download | crawl-ref-f01463de3abf61a8c3057b7aa70841e000cf55f4.tar.gz crawl-ref-f01463de3abf61a8c3057b7aa70841e000cf55f4.zip |
Overhauled potions of blood and vampires.
1.) Vampires can only suck blood from creatures with M_COLD_BLOOD or
M_WARM_BLOOD set (no insects anymore!)
These restrictions are the same for blood spatter.
Also, the monster's corpse must be of type contaminated (e.g. gnoll)
or clean. Everything will be rejected.
2.) At xl 6 vampires gain the ability to create potions of blood from
butchered corpses. The delay is the same as for butchering, and they also
need a butchering tool (since I now think fangs don't really cut it);
only the messaging is different, and the result, of course.
If the monster doesn't meet the restrictions in (1), the corpse gets
butchered instead (important when there are necromancers roaming about)
and the resulting chunks don't get the THROWN flag set because vampires
are unlikely to want to pick them up.
3.) Potions of blood can turn bad.
They last about 1200 turns which is a rather long time, though of course
not infinite. Potions created from corpses take the corpse age into
account. From age 199 downwards potions of blood are described as
"congealed blood". The effect when quaffing is entirely the same, it's
just a warning that the potion will soon disappear.
I've moved the potion descriptions over into item.plus, so that I could
use item.special for the timer to allow for easy comparison in
update_corpses() etc.
Ideally each stack of potions of blood would have a props vector
attached (similarly to decks) with the timeout turns stored in order
oldest to newest, so that you'd always drink the oldest potion first, and
if a potion was too old it (and it's time value) would just drop out of
the stack.
Since I haven't got this to work yet, instead the weighted average age
of two substacks is calculated and used for the combined stack.
Congealed (age < 200) and comparatively fresh (age >= 200) potions of
blood will never stack.
As suggested in FR 191314, !blood are a now an additional power source for
Sublimation of Blood, and the used potion turns into decay. And speaking of
decay, I've modified the mummy curse to only affect a substack if the
to-be-decayed potions are blood because I think losing your food source that
way would be the equivalent of spores destroying all your food at the same
time.
I think that's it; might still be buggy though I *did* test with some
vampires, both wiz-mode and not, and because of the special -> plus change
for potions, existing potions will now all look alike (clear potions).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3626 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makeitem.cc')
-rw-r--r-- | crawl-ref/source/makeitem.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index ff1af54244..4fc9f2b377 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -490,9 +490,9 @@ void item_colour( item_def &item ) break; case OBJ_POTIONS: - item.special = you.item_description[IDESC_POTIONS][item.sub_type]; + item.plus = you.item_description[IDESC_POTIONS][item.sub_type]; - switch (item.special % 14) + switch (item.plus % 14) { case 0: //"clear potion" default: @@ -2313,14 +2313,19 @@ static void generate_potion_item(item_def& item, int force_type, } while ( (stype == POT_POISON && item_level < 1) || (stype == POT_STRONG_POISON && item_level < 11) || (stype == POT_SLOWING && item_level < 7) ); + if ( stype == POT_GAIN_STRENGTH || stype == POT_GAIN_DEXTERITY || stype == POT_GAIN_INTELLIGENCE || stype == POT_EXPERIENCE || stype == POT_MAGIC || stype == POT_RESTORE_ABILITIES ) + { item.quantity = 1; + } item.sub_type = stype; } - - item.plus = 0; + if (item.sub_type == POT_BLOOD) + item.special = 1200; + else + item.special = 0; } static void generate_scroll_item(item_def& item, int force_type, |