From 0a035731a014657ed31f567eb854033a1a62f0e4 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Mon, 8 Dec 2008 06:11:34 +0000 Subject: 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 --- crawl-ref/source/enum.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/enum.h') diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index e8eaf0cf59..4523d77359 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -209,7 +209,7 @@ enum beam_type // beam[].flavour BEAM_ICE, BEAM_NUKE, BEAM_RANDOM, // currently translates into FIRE..ACID - // 24 + BEAM_CHAOS, // Enchantments BEAM_FIRST_ENCHANTMENT = 25, // 25 @@ -411,6 +411,7 @@ enum cloud_type CLOUD_STEAM, CLOUD_MIASMA, CLOUD_MIST, + CLOUD_CHAOS, CLOUD_RANDOM = 98, CLOUD_DEBUGGING = 99 // 99: used once as 'nonexistent cloud' {dlb} }; @@ -3016,6 +3017,7 @@ enum zap_type ZAP_PETRIFY, ZAP_ENSLAVE_SOUL, ZAP_HELLFROST, + ZAP_CHAOS, NUM_ZAPS }; -- cgit v1.2.3-54-g00ecf