diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
| commit | 02819db3483514d49df7ec3f7e372b5aeb831466 (patch) | |
| tree | 6a86adac74beac293bc688dafcfa1709a6476901 /lib/mods/theme/scpt/gods.lua | |
| parent | 2a61dffe127e22c1aaf955db6f085ac2eefbebba (diff) | |
| parent | 6f6de67c70fd98815088ce49f046f48f88ea35bd (diff) | |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# src/CMakeLists.txt
# src/config.h
# src/lua/llimits.h
Diffstat (limited to 'lib/mods/theme/scpt/gods.lua')
| -rw-r--r-- | lib/mods/theme/scpt/gods.lua | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/lib/mods/theme/scpt/gods.lua b/lib/mods/theme/scpt/gods.lua deleted file mode 100644 index 014a4423..00000000 --- a/lib/mods/theme/scpt/gods.lua +++ /dev/null @@ -1,26 +0,0 @@ -add_hooks -{ - [HOOK_FOLLOW_GOD] = function(god, action) - if action == "ask" then - if not (god == GOD_MELKOR) then - local i = INVEN_WIELD - while i < INVEN_TOTAL do - -- 13 is ART_POWER - if player.inventory(i).name1 == 13 then - msg_print("The One Ring has corrupted you, and you are rejected.") - return TRUE - end - i = i + 1 - end - end - end - return FALSE - end, - [HOOK_RECALC_SKILLS] = function() - if not (player.pgod == GOD_NONE) and (get_skill(SKILL_ANTIMAGIC) > 0) then - msg_print("You no longer believe.") - abandon_god(GOD_ALL) - end - return FALSE - end, -} |