diff options
-rw-r--r-- | lib/mods/theme/edit/t_minas.txt | 2 | ||||
-rw-r--r-- | lib/mods/theme/scpt/gondolin.lua | 36 | ||||
-rw-r--r-- | src/defines.h | 2 | ||||
-rw-r--r-- | src/tables.c | 8 |
4 files changed, 13 insertions, 35 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) diff --git a/src/defines.h b/src/defines.h index 93b6e9a6..3fc34864 100644 --- a/src/defines.h +++ b/src/defines.h @@ -863,7 +863,7 @@ /* Features 0xCF - 0xFF -- unused */ -#define MAX_BETWEEN_EXITS 2 +#define MAX_BETWEEN_EXITS 3 /* * Number of effects diff --git a/src/tables.c b/src/tables.c index 18a9329a..c5a22204 100644 --- a/src/tables.c +++ b/src/tables.c @@ -4673,6 +4673,14 @@ between_exit between_exits[MAX_BETWEEN_EXITS] = 10, 35, 0, 0 }, + /* Theme: Minas Tirith -> Gondolin link */ + { + 0, + FALSE, + 3, 11, + 119, 25, + 0, 0 + }, }; /* |