From 28637279f2b2039168bdd099560ed93bf9678e41 Mon Sep 17 00:00:00 2001
From: Sage <SageBasilMint@gmail.com>
Date: Sat, 25 Jan 2014 17:11:39 +0000
Subject: [PATCH 1/2] Remove poison from Zot trap effects.

If you have curing, it's pointless; if no, you die. Hard to make it anything
but that, given how common potions of curing are.
---
 crawl-ref/source/spl-miscast.cc |   22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/crawl-ref/source/spl-miscast.cc b/crawl-ref/source/spl-miscast.cc
index 8b49d8c..dfc3cbb 100644
--- a/crawl-ref/source/spl-miscast.cc
+++ b/crawl-ref/source/spl-miscast.cc
@@ -2986,12 +2986,6 @@ void MiscastEffect::_zot()
                 goto reroll_2;
             break;
         case 4:
-            you_msg      = "You feel incredibly sick.";
-            mon_msg_seen = "@The_monster@ looks incredibly sick.";
-            _do_poison(10 + random2avg(19, 2));
-            do_msg();
-            break;
-        case 5:
             if (!target->is_player())
                 target->polymorph(0);
             else if (coinflip())
@@ -3009,8 +3003,8 @@ void MiscastEffect::_zot()
                 do_msg();
             }
             break;
+        case 5:
         case 6:
-        case 7:
             roll = random2(3); // Give 2 of 3 effects.
             if (roll != 0)
                 _potion_effect(POT_CONFUSION, 15);
@@ -3034,26 +3028,26 @@ void MiscastEffect::_zot()
                 }
             }
             break;
-        case 8:
+        case 7:
             you_msg      = "You are engulfed in negative energy!";
             mon_msg_seen = "@The_monster@ is engulfed in negative energy!";
             do_msg();
             target->drain_exp(act_source, false, 100);
             break;
-        case 9:
+        case 8:
             if (target->is_player())
                 contaminate_player(2000 + random2avg(13000, 2), false);
             else
                 target->polymorph(0);
             break;
-        case 10:
+        case 9:
             if (you.magic_points > 0)
             {
                 dec_mp(10 + random2(21));
                 mprf(MSGCH_WARN, "You suddenly feel drained of magical energy!");
             }
             break;
-        case 11:
+        case 10:
         {
             vector<string> wands;
             for (int i = 0; i < ENDOFPACK; ++i)
@@ -3078,15 +3072,15 @@ void MiscastEffect::_zot()
                 do_msg(); // For canned_msg(MSG_NOTHING_HAPPENS)
             break;
         }
-        case 12:
+        case 11:
             _lose_stat(STAT_RANDOM, 1 + random2avg((coinflip() ? 7 : 4), 2));
             break;
-        case 13:
+        case 12:
             mpr("An unnatural silence engulfs you.");
             you.increase_duration(DUR_SILENCE, 10 + random2(21), 30);
             invalidate_agrid(true);
             break;
-        case 14:
+        case 13:
             if (mons_word_of_recall(NULL, 2 + random2(3)) == 0)
                 canned_msg(MSG_NOTHING_HAPPENS);
             break;
-- 
1.7.9.5

From a6c4425b83c1dbe96173c103206d742ad756a833 Mon Sep 17 00:00:00 2001
From: Sage <SageBasilMint@gmail.com>
Date: Sat, 25 Jan 2014 17:31:44 +0000
Subject: [PATCH 2/2] Remove paralyse from hell effects.

Usually pointless. Occasionally fatal, and unpreventable, save by
going through hell wearing stasis
---
 crawl-ref/source/spl-miscast.cc |   13 ++++++++++++-
 crawl-ref/source/spl-miscast.h  |    1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/crawl-ref/source/spl-miscast.cc b/crawl-ref/source/spl-miscast.cc
index dfc3cbb..ec74b6a 100644
--- a/crawl-ref/source/spl-miscast.cc
+++ b/crawl-ref/source/spl-miscast.cc
@@ -621,6 +621,17 @@ void MiscastEffect::_potion_effect(potion_type pot_eff, int pot_pow)
     }
 }
 
+bool MiscastEffect::_paralyse(int dur)
+{
+    if (source != HELL_EFFECT_MISCAST)
+    {
+        target->paralyse(act_source, dur, cause);
+        return true;
+    }
+    else
+        return false;
+}
+
 bool MiscastEffect::_send_to_abyss()
 {
     if ((player_in_branch(BRANCH_ABYSS) && x_chance_in_y(you.depth, brdepth[BRANCH_ABYSS]))
@@ -1045,7 +1056,7 @@ void MiscastEffect::_enchantment(int severity)
         switch (random2(target->is_player() ? 4 : 2))
         {
         case 0:
-            target->paralyse(act_source, 2 + random2(6), cause);
+            _paralyse(2 + random2(6));
             break;
         case 1:
             _potion_effect(POT_CONFUSION, 10);
diff --git a/crawl-ref/source/spl-miscast.h b/crawl-ref/source/spl-miscast.h
index 570717a..7a11ae3 100644
--- a/crawl-ref/source/spl-miscast.h
+++ b/crawl-ref/source/spl-miscast.h
@@ -114,6 +114,7 @@ private:
                     int spread_rate = -1);
     bool _lose_stat(stat_type which_stat, int8_t stat_loss);
     void _potion_effect(potion_type pot_eff, int pot_pow);
+    bool _paralyse(int dur);
     bool _create_monster(monster_type what, int abj_deg, bool alert = false);
     bool _send_to_abyss();
     bool _malign_gateway();
-- 
1.7.9.5