summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-12-30 14:42:38 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-12-30 14:42:38 +0100
commitfdfbfdeb226cb33da8198cb3da6b6f39d7118dfc (patch)
treeb8c6fbef01456b223cc4076e05ce9c16e3ce160e
parentd8190f4c633d2c4065e92c61894f85f506d5246a (diff)
downloadcrawl-ref-fdfbfdeb226cb33da8198cb3da6b6f39d7118dfc.tar.gz
crawl-ref-fdfbfdeb226cb33da8198cb3da6b6f39d7118dfc.zip
A new cloud type: magical condensation trails, used by IOOD.
-rw-r--r--crawl-ref/source/cloud.cc7
-rw-r--r--crawl-ref/source/enum.h1
-rw-r--r--crawl-ref/source/mon-project.cc2
-rw-r--r--crawl-ref/source/tutorial.cc1
4 files changed, 10 insertions, 1 deletions
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;