diff options
| author | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-04 21:49:19 -0800 |
|---|---|---|
| committer | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-04 21:51:35 -0800 |
| commit | c73c1dad0a1d80a014ef59087aeee9f0e6171cf2 (patch) | |
| tree | 3c8bfc0b1882d6df35fede06b3b629dee1b104bc /crawl-ref/source/dat/clua/lm_monst.lua | |
| parent | 1c4f4dd987fdfe1462aef78550f46ac1f46adf26 (diff) | |
| download | crawl-ref-c73c1dad0a1d80a014ef59087aeee9f0e6171cf2.tar.gz crawl-ref-c73c1dad0a1d80a014ef59087aeee9f0e6171cf2.zip | |
Slave/master handling in the Triggerable class
The Triggerable class can now handle master/slave marker logic. See
dis_mu in hells.des for an example.
Diffstat (limited to 'crawl-ref/source/dat/clua/lm_monst.lua')
| -rw-r--r-- | crawl-ref/source/dat/clua/lm_monst.lua | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/crawl-ref/source/dat/clua/lm_monst.lua b/crawl-ref/source/dat/clua/lm_monst.lua index 539b7b140b..73b32cbc3c 100644 --- a/crawl-ref/source/dat/clua/lm_monst.lua +++ b/crawl-ref/source/dat/clua/lm_monst.lua @@ -49,15 +49,11 @@ function MonsterOnTrigger:new(pars) mot.message_unseen = pars.message_unseen mot.death_monster = pars.death_monster mot.new_monster = pars.new_monster - mot.props = pars + mot.props = util.append( mot.props, pars) return mot end -function MonsterOnTrigger:property(marker, pname) - return self.props[pname] or '' -end - function MonsterOnTrigger:write(marker, th) MonsterOnTrigger.super.write(self, marker, th) |