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, 42 insertions, 0 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 9f01b74414..7c8e4a1276 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1886,6 +1886,38 @@ static void decrement_durations()
         you.duration[DUR_CONTROL_TELEPORT] = 0;
     }
 
+    if (you.duration[DUR_RESIST_FIRE] > 1)
+    {
+        you.duration[DUR_RESIST_FIRE]--;
+        if (you.duration[DUR_RESIST_FIRE] == 6)
+        {
+            mpr("Your fire resistance is about to expire.", MSGCH_DURATION);
+            if (coinflip())
+                you.duration[DUR_RESIST_FIRE]--;
+        }
+    }
+    else if (you.duration[DUR_RESIST_FIRE] == 1)
+    {
+        mpr("Your fire resistance expires.", MSGCH_DURATION);
+        you.duration[DUR_RESIST_FIRE] = 0;
+    }
+
+    if (you.duration[DUR_RESIST_COLD] > 1)
+    {
+        you.duration[DUR_RESIST_COLD]--;
+        if (you.duration[DUR_RESIST_COLD] == 6)
+        {
+            mpr("Your cold resistance is about to expire.", MSGCH_DURATION);
+            if (coinflip())
+                you.duration[DUR_RESIST_COLD]--;
+        }
+    }
+    else if (you.duration[DUR_RESIST_COLD] == 1)
+    {
+        mpr("Your cold resistance expires.", MSGCH_DURATION);
+        you.duration[DUR_RESIST_COLD] = 0;
+    }
+
     if (you.duration[DUR_RESIST_POISON] > 1)
     {
         you.duration[DUR_RESIST_POISON]--;
@@ -1902,6 +1934,16 @@ static void decrement_durations()
         you.duration[DUR_RESIST_POISON] = 0;
     }
 
+    if (you.duration[DUR_SLAYING] > 1)
+    {
+        you.duration[DUR_SLAYING]--;
+    }
+    else if (you.duration[DUR_SLAYING] == 1)
+    {
+        mpr("You feel less lethal.", MSGCH_DURATION);
+        you.duration[DUR_SLAYING] = 0;
+    }
+
     if (you.duration[DUR_DEATH_CHANNEL] > 1)
     {
         you.duration[DUR_DEATH_CHANNEL]--;