Some more card implementations (resists in Helm, demon summoning.)

More type-safety.


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

1 files changed, 10 insertions, 0 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 676a064cbb..940c0cc90b 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -887,6 +887,10 @@ int player_res_fire(bool calc_unid)
     if (you.species == SP_MUMMY)
         rf--;
 
+    // spells:
+    if (you.duration[DUR_RESIST_FIRE] > 0)
+        rf++;
+
     // mutations:
     rf += you.mutation[MUT_HEAT_RESISTANCE];
 
@@ -944,6 +948,10 @@ int player_res_cold(bool calc_unid)
     // randart weapons:
     rc += scan_randarts(RAP_COLD, calc_unid);
 
+    // spells:
+    if (you.duration[DUR_RESIST_COLD] > 0)
+        rc++;
+
     // mutations:
     rc += you.mutation[MUT_COLD_RESISTANCE];
 
@@ -3694,6 +3702,8 @@ int slaying_bonus(char which_affected)
         ret += scan_randarts(RAP_DAMAGE);
     }
 
+    ret += std::min(you.duration[DUR_SLAYING] / 13, 6);
+
     return (ret);
 }                               // end slaying_bonus()