diff options
| author | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-11 13:08:49 -0800 |
|---|---|---|
| committer | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-11 13:08:49 -0800 |
| commit | 53a5f1b2f8b14d8f7ee2f85b15ba32648a0878c3 (patch) | |
| tree | 1dbe417a8d11f3849b55e3bad6df24b9533e685e /crawl-ref/source/dat/clua | |
| parent | 86d3b14238ff1ff65f6a4712ac2c8927485c0777 (diff) | |
| download | crawl-ref-53a5f1b2f8b14d8f7ee2f85b15ba32648a0878c3.tar.gz crawl-ref-53a5f1b2f8b14d8f7ee2f85b15ba32648a0878c3.zip | |
lm_trig.lua: monster_dies fix, slaved marker fix
monster_dies now uses the full name of the monster, rather than the name
of the monster's type.
Fixed error with using slave markers.
Diffstat (limited to 'crawl-ref/source/dat/clua')
| -rw-r--r-- | crawl-ref/source/dat/clua/lm_trig.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/dat/clua/lm_trig.lua b/crawl-ref/source/dat/clua/lm_trig.lua index 336da856b0..d17ea9e0da 100644 --- a/crawl-ref/source/dat/clua/lm_trig.lua +++ b/crawl-ref/source/dat/clua/lm_trig.lua @@ -274,7 +274,7 @@ function Triggerable:do_trigger(triggerer, marker, ev) slaves = { slave_marker } else - dgn.find_markers_by_prop("slaved_to", master_name) + slaves = dgn.find_markers_by_prop("slaved_to", master_name) end -- If all slaves are gone, we're done. @@ -693,7 +693,7 @@ function DgnTriggerer:monster_dies(triggerable, marker, ev) error("DgnTriggerer:monster_dies() didn't get a valid monster index") end - if mons.name == self.target then + if mons.full_name == self.target then triggerable:do_trigger(self, marker, ev) end end |