summaryrefslogtreecommitdiff
path: root/lib/mods/theme/scpt
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2012-05-09 22:35:12 +0200
committerBardur Arantsson <bardur@scientician.net>2012-05-09 22:42:46 +0200
commita5b78e910344f4277c110941145e9412a03039ef (patch)
tree30fb069716346dc67e37a40775d06bec7e755f75 /lib/mods/theme/scpt
parent6ef98743b002c48fb3bf720fb07936e34926b313 (diff)
Lua: Move Theme's "aggravate_evil" timer to C
Diffstat (limited to 'lib/mods/theme/scpt')
-rw-r--r--lib/mods/theme/scpt/monsters.lua11
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/mods/theme/scpt/monsters.lua b/lib/mods/theme/scpt/monsters.lua
index cbadf1d6..6c0cc197 100644
--- a/lib/mods/theme/scpt/monsters.lua
+++ b/lib/mods/theme/scpt/monsters.lua
@@ -62,15 +62,6 @@ end
-- cast dispel evil with 0 damage every 10 turns
-TIMER_AGGRAVATE_EVIL = new_timer
-{
- ["enabled"] = FALSE,
- ["delay"] = 10,
- ["callback"] = function()
- dispel_evil(0)
- end,
-}
-
add_hooks{
[HOOK_GAME_START] = function()
@@ -80,7 +71,7 @@ add_hooks{
(player_has_corruption(CORRUPT_BALROG_STRENGTH) ~= TRUE) and
(player_has_corruption(CORRUPT_BALROG_FORM) ~= TRUE)) then
-- "Proper" Maiar aggravate evil beings
- TIMER_AGGRAVATE_EVIL.enabled = TRUE
+ timer_aggravate_evil_enable()
-- Good beings (except swans, GWoPs, Wyrm Spirits, and some joke uniques) are coaligned with Maiar
monst_al_add(MSTATUS_FRIEND, {25, 29, 45, 97, 109, 147, 225, 335, 346, 443, 581, 629, 699, 853, 984, 1007, 1017}, {21})