summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2014-08-13 02:28:25 -0400
committerJesse Luehrs <doy@tozt.net>2014-08-13 02:28:25 -0400
commitdde1abbfade408b6d808d5207d5f15e7da489f56 (patch)
tree38c84532090c24a4df5f8d77c8558a57f9ce5b33
parent3487c1a9300529a40ee5a952371fb8fc376e93c5 (diff)
downloadcrawl-ref-dde1abbfade408b6d808d5207d5f15e7da489f56.tar.gz
crawl-ref-dde1abbfade408b6d808d5207d5f15e7da489f56.zip
fix message when the wizard is freed in trog_wizard (8756)
-rw-r--r--crawl-ref/source/dat/des/altar/trog_wizard.des12
1 files changed, 10 insertions, 2 deletions
diff --git a/crawl-ref/source/dat/des/altar/trog_wizard.des b/crawl-ref/source/dat/des/altar/trog_wizard.des
index 9627fa6890..1f91c2f3fa 100644
--- a/crawl-ref/source/dat/des/altar/trog_wizard.des
+++ b/crawl-ref/source/dat/des/altar/trog_wizard.des
@@ -31,8 +31,16 @@ function callback.trog_wizard_convert_wizard(data, triggerable,
end
dgn.place_cloud(_x, _y, "flame", 15)
- crawl.god_speaks("Trog", "Flames erupt from the bowels of the wizard! "
- .. "Trog roars with satisfaction!")
+ local mons = dgn.mons_at(_x, _y)
+ if mons and mons.base_name == "wizard" then
+ crawl.god_speaks("Trog", "Flames erupt from the bowels of the wizard! "
+ .. "Trog roars with satisfaction!")
+ else
+ crawl.god_speaks("Trog", "Flames erupt from the wizard's "
+ .. (mons and "" or "empty ")
+ .. "cell! "
+ .. "Trog roars with frustration!")
+ end
data.triggered = true
end
end