summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/l_mons.cc
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-02-07 19:44:05 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-02-07 19:44:05 +0530
commit22cbbebdf0b402843474de9c091fe944c0d79557 (patch)
tree358b82e40478bc662127a97765dd64b314578c37 /crawl-ref/source/l_mons.cc
parent609e8d3028a8f44eb8cadf756675ed0d24ab7e2c (diff)
downloadcrawl-ref-22cbbebdf0b402843474de9c091fe944c0d79557.tar.gz
crawl-ref-22cbbebdf0b402843474de9c091fe944c0d79557.zip
Make place-population report shapeshifters correctly, and merge hydras and ugly things when counting.
Diffstat (limited to 'crawl-ref/source/l_mons.cc')
-rw-r--r--crawl-ref/source/l_mons.cc25
1 files changed, 19 insertions, 6 deletions
diff --git a/crawl-ref/source/l_mons.cc b/crawl-ref/source/l_mons.cc
index 2898ad7208..df0b4bc288 100644
--- a/crawl-ref/source/l_mons.cc
+++ b/crawl-ref/source/l_mons.cc
@@ -85,6 +85,18 @@ MDEF(hd)
PLUARET(number, mons->hit_dice);
}
+MDEF(shapeshifter)
+{
+ ASSERT_DLUA;
+ if (mons->has_ench(ENCH_GLOWING_SHAPESHIFTER))
+ lua_pushstring(ls, "glowing shapeshifter");
+ else if (mons->has_ench(ENCH_SHAPESHIFTER))
+ lua_pushstring(ls, "shapeshifter");
+ else
+ lua_pushnil(ls);
+ return (1);
+}
+
static const char *_monuse_names[] =
{
"nothing", "open_doors", "starting_equipment", "weapons_armour",
@@ -281,12 +293,13 @@ struct MonsAccessor
static MonsAccessor mons_attrs[] =
{
- { "name", l_mons_name },
- { "base_name", l_mons_base_name },
- { "full_name", l_mons_full_name },
- { "db_name", l_mons_db_name },
- { "type_name", l_mons_type_name },
- { "unique" , l_mons_unique },
+ { "name", l_mons_name },
+ { "base_name", l_mons_base_name },
+ { "full_name", l_mons_full_name },
+ { "db_name", l_mons_db_name },
+ { "type_name", l_mons_type_name },
+ { "unique" , l_mons_unique },
+ { "shapeshifter", l_mons_shapeshifter },
{ "x" , l_mons_x },
{ "y" , l_mons_y },