From 0cebeb433d68aea197f5ee1d2c38809b71c2e3dd Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Sat, 19 Dec 2009 22:51:57 +0100 Subject: Iskenderun's Orb of Destruction --- crawl-ref/source/enum.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/enum.h') diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 94d2b6328d..fe079d395f 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1671,8 +1671,8 @@ enum monster_type // (int) menv[].type MONS_KOBOLD_DEMONOLOGIST, MONS_ORC_WIZARD, MONS_ORC_KNIGHT, // 55 - //MONS_WORM_TAIL = 56, // deprecated and now officially removed {dlb} - MONS_WYVERN = 57, // 57 + MONS_ORB_OF_DESTRUCTION, // a projectile, not a real mon + MONS_WYVERN, MONS_BIG_KOBOLD, MONS_GIANT_EYEBALL, MONS_WIGHT, // 60 @@ -2912,6 +2912,7 @@ enum spell_type SPELL_BLINK_CLOSE, SPELL_BLINK_RANGE, SPELL_BLINK_AWAY, + SPELL_IOOD, NUM_SPELLS }; @@ -3159,6 +3160,7 @@ enum zap_type ZAP_SLIME, ZAP_PORKALATOR, ZAP_SLEEP, + ZAP_IOOD, NUM_ZAPS }; -- cgit v1.2.3-54-g00ecf From fdfbfdeb226cb33da8198cb3da6b6f39d7118dfc Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Wed, 30 Dec 2009 14:42:38 +0100 Subject: A new cloud type: magical condensation trails, used by IOOD. --- crawl-ref/source/cloud.cc | 7 +++++++ crawl-ref/source/enum.h | 1 + crawl-ref/source/mon-project.cc | 2 +- crawl-ref/source/tutorial.cc | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/enum.h') diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc index 58eb185c97..823164846d 100644 --- a/crawl-ref/source/cloud.cc +++ b/crawl-ref/source/cloud.cc @@ -886,6 +886,7 @@ bool is_harmless_cloud(cloud_type type) case CLOUD_TLOC_ENERGY: case CLOUD_MIST: case CLOUD_RAIN: + case CLOUD_MAGIC_TRAIL: case CLOUD_DEBUGGING: return (true); default: @@ -960,6 +961,8 @@ std::string cloud_name(cloud_type type) return "rain"; case CLOUD_MUTAGENIC: return "mutagenic fog"; + case CLOUD_MAGIC_TRAIL: + return "magical condensation"; default: return "buggy goodness"; } @@ -1096,6 +1099,10 @@ int get_cloud_colour(int cloudno) which_colour = ETC_MUTAGENIC; break; + case CLOUD_MAGIC_TRAIL: + which_colour = ETC_MAGIC; + break; + default: which_colour = LIGHTGREY; break; diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 5ea569e163..a3eca5e4b2 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -442,6 +442,7 @@ enum cloud_type CLOUD_CHAOS, CLOUD_RAIN, CLOUD_MUTAGENIC, + CLOUD_MAGIC_TRAIL, CLOUD_RANDOM = 98, CLOUD_DEBUGGING = 99 // 99: used once as 'nonexistent cloud' {dlb} }; diff --git a/crawl-ref/source/mon-project.cc b/crawl-ref/source/mon-project.cc index d1d3ba4f3b..0af08ef38d 100644 --- a/crawl-ref/source/mon-project.cc +++ b/crawl-ref/source/mon-project.cc @@ -242,7 +242,7 @@ bool iood_act(monsters &mon, bool no_trail) if (!no_trail) { - place_cloud(CLOUD_GREY_SMOKE, mon.pos(), + place_cloud(CLOUD_MAGIC_TRAIL, mon.pos(), 2 + random2(3), mon.kill_alignment(), KILL_MON_MISSILE); } diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index e0e7d53b72..1b173c694b 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -4462,6 +4462,7 @@ static void _tutorial_describe_cloud(int x, int y) case CLOUD_TLOC_ENERGY: case CLOUD_PURPLE_SMOKE: case CLOUD_MIST: + case CLOUD_MAGIC_TRAIL: ostr << "harmless. "; break; -- cgit v1.2.3-54-g00ecf