From 8cbb227becdc172839b901aedf972022dc73118d Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 8 Dec 2008 20:15:03 +0000 Subject: Apply a bunch of trunk commits, mostly by Haran, namely: 6766 (partly), 6834 (partly), 6867, 6892, 6903, 6906, 6908, 6909, 6927, 6928, 6929, 6943, 6945, 6946 * Message/description tweaks. * Fix enchanting hides not updating AC. * Fix incorrect score calculation. * All 't' commands now take a turn. * Don't prompt when swapping into dangerous terrain. * Fix backwards stealth check. * Fix off-by-1 error when selecting starting weapon. * Lichform discards holy wrath weapons. * Reinitialise zap counter for recharged wands, mention charges. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7786 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/mutation.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/mutation.cc') diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index eb71937c0d..f0b36f027a 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1453,7 +1453,7 @@ static void _display_vampire_attributes() //Alive Full Satiated Thirsty Near... Bloodless {"Metabolism ", "very fast ", "fast ", "fast ", "normal ", "slow ", "none "}, - {"Regeneration ", "very fast ", "fast ", "normal ", "normal ", "slow ", "none "}, + {"Regeneration ", "very fast ", "fast ", "normal ", "slow ", "slow ", "none "}, {"Stealth boost ", "none ", "none ", "none ", "minor ", "major ", "large "}, @@ -1464,7 +1464,7 @@ static void _display_vampire_attributes() {"Cold resistance ", " ", " ", " ", " + ", " + ", " ++ "}, - {"Negative resistance ", " ", " ", " ", " + ", " ++ ", " +++ "}, + {"Negative resistance ", " ", " ", " + ", " ++ ", " +++ ", " +++ "}, {"Torment resistance ", " ", " ", " ", " ", " ", " + "}, -- cgit v1.2.3-54-g00ecf