diff options
author | Bardur Arantsson <bardur@scientician.net> | 2012-04-09 20:52:39 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2012-04-09 20:52:39 +0200 |
commit | d71c748f56b479ab97408fe2d42eaf0898982fb7 (patch) | |
tree | b2a26afbfa582190819b3ffdaf46556f3a169811 /lib/mods/theme | |
parent | 07a11792fc5f385130b36da44aa71c32cb96c514 (diff) |
Lua: Remove the need for script for Minas Tirith <-> Gondolin link
Diffstat (limited to 'lib/mods/theme')
-rw-r--r-- | lib/mods/theme/edit/t_minas.txt | 2 | ||||
-rw-r--r-- | lib/mods/theme/scpt/gondolin.lua | 36 |
2 files changed, 4 insertions, 34 deletions
diff --git a/lib/mods/theme/edit/t_minas.txt b/lib/mods/theme/edit/t_minas.txt index b96481d8..cea53634 100644 --- a/lib/mods/theme/edit/t_minas.txt +++ b/lib/mods/theme/edit/t_minas.txt @@ -15,7 +15,7 @@ F:w:8:3:0:0:0:0:0:24 # Quest 16 finished, reward is a between gate ?:[EQU $QUEST16 5] -F:Z:176:3:0:0:0:0:0:0 +F:Z:176:3:0:0:0:0:0:2 ?:1 diff --git a/lib/mods/theme/scpt/gondolin.lua b/lib/mods/theme/scpt/gondolin.lua index c85d8f53..f70f2044 100644 --- a/lib/mods/theme/scpt/gondolin.lua +++ b/lib/mods/theme/scpt/gondolin.lua @@ -1,36 +1,6 @@ --- This script makes the void jumpgates between Minas Anor and Gondolin appear in Gondolin rather than in a weird wilderness spot --- as well as making the Save Gondolin quest take the player straight to Gondolin instead of the Secret Valley. --- Many thanks to TheFalcon for the code. - -function minas_gate() - if (quest(16).status == QUEST_STATUS_FINISHED) and (player.wilderness_y == 56) and (player.wilderness_x == 60) and (player.wild_mode == FALSE) then - cave(35,10).feat = 159 - end -end - -add_hook_script(HOOK_QUEST_FINISH, "minas_gate", "minas_gate") -add_hook_script(HOOK_WILD_GEN, "minas_gate", "minas_gate") - -function minas_jump(direction) - if (quest(16).status == QUEST_STATUS_FINISHED) and (player.wilderness_y == 56) and (player.wilderness_x == 60) and (player.wild_mode == FALSE) then - if (player.px == 10) and (player.py == 35) then - if (direction == "down") then - player.wilderness_x = 3 - player.wilderness_y = 11 - player.wild_mode = FALSE - player.px = 119 - player.py = 25 - player.oldpx = player.px - player.oldpy = player.py - dun_level = 0 - player.leaving = TRUE - return TRUE - end - end - end -end - -add_hook_script(HOOK_STAIR, "minas_jump", "minas_jump") +-- This script makes the Save Gondolin quest take the player straight +-- to Gondolin instead of the Secret Valley. Many thanks to TheFalcon +-- for the code. add_loadsave("tolan_count", 0) |