Don't treat storm clouds as harmless for many purposes (DracoOmega).

1 files changed, 10 insertions, 1 deletions

diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc
index 39dc3b7994..3de0a7f493 100644
--- a/crawl-ref/source/cloud.cc
+++ b/crawl-ref/source/cloud.cc
@@ -1123,7 +1123,7 @@ static int _actor_cloud_damage(actor *act,
         break;
     case CLOUD_STORM:
     {
-        if (you.turn_is_over && you.time_taken > 0)
+        if (maximum_damage || you.turn_is_over && you.time_taken > 0)
         {
             if (!maximum_damage)
                 cloud.announce_actor_engulfed(act);
@@ -1152,6 +1152,15 @@ static int _actor_cloud_damage(actor *act,
                                             resist, cloud_base_damage,
                                             maximum_damage);
                 }
+                else
+                {
+                    // Average maximum damage over time.
+                    int dam = _cloud_damage_output(act, _cloud2beam(cloud.type),
+                                                   resist, cloud_base_damage,
+                                                   maximum_damage) / 4;
+                    if (dam > 0)
+                        return dam;
+                }
             }
         }
         cloud_struct dupl = cloud;