Added BEAM_CHAOS and changed chaos launchers/ammo to use that. Currently only

chooses a different, random beam flavour (which undoudtedly needs to have their
relative weights changed after playtesting) for each square it passes through,
but in the future it might do things like bounce off walls at weird angles or
animate weapons left laying on the ground.

Added CLOUD_CHAOS, though it doesn't do anything yet.

Monsters which are marked summoned or otherwise given ENCH_ABJ can also be
marked with the type of summoning that happened, which is stored in the
until-now-unused ENCH_SUMMON.  This is useful for figuring out if a monster has
ENCH_ABJ but isn't really summoned (like fire vortices created by Fire Storm or
dancing weapons created by Tukima's Dance) so that they won't be affected by
abjuration.  It's also currently used to do a different "dissapears in a puff
of smoke" messages for summoned monsters based on the summoning type, so that
monsters summoned by Shadow Creature "dissolve into shadows" and don't leave
behind any clouds, and temporary god gift monsters from good gods "dissolve
into sparkling lights".  In the future it might be used to do temporarily
animated corpses, which turn back into a corpse when killed or when the
animation runs out.


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

1 files changed, 7 insertions, 0 deletions

diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc
index daed16067d..f664ccc5c3 100644
--- a/crawl-ref/source/cloud.cc
+++ b/crawl-ref/source/cloud.cc
@@ -411,6 +411,8 @@ cloud_type beam2cloud(beam_type flavour)
     case BEAM_MIASMA:
     case BEAM_POTION_MIASMA:
         return CLOUD_MIASMA;
+    case BEAM_CHAOS:
+        return CLOUD_CHAOS;
     case BEAM_RANDOM:
         return CLOUD_RANDOM;
     }
@@ -443,6 +445,8 @@ beam_type cloud2beam(cloud_type flavour)
         return BEAM_STEAM;
     case CLOUD_MIASMA:
         return BEAM_MIASMA;
+    case CLOUD_CHAOS:
+        return BEAM_CHAOS;
     case CLOUD_RANDOM:
         return BEAM_RANDOM;
     }
@@ -619,6 +623,7 @@ bool is_damaging_cloud(cloud_type type, bool temp)
         // ... unless a Ring of Flames is up and it's a fire cloud.
         if (temp && you.duration[DUR_FIRE_SHIELD])
             return (false);
+    case CLOUD_CHAOS:
     case CLOUD_COLD:
         return (true);
 
@@ -682,6 +687,8 @@ std::string cloud_name(cloud_type type)
         return "black smoke";
     case CLOUD_MIST:
         return "thin mist";
+    case CLOUD_CHAOS:
+        return "seething chaos";
     default:
         return "buggy goodness";
     }