Add lm_props.lua and appry recent commits.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6494 c06c8d41-db1a-0410-9941-cceddc491573

2 files changed, 41 insertions, 7 deletions

diff --git a/crawl-ref/source/dat/clua/lm_props.lua b/crawl-ref/source/dat/clua/lm_props.lua
new file mode 100644
index 0000000000..03c746eb32
--- /dev/null
+++ b/crawl-ref/source/dat/clua/lm_props.lua
@@ -0,0 +1,32 @@
+------------------------------------------------------------------------------
+-- lm_props.lua:
+-- Property markers.
+------------------------------------------------------------------------------
+
+PropertiesDescriptor = { }
+PropertiesDescriptor.__index = PropertiesDescriptor
+
+function PropertiesDescriptor:new(properties)
+  local pd = { }
+  setmetatable(pd, self)
+  pd.props = properties
+  return pd
+end
+
+function PropertiesDescriptor:write(marker, th)
+  lmark.marshall_table(th, self.props)
+end
+
+function PropertiesDescriptor:read(marker, th)
+  self.props = lmark.unmarshall_table(th)
+  setmetatable(self, PropertiesDescriptor)
+  return self
+end
+
+function PropertiesDescriptor:property(marker, pname)
+  return self.props and self.props[pname] or ''
+end
+
+function props_marker(props)
+  return PropertiesDescriptor:new(props)
+end
diff --git a/crawl-ref/source/dat/descript/ability.txt b/crawl-ref/source/dat/descript/ability.txt
index 89c7966cb2..5f5a294044 100644
--- a/crawl-ref/source/dat/descript/ability.txt
+++ b/crawl-ref/source/dat/descript/ability.txt
@@ -253,19 +253,21 @@ your magical contamination and may eventually cause glowing.
 # Makhleb
 Minor Destruction
 
-There's currently no description for this ability...
+Shoot a random harmful beam at the targetted monster.
 %%%%
 Lesser Servant of Makhleb
 
-There's currently no description for this ability...
+Summon a minor demon, with a chance of being hostile at low Invocations
+skill.
 %%%%
 Major Destruction
 
-There's currently no description for this ability...
+Inflict a random harmful beam or explosion on the targetted monster.
 %%%%
 Greater Servant of Makhleb
 
-There's currently no description for this ability...
+Summon a major demon, with a chance of being hostile at low Invocations
+skill.
 %%%%
 # Sif Muna
 Channel Energy
@@ -376,9 +378,9 @@ which one to keep. Discard the other two.
 %%%%
 Mark Four
 
-Draw four cards from your wielded deck, remember them and shuffle them
-back into the deck. The deck will be inscribed as containing those
-cards, and doing so will identify the deck.
+Draw four cards from your wielded deck, mark and remember them and
+shuffle them back into the deck. The deck will be inscribed as
+containing those cards, and doing so will identify the deck.
 %%%%
 Stack Five