summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-24 17:43:52 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-24 17:43:52 +0000
commit6fdfd21f6074128ed4b3008b30e71364aacc50e3 (patch)
treee50f68021221446d40e97e9db8cb4f7d1342c279 /crawl-ref/source
parent0b98eac7172e8d1dca5efcd7da828bbd45422880 (diff)
downloadcrawl-ref-6fdfd21f6074128ed4b3008b30e71364aacc50e3.tar.gz
crawl-ref-6fdfd21f6074128ed4b3008b30e71364aacc50e3.zip
Improve the "feet feel warm" miscast message again to take more
conditions into account. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5214 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/spl-cast.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 19d76a26fd..c76686a581 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -3334,10 +3334,16 @@ static void _miscast_earth(int severity, const char* cause)
break;
case 9:
mprf("Your %s warm.",
- (you.species == SP_NAGA) ? "underbelly feels" :
- (player_mutation_level(MUT_HOOVES)) ? "hooves feel" :
- (player_mutation_level(MUT_TALONS)) ? "talons feel"
- : "feet feel");
+ (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
+ ? "lowest portion feels" :
+ (!transform_changed_physiology() ?
+ (player_mutation_level(MUT_HOOVES)) ? "hooves feel" :
+ (player_mutation_level(MUT_TALONS)) ? "talons feel" :
+ (you.species == SP_NAGA) ? "underbelly feels" :
+ (you.species == SP_MERFOLK
+ && player_is_swimming()) ? "tail feels"
+ : "feet feel"
+ : "feet feel"));
break;
}
break;