diff options
| -rw-r--r-- | crawl-ref/docs/changes.stone_soup | 2 | ||||
| -rw-r--r-- | crawl-ref/docs/crawl_manual.txt | 6 | ||||
| -rw-r--r-- | crawl-ref/source/mutation.cc | 30 | ||||
| -rw-r--r-- | crawl-ref/source/output.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 13 |
5 files changed, 26 insertions, 28 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup index 69a3ee7df0..16d29dcc7c 100644 --- a/crawl-ref/docs/changes.stone_soup +++ b/crawl-ref/docs/changes.stone_soup @@ -29,6 +29,7 @@ Interface * Arriving via stairs calls autopickup and lists items on square. * Refuse to eat rotten meat for non-saprovorous characters. * Evaporate can now be cancelled during potion/direction choice. +* Portaled Projectile now allows choice of ammunition. * greedy_explore now defaults to true. Gods @@ -121,6 +122,7 @@ Levels * Modified Slime Pits end, guarantee rune. * Several new vaults. * Fixed some levels having the wrong amount of stairs. +* Fixed wonky vaults on lava etc. * Treat adjacent doors as one (large) gate, opening/closing together. * Minotaurs may map labyrinths. * Removed amnesia traps. diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt index 6a30921846..2e3762ec2c 100644 --- a/crawl-ref/docs/crawl_manual.txt +++ b/crawl-ref/docs/crawl_manual.txt @@ -1786,15 +1786,15 @@ Ghouls and death magic without too many difficulties. Vampires - Vampires are another form of undead, but with a peculiarity: by + Vampires are another form of undead, but with a peculiarity: by consuming fresh blood, they may become alive. A bloodless Vampire has all the traits of an undead, yet possesses no innate healing power at all -- in particular, magical items or spells which increase the rate of regeneration will not work. On the other hand, a Vampire full with blood will regenerate very quickly, but lose all undead powers. Vampires can never starve. Upon growing, they learn to transform into - quick bats (in which form they can heal even when bloodless), and, - later, how to draw potions of blood from fresh corpses. + quick bats, and, later, how to draw potions of blood from fresh + corpses. Note: Use 'A' to check for which particular peculiarities a species diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index fabf3852aa..63d6bde04a 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1408,33 +1408,37 @@ static void _display_vampire_attributes() std::string result; - std::string column[12][7] = + const int lines = 13; + std::string column[lines][7] = { {" ", "<lightgreen>Alive</lightgreen> ", "<green>Full</green> ", "Satiated ", "<yellow>Thirsty</yellow> ", "<yellow>Near...</yellow> ", "<lightred>Bloodless</lightred>"}, //Alive Full Satiated Thirsty Near... Bloodless - {"Metabolism ", "very fast ", "fast ", "fast ", "normal ", "slow ", "none"}, + {"Metabolism ", "very fast ", "fast ", "fast ", "normal ", "slow ", "none "}, - {"Regeneration ", "very fast ", "fast ", "normal ", "normal ", "slow ", "none"}, + {"Regeneration ", "very fast ", "fast ", "normal ", "normal ", "slow ", "none "}, - {"Poison resistance ", " ", " ", " ", " + ", " + ", " + "}, + {"Poison resistance ", " ", " ", " ", " + ", " + ", " + "}, - {"Cold resistance ", " ", " ", " ", " + ", " + ", " ++ "}, + {"Cold resistance ", " ", " ", " ", " + ", " + ", " ++ "}, - {"Negative resistance ", " ", " ", " ", " + ", " ++ ", " +++ "}, + {"Negative resistance ", " ", " ", " ", " + ", " ++ ", " +++ "}, - {"Torment resistance ", " ", " ", " ", " ", " ", " + "}, + {"Torment resistance ", " ", " ", " ", " ", " ", " + "}, - {"Mutation chance ", "always ", "often ", "sometimes ", "never ", "never ", "never"}, + {"Mutation chance ", "always ", "often ", "sometimes ", "never ", "never ", "never "}, - {"Mutation effects ", "full ", "capped ", "capped ", "none ", "none ", "none "}, + {"Non-physical " EOL + "mutation effects ", "full ", "capped ", "capped ", "none ", "none ", "none "}, - {"Stealth boost ", "none ", "none ", "none ", "minor ", "major ", "large"}, + {"Potion effects ", "full ", "full ", "full ", "halved ", "halved ", "halved"}, - {"Bat Form ", "no ", "no ", "yes ", "yes ", "yes ", "yes "}, + {"Bat Form ", "no ", "no ", "yes ", "yes ", "yes ", "yes "}, - {"Spell hunger ", "full ", "full ", "full ", "halved ", "none ", "none "} + {"Stealth boost ", "none ", "none ", "none ", "minor ", "major ", "large "}, + + {"Spell hunger ", "full ", "full ", "full ", "halved ", "none ", "none "} }; int current = 0; @@ -1461,7 +1465,7 @@ static void _display_vampire_attributes() current = 6; } - for (int y = 0; y < 12; y++) // lines (properties) + for (int y = 0; y < lines; y++) // lines (properties) { for (int x = 0; x < 7; x++) // columns (hunger states) { diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index db0f5e1c7e..e5a0f367f0 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -2308,8 +2308,7 @@ std::string _status_mut_abilities() text += "praying, "; if (you.disease && !you.duration[DUR_REGENERATION] - || you.species == SP_VAMPIRE && you.hunger_state == HS_STARVING - && you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT) + || you.species == SP_VAMPIRE && you.hunger_state == HS_STARVING) { text += "non-regenerating, "; } diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index ac9bae5a8a..96ebb92304 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -975,9 +975,7 @@ int player_regen(void) switch (you.hunger_state) { case HS_STARVING: - if (you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT) - return (0); // No regeneration for starving vampires! - // intentional fall-through for bat form + return (0); // No regeneration for starving vampires! case HS_NEAR_STARVING: case HS_VERY_HUNGRY: case HS_HUNGRY: @@ -3690,11 +3688,7 @@ void display_char_status() attrib.push_back("resist torment"); if (you.experience_level >= 13) attrib.push_back("are in touch with the powers of death"); - - if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT) - attrib.push_back("heal slowly (as a bat)!"); - else - attrib.push_back("do not heal!"); + attrib.push_back("do not heal!"); break; case HS_NEAR_STARVING: attrib.push_back("resist poison"); @@ -3805,8 +3799,7 @@ void display_char_status() mpr( "You are praying." ); if (you.disease && !you.duration[DUR_REGENERATION] - && (you.species != SP_VAMPIRE || you.hunger_state != HS_STARVING - || you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)) + && (you.species != SP_VAMPIRE || you.hunger_state != HS_STARVING)) { mpr("You do not heal."); } |