From f65b0e512e9ebabc93aa35224228a39e1c3d5a88 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 29 Dec 2008 13:20:43 +0000 Subject: Vampires may no longer draw blood from summoned monsters. Remove Vampires being "in touch with the powers of death". Only print Mummies death boost message from xp >= 13 where it actually appears. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8015 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/fight.cc | 3 +++ crawl-ref/source/mon-util.cc | 4 ++-- crawl-ref/source/mutation.cc | 26 +++++++------------------- crawl-ref/source/player.cc | 18 ------------------ crawl-ref/source/spl-book.cc | 2 +- 5 files changed, 13 insertions(+), 40 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 16a1cb685c..5f8ed20af7 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -712,6 +712,9 @@ static bool _vamp_wants_blood_from_monster(const monsters *mon) if (you.hunger_state == HS_ENGORGED) return (false); + if (mons_is_summoned(mon)) + return (false); + if (!mons_has_blood(mon->type)) return (false); diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 67787ff596..1435023650 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -930,8 +930,8 @@ bool mons_class_can_be_zombified(int mc) bool mons_can_be_zombified(const monsters *mon) { return (mons_class_can_be_zombified(mon->type) - && !mons_is_summoned(mon) - && !mons_enslaved_body_and_soul(mon)); + && !mons_is_summoned(mon) + && !mons_enslaved_body_and_soul(mon)); } bool mons_enslaved_body_and_soul(const monsters *mon) diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index b5244c75df..8f2f1985bf 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1125,17 +1125,16 @@ formatted_string describe_mutations() break; case SP_MUMMY: - result += "You are"; - if (you.experience_level > 25) - result += " very strongly"; - else if (you.experience_level > 12) - result += " strongly"; - - result += " in touch with the powers of death." EOL; result += "Your flesh is vulnerable to fire." EOL; - if (you.experience_level > 12) + { + result += "You are"; + if (you.experience_level > 25) + result += " strongly"; + + result += " in touch with the powers of death." EOL; result += "You can restore your body by infusing magical energy." EOL; + } have_any = true; break; @@ -1218,17 +1217,6 @@ formatted_string describe_mutations() break; case SP_VAMPIRE: - if (you.hunger_state < HS_SATIATED) - { - if (you.experience_level >= 13) - { - result += ""; - result += "You are"; - result += " in touch with the powers of death." EOL; - result += ""; - } - } - if (you.hunger_state == HS_STARVING) result += "You do not heal." EOL; else if (you.hunger_state <= HS_HUNGRY) diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 4fc49dc56a..cc236f217a 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -1656,12 +1656,6 @@ int player_spec_death() if (you.experience_level >= 26) sd++; } - else if (you.species == SP_VAMPIRE) - { - // Vampires get bonus only when thirsty - if (you.experience_level >= 13 && you.hunger_state < HS_SATIATED) - sd++; - } // transformations: if (you.attribute[ATTR_TRANSFORMATION] == TRAN_LICH) @@ -3206,12 +3200,6 @@ void level_change(bool skip_attribute_increase) mpr("You can now bottle potions of blood from chopped up " "corpses."); } - else if (you.experience_level == 13) - { - mprf( MSGCH_INTRINSIC_GAIN, - "You feel %sin touch with the powers of death.", - (you.hunger_state < HS_SATIATED ? "" : "strangely ")); - } break; case SP_NAGA: // lower because of HD raise -- bwr @@ -3787,16 +3775,12 @@ void display_char_status() attrib.push_back("significantly resist cold"); attrib.push_back("strongly resist negative energy"); attrib.push_back("resist torment"); - if (you.experience_level >= 13) - attrib.push_back("are in touch with the powers of death"); attrib.push_back("do not heal!"); break; case HS_NEAR_STARVING: attrib.push_back("resist poison"); attrib.push_back("significantly resist cold"); attrib.push_back("strongly resist negative energy"); - if (you.experience_level >= 13) - attrib.push_back("are in touch with the powers of death"); attrib.push_back("have an extremely slow metabolism"); attrib.push_back("heal slowly!"); break; @@ -3805,8 +3789,6 @@ void display_char_status() attrib.push_back("resist poison"); attrib.push_back("resist cold"); attrib.push_back("significantly resist negative energy"); - if (you.experience_level >= 13) - attrib.push_back("are in touch with the powers of death"); if (you.hunger_state == HS_HUNGRY) attrib.push_back("have a slow metabolism"); else diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index b8ecd5d7c0..5821601986 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -1443,7 +1443,7 @@ bool learn_spell(int book) : "absorb")); snprintf(info, INFO_SIZE, "Memorise %s?", spell_title(specspell)); - if ( !yesno(info, true, 0, false) ) + if ( !yesno(info, true, 'n', false) ) { canned_msg( MSG_OK ); return (false); -- cgit v1.2.3-54-g00ecf