[2058822] Fix ice storm damage, make both storms and bolts of ice and magma less resistible (ice being less resistible than magma), give ice storm more damage than fire storm, make fire storm vortices aligned with the caster, but temporary.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6845 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 5 insertions, 2 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 1b1017f371..14ff401e29 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1897,9 +1897,12 @@ static inline int get_resistible_fraction(beam_type flavour)
 {
     switch (flavour)
     {
-    case BEAM_LAVA:
+    // Assume ice storm and ice bolt are mostly solid.
     case BEAM_ICE:
-        return (50);
+        return (15);
+
+    case BEAM_LAVA:
+        return (30);
 
     case BEAM_POISON_ARROW:
         return (40);