Let markers change the description of any feature

Allow markers to change the short and/or long description of any
feature, not just portal vault entrances.  The feature_description() and
feature_description_long() functions have been removed from the mapmark
classes and turned into ordinary properties.  Also added the marker
property "door_description_suffix", which can be used to alter the short
description of (known) doors by appending a string to them.

1 files changed, 6 insertions, 8 deletions

diff --git a/crawl-ref/source/dat/clua/lm_pdesc.lua b/crawl-ref/source/dat/clua/lm_pdesc.lua
index 49b6273680..e96c852336 100644
--- a/crawl-ref/source/dat/clua/lm_pdesc.lua
+++ b/crawl-ref/source/dat/clua/lm_pdesc.lua
@@ -32,15 +32,13 @@ function PortalDescriptor:unmangle(x)
   end
 end
 
-function PortalDescriptor:feature_description(marker)
-  return self:unmangle(self.props.desc)
-end
-
-function PortalDescriptor:feature_description_long(marker)
-  return self:unmangle(self.props.desc_long)
-end
-
 function PortalDescriptor:property(marker, pname)
+  if pname == 'feature_description' then
+    return self:unmangle(self.props.desc)
+  elseif pname == 'feature_description_long' then
+    return self:unmangle(self.props.desc_long)
+  end
+
   return self:unmangle(self.props and self.props[pname] or '')
 end