Base RMsl/DMsl expiry on current power rather than power at cast time

Also expire them immediately when they fail, rather than still having a
short duration afterwards.

1 files changed, 12 insertions, 4 deletions

diff --git a/crawl-ref/source/spl-selfench.cc b/crawl-ref/source/spl-selfench.cc
index 09f0bfdace..5582d5a985 100644
--- a/crawl-ref/source/spl-selfench.cc
+++ b/crawl-ref/source/spl-selfench.cc
@@ -111,18 +111,26 @@ spret_type ice_armour(int pow, bool fail)
 
 spret_type missile_prot(int pow, bool fail)
 {
+    if (you.attribute[ATTR_REPEL_MISSILES])
+    {
+        mpr("You are already repelling missiles.");
+        return SPRET_ABORT;
+    }
     fail_check();
-    you.attribute[ATTR_REPEL_MISSILES] = 1 + pow / 6;
-    you.set_duration(DUR_REPEL_MISSILES, 1 + random2(3));
+    you.attribute[ATTR_REPEL_MISSILES] = 1;
     mpr("You feel protected from missiles.");
     return SPRET_SUCCESS;
 }
 
 spret_type deflection(int pow, bool fail)
 {
+    if (you.attribute[ATTR_DEFLECT_MISSILES])
+    {
+        mpr("You are already deflecting missiles.");
+        return SPRET_ABORT;
+    }
     fail_check();
-    you.attribute[ATTR_DEFLECT_MISSILES] = 1 + pow / 6;
-    you.set_duration(DUR_DEFLECT_MISSILES, 1 + random2(3));
+    you.attribute[ATTR_DEFLECT_MISSILES] = 1;
     mpr("You feel very safe from missiles.");
     return SPRET_SUCCESS;
 }