summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/describe.cc
diff options
context:
space:
mode:
authorNicholas Feinberg <pleasingfung@gmail.com>2014-06-18 23:28:20 -0700
committerNicholas Feinberg <pleasingfung@gmail.com>2014-06-18 23:46:24 -0700
commit20f17586caff37b9dc6f1d4d32abf6f9684a25ae (patch)
treeb0913a87ce59267712eec699a8d531c6d2301b04 /crawl-ref/source/describe.cc
parent9b5e66a160e0346e3839ec27233267296d714636 (diff)
downloadcrawl-ref-20f17586caff37b9dc6f1d4d32abf6f9684a25ae.tar.gz
crawl-ref-20f17586caff37b9dc6f1d4d32abf6f9684a25ae.zip
Take the 'trap' out of web traps!
Diffstat (limited to 'crawl-ref/source/describe.cc')
-rw-r--r--crawl-ref/source/describe.cc19
1 files changed, 19 insertions, 0 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 1c8abff2ae..0da8fc016b 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -570,6 +570,25 @@ string trap_name(trap_type trap)
return "";
}
+string full_trap_name(trap_type trap)
+{
+ string basename = trap_name(trap);
+ switch (trap)
+ {
+ case TRAP_GOLUBRIA:
+ return basename + " of Golubria";
+ case TRAP_PLATE:
+ case TRAP_WEB:
+ case TRAP_SHAFT:
+#if TAG_MAJOR_VERSION == 34
+ case TRAP_GAS:
+#endif
+ return basename;
+ default:
+ return basename + " trap";
+ }
+}
+
int str_to_trap(const string &s)
{
// "Zot trap" is capitalised in trap_names[], but the other trap