Add immunity checks for prompts about beams potentially hitting yourself

(not counting self-targetting since what we're trying to avoid in that
case is loss of magic as well as self-damage) and add some special cases
for Evaporate, so the potions use appropriate resistances without
leaking information on the random choices.

Let Enhancers start with Short Blades skill 1.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6627 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 5 insertions, 5 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 550bbf5851..d8a70c7848 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1535,12 +1535,12 @@ int player_res_poison(bool calc_unid, bool temp, bool items)
     // mutations:
     rp += player_mutation_level(MUT_POISON_RESISTANCE);
 
+    // Only thirsty vampires are naturally poison resistant.
+    if (you.species == SP_VAMPIRE && you.hunger_state < HS_SATIATED)
+        rp++;
+
     if (temp)
     {
-        // Only thirsty vampires are naturally poison resistant.
-        if (you.species == SP_VAMPIRE && you.hunger_state < HS_SATIATED)
-            rp++;
-
         // spells:
         if (you.duration[DUR_RESIST_POISON] > 0)
             rp++;
@@ -4201,7 +4201,7 @@ int player_mental_clarity(bool calc_unid, bool items)
 {
     const int ret = (3 * player_equip(EQ_AMULET, AMU_CLARITY, calc_unid)
                        * items)
-                        + player_mutation_level(MUT_CLARITY);
+                     + player_mutation_level(MUT_CLARITY);
 
     return ((ret > 3) ? 3 : ret);
 }