diff options
| author | Bookofjude <bookofjude@gmail.com> | 2009-11-03 16:18:30 +1000 |
|---|---|---|
| committer | Bookofjude <bookofjude@gmail.com> | 2009-11-03 16:21:58 +1000 |
| commit | 7e4e5ebd6a2bbdf21037b1089b1ad96fa439985e (patch) | |
| tree | a5ba69e9f902173340ff697847373eff2018177d /crawl-ref/source/dat/clua | |
| parent | 0addd910ea1fec2edab2a0672cd086ee83c19f67 (diff) | |
| download | crawl-ref-7e4e5ebd6a2bbdf21037b1089b1ad96fa439985e.tar.gz crawl-ref-7e4e5ebd6a2bbdf21037b1089b1ad96fa439985e.zip | |
Chained FogMachine convenience function, documentation, minor corrections.
chained_fog_machine now performs relevant lmark.synchronized_markers modification to fog machines. Provided documentation for this. Cleaned up volcano.des, removed some unused functions and fixed some line lengths, other minor corrections.
Diffstat (limited to 'crawl-ref/source/dat/clua')
| -rw-r--r-- | crawl-ref/source/dat/clua/lm_fog.lua | 10 | ||||
| -rw-r--r-- | crawl-ref/source/dat/clua/lm_mslav.lua | 5 | ||||
| -rw-r--r-- | crawl-ref/source/dat/clua/lm_trig.lua | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/crawl-ref/source/dat/clua/lm_fog.lua b/crawl-ref/source/dat/clua/lm_fog.lua index 91dbbc64f3..1b87026c9a 100644 --- a/crawl-ref/source/dat/clua/lm_fog.lua +++ b/crawl-ref/source/dat/clua/lm_fog.lua @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------ --- lm_tmsg.lua: +-- lm_fog.lua: -- Fog machines. -- -- There are three different "pure" ways to use a fog machine marker: @@ -17,6 +17,10 @@ -- Combining these different methods, along with varying the different -- parameters, can be used to achieve different effects. -- +-- Fog machines can be "chained" together (activated at the same time) by using +-- the convenience function "chained_fog_machine" with the normal paramaters +-- which are accepted by "fog_machine". +-- -- Marker parameters: -- -- cloud_type: The name of the cloud type to use. Possible cloud types are: @@ -265,6 +269,10 @@ function fog_machine(pars) return FogMachine:new(pars) end +function chained_fog_machine(pars) + return lmark.synchronized_markers(FogMachine:new(pars), "do_fog") +end + function fog_machine_geyser(cloud_type, size, power, buildup_amnt, buildup_time) return FogMachine:new { diff --git a/crawl-ref/source/dat/clua/lm_mslav.lua b/crawl-ref/source/dat/clua/lm_mslav.lua index 141dea7521..b601028d5c 100644 --- a/crawl-ref/source/dat/clua/lm_mslav.lua +++ b/crawl-ref/source/dat/clua/lm_mslav.lua @@ -6,6 +6,9 @@ -- positions. -- -- API: lmark.synchronized_markers(<marker>, <trigger-function-names>) +-- +-- (Some markers may already provide convenience functionality for the +-- synchronized_markers call, so check the relevant marker file.) -- -- Usage: -- ------ @@ -154,4 +157,4 @@ function lmark.synchronized_markers(master, ...) return lmark.make_slave(slave_id) end end -end
\ No newline at end of file +end diff --git a/crawl-ref/source/dat/clua/lm_trig.lua b/crawl-ref/source/dat/clua/lm_trig.lua index b4b1ef52b8..8431fe58b3 100644 --- a/crawl-ref/source/dat/clua/lm_trig.lua +++ b/crawl-ref/source/dat/clua/lm_trig.lua @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------ --- dungeon.lua: +-- lm_trig.lua: -- DgnTriggerers and triggerables: -- -- This is similar to the overvable/observer design pattern: a triggerable |