diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-01 16:07:23 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-01 16:07:23 +0000 |
| commit | ce03c65515786c7f3c019314fe44019258236a94 (patch) | |
| tree | 4f2215b3c665329834e2d654af4c2d43e009b3b9 /crawl-ref/source/dat | |
| parent | 8f8b5b59f645ca88bf6b821b04a899b8d779ea45 (diff) | |
| download | crawl-ref-ce03c65515786c7f3c019314fe44019258236a94.tar.gz crawl-ref-ce03c65515786c7f3c019314fe44019258236a94.zip | |
Slime:6 teleport control is enabled even if you kill the royal jelly off-level (sorear). TC is also enabled when banishing the royal jelly, which is a bit cheesy...
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4026 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dat')
| -rw-r--r-- | crawl-ref/source/dat/clua/lm_flags.lua | 6 | ||||
| -rw-r--r-- | crawl-ref/source/dat/lair.des | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/dat/clua/lm_flags.lua b/crawl-ref/source/dat/clua/lm_flags.lua index 68bf42177e..86814a26a8 100644 --- a/crawl-ref/source/dat/clua/lm_flags.lua +++ b/crawl-ref/source/dat/clua/lm_flags.lua @@ -73,8 +73,10 @@ function ChangeFlags:new(pars) pars.branch_flags = pars.branch_flags or "" pars.msg = pars.msg or "" - if not (pars.level_flags ~= "" or pars.branch_flags ~= "") then - error("Must provide at least one of level_flags or branch_flags.") + if pars.level_flags == "" and pars.branch_flags == "" + and not pars.trigger + then + error("Must provide at least one of level_flags, branch_flags, or trigger.") end local cf = self:_new() diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des index 9b63a34ad1..c476cb5581 100644 --- a/crawl-ref/source/dat/lair.des +++ b/crawl-ref/source/dat/lair.des @@ -786,7 +786,7 @@ NSUBST: P = O / *| SHUFFLE: ([{ LFLAGS: no_tele_control MARKER: X = lua:mons_dies_change_flags { \ - level_flags="!no_tele_control", mon_name="royal jelly", \ + mon_name="royal jelly", \ trigger=slime_wall_morph \ } SUBST: X = . |