diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-15 20:39:15 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-15 20:39:15 +0000 |
commit | be3a188d2d063ce38289db5f96c66f218167d73a (patch) | |
tree | d60703893c7e690314081a1585f2e97121c198c1 /crawl-ref/source/clua.cc | |
parent | 89162833bce0a3fc8d4b75dd3300dc6db24e4666 (diff) | |
download | crawl-ref-be3a188d2d063ce38289db5f96c66f218167d73a.tar.gz crawl-ref-be3a188d2d063ce38289db5f96c66f218167d73a.zip |
Applying patches by dolorous:
1795373: level-2 carnivorous mutation gets another
description to differentiate the levels
1795116: more levitation cleanups (using you.flies())
1794858: cleanup for vampires and fangs mutation
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2092 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/clua.cc')
-rw-r--r-- | crawl-ref/source/clua.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc index 94856ee021..95c31ed9b0 100644 --- a/crawl-ref/source/clua.cc +++ b/crawl-ref/source/clua.cc @@ -725,10 +725,8 @@ LUARET1(you_res_statdrain, number, player_sust_abil(false)) LUARET1(you_res_mutation, number, wearing_amulet(AMU_RESIST_MUTATION, false)) LUARET1(you_res_slowing, number, wearing_amulet(AMU_RESIST_SLOW, false)) LUARET1(you_gourmand, boolean, wearing_amulet(AMU_THE_GOURMAND, false)) -LUARET1(you_levitating, boolean, - player_is_levitating() && !wearing_amulet(AMU_CONTROLLED_FLIGHT)) -LUARET1(you_flying, boolean, - player_is_levitating() && wearing_amulet(AMU_CONTROLLED_FLIGHT)) +LUARET1(you_levitating, boolean, you.flies() == FL_LEVITATE) +LUARET1(you_flying, boolean, you.flies() == FL_FLY) LUARET1(you_transform, string, transform_name()) LUARET1(you_where, string, level_id::current().describe().c_str()) LUARET1(you_branch, string, level_id::current().describe(false, false).c_str()) |