summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-09-02 12:49:43 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-09-02 12:49:43 +0000
commit9d37693a7e90747aa4a5c6be99bc05b57e24ce50 (patch)
tree6b55dbe42b427aa4a4a57161d669b1d135b3cf66 /crawl-ref
parentc14c22125fe5b87cd329cd75f38270aa7f233056 (diff)
downloadcrawl-ref-9d37693a7e90747aa4a5c6be99bc05b57e24ce50.tar.gz
crawl-ref-9d37693a7e90747aa4a5c6be99bc05b57e24ce50.zip
Two vampire fixes by dolorous: patches 1782673 and
1784964. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2043 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/debug.cc2
-rw-r--r--crawl-ref/source/mutation.cc18
2 files changed, 9 insertions, 11 deletions
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 9750100bae..7a721d72d3 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -258,7 +258,7 @@ void debug_change_species( void )
you.species = sp;
you.is_undead = ((you.species == SP_MUMMY) ? US_UNDEAD :
- (you.species == SP_GHOUL) ? US_HUNGRY_DEAD : US_ALIVE);
+ (you.species == SP_GHOUL || you.species == SP_VAMPIRE) ? US_HUNGRY_DEAD : US_ALIVE);
redraw_screen();
}
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index ae5ec3496a..85d98eed44 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -964,11 +964,7 @@ formatted_string describe_mutations()
case SP_GHOUL:
result += "Your body is rotting away." EOL;
- if ( you.mutation[MUT_CLAWS] )
- result += "<cyan>";
result += troll_claw_descrip[you.mutation[MUT_CLAWS]];
- if ( you.mutation[MUT_CLAWS] )
- result += "</cyan><lightblue>";
result += EOL;
result += "You preferably eat rotten meat." EOL;
result += "You resist negative energy." EOL;
@@ -1103,7 +1099,7 @@ formatted_string describe_mutations()
break;
case SP_VAMPIRE:
- if (you.hunger_state < HS_SATIATED)
+ if (you.hunger_state >= HS_SATIATED)
{
result += "<green>";
result += "You are";
@@ -1112,13 +1108,15 @@ formatted_string describe_mutations()
result += " in touch with the powers of death." EOL;
result += "You mostly resist negative energy." EOL;
result += "You can see invisible." EOL;
- if (you.hunger_state < HS_HUNGRY)
- result += "You do not regenerate." EOL;
- else
- result += "You regenerate slowly." EOL;
result += "</green>";
- have_any = true;
}
+ result += "<green>";
+ if (you.hunger_state < HS_HUNGRY)
+ result += "You do not regenerate." EOL;
+ else
+ result += "You regenerate slowly." EOL;
+ result += "</green>";
+ have_any = true;
break;
default: