diff options
| -rw-r--r-- | lib/mods/theme/scpt/god.lua | 23 | ||||
| -rw-r--r-- | lib/scpt/god.lua | 15 | ||||
| -rw-r--r-- | src/q_god.c | 23 |
3 files changed, 22 insertions, 39 deletions
diff --git a/lib/mods/theme/scpt/god.lua b/lib/mods/theme/scpt/god.lua index 54314d60..31aafd17 100644 --- a/lib/mods/theme/scpt/god.lua +++ b/lib/mods/theme/scpt/god.lua @@ -39,29 +39,6 @@ function msg_directions() end) end --- Set up relic number according to god -function setup_relic_number() - if player.pgod == GOD_ERU then - god_quest.relic_num = 7 - elseif player.pgod == GOD_MANWE then - god_quest.relic_num = 8 - elseif player.pgod == GOD_TULKAS then - god_quest.relic_num = 9 - elseif player.pgod == GOD_MELKOR then - god_quest.relic_num = 10 - elseif player.pgod == GOD_YAVANNA then - god_quest.relic_num = 11 - elseif player.pgod == GOD_AULE then - god_quest.relic_num = 16 - elseif player.pgod == GOD_VARDA then - god_quest.relic_num = 17 - elseif player.pgod == GOD_ULMO then - god_quest.relic_num = 18 - elseif player.pgod == GOD_MANDOS then - god_quest.relic_num = 19 - end -end - add_quest { ["global"] = "GOD_QUEST", diff --git a/lib/scpt/god.lua b/lib/scpt/god.lua index d478bf1e..b8426182 100644 --- a/lib/scpt/god.lua +++ b/lib/scpt/god.lua @@ -39,21 +39,6 @@ function msg_directions() end) end --- Set up relic number according to god -function setup_relic_number() - if player.pgod == GOD_ERU then - god_quest.relic_num = 7 - elseif player.pgod == GOD_MANWE then - god_quest.relic_num = 8 - elseif player.pgod == GOD_TULKAS then - god_quest.relic_num = 9 - elseif player.pgod == GOD_MELKOR then - god_quest.relic_num = 10 - elseif player.pgod == GOD_YAVANNA then - god_quest.relic_num = 11 - end -end - add_quest { ["global"] = "GOD_QUEST", diff --git a/src/q_god.c b/src/q_god.c index 04a5eb15..7b5f69b4 100644 --- a/src/q_god.c +++ b/src/q_god.c @@ -142,7 +142,28 @@ static void set_relics_found(int v) static void setup_relic_number() { - exec_lua("setup_relic_number()"); + int i; + int sval_by_god[][2] = { + { GOD_ERU, 7 }, + { GOD_MANWE, 8 }, + { GOD_TULKAS, 9 }, + { GOD_MELKOR, 10 }, + { GOD_YAVANNA, 11 }, + { GOD_AULE, 16 }, + { GOD_VARDA, 17 }, + { GOD_ULMO, 18 }, + { GOD_MANDOS, 19 }, + { -1, -1 }, + }; + + for (i = 0; sval_by_god[i][1] != -1; i++) + { + if (p_ptr->pgod == sval_by_god[i][0]) + { + int sval = sval_by_god[i][1]; + exec_lua(format("god_quest.relic_num = %d", sval)); + } + } } static void msg_directions() |