Make torpor snail slow end immediately after LOS is broken

Or after they die, etc.

Also no longer require the torpor snail to be visible, thus
preventing powerful /invis secret tech. rip :(

1 files changed, 14 insertions, 2 deletions

diff --git a/crawl-ref/source/mon-ench.cc b/crawl-ref/source/mon-ench.cc
index adbbf5cfc6..6203d38a5f 100644
--- a/crawl-ref/source/mon-ench.cc
+++ b/crawl-ref/source/mon-ench.cc
@@ -1097,11 +1097,12 @@ void monster::timeout_enchantments(int levels)
                 del_ench(i->first);
                 break;
             }
-            // Deliberate fall-through
+            lose_ench_levels(i->second, levels);
+            break;
 
         case ENCH_POISON: case ENCH_ROT: case ENCH_CORONA:
         case ENCH_STICKY_FLAME: case ENCH_ABJ: case ENCH_SHORT_LIVED:
-        case ENCH_SLOW: case ENCH_HASTE: case ENCH_MIGHT: case ENCH_FEAR:
+        case ENCH_HASTE: case ENCH_MIGHT: case ENCH_FEAR:
         case ENCH_CHARM: case ENCH_SLEEP_WARY: case ENCH_SICK:
         case ENCH_PARALYSIS: case ENCH_PETRIFYING:
         case ENCH_PETRIFIED: case ENCH_SWIFT: case ENCH_BATTLE_FRENZY:
@@ -1120,6 +1121,17 @@ void monster::timeout_enchantments(int levels)
             lose_ench_levels(i->second, levels);
             break;
 
+        case ENCH_SLOW:
+            if (torpor_slowed())
+                lose_ench_levels(i->second, min(levels, i->second.degree - 1));
+            else
+            {
+                lose_ench_levels(i->second, levels);
+                if (props.exists(TORPOR_SLOWED_KEY))
+                    props.erase(TORPOR_SLOWED_KEY);
+            }
+            break;
+
         case ENCH_INVIS:
             if (!mons_class_flag(type, M_INVIS))
                 lose_ench_levels(i->second, levels);