diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2012-06-11 19:50:10 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2012-06-19 18:36:19 +0200 |
| commit | cd328f56d295a6e8c17cd12110368a489cf82b58 (patch) | |
| tree | f455f23bd2226e80d35ed7bd8b4f1008681dcc5d /src | |
| parent | 7833f2577399f212be5c107611f291be1b47ce8f (diff) | |
Lua: Move activation of Theme's Maia "aggravation" to C
Diffstat (limited to 'src')
| -rw-r--r-- | src/lua_bind.c | 9 | ||||
| -rw-r--r-- | src/modules.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/lua_bind.c b/src/lua_bind.c index 34a89613..ab1a19c8 100644 --- a/src/lua_bind.c +++ b/src/lua_bind.c @@ -548,7 +548,14 @@ void timer_aggravate_evil_enable() void timer_aggravate_evil_callback() { - dispel_evil(0); + if ((p_ptr->prace == RACE_MAIA) && + (!player_has_corruption(CORRUPT_BALROG_AURA)) && + (!player_has_corruption(CORRUPT_BALROG_WINGS)) && + (!player_has_corruption(CORRUPT_BALROG_STRENGTH)) && + (!player_has_corruption(CORRUPT_BALROG_FORM))) + { + dispel_evil(0); + } } cptr get_spell_info(s32b s) diff --git a/src/modules.c b/src/modules.c index 01f1be00..c4bea6eb 100644 --- a/src/modules.c +++ b/src/modules.c @@ -1152,6 +1152,8 @@ void init_hooks_module() case MODULE_THEME: { + timer_aggravate_evil_enable(); + add_hook_new(HOOK_PLAYER_LEVEL, auto_stat_gain_hook, "auto_stat_gain", |